chore: Reformat with eslint & prettier

Author: pgrzesik

.github/dependabot.yml

@@ -1,12 +1,12 @@
 version: 2
 updates:
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "10:00"
-  open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: eslint
-    versions:
-    - "> 7.22.0"
+  - package-ecosystem: npm
+    directory: '/'
+    schedule:
+      interval: daily
+      time: '10:00'
+    open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: eslint
+        versions:
+          - '> 7.22.0'

.github/workflows/integrate.yml

@@ -59,7 +59,7 @@ jobs:
           npm update --no-save
           npm update --save-dev --no-save
       - name: Unit tests
-        run: script -e -c "npm test"
+        run: npm test
 
   windowsNode16:
     name: '[Windows] Node.js v16: Unit tests'
@@ -161,7 +161,7 @@ jobs:
           npm update --no-save
           npm update --save-dev --no-save
       - name: Unit tests
-        run: script -e -c "npm test"
+        run: npm test
 
   linuxNode12:
     name: '[Linux] Node.js v12: Unit tests'
@@ -212,12 +212,12 @@ jobs:
           npm update --no-save
           npm update --save-dev --no-save
       - name: Unit tests
-        run: script -e -c "npm test"
+        run: npm test
 
   tagIfNewVersion:
     name: Tag if new version
     runs-on: ubuntu-latest
-    needs: [linuxNode14, windowsNode14, linuxNode16, linuxNode12]
+    needs: [linuxNode16, windowsNode16, linuxNode14, linuxNode12]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2

.github/workflows/publish.yml

@@ -26,12 +26,12 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v14-${{ runner.os }}-refs/heads/master-${{ hashFiles('package.json') }}
+          key: npm-v16-${{ runner.os }}-refs/heads/master-${{ hashFiles('package.json') }}
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
           registry-url: https://registry.npmjs.org
 
       - name: Publish new version

.github/workflows/validate.yml

@@ -86,7 +86,7 @@ jobs:
             npx dump-release-notes-from-cc-changelog $NEW_VERSION
           fi
       - name: Unit tests
-        run: script -e -c "npm test"
+        run: npm test
 
   windowsNode16:
     name: '[Windows] Node.js v16: Unit tests'
@@ -192,9 +192,7 @@ jobs:
           npm update --no-save
           npm update --save-dev --no-save
       - name: Unit tests
-        # Some tests depend on TTY support, which is missing in GA runner
-        # Workaround taken from https://github.com/actions/runner/issues/241#issuecomment-577360161
-        run: script -e -c "npm test"
+        run: npm test
 
   linuxNode12:
     name: '[Linux] Node.js v12: Unit tests'
@@ -247,4 +245,4 @@ jobs:
           npm update --no-save
           npm update --save-dev --no-save
       - name: Unit tests
-        run: script -e -c "npm test"
+        run: npm test

README.md

@@ -7,13 +7,13 @@
 
 A Serverless v1.x plugin to automatically bundle dependencies from `requirements.txt` and make them available in your `PYTHONPATH`.
 
