refactor: reorganize files

- move all code into lib folder
- move unit tests next to lib code
- rename files in kebab-case
- sort some requires
- remove utilities folder since there was only one file

.nycrc.json

@@ -1,6 +1,6 @@
 {
   "all": true,
-  "include": ["index.js", "lib/**/*.js"],
+  "include": ["lib/**/*.js"],
   "exclude": ["**/*.test.js"],
   "reporter": ["lcov", "html", "text-summary"]
 }

lib/bucketUtils.js → lib/bucket-utils.js

@@ -56,17 +56,18 @@ function emptyBucket(aws, bucketName, keyPrefix) {
     if (!contents[0]) {
       return Promise.resolve();
     } else {
-
       if (keyPrefix) {
         testPrefix = true;
         prefixRegexp = new RegExp('^' + keyPrefix);
       }
-      const objects = contents.map(function(content) {
-        return {Key: content.Key};
-      }).filter(content => !testPrefix || prefixRegexp.test(content.Key));
+      const objects = contents
+        .map(function (content) {
+          return { Key: content.Key };
+        })
+        .filter(content => !testPrefix || prefixRegexp.test(content.Key));
 
       if (objects.length === 0) {
-        return Promise.resolve()
+        return Promise.resolve();
       }
 
       const params = {

lib/configure.js

@@ -122,7 +122,7 @@ function configurePolicyForBucket(aws, bucketName, customPolicy) {
 function configureCorsForBucket(aws, bucketName) {
   const params = {
     Bucket: bucketName,
-    CORSConfiguration: require('./resources/CORSPolicy')
+    CORSConfiguration: require('./resources/cors-policy.json')
   };
 
   return aws.request('S3', 'putBucketCors', params);

index.js → lib/plugin.js

@@ -1,15 +1,14 @@
 'use strict';
 
-const path = require('path');
-const fs = require('fs');
-
 const confirm = require('@serverless/utils/inquirer/confirm');
+const fs = require('fs');
+const path = require('path');
 
-const bucketUtils = require('./lib/bucketUtils');
-const configure = require('./lib/configure');
-const regionUrls = require('./lib/resources/awsRegionUrls');
-const uploadDirectory = require('./lib/upload');
-const validateClient = require('./lib/validate');
+const bucketUtils = require('./bucket-utils');
+const configure = require('./configure');
+const regionUrls = require('./resources/aws-region-urls.json');
+const uploadDirectory = require('./upload');
+const validateClient = require('./validate');
 
 class Client {
   constructor(serverless, cliOptions, { log }) {

test/unit/deploy.test.js → lib/plugin.test.js

@@ -5,7 +5,7 @@ const inquirer = require('@serverless/utils/inquirer');
 const chai = require('chai');
 const sinon = require('sinon');
 
-const runServerless = require('../run-serverless');
+const runServerless = require('../test/run-serverless');
 
 chai.use(require('chai-as-promised'));
 chai.use(require('sinon-chai'));

lib/upload.js

@@ -1,14 +1,11 @@
 'use strict';
 
 const fs = require('fs');
-const path = require('path');
-
 const mime = require('mime');
-
-const getFileList = require('./utilities/getFileList');
-const regionUrls = require('./resources/awsRegionUrls');
-
 const minimatch = require('minimatch');
+const path = require('path');
+
+const getFileList = require('./get-file-list');
 
 /**
  * Uploads client files to an S3 bucket

lib/validate.js

@@ -1,9 +1,8 @@
 'use strict';
 
 const fs = require('fs');
-const path = require('path');
-
 const is = require('is_js');
+const path = require('path');
 
 /**
  * Validates the configuration parameters that will be used for deployment

package.json

@@ -5,10 +5,10 @@
     "node": ">=14.15.5"
   },
   "description": "Deploy your serverless static website to AWS S3.",
-  "main": "index.js",
+  "main": "lib/plugin.js",
   "scripts": {
     "prepare": "husky install",
-    "test": "mocha \"test/unit/**/*.test.js\"",
+    "test": "mocha \"lib/**/*.test.js\"",
     "coverage": "nyc npm run test",
     "integration-test": "mocha-isolated --pass-through-aws-creds \"test/integration/**/*.test.js\""
   },