Merge pull request #76 from Testlio/release/3.4.5

v3.4.5
Testlio · Dec 16, 2019 · edc6cbe · edc6cbe
2 parents b9ae929 + 9a67e6f
commit edc6cbe
Show file tree

Hide file tree

Showing 9 changed files with 390 additions and 26 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -42,7 +42,7 @@ defaults:
   docker: &default
     working_directory: ~/builds
     docker:
-      - image: circleci/node:8
+      - image: circleci/node:12
 
 jobs:
   install-dependencies:

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-8.10
+12.10
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ All scripts may make use of a `.lambda-tools-rc.json` file in the root of the pr
         "name": "Project Name"
     },
     "lambda": {
-        "runtime": "nodejs8.10"
+        "runtime": "nodejs12.10"
     },
     "aws": {
         "region": "us-east-1",

diff --git a/lib/deploy/bundle-lambdas-step.js b/lib/deploy/bundle-lambdas-step.js
@@ -11,11 +11,10 @@ const getDependencies = require('../helpers/dependencies');
 const path = require('path');
 const hashFiles = Promise.promisify(require('hash-files'));
 
-const babel = require('babel-core');
+const babel = require('@babel/core');
 const es2015presets = require('babel-preset-es2015');
-const node4presets = require('babel-preset-es2015-node4');
-const node6presets = require('babel-preset-es2015-node6');
-const node8presets = require('babel-preset-node8');
+const nodePresets = require('babel-preset-latest-node');
+
 const Browserify = require('browserify');
 const envify = require('envify/custom');
 const exorcist = require('exorcist');
@@ -149,7 +148,7 @@ module.exports = function(context) {
                 const zippedPath = path.resolve(basePath, lambda.name + '.zip');
                 const manifestPath = path.resolve(basePath, lambda.name + '.manifest.json');
 
-                const runtime = _.get(lambda, 'config.Properties.Runtime', 'nodejs');
+                const runtime = _.get(lambda, 'config.Properties.Runtime', 'nodejs12.x');
 
                 return context.logger.task(lambda.name, function(resolve, reject) {
                     // First, bundle the code (this bundle will be used for the manifest etc)
@@ -264,17 +263,9 @@ module.exports = function(context) {
                             };
 
                             if (runtime === 'nodejs') {
-                                // 0.10 runtime
                                 options.presets = [es2015presets];
-                            } else if (runtime === 'nodejs4.3') {
-                                // Node 4.3 runtime
-                                options.presets = [node4presets];
-                            } else if (runtime === 'nodejs6.10') {
-                                // Node 6.10 runtime
-                                options.presets = [node6presets];
-                            } else if (runtime === 'nodejs8.10') {
-                                // Node 8.10 runtime
-                                options.presets = [node8presets];
+                            } else if (runtime === 'nodejs12.x') {
+                                options.presets = [nodePresets];
                             }
 
                             babel.transformFile(bundledPath, options, function(err, transpiled) {

diff --git a/lib/deploy/templates/lambda.cf.json b/lib/deploy/templates/lambda.cf.json
@@ -11,7 +11,7 @@
         "Handler": "index.handler",
         "MemorySize": 256,
         "Role": { "Fn::GetAtt": ["IamRoleLambda", "Arn"] },
-        "Runtime": "nodejs",
+        "Runtime": "nodejs12.x",
         "Timeout": 6
     }
 }
diff --git a/lib/helpers/config.js b/lib/helpers/config.js
@@ -20,7 +20,7 @@ const resourcePrefix = _.compact([(new Configstore(pkg.name)).get('ResourcePrefi
 let result = {
     project: {},
     lambda: {
-        runtime: 'nodejs'
+        runtime: 'nodejs12.x'
     },
     aws: {
         region: 'us-east-1',

diff --git a/lib/setup/create-cf-resources.js b/lib/setup/create-cf-resources.js
@@ -106,7 +106,7 @@ function updateOrCreateFunction(name, code, role) {
                 return new Promise(function(resolve, reject) {
                     lambda.updateFunctionConfiguration({
                         FunctionName: name,
-                        Runtime: 'nodejs8.10'
+                        Runtime: 'nodejs12.x'
                     }, function(err) {
                         if (err) return reject(err);
                         resolve(result);
@@ -119,7 +119,7 @@ function updateOrCreateFunction(name, code, role) {
             lambda.createFunction({
                 FunctionName: name,
                 Handler: 'index.handler',
-                Runtime: 'nodejs8.10',
+                Runtime: 'nodejs12.x',
                 Role: role.Arn,
                 MemorySize: 256,
                 Publish: true,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lambda-tools",
-  "version": "3.4.4",
+  "version": "3.4.5",
   "description": "Scripts for working with AWS Lambda backed microservices",
   "main": "",
   "scripts": {
@@ -25,13 +25,15 @@
   },
   "license": "ISC",
   "dependencies": {
+    "@babel/core": "^7.7.5",
     "ansi": "^0.3.1",
     "archy": "^1.0.0",
     "aws-sdk": "^2.3.x",
     "babel-core": "6.26.0",
     "babel-preset-es2015": "^6.1.18",
     "babel-preset-es2015-node4": "^2.1.0",
     "babel-preset-es2015-node6": "^0.4.0",
+    "babel-preset-latest-node": "^4.0.1",
     "babel-preset-node8": "^1.2.0",
     "bluebird": "^3.1.1",
     "browserify": "^12.0.1",