serverless-offline 13.1.2 → 13.2.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "13.1.2",
+  "version": "13.2.1",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "exports": {
@@ -79,7 +79,7 @@
     ]
   },
   "dependencies": {
-    "@aws-sdk/client-lambda": "^3.421.0",
+    "@aws-sdk/client-lambda": "^3.441.0",
     "@hapi/boom": "^10.0.1",
     "@hapi/h2o2": "^10.0.4",
     "@hapi/hapi": "^21.3.2",
@@ -92,7 +92,7 @@
     "fs-extra": "^11.1.1",
     "is-wsl": "^3.1.0",
     "java-invoke-local": "0.0.6",
-    "jose": "^4.14.6",
+    "jose": "^5.1.0",
     "js-string-escape": "^1.0.1",
     "jsonpath-plus": "^7.2.0",
     "jsonschema": "^1.4.1",
@@ -107,19 +107,19 @@
   "devDependencies": {
     "@istanbuljs/esm-loader-hook": "^0.2.0",
     "archiver": "^6.0.1",
-    "eslint": "^8.50.0",
+    "eslint": "^8.53.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-unicorn": "^48.0.1",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-unicorn": "^49.0.0",
     "git-list-updated": "^1.2.1",
     "husky": "^8.0.3",
-    "lint-staged": "^14.0.1",
+    "lint-staged": "^15.0.2",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
     "prettier": "^3.0.3",
-    "serverless": "^3.35.2",
+    "serverless": "^3.36.0",
     "standard-version": "^9.5.0"
   },
   "peerDependencies": {

package/src/lambda/LambdaFunction.js

@@ -2,7 +2,7 @@ import { readFile, writeFile } from 'node:fs/promises'
 import { dirname, join, resolve } from 'node:path'
 import process from 'node:process'
 import { performance } from 'node:perf_hooks'
-import { promisify } from 'node:util'
+import { setTimeout } from 'node:timers/promises'
 import { log } from '@serverless/utils/log.js'
 import { emptyDir, ensureDir, remove } from 'fs-extra'
 import jszip from 'jszip'
@@ -20,8 +20,6 @@ import { createUniqueId } from '../utils/index.js'
 const { ceil } = Math
 const { entries, fromEntries } = Object
 
-const setTimeoutPromise = promisify(setTimeout)
-
 export default class LambdaFunction {
   #artifact = null
 
@@ -73,7 +71,7 @@ export default class LambdaFunction {
     // TEMP options.location, for compatibility with serverless-webpack:
     // https://github.com/dherault/serverless-offline/issues/787
     // TODO FIXME look into better way to work with serverless-webpack
-    const servicepath = resolve(servicePath, options.location || '')
+    const servicepath = resolve(servicePath, options.location ?? '')
 
     const { handler, name, package: functionPackage = {} } = functionDefinition
 
@@ -83,8 +81,8 @@ export default class LambdaFunction {
     this.#handler = handler
 
     this.#memorySize =
-      functionDefinition.memorySize ||
-      provider.memorySize ||
+      functionDefinition.memorySize ??
+      provider.memorySize ??
       DEFAULT_LAMBDA_MEMORY_SIZE
 
     this.#noTimeout = options.noTimeout
@@ -92,11 +90,11 @@ export default class LambdaFunction {
     this.#region = provider.region
 
     this.#runtime =
-      functionDefinition.runtime || provider.runtime || DEFAULT_LAMBDA_RUNTIME
+      functionDefinition.runtime ?? provider.runtime ?? DEFAULT_LAMBDA_RUNTIME
 
     this.#timeout =
-      (functionDefinition.timeout ||
-        provider.timeout ||
+      (functionDefinition.timeout ??
+        provider.timeout ??
         DEFAULT_LAMBDA_TIMEOUT) * 1000
 
     this.#verifySupportedRuntime()
@@ -278,7 +276,7 @@ export default class LambdaFunction {
   }
 
   async #timeoutAndTerminate() {
-    await setTimeoutPromise(this.#timeout)
+    await setTimeout(this.#timeout)
 
     throw new LambdaTimeoutError('[504] - Lambda timeout.')
   }

package/src/lambda/handler-runner/go-runner/GoRunner.js

@@ -37,6 +37,22 @@ export default class GoRunner {
       // refresh go.mod
       await rm(this.#tmpFile)
       await execa('go', ['mod', 'tidy'])
+
+      if (this.workspace && this.#tmpPath) {
+        const workPath = `${this.#codeDir}/go.work`
+        const workFile = await readFile(workPath, 'utf8')
+
+        const out = workFile.replace(this.#tmpPath, '')
+
+        try {
+          await writeFile(workPath, out, 'utf8')
+        } catch {
+          // @ignore
+        }
+
+        await execa('go', ['work', 'sync'])
+      }
+
       await rmdir(this.#tmpPath, {
         recursive: true,
       })
@@ -125,6 +141,14 @@ export default class GoRunner {
     try {
       chdir(cwdPath.substring(0, cwdPath.indexOf('main.go')))
 
+      if (this.workspace) {
+        /**
+         * We need to initialize the module, as in the case of a workspace it will not already exist
+         */
+        await execa('go', ['mod', 'init', 'tmp'])
+        await execa('go', ['work', 'use', this.#tmpPath])
+      }
+
       // Make sure we have the mock-lambda runner
       await execa('go', [
         'get',
@@ -171,4 +195,8 @@ export default class GoRunner {
 
     return this.#parsePayload(stdout)
   }
+
+  get workspace() {
+    return this.#goEnv.GOWORK && this.#goEnv.GOWORK.length > 0
+  }
 }