node-lambda 0.22.0 → 1.1.0

package/.github/workflows/workflow.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [14.x, 16.x, 17.x]
+        node-version: [14.x, 16.x, 18.x]
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2
@@ -33,7 +33,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2
       with:
-        node-version: 16.x
+        node-version: 18.x
         cache: 'npm'
     - run: npm i -g npm
     - run: node -v

package/CHANGELOG.md

@@ -450,3 +450,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Support for Architectures parameter [#591](https://github.com/motdotla/node-lambda/pull/591)
 ### Bugfixes
 - fix: skip installing the package, when there is no `package.json` [#589](https://github.com/motdotla/node-lambda/pull/589)
+
+## [1.0.0] - 2022-05-19
+### Features
+- feat: remove BUILD from the exclusion list [#607](https://github.com/motdotla/node-lambda/pull/607)
+    - BREAKING CHANGES
+- add nodejs16.x to runtime [#605](https://github.com/motdotla/node-lambda/pull/605)
+
+## [1.1.0] - 2022-10-26
+### Features
+- feat: support esm [#613](https://github.com/motdotla/node-lambda/pull/613)
+
+### Bugfixes
+- fix the bug in `excludeGlobs` in `_fileCopy` [#609](https://github.com/motdotla/node-lambda/pull/609)

package/README.md

@@ -83,7 +83,7 @@ AWS_TIMEOUT                // (default: 60)
 AWS_RUN_TIMEOUT            // (default: 3)
 AWS_ARCHITECTURE           // (default: 'x86_64')
 AWS_DESCRIPTION            // (default: package.json.description or '')
-AWS_RUNTIME                // (default: 'nodejs14.x')
+AWS_RUNTIME                // (default: 'nodejs16.x')
 AWS_PUBLISH                // (default: false)
 AWS_FUNCTION_VERSION       // (default: '')
 AWS_VPC_SUBNETS            // (default: '')
@@ -118,7 +118,7 @@ Run your Amazon Lambda application locally
 Options:
   -H, --handler [AWS_HANDLER]                                 Lambda Handler {index.handler} (default: "index.handler")
   -j, --eventFile [EVENT_FILE]                                Event JSON File (default: "event.json")
-  -u, --runtime [AWS_RUNTIME]                                 Lambda Runtime (default: "nodejs14.x")
+  -u, --runtime [AWS_RUNTIME]                                 Lambda Runtime (default: "nodejs16.x")
   -t, --timeout [AWS_RUN_TIMEOUT]                             Lambda Timeout (default: 3)
   -f, --configFile [CONFIG_FILE]                              Path to file holding secret environment variables (e.g. "deploy.env") (default: "")
   -x, --contextFile [CONTEXT_FILE]                            Context JSON File (default: "context.json")
@@ -182,7 +182,7 @@ Options:
   -t, --timeout [AWS_TIMEOUT]                           Lambda Timeout (default: 60)
   --architecture [AWS_ARCHITECTURE]                     The instruction set architecture that the function supports.  (x86_64|arm64) (default: "x86_64")
   -d, --description [AWS_DESCRIPTION]                   Lambda Description (default: "Command line tool for locally running and remotely deploying your node.js applications to Amazon Lambda.")
-  -u, --runtime [AWS_RUNTIME]                           Lambda Runtime (default: "nodejs14.x")
+  -u, --runtime [AWS_RUNTIME]                           Lambda Runtime (default: "nodejs16.x")
   -p, --publish [AWS_PUBLISH]                           Lambda Publish (default: false)
   -L, --lambdaVersion [AWS_FUNCTION_VERSION]            Lambda Function Version (default: "")
   -b, --vpcSubnets [AWS_VPC_SUBNETS]                    Lambda Function VPC Subnet IDs (comma delimited) (default: "")
@@ -221,7 +221,7 @@ AWS Lambda will let you set environment variables for your function. Use the sam
 
 ## Node.js Runtime Configuration
 
-AWS Lambda now supports Node.js14 and Node.js 12. Please also check the [Lambda runtimes](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html) page.
+AWS Lambda now supports Node.js 16 and Node.js 14. Please also check the [Lambda runtimes](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html) page.
 
 ## Use S3 to deploy
 

package/bin/node-lambda

@@ -31,7 +31,7 @@ const AWS_TIMEOUT = process.env.AWS_TIMEOUT || 60
 const AWS_RUN_TIMEOUT = process.env.AWS_RUN_TIMEOUT || 3
 const AWS_ARCHITECTURE = process.env.AWS_ARCHITECTURE || 'x86_64'
 const AWS_DESCRIPTION = process.env.AWS_DESCRIPTION || packageJson.description || ''
-const AWS_RUNTIME = process.env.AWS_RUNTIME || 'nodejs14.x'
+const AWS_RUNTIME = process.env.AWS_RUNTIME || 'nodejs16.x'
 const AWS_PUBLISH = process.env.AWS_PUBLISH || false
 const AWS_FUNCTION_VERSION = process.env.AWS_FUNCTION_VERSION || ''
 const AWS_VPC_SUBNETS = process.env.AWS_VPC_SUBNETS || ''

package/lib/.env.example

@@ -10,10 +10,10 @@ AWS_HANDLER=index.handler
 AWS_MEMORY_SIZE=128
 AWS_TIMEOUT=3
 AWS_DESCRIPTION=
-AWS_RUNTIME=nodejs14.x
+AWS_RUNTIME=nodejs16.x
 AWS_VPC_SUBNETS=
 AWS_VPC_SECURITY_GROUPS=
 AWS_TRACING_CONFIG=
 AWS_LOGS_RETENTION_IN_DAYS=
-EXCLUDE_GLOBS="event.json"
+EXCLUDE_GLOBS="event.json build/"
 PACKAGE_DIRECTORY=build

package/lib/aws.js

@@ -6,7 +6,7 @@ const proxy = require('proxy-agent')
 module.exports = {
   sdk: aws,
   updateConfig (config, region) {
-    const awsSecurity = { region: region }
+    const awsSecurity = { region }
 
     if (config.profile) {
       aws.config.credentials = new aws.SharedIniFileCredentials({

package/lib/cloudwatch_logs.js

@@ -4,7 +4,7 @@ class CloudWatchLogs {
   constructor (aws, region) {
     // Authenticated `aws` object in `lib/main.js`
     this.lambda = new aws.Lambda({
-      region: region,
+      region,
       apiVersion: '2015-03-31'
     })
     this.cloudwatchlogs = new aws.CloudWatchLogs({

package/lib/main.js

@@ -51,8 +51,8 @@ Edit the .env, deploy.env, ${program.contextFile}, \
 event_sources.json and ${program.eventFile} files as needed.`)
   }
 
-  run (program) {
-    if (!['nodejs12.x', 'nodejs14.x'].includes(program.runtime)) {
+  async run (program) {
+    if (!['nodejs14.x', 'nodejs16.x'].includes(program.runtime)) {
       console.error(`Runtime [${program.runtime}] is not supported.`)
       process.exit(254)
     }
@@ -67,7 +67,18 @@ event_sources.json and ${program.eventFile} files as needed.`)
       this._setRunTimeEnvironmentVars(program)
     }
 
-    const handler = require(path.join(process.cwd(), filename))[handlername]
+    const handlerFilePath = (() => {
+      const filePath = path.join(process.cwd(), filename)
+      if (path.sep === '\\') {
+        // Convert because of error in Windows.
+        // Error [ERR_UNSUPPORTED_ESM_URL_SCHEME]:
+        // Only URLs with a scheme in: file, data are supported by the default ESM loader.
+        // On Windows, absolute paths must be valid file:// URLs. Received protocol 'c:'
+        return 'file:///' + filePath.split(path.sep).join('/')
+      }
+      return filePath
+    })()
+    const handler = (await import(handlerFilePath))[handlername]
     const event = require(path.join(process.cwd(), program.eventFile))
     const context = require(path.join(process.cwd(), program.contextFile))
     const enableRunMultipleEvents = (() => {
@@ -336,8 +347,7 @@ Emulate only the body of the API Gateway event.
         '.editorconfig',
         '.lambda',
         'deploy.env',
-        '*.log',
-        path.join('build', path.sep)
+        '*.log'
       ]
         .concat(program.excludeGlobs ? program.excludeGlobs.split(' ') : [])
         .concat(excludeNodeModules ? [path.join('node_modules')] : [])
@@ -352,7 +362,7 @@ Emulate only the body of the API Gateway event.
       }
       return str
     }).join(',') + '}'
-    const dirPatternRegExp = new RegExp(`(${dirBlobs.join('|')})$`)
+    const dirPatternRegExp = dirBlobs.length > 0 ? new RegExp(`(${dirBlobs.join('|')})$`) : null
 
     return new Promise((resolve, reject) => {
       fs.mkdirs(dest, (err) => {
@@ -365,13 +375,15 @@ Emulate only the body of the API Gateway event.
               return true
             }
 
-            if (!minimatch(src, pattern, { matchBase: true })) {
+            if (!minimatch(src, pattern, { matchBase: true, windowsPathsNoEscape: true })) {
               return true
             }
+
             // Directory check. Even if `src` is a directory it will not end with '/'.
-            if (!dirPatternRegExp.test(src)) {
+            if (dirPatternRegExp === null || !dirPatternRegExp.test(src)) {
               return false
             }
+
             return !fs.statSync(src).isDirectory()
           }
         }
@@ -973,7 +985,7 @@ they may not work as expected in the Lambda environment.
       console.log(params)
 
       const lambda = new aws.sdk.Lambda({
-        region: region,
+        region,
         apiVersion: '2015-03-31'
       })
       const scheduleEvents = new ScheduleEvents(aws.sdk, region)

package/lib/s3_deploy.js

@@ -35,7 +35,7 @@ class S3Deploy {
   constructor (aws, region) {
     // Authenticated `aws` object in `lib/main.js`
     this.s3 = new aws.S3({
-      region: region,
+      region,
       apiVersion: '2006-03-01'
     })
   }
@@ -133,7 +133,7 @@ class S3Deploy {
   }
 
   putPackage (params, region, buffer) {
-    const _params = Object.assign({ region: region }, params)
+    const _params = Object.assign({ region }, params)
     _params.bucketName = this._bucketName(_params)
     _params.s3Key = this._s3Key(_params)
 

package/lib/s3_events.js

@@ -8,11 +8,11 @@ class S3Events {
   constructor (aws, region) {
     // Authenticated `aws` object in `lib/main.js`
     this.lambda = new aws.Lambda({
-      region: region,
+      region,
       apiVersion: '2015-03-31'
     })
     this.s3 = new aws.S3({
-      region: region,
+      region,
       apiVersion: '2006-03-01'
     })
   }

package/lib/schedule_events.js

@@ -4,7 +4,7 @@ class ScheduleEvents {
   constructor (aws, region) {
     // Authenticated `aws` object in `lib/main.js`
     this.lambda = new aws.Lambda({
-      region: region,
+      region,
       apiVersion: '2015-03-31'
     })
     this.cloudwatchevents = new aws.CloudWatchEvents({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-lambda",
-  "version": "0.22.0",
+  "version": "1.1.0",
   "description": "Command line tool for locally running and remotely deploying your node.js applications to Amazon Lambda.",
   "main": "lib/main.js",
   "directories": {
@@ -35,22 +35,22 @@
     "node": ">= 10.0.0"
   },
   "dependencies": {
-    "archiver": "^5.3.0",
-    "aws-sdk": "^2.1074.0",
-    "aws-xray-sdk-core": "^3.3.4",
-    "commander": "^9.0.0",
+    "archiver": "^5.3.1",
+    "aws-sdk": "^2.1238.0",
+    "aws-xray-sdk-core": "^3.3.8",
+    "commander": "^9.4.1",
     "continuation-local-storage": "^3.2.1",
-    "dotenv": "^16.0.0",
-    "fs-extra": "^10.0.0",
+    "dotenv": "^16.0.3",
+    "fs-extra": "^10.1.0",
     "klaw": "^4.0.1",
-    "minimatch": "^5.0.0",
+    "minimatch": "^5.1.0",
     "proxy-agent": "^5.0.0"
   },
   "devDependencies": {
-    "aws-sdk-mock": "^5.6.2",
+    "aws-sdk-mock": "^5.8.0",
     "chai": "^4.3.6",
-    "mocha": "^9.2.0",
+    "mocha": "^10.1.0",
     "node-zip": "^1.1.1",
-    "standard": "^16.0.4"
+    "standard": "^17.0.0"
   }
 }

package/test/main.js

@@ -22,7 +22,7 @@ const originalProgram = {
   memorySize: 128,
   timeout: 3,
   description: '',
-  runtime: 'nodejs14.x',
+  runtime: 'nodejs16.x',
   deadLetterConfigTargetArn: '',
   tracingConfig: '',
   Layers: '',
@@ -151,7 +151,7 @@ describe('lib/main', function () {
   })
 
   it('version should be set', () => {
-    assert.equal(lambda.version, '0.22.0')
+    assert.equal(lambda.version, '1.1.0')
   })
 
   describe('_codeDirectory', () => {
@@ -459,7 +459,6 @@ describe('lib/main', function () {
 
   describe('_fileCopy', () => {
     before(() => {
-      fs.mkdirSync('build')
       fs.mkdirsSync(path.join('__unittest', 'hoge'))
       fs.mkdirsSync(path.join('__unittest', 'fuga'))
       fs.writeFileSync(path.join('__unittest', 'hoge', 'piyo'), '')
@@ -467,7 +466,7 @@ describe('lib/main', function () {
       fs.writeFileSync('fuga', '')
     })
     after(() => {
-      ['build', 'fuga', '__unittest'].forEach((path) => {
+      ['fuga', '__unittest'].forEach((path) => {
         fs.removeSync(path)
       })
     })

package/test/node-lambda.js

@@ -157,7 +157,7 @@ describe('bin/node-lambda', () => {
         process.env.AWS_RUNTIME = 'test'
       })
       after(() => {
-        process.env.AWS_RUNTIME = 'nodejs14.x'
+        process.env.AWS_RUNTIME = 'nodejs16.x'
       })
 
       it('`node-lambda run` exitCode is `254` (callback(null))', (done) => {

package/test/s3_events.js

@@ -60,7 +60,7 @@ describe('lib/s3_events', () => {
   describe('_statementId', () => {
     it('StatementId that matches /[a-zA-Z0-9-_]+/.', () => {
       [{
-        params: params,
+        params,
         expected: 'node-lambda-test-bucket'
       }, {
         params: { Bucket: 'example.com' },