Fix tests with Serverless v3

.eslintrc.yml

@@ -10,6 +10,7 @@ extends:
   - plugin:promise/recommended
   - plugin:import/errors
   - plugin:import/warnings
+  - prettier
 parser: "@babel/eslint-parser"
 parserOptions:
   requireConfigFile: false
@@ -18,10 +19,8 @@ plugins:
   - promise
   - lodash
   - import
+  - prettier
 rules:
-  indent: [ error, 2, {
-    MemberExpression: off
-  } ]
   linebreak-style: [ error, unix ]
   semi: [ error, always ]
   quotes: [ error, single, { avoidEscape: true } ]
@@ -32,7 +31,6 @@ rules:
   brace-style: [ error, '1tbs' ]
   comma-spacing: [ error, { before: false, after: true } ]
   comma-style: [ error, last, { exceptions: { VariableDeclaration: true } } ]
-  array-bracket-spacing: [ error, always, { singleValue: false } ]
   computed-property-spacing: [ error, never ]
   object-curly-spacing: [ error, always ]
   prefer-const: error
@@ -47,3 +45,11 @@ rules:
   lodash/prop-shorthand: off
   lodash/prefer-lodash-method: [ error, { ignoreObjects: [ BbPromise, path ] } ]
   max-len: [ error, { code: 120, ignoreStrings: true, ignoreComments: true, ignoreTemplateLiterals: true } ]
+  prettier/prettier: [ error, {
+    printWidth: 120,
+    arrowParens: 'avoid',
+    bracketSpacing: true,
+    semi: true,
+    singleQuote: true,
+    trailingComma: 'none',
+  } ]

.github/workflows/tests.yml

@@ -21,6 +21,7 @@ jobs:
           - "10"
           - "12"
           - "14"
+          - "16"
 
     steps:
       - name: "Checkout"
@@ -97,3 +98,34 @@ jobs:
 
       - name: "Run tests"
         run: "npm run test"
+
+  serverless-v2:
+    runs-on: ${{ matrix.os }}
+    name: Node.js ${{ matrix.node }} on ${{ matrix.os }} with Serverless v2
+
+    strategy:
+      matrix:
+        os:
+          - ubuntu-20.04
+        node:
+          - "14"
+
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+
+      - name: "Install Node.js"
+        uses: actions/setup-node@v2
+        with:
+          node-version: "${{ matrix.node }}"
+
+      - name: "Install Serverless v2"
+        run: npm install serverless@2
+
+      - name: "Install dependencies"
+        run: npm ci
+
+      - name: "Run tests"
+        run: "npm run test"

.npmignore

@@ -13,4 +13,3 @@ yarn-error.log
 .eslintrc.yml
 .huskyrc
 .lintstagedrc.yml
-prettier.config.js

examples/typescript/webpack.config.js

@@ -12,7 +12,7 @@ module.exports = {
   externals: [nodeExternals()],
   devtool: 'source-map',
   resolve: {
-    extensions: [ '.js', '.jsx', '.json', '.ts', '.tsx' ]
+    extensions: ['.js', '.jsx', '.json', '.ts', '.tsx']
   },
   output: {
     libraryTarget: 'commonjs2',

index.js

@@ -84,7 +84,7 @@ class ServerlessWebpack {
           },
           package: {
             type: 'entrypoint',
-            lifecycleEvents: [ 'packExternalModules', 'packageModules', 'copyExistingArtifacts' ]
+            lifecycleEvents: ['packExternalModules', 'packageModules', 'copyExistingArtifacts']
           }
         }
       }

lib/packExternalModules.js

@@ -143,7 +143,7 @@ function getProdModules(externalModules, packagePath, nodeModulesRelativeDir, de
         moduleVersion = _.get(_.get(originInfo, 'dependencies', {})[module.external], 'version');
         if (!moduleVersion) {
           // eslint-disable-next-line lodash/path-style
-          moduleVersion = _.get(dependencyGraph, [ 'dependencies', module.external, 'version' ]);
+          moduleVersion = _.get(dependencyGraph, ['dependencies', module.external, 'version']);
         }
         if (!moduleVersion) {
           this.serverless.cli.log(`WARNING: Could not determine version of module ${module.external}`);
@@ -378,12 +378,12 @@ module.exports = {
               .then(() =>
                 hasPackageLock
                   ? BbPromise.fromCallback(callback =>
-                    fse.copy(
-                      path.join(compositeModulePath, packager.lockfileName),
-                      path.join(modulePath, packager.lockfileName),
-                      callback
+                      fse.copy(
+                        path.join(compositeModulePath, packager.lockfileName),
+                        path.join(modulePath, packager.lockfileName),
+                        callback
+                      )
                     )
-                  )
                   : BbPromise.resolve()
               )
               .tap(

lib/packagers/npm.js

@@ -124,7 +124,7 @@ class NPM {
   static runScripts(cwd, scriptNames) {
     const command = /^win/.test(process.platform) ? 'npm.cmd' : 'npm';
     return BbPromise.mapSeries(scriptNames, scriptName => {
-      const args = [ 'run', scriptName ];
+      const args = ['run', scriptName];
 
       return Utils.spawnProcess(command, args, { cwd });
     }).return();

lib/packagers/yarn.js

@@ -30,7 +30,7 @@ class Yarn {
 
   static getProdDependencies(cwd, depth) {
     const command = /^win/.test(process.platform) ? 'yarn.cmd' : 'yarn';
-    const args = [ 'list', `--depth=${depth || 1}`, '--json', '--production' ];
+    const args = ['list', `--depth=${depth || 1}`, '--json', '--production'];
 
     // If we need to ignore some errors add them here
     const ignoredYarnErrors = [];
@@ -123,7 +123,7 @@ class Yarn {
     }
 
     const command = /^win/.test(process.platform) ? 'yarn.cmd' : 'yarn';
-    const args = [ 'install', '--non-interactive' ];
+    const args = ['install', '--non-interactive'];
 
     // Convert supported packagerOptions
     if (!packagerOptions.noFrozenLockfile) {
@@ -147,7 +147,7 @@ class Yarn {
   static runScripts(cwd, scriptNames) {
     const command = /^win/.test(process.platform) ? 'yarn.cmd' : 'yarn';
     return BbPromise.mapSeries(scriptNames, scriptName => {
-      const args = [ 'run', scriptName ];
+      const args = ['run', scriptName];
 
       return Utils.spawnProcess(command, args, { cwd });
     }).return();

lib/validate.js

@@ -14,7 +14,7 @@ const { getAllNodeFunctions, isNodeRuntime } = require('./utils');
  * This should cover most of the cases. For complex setups the user should
  * build his own entries with help of the other exports.
  */
-const preferredExtensions = [ '.js', '.ts', '.jsx', '.tsx' ];
+const preferredExtensions = ['.js', '.ts', '.jsx', '.tsx'];
 
 module.exports = {
   validate() {
@@ -249,7 +249,7 @@ module.exports = {
           const entry = path.relative('.', value);
           const entryFile = _.replace(entry, new RegExp(`${path.extname(entry)}$`), '');
 
-          const entryFuncs = _.filter(allEntryFunctions, [ 'handlerFile', entryFile ]);
+          const entryFuncs = _.filter(allEntryFunctions, ['handlerFile', entryFile]);
           if (_.isEmpty(entryFuncs)) {
             // We have to make sure that for each entry there is an entry function item.
             entryFuncs.push({});