serverless-offline 14.4.0 → 14.5.0

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2024 David Hérault
+Copyright (c) 2016-2025 David Hérault
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -1,22 +1,32 @@
 # Serverless Offline
 
 <div align="center">
-  <p>
-    <sup>
-      <a href="https://github.com/sponsors/dherault">Serverless-offline is supported by the community.</a>
-    </sup>
-  </p>
+  We are looking for maintainers! 
+  <br />
+  Please contact <a href="https://github.com/dherault">dherault</a> if you feel you are a good match.
+</div> 
+<br />
+<div align="center">
+  <sup>
+    Serverless-offline is supported by the community.
+  </sup>
+  <br />
   <sup>
     Special thanks to:
   </sup>
-  <a href="https://airfriend.app?ref=so">
+  <br />
+  <a href="https://symmetrics.app?ref=so">
     <div>
-      <img src="https://airfriend.app/images/logotype.png" height="64" alt="Airfriend">
+      <img src="https://symmetrics.app/images/logo/logotype.png" height="64" alt="Symmetrics">
     </div>
     <b>
-      An AI friend on WhatsApp.
+      Become a data-driven product builder
     </b>
+    <div>
+      Metrics, community and resources for lead developers and engineering managers.
+    </div>
   </a>
+  <br />
   <a href="https://arccode.dev?ref=so">
     <div>
       <img src="https://arccode.dev/images/logotype.png" height="64" alt="Arccode">
@@ -31,9 +41,6 @@
 </div>
 &nbsp;
 <p>
-  <a href="https://www.serverless.com">
-    <img src="http://public.serverless.com/badges/v3.svg">
-  </a>
   <a href="https://www.npmjs.com/package/serverless-offline">
     <img src="https://img.shields.io/npm/v/serverless-offline.svg?style=flat-square">
   </a>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-offline",
