Merging MadSkills-io#45 by @somq.

Author: jsutton

CHANGELOG.md

@@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-
+- Adding basic v3 cli compatibility thanks to @somq
 
 ## [0.8.0] - 2021-1-28
 Thanks @pecirep, @miguel-a-calles-mba, @superandrew213

README.md

@@ -97,10 +97,22 @@ echo "error page" >> client/dist/error.html
 
 **Third**, run the plugin (this can take several minutes the first time), and visit your new website!
 
+Serverless v2 cli params
+
 ```bash
 serverless deploy [--no-delete-contents] [--no-generate-client]
 ```
 
+Serverless v3 cli params
+
+> Serverless v3 forbids free-form cli options.  
+> Therefore options can now only be passed as `--param="option=value"`.  
+> For the sake of simplicity, all v2 options are still available and passable through the `param` argument.  
+
+```bash
+serverless deploy [--param="no-delete-contents"] [--param="generate-client"]
+```
+
 The plugin should output the location of your newly deployed static site to the console.
 
 **Note:** *See [Command-line Parameters](#command-line-parameters) for details on command above*
@@ -635,4 +647,4 @@ Use this parameter if you do not want to invalidate the CloudFront distribution.
 Forked from the [**serverless-api-cloudfront**](https://github.com/Droplr/serverless-api-cloudfront/)  
 Borrowed heavily from the [**serverless-finch**](https://github.com/fernando-mc/serverless-finch/)  
 Initial CloudFormation template from [**Full Stack Serverless Web Apps with AWS**](https://medium.com/99xtechnology/full-stack-serverless-web-apps-with-aws-189d87da024a/)  
-Inspiration from [**serverless-stack.com**](https://serverless-stack.com/)
+Inspiration from [**serverless-stack.com**](https://serverless-stack.com/)

index.js

@@ -67,7 +67,7 @@ class ServerlessFullstackPlugin {
         return this.validateConfig()
             .then(() => {
                 bucketName = this.getBucketName(this.options.bucketName);
-                return (this.cliOptions.confirm === false || this.options.noConfirm === true) ? true : new Confirm(`Are you sure you want to delete bucket '${bucketName}'?`).run();
+                return (this.getCLIOptions('confirm') === false || this.options.noConfirm === true) ? true : new Confirm(`Are you sure you want to delete bucket '${bucketName}'?`).run();
             })
             .then(goOn => {
                 if (goOn) {
@@ -111,7 +111,7 @@ class ServerlessFullstackPlugin {
     generateClient() {
         const clientCommand = this.options.clientCommand;
         const clientSrcPath = this.options.clientSrcPath || '.';
-        if (clientCommand && this.cliOptions['generate-client'] !== false) {
+        if (clientCommand && this.getCLIOptions('generate-client') !== false) {
             const args = clientCommand.split(' ');
             const command = args.shift();
             return new BbPromise(this.performClientGeneration.bind(this, command, args, clientSrcPath));
@@ -150,7 +150,7 @@ class ServerlessFullstackPlugin {
 
     processDeployment() {
 
-        if(this.cliOptions['client-deploy'] !== false) {
+        if(this.getCLIOptions('client-deploy') !== false) {
             let region,
                 distributionFolder,
                 clientPath,
@@ -189,15 +189,15 @@ class ServerlessFullstackPlugin {
 
                     const deployDescribe = ['This deployment will:'];
 
-                    if (this.cliOptions['delete-contents'] !== false) {
+                    if (this.getCLIOptions('delete-contents') !== false) {
                         deployDescribe.push(`- Remove all existing files from bucket '${bucketName}'`);
                     }
                     deployDescribe.push(
                         `- Upload all files from '${distributionFolder}' to bucket '${bucketName}'`
                     );
 
                     deployDescribe.forEach(m => this.serverless.cli.log(m));
-                    return (this.cliOptions.confirm === false || this.options.noConfirm === true) ? true : new Confirm(`Do you want to proceed?`).run();
+                    return (this.getCLIOptions('confirm') === false || this.options.noConfirm === true) ? true : new Confirm(`Do you want to proceed?`).run();
                 })
                 .then(goOn => {
                     if (goOn) {
@@ -207,7 +207,7 @@ class ServerlessFullstackPlugin {
                             .then(exists => {
                                 if (exists) {
                                     this.serverless.cli.log(`Bucket found...`);
-                                    if (this.cliOptions['delete-contents'] === false) {
+                                    if (this.getCLIOptions('delete-contents') === false) {
                                         this.serverless.cli.log(`Keeping current bucket contents...`);
                                         return BbPromise.resolve();
                                     }
@@ -233,7 +233,7 @@ class ServerlessFullstackPlugin {
                     return BbPromise.resolve();
                 })
                 .then(() => {
-                    if (this.cliOptions['invalidate-distribution'] === false) {
+                    if (this.getCLIOptions('invalidate-distribution') === false) {
                         this.serverless.cli.log(`Skipping cloudfront invalidation...`);
                     } else {
                         return invalidateCloudfrontDistribution(this.serverless, invalidationPaths);
@@ -561,6 +561,31 @@ class ServerlessFullstackPlugin {
         }
         return stage;
     }
+
+    /**
+     * Serverless v3 hotfix/compat.
+     * @param {the cli option} param 
+     * @returns Boolean
+     */
+    getCLIOptions(param) {
+      // v3
+      const isv3 = this.serverless.version.split('.')[0] === '3';
+      if (isv3) {
+        const cliOptionsParams = Array.isArray(this.cliOptions?.param) ? [...this.cliOptions.param] : [];
+        const cliOptions = {...this.cliOptions}
+
+        // Build key/value cli options from param array
+        cliOptionsParams.forEach((k) => {
+          const key = k.replace('no-', '');
+          const val = !k.includes('no');
+          cliOptions[key] = val;
+        });
+        return cliOptions[param]
+      }
+
+      // v2
+      return this.cliOptions[param]
+    }
 }
 
-module.exports = ServerlessFullstackPlugin;
+module.exports = ServerlessFullstackPlugin;