---- 
+---
 
 _Originally developed by [**Capital One**](https://www.capitalone.com/tech/open-source/), now maintained in scope of Serverless, Inc_
 
 _Capital One considers itself the bank a technology company would build. It's delivering best-in-class innovation so that its millions of customers can manage their finances with ease. Capital One is all-in on the cloud and is a leader in the adoption of open source, RESTful APIs, microservices and containers. We build our own products and release them with a speed and agility that allows us to get new customer experiences to market quickly. Our engineers use artificial intelligence and machine learning to transform real-time data, software and algorithms into the future of finance, reimagined._
 
---- 
+---
 
 ## Install
 
@@ -557,10 +557,10 @@ package:
 - [@andrewfarley](https://github.com/andrewfarley) - Implemented download caching and static caching
 - [@bweigel](https://github.com/bweigel) - adding the `slimPatternsAppendDefaults` option & fixing per-function packaging when some functions don't have requirements & Porting tests from bats to js!
 - Poetry support
-	- [@squaresurf](https://github.com/squaresurf)
-	- [@drice](https://github.com/drice)
-	- [@ofercaspi](https://github.com/ofercaspi)
-	- [@tpansino](https://github.com/tpansino)
+  - [@squaresurf](https://github.com/squaresurf)
+  - [@drice](https://github.com/drice)
+  - [@ofercaspi](https://github.com/ofercaspi)
+  - [@tpansino](https://github.com/tpansino)
 - [@david-mk-lawrence](https://github.com/david-mk-lawrence) - added Lambda Layer support
 - [@bryantbriggs](https://github.com/bryantbiggs) - Fixing CI/CD
 - [@jacksgt](https://github.com/jacksgt) - Fixing pip issues

index.js

@@ -7,7 +7,7 @@ const values = require('lodash.values');
 const {
   addVendorHelper,
   removeVendorHelper,
-  packRequirements
+  packRequirements,
 } = require('./lib/zip');
 const { injectAllRequirements } = require('./lib/inject');
 const { layerRequirements } = require('./lib/layer');
@@ -57,7 +57,7 @@ class ServerlessPythonRequirements {
         staticCacheMaxVersions: 0,
         pipCmdExtraArgs: [],
         noDeploy: [],
-        vendor: ''
+        vendor: '',
       },
       (this.serverless.service.custom &&
         this.serverless.service.custom.pythonRequirements) ||
@@ -75,7 +75,9 @@ class ServerlessPythonRequirements {
     ) {
       if (!this.warningLogged) {
         if (this.log) {
-          this.log.warning('You provided a docker related option but dockerizePip is set to false.');
+          this.log.warning(
+            'You provided a docker related option but dockerizePip is set to false.'
+          );
         } else {
           this.serverless.cli.log(
             'WARNING: You provided a docker related option but dockerizePip is set to false.'
@@ -144,31 +146,31 @@ class ServerlessPythonRequirements {
         commands: {
           clean: {
             usage: 'Remove .requirements and requirements.zip',
-            lifecycleEvents: ['clean']
+            lifecycleEvents: ['clean'],
           },
           install: {
             usage: 'install requirements manually',
-            lifecycleEvents: ['install']
+            lifecycleEvents: ['install'],
           },
           cleanCache: {
             usage:
               'Removes all items in the pip download/static cache (if present)',
-            lifecycleEvents: ['cleanCache']
-          }
-        }
-      }
+            lifecycleEvents: ['cleanCache'],
+          },
+        },
+      },
     };
 
-		if (this.serverless.cli.generateCommandsHelp) {
-			Object.assign(this.commands.requirements, {
-				usage: 'Serverless plugin to bundle Python packages',
-				lifecycleEvents: ['requirements']
-			});
-		} else {
-			this.commands.requirements.type = 'container';
-		}
+    if (this.serverless.cli.generateCommandsHelp) {
+      Object.assign(this.commands.requirements, {
+        usage: 'Serverless plugin to bundle Python packages',
+        lifecycleEvents: ['requirements'],
+      });
+    } else {
+      this.commands.requirements.type = 'container';
+    }
 
-    const isFunctionRuntimePython = args => {
+    const isFunctionRuntimePython = (args) => {
       // If functionObj.runtime is undefined, python.
       if (!args[1].functionObj || !args[1].functionObj.runtime) {
         return true;
@@ -177,9 +179,7 @@ class ServerlessPythonRequirements {
     };
 
     const clean = () =>
-      BbPromise.bind(this)
-        .then(cleanup)
-        .then(removeVendorHelper);
+      BbPromise.bind(this).then(cleanup).then(removeVendorHelper);
 
     const setupArtifactPathCapturing = () => {
       // Reference:
@@ -243,7 +243,7 @@ class ServerlessPythonRequirements {
       },
       'requirements:install:install': before,
       'requirements:clean:clean': clean,
-      'requirements:cleanCache:cleanCache': cleanCache
+      'requirements:cleanCache:cleanCache': cleanCache,
     };
   }
 }

package.json

@@ -39,8 +39,7 @@
   "bin": {},
   "scripts": {
     "commitlint": "commitlint -f HEAD@{15}",
-    "format": "prettier --write '{.,lib}/*.{js,md}'",
-    "lint": "eslint *.js lib/*.js && prettier -c '{.,lib}/*.{js,md}'",
+    "lint": "eslint .",
     "lint:updated": "pipe-git-updated --ext=js -- eslint",
     "prepare-release": "standard-version && prettier --write CHANGELOG.md",
     "prettier-check": "prettier -c --ignore-path .gitignore \"**/*.{css,html,js,json,md,yaml,yml}\"",
@@ -79,6 +78,14 @@
   "peerDependencies": {
     "serverless": "^2.32"
   },
+  "lint-staged": {
+    "*.js": [
+      "eslint"
+    ],
+    "*.{css,html,js,json,md,yaml,yml}": [
+      "prettier -c"
+    ]
+  },
   "eslintConfig": {
     "extends": "eslint:recommended",
     "env": {