-  "version": "14.4.0",
+  "version": "14.5.0",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "exports": {
@@ -49,7 +49,7 @@
   ],
   "author": "David Hérault <dherault@gmail.com> (https://github.com/dherault)",
   "engines": {
-    "node": ">=18.12.0"
+    "node": ">=20.0.0"
   },
   "commit-and-tag-version": {
     "skip": {

package/src/config/constants.js

@@ -4,7 +4,7 @@ export const BASE_URL_PLACEHOLDER = "http://example"
 
 export const CUSTOM_OPTION = "serverless-offline"
 
-export const DEFAULT_LAMBDA_RUNTIME = "nodejs14.x"
+export const DEFAULT_LAMBDA_RUNTIME = "nodejs20.x"
 
 export const DEFAULT_LAMBDA_ARCHITECTURE = "arm64"
 

package/src/config/supportedRuntimes.js

@@ -11,19 +11,19 @@ const X86_64 = "x86_64"
 const ARM64 = "arm64"
 
 export const supportedRuntimesArchitecture = {
-  "nodejs14.x": [ARM64, X86_64],
-  "nodejs16.x": [ARM64, X86_64],
-  "nodejs18.x": [ARM64, X86_64],
   "nodejs20.x": [ARM64, X86_64],
   "nodejs22.x": [ARM64, X86_64],
+  "nodejs24.x": [ARM64, X86_64],
   "python3.7": [X86_64],
   "python3.8": [ARM64, X86_64],
   "python3.9": [ARM64, X86_64],
   "python3.10": [ARM64, X86_64],
   "python3.11": [ARM64, X86_64],
   "python3.12": [ARM64, X86_64],
+  "python3.13": [ARM64, X86_64],
   "ruby2.7": [ARM64, X86_64],
   "ruby3.2": [ARM64, X86_64],
+  "ruby3.3": [ARM64, X86_64],
   java8: [X86_64],
   "java8.al2": [ARM64, X86_64],
   java11: [ARM64, X86_64],
@@ -44,11 +44,9 @@ export const supportedJava = new Set(["java8", "java8.al2", "java11", "java17"])
 
 // NODE.JS
 export const supportedNodejs = new Set([
-  "nodejs14.x",
-  "nodejs16.x",
-  "nodejs18.x",
   "nodejs20.x",
   "nodejs22.x",
+  "nodejs24.x",
 ])
 
 // PROVIDED
@@ -66,10 +64,11 @@ export const supportedPython = new Set([
   "python3.10",
   "python3.11",
   "python3.12",
+  "python3.13",
 ])
 
 // RUBY
-export const supportedRuby = new Set(["ruby2.7", "ruby3.2"])
+export const supportedRuby = new Set(["ruby2.7", "ruby3.2", "ruby3.3"])
 
 export const supportedRuntimes = new Set([
   // ...supportedDotnetcore,

package/src/lambda/LambdaFunction.js

@@ -7,6 +7,7 @@ import { setTimeout } from "node:timers/promises"
 import { emptyDir, ensureDir, remove } from "fs-extra"
 import jszip from "jszip"
 import { log } from "../utils/log.js"
+import renderIntrinsicFunction from "../utils/renderIntrinsicFunction.js"
 import HandlerRunner from "./handler-runner/index.js"
 import LambdaContext from "./LambdaContext.js"
 import {
@@ -114,8 +115,8 @@ export default class LambdaFunction {
             entries(process.env).filter(([key]) => key.startsWith("AWS_")),
           )),
       ...this.#getAwsEnvVars(),
-      ...provider.environment,
-      ...functionDefinition.environment,
+      ...renderIntrinsicFunction(provider.environment),
+      ...renderIntrinsicFunction(functionDefinition.environment),
       IS_OFFLINE: "true",
     }
 

package/src/lambda/handler-runner/in-process-runner/aws-lambda-ric/UserFunction.js

@@ -20,6 +20,7 @@ const fs = require("node:fs")
 const process = require("node:process")
 
 const { require: tsxRequire } = require(`tsx/cjs/api`)
+const { tsImport } = require(`tsx/esm/api`)
 const {
   HandlerNotFound,
   MalformedHandlerName,
@@ -136,10 +137,9 @@ function _hasFolderPackageJsonTypeModule(folder) {
 }
 
 function _hasPackageJsonTypeModule(file) {
-  // File must have a .js extension
-  const jsPath = `${file}.js`
-  return fs.existsSync(jsPath)
-    ? _hasFolderPackageJsonTypeModule(path.resolve(path.dirname(jsPath)))
+  const dir = path.dirname(file)
+  return fs.existsSync(dir)
+    ? _hasFolderPackageJsonTypeModule(path.resolve(dir))
     : false
 }
 
@@ -175,13 +175,15 @@ async function _tryRequire(appRoot, moduleRoot, module) {
   }
 
   // If still not loaded, try .js, .mjs, .cjs and .ts in that order.
-  // Files ending with .js are loaded as ES modules when the nearest parent package.json
+  // Files ending with .js and .ts are loaded as ES modules when the nearest parent package.json
   // file contains a top-level field "type" with a value of "module".
   // https://nodejs.org/api/packages.html#packages_type
   const loaded =
     (pjHasModule && (await _tryAwaitImport(lambdaStylePath, ".js"))) ||
     (await _tryAwaitImport(lambdaStylePath, ".mjs")) ||
     _tryRequireFile(lambdaStylePath, ".cjs") ||
+    (pjHasModule &&
+      (await tsImport(`${lambdaStylePath}.ts`, `${lambdaStylePath}.ts`))) ||
     tsxRequire(`${lambdaStylePath}.ts`, `${lambdaStylePath}.ts`)
   if (loaded) {
     return loaded

package/src/utils/renderIntrinsicFunction.js

@@ -0,0 +1,34 @@
+export default function renderIntrinsicFunction(input) {
+  if (input === null || input === undefined) {
+    return input
+  }
+
+  if (typeof input === "string") {
+    return input
+  }
+
+  if (Array.isArray(input)) {
+    return input.map(renderIntrinsicFunction)
+  }
+
+  if (typeof input === "object") {
+    const result = {}
+    for (const [key, value] of Object.entries(input)) {
+      if (key === "Fn::Join" || key === "!Join") {
+        const [delimiter, list] = value
+        return list.map(renderIntrinsicFunction).join(delimiter)
+      }
+      if (key === "Fn::Sub" || key === "!Sub") {
+        const [template, variables] = value
+        result[key] = template.replaceAll(/\${(.*?)}/g, (match, variable) => {
+          return variable in variables ? variables[variable] : match
+        })
+        return result[key]
+      }
+      result[key] = renderIntrinsicFunction(value)
+    }
+    return result
+  }
+
+  return input
+}