Depracate node 8.10. Add support for node 14.x

nordcloud · Aug 28, 2021 · ec49ca3 · ec49ca3
1 parent 7096092
commit ec49ca3
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 language: node_js
 node_js:
-- '8.10.0'
 - '10'
 - '12'
+- '14'
 script:
 - npm run lint
 - npm test
diff --git a/__tests__/config.test.js b/__tests__/config.test.js
@@ -94,7 +94,7 @@ xdescribe('jest configuration', () => {
       service: my-service
       provider:
         name: aws
-        runtime: nodejs8.10
+        runtime: nodejs14.x
         stage: dev
         region: us-west-1
       plugins:
@@ -147,7 +147,7 @@ xdescribe('jest configuration', () => {
       service: my-service
       provider:
         name: aws
-        runtime: nodejs8.10
+        runtime: nodejs14.x
         stage: dev
         region: us-west-1
       plugins:

diff --git a/__tests__/integration10.x.test.js b/__tests__/integration10.x.test.js
@@ -4,6 +4,7 @@ const Serverless = require('serverless');
 const execSync = require('child_process').execSync;
 const path = require('path');
 const fs = require('fs-extra');
+const stripAnsi = require('strip-ansi');
 const { getTmpDirPath, replaceTextInFile, spawnPromise } = require('./test-utils');
 
 const serverless = new Serverless();
@@ -71,8 +72,9 @@ describe('integration', () => {
         "require('../.serverless_plugins/serverless-jest-plugin/index.js')",
       );
       return spawnPromise(serverlessExec, 'invoke test --stage prod').then(({ stderr }) => {
-        expect(stderr).toContain('PASS');
-        return expect(stderr).toContain('Test Suites: 2 passed, 2 total');
+        const rawStderr = stripAnsi(stderr);
+        expect(rawStderr).toContain('PASS');
+        return expect(rawStderr).toContain('Test Suites: 2 passed, 2 total');
       });
     },
     35000,

diff --git a/__tests__/integration12.x.test.js b/__tests__/integration12.x.test.js
@@ -4,6 +4,7 @@ const Serverless = require('serverless');
 const execSync = require('child_process').execSync;
 const path = require('path');
 const fs = require('fs-extra');
+const stripAnsi = require('strip-ansi');
 const { getTmpDirPath, replaceTextInFile, spawnPromise } = require('./test-utils');
 
 const serverless = new Serverless();
@@ -71,8 +72,9 @@ describe('integration', () => {
         "require('../.serverless_plugins/serverless-jest-plugin/index.js')",
       );
       return spawnPromise(serverlessExec, 'invoke test --stage prod').then(({ stderr }) => {
-        expect(stderr).toContain('PASS');
-        return expect(stderr).toContain('Test Suites: 2 passed, 2 total');
+        const rawStderr = stripAnsi(stderr);
+        expect(rawStderr).toContain('PASS');
+        return expect(rawStderr).toContain('Test Suites: 2 passed, 2 total');
       });
     },
     35000,

diff --git a/__tests__/integration8.10.test.js → __tests__/integration14.x.test.js b/__tests__/integration8.10.test.js → __tests__/integration14.x.test.js
@@ -16,7 +16,7 @@ describe('integration', () => {
     process.env.PLUGIN_TEST_DIR = path.join(__dirname);
     const tmpDir = getTmpDirPath();
     fs.mkdirsSync(tmpDir);
-    fs.copySync(path.join(process.env.PLUGIN_TEST_DIR, 'test-service8.10'), tmpDir);
+    fs.copySync(path.join(process.env.PLUGIN_TEST_DIR, 'test-service14.x'), tmpDir);
     const packageJsonPath = path.join(tmpDir, 'package.json');
     const packageJson = fs.readJsonSync(packageJsonPath);
     packageJson.name = `application-${Date.now()}`;

diff --git a/__tests__/test-service-options/serverless.yml b/__tests__/test-service-options/serverless.yml
@@ -19,7 +19,7 @@ service: jest-test-suite
 
 provider:
   name: aws
-  runtime: nodejs8.10
+  runtime: nodejs14.x
   environment:
     STAGE: ${opt:stage}-stage-test
   stage: dev

diff --git a/__tests__/test-service8.10/.npmignore → __tests__/test-service14.x/.npmignore b/__tests__/test-service8.10/.npmignore → __tests__/test-service14.x/.npmignore
diff --git a/...s_plugins/serverless-jest-plugin/index.js → ...s_plugins/serverless-jest-plugin/index.js b/...s_plugins/serverless-jest-plugin/index.js → ...s_plugins/serverless-jest-plugin/index.js
diff --git a/__tests__/test-service8.10/handler.js → __tests__/test-service14.x/handler.js b/__tests__/test-service8.10/handler.js → __tests__/test-service14.x/handler.js
diff --git a/__tests__/test-service8.10/package.json → __tests__/test-service14.x/package.json b/__tests__/test-service8.10/package.json → __tests__/test-service14.x/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "application-name-8",
+  "name": "application-name-12",
   "version": "0.0.1",
   "dependencies": {
     "serverless-jest-plugin": ""

diff --git a/__tests__/test-service8.10/serverless.yml → __tests__/test-service14.x/serverless.yml b/__tests__/test-service8.10/serverless.yml → __tests__/test-service14.x/serverless.yml
@@ -19,7 +19,7 @@ service: jest-test-suite
 
 provider:
   name: aws
-  runtime: nodejs8.10
+  runtime: nodejs14.x
   stage: dev
   region: us-east-1
 

diff --git a/__tests__/utils.test.js b/__tests__/utils.test.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 const fs = require('fs-extra');
-const utils = require('../lib/utils.js');
+const utils = require('../lib/utils');
 const testUtils = require('../__tests__/test-utils');
 
 describe('utils', () => {

diff --git a/lib/create-function.js b/lib/create-function.js
@@ -9,9 +9,9 @@ const ejs = require('ejs');
 const functionTemplateFile = path.join('templates', 'function-template.ejs');
 
 const validFunctionRuntimes = [
-  'aws-nodejs8.10',
   'aws-nodejs10.x',
   'aws-nodejs12.x',
+  'aws-nodejs14.x',
 ];
 
 const humanReadableFunctionRuntimes = `${validFunctionRuntimes