sst 2.36.1 → 2.36.3

package/bootstrap.js

@@ -203,7 +203,7 @@ export async function bootstrapSST(cdkBucket) {
         code: Code.fromAsset(path.resolve(__dirname, "support/bootstrap-metadata-function")),
         handler: "index.handler",
         runtime: region?.startsWith("us-gov-")
-            ? Runtime.NODEJS_16_X
+            ? Runtime.NODEJS_18_X
             : Runtime.NODEJS_18_X,
         environment: {
             BUCKET_NAME: bucket.bucketName,

package/constructs/App.d.ts

@@ -110,7 +110,7 @@ export declare class App extends CDKApp {
      * @example
      * ```js
      * app.setDefaultFunctionProps({
-     *   runtime: "nodejs16.x",
+     *   runtime: "nodejs18.x",
      *   timeout: 30
      * })
      * ```

package/constructs/App.js

@@ -117,7 +117,7 @@ export class App extends CDKApp {
      * @example
      * ```js
      * app.setDefaultFunctionProps({
-     *   runtime: "nodejs16.x",
+     *   runtime: "nodejs18.x",
      *   timeout: 30
      * })
      * ```
@@ -273,7 +273,7 @@ export class App extends CDKApp {
                                     effect: Effect.ALLOW,
                                     actions: ["s3:GetObject", "s3:PutObject"],
                                     resources: [
-                                        sourcemaps[0].srcBucket.bucketArn + "/*",
+                                        sourcemaps[0].asset.bucket.bucketArn + "/*",
                                         `arn:${child.partition}:s3:::${bootstrap.bucket}/*`,
                                     ],
                                 }),
@@ -287,8 +287,11 @@ export class App extends CDKApp {
                                 app: this.name,
                                 stage: this.stage,
                                 tarBucket: bootstrap.bucket,
-                                srcBucket: sourcemaps[0].srcBucket.bucketName,
-                                sourcemaps: sourcemaps.map((s) => [s.tarKey, s.srcKey]),
+                                srcBucket: sourcemaps[0].asset.bucket.bucketName,
+                                sourcemaps: sourcemaps.map((s) => [
+                                    s.tarKey,
+                                    s.asset.s3ObjectKey,
+                                ]),
                             },
                         });
                         resource.node.addDependency(policy);

package/constructs/AstroSite.d.ts

@@ -70,7 +70,7 @@ export declare class AstroSite extends SsrSite {
         data: {
             mode: "placeholder" | "deployed";
             path: string;
-            runtime: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
+            runtime: "nodejs16.x" | "nodejs18.x";
             customDomainUrl: string | undefined;
             url: string | undefined;
             edge: boolean | undefined;

package/constructs/EdgeFunction.d.ts

@@ -9,7 +9,7 @@ import { Permissions } from "./util/permission.js";
 export interface EdgeFunctionProps {
     bundle?: string;
     handler: string;
-    runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
+    runtime?: "nodejs16.x" | "nodejs18.x";
     timeout?: number | Duration;
     memorySize?: number | Size;
     permissions?: Permissions;

package/constructs/EdgeFunction.js

@@ -125,8 +125,7 @@ export class EdgeFunction extends Construct {
             });
             await fs.promises.rm(result.sourcemap);
             useFunctions().sourcemaps.add(stack.stackName, {
-                srcBucket: asset.bucket,
-                srcKey: asset.s3ObjectKey,
+                asset,
                 tarKey: this.functionArn,
             });
         }
@@ -285,7 +284,7 @@ export class EdgeFunction extends Construct {
         const provider = new CdkFunction(stack, providerId, {
             code: Code.fromAsset(path.join(__dirname, "../support/edge-function")),
             handler: "s3-bucket.handler",
-            runtime: Runtime.NODEJS_16_X,
+            runtime: Runtime.NODEJS_18_X,
             timeout: CdkDuration.minutes(15),
             memorySize: 1024,
             initialPolicy: [
@@ -318,7 +317,7 @@ export class EdgeFunction extends Construct {
             provider = new CdkFunction(stack, providerId, {
                 code: Code.fromAsset(path.join(__dirname, "../support/edge-function")),
                 handler: "edge-lambda.handler",
-                runtime: Runtime.NODEJS_16_X,
+                runtime: Runtime.NODEJS_18_X,
                 timeout: CdkDuration.minutes(15),
                 memorySize: 1024,
                 initialPolicy: [
@@ -347,11 +346,9 @@ export class EdgeFunction extends Construct {
                         S3Bucket: assetBucket,
                         S3Key: assetKey,
                     },
-                    Runtime: runtime === "nodejs14.x"
-                        ? Runtime.NODEJS_14_X.name
-                        : runtime === "nodejs16.x"
-                            ? Runtime.NODEJS_16_X.name
-                            : Runtime.NODEJS_18_X.name,
+                    Runtime: runtime === "nodejs16.x"
+                        ? Runtime.NODEJS_16_X.name
+                        : Runtime.NODEJS_18_X.name,
                     MemorySize: typeof memorySize === "string"
                         ? toCdkSize(memorySize).toMebibytes()
                         : memorySize,
@@ -382,7 +379,7 @@ export class EdgeFunction extends Construct {
             provider = new CdkFunction(stack, providerId, {
                 code: Code.fromAsset(path.join(__dirname, "../support/edge-function")),
                 handler: "edge-lambda-version.handler",
-                runtime: Runtime.NODEJS_16_X,
+                runtime: Runtime.NODEJS_18_X,
                 timeout: CdkDuration.minutes(15),
                 memorySize: 1024,
                 initialPolicy: [

package/constructs/EventBus.js

@@ -248,7 +248,7 @@ export class EventBus extends Construct {
         });
         this.retrierFn = new lambda.Function(this, `RetrierFunction`, {
             functionName: app.logicalPrefixedName(this.node.id + "Retrier"),
-            runtime: lambda.Runtime.NODEJS_16_X,
+            runtime: lambda.Runtime.NODEJS_18_X,
             timeout: Duration.seconds(30),
             handler: "index.handler",
             code: lambda.Code.fromAsset(path.join(__dirname, "../support/event-bus-retrier")),

package/constructs/Function.d.ts

@@ -10,11 +10,10 @@ import * as functionUrlCors from "./util/functionUrlCors.js";
 import { Architecture, Function as CDKFunction, FunctionOptions, ILayerVersion, Runtime as CDKRuntime, Tracing } from "aws-cdk-lib/aws-lambda";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { Size as CDKSize, Duration as CDKDuration } from "aws-cdk-lib/core";
-import { IBucket } from "aws-cdk-lib/aws-s3";
+import { Asset } from "aws-cdk-lib/aws-s3-assets";
 declare const supportedRuntimes: {
     container: CDKRuntime;
     rust: CDKRuntime;
-    "nodejs14.x": CDKRuntime;
     "nodejs16.x": CDKRuntime;
     "nodejs18.x": CDKRuntime;
     "python3.7": CDKRuntime;
@@ -127,7 +126,7 @@ export interface FunctionProps extends Omit<FunctionOptions, "functionName" | "m
      * ```js
      * new Function(stack, "Function", {
      *   handler: "function.handler",
-     *   runtime: "nodejs16.x",
+     *   runtime: "nodejs18.x",
      * })
      *```
      */
@@ -703,7 +702,7 @@ export declare class Function extends CDKFunction implements SSTConstruct {
         type: "Function";
         data: {
             arn: string;
-            runtime: "container" | "rust" | "nodejs14.x" | "nodejs16.x" | "nodejs18.x" | "python3.7" | "python3.8" | "python3.9" | "python3.10" | "python3.11" | "dotnetcore3.1" | "dotnet6" | "java8" | "java11" | "java17" | "go1.x" | "go" | undefined;
+            runtime: "container" | "rust" | "nodejs16.x" | "nodejs18.x" | "python3.7" | "python3.8" | "python3.9" | "python3.10" | "python3.11" | "dotnetcore3.1" | "dotnet6" | "java8" | "java11" | "java17" | "go1.x" | "go" | undefined;
             handler: string | undefined;
             missingSourcemap: boolean | undefined;
             localId: string;
@@ -729,13 +728,11 @@ export declare class Function extends CDKFunction implements SSTConstruct {
 export declare const useFunctions: () => {
     sourcemaps: {
         add(stack: string, source: {
-            srcBucket: IBucket;
-            srcKey: string;
+            asset: Asset;
             tarKey: string;
         }): void;
         forStack(stack: string): {
-            srcBucket: IBucket;
-            srcKey: string;
+            asset: Asset;
             tarKey: string;
         }[];
     };

package/constructs/Function.js

@@ -31,7 +31,6 @@ const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 const supportedRuntimes = {
     container: CDKRuntime.FROM_IMAGE,
     rust: CDKRuntime.PROVIDED_AL2,
-    "nodejs14.x": CDKRuntime.NODEJS_14_X,
     "nodejs16.x": CDKRuntime.NODEJS_16_X,
     "nodejs18.x": CDKRuntime.NODEJS_18_X,
     "python3.7": CDKRuntime.PYTHON_3_7,
@@ -114,7 +113,7 @@ export class Function extends CDKFunction {
                 code: Code.fromInline("export function placeholder() {}"),
                 handler: "index.placeholder",
                 functionName,
-                runtime: CDKRuntime.NODEJS_16_X,
+                runtime: CDKRuntime.NODEJS_18_X,
                 memorySize,
                 ephemeralStorageSize: diskSize,
                 timeout,
@@ -221,7 +220,7 @@ export class Function extends CDKFunction {
                     : {
                         code: Code.fromInline("export function placeholder() {}"),
                         handler: "index.placeholder",
-                        runtime: CDKRuntime.NODEJS_16_X,
+                        runtime: CDKRuntime.NODEJS_18_X,
                         layers: Function.buildLayers(scope, id, props),
                     }),
                 architecture,
@@ -257,8 +256,7 @@ export class Function extends CDKFunction {
                     });
                     await fs.rm(result.sourcemap);
                     useFunctions().sourcemaps.add(stack.stackName, {
-                        srcBucket: asset.bucket,
-                        srcKey: asset.s3ObjectKey,
+                        asset,
                         tarKey: this.functionArn,
                     });
                 }
@@ -584,7 +582,13 @@ export const useFunctions = createAppContext(() => {
                 arr.push(source);
             },
             forStack(stack) {
-                return sourcemaps[stack] || [];
+                return (sourcemaps[stack] || []).sort((a, b) => {
+                    if (a.asset.node.path > b.asset.node.path)
+                        return 1;
+                    if (a.asset.node.path < b.asset.node.path)
+                        return -1;
+                    return 0;
+                });
             },
         },
         fromID(id) {

package/constructs/Job.js

@@ -307,7 +307,7 @@ export class Job extends Construct {
         return new CdkFunction(this, "Manager", {
             code: Code.fromAsset(path.join(__dirname, "../support/job-manager/")),
             handler: "index.handler",
-            runtime: Runtime.NODEJS_16_X,
+            runtime: Runtime.NODEJS_18_X,
             timeout: CdkDuration.seconds(10),
             memorySize: 1024,
             environment: {

package/constructs/NextjsSite.d.ts

@@ -68,6 +68,7 @@ export interface NextjsSiteProps extends Omit<SsrSiteProps, "nodejs"> {
          * experimental: {
          *   disableIncrementalCache: true,
          * }
+         * ```
          */
         disableIncrementalCache?: boolean;
         /**
@@ -150,7 +151,7 @@ export declare class NextjsSite extends SsrSite {
                     layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
                     handler: string;
                     bundle?: string | undefined;
-                    runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x" | undefined;
+                    runtime?: "nodejs16.x" | "nodejs18.x" | undefined;
                     timeout?: number | `${number} second` | `${number} seconds` | `${number} minute` | `${number} minutes` | `${number} hour` | `${number} hours` | `${number} day` | `${number} days` | undefined;
                     memorySize?: number | `${number} MB` | `${number} GB` | undefined;
                     permissions?: import("./index.js").Permissions | undefined;
@@ -197,20 +198,10 @@ export declare class NextjsSite extends SsrSite {
                     layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
                     handler: string;
                     bundle?: string | undefined;
-                    runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x" | undefined;
+                    runtime?: "nodejs16.x" | "nodejs18.x" | undefined;
                     timeout?: number | `${number} second` | `${number} seconds` | `${number} minute` | `${number} minutes` | `${number} hour` | `${number} hours` | `${number} day` | `${number} days` | undefined;
                     memorySize?: number | `${number} MB` | `${number} GB` | undefined;
                     permissions?: import("./index.js").Permissions | undefined;
-                    /**
-                     * How the logs are stored in CloudWatch
-                     * - "combined" - Logs from all routes are stored in the same log group.
-                     * - "per-route" - Logs from each route are stored in a separate log group.
-                     * @default "per-route"
-                     * @example
-                     * ```js
-                     * logging: "combined",
-                     * ```
-                     */
                     environment?: Record<string, string> | undefined;
                     bind?: import("./Construct.js").SSTConstruct[] | undefined;
                     nodejs?: import("./Function.js").NodeJSProps | undefined;
@@ -257,7 +248,7 @@ export declare class NextjsSite extends SsrSite {
                     layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
                     handler: string;
                     bundle?: string | undefined;
-                    runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x" | undefined;
+                    runtime?: "nodejs16.x" | "nodejs18.x" | undefined;
                     timeout?: number | `${number} second` | `${number} seconds` | `${number} minute` | `${number} minutes` | `${number} hour` | `${number} hours` | `${number} day` | `${number} days` | undefined;
                     memorySize?: number | `${number} MB` | `${number} GB` | undefined;
                     permissions?: import("./index.js").Permissions | undefined;
@@ -304,20 +295,10 @@ export declare class NextjsSite extends SsrSite {
                     layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
                     handler: string;
                     bundle?: string | undefined;
-                    runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x" | undefined;
+                    runtime?: "nodejs16.x" | "nodejs18.x" | undefined;
                     timeout?: number | `${number} second` | `${number} seconds` | `${number} minute` | `${number} minutes` | `${number} hour` | `${number} hours` | `${number} day` | `${number} days` | undefined;
                     memorySize?: number | `${number} MB` | `${number} GB` | undefined;
                     permissions?: import("./index.js").Permissions | undefined;
-                    /**
-                     * How the logs are stored in CloudWatch
-                     * - "combined" - Logs from all routes are stored in the same log group.
-                     * - "per-route" - Logs from each route are stored in a separate log group.
-                     * @default "per-route"
-                     * @example
-                     * ```js
-                     * logging: "combined",
-                     * ```
-                     */
                     environment?: Record<string, string> | undefined;
                     bind?: import("./Construct.js").SSTConstruct[] | undefined;
                     nodejs?: import("./Function.js").NodeJSProps | undefined;
@@ -357,7 +338,7 @@ export declare class NextjsSite extends SsrSite {
             } | undefined;
             mode: "placeholder" | "deployed";
             path: string;
-            runtime: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
+            runtime: "nodejs16.x" | "nodejs18.x";
             customDomainUrl: string | undefined;
             url: string | undefined;
             edge: boolean | undefined;

package/constructs/NextjsSite.js

@@ -339,17 +339,19 @@ export class NextjsSite extends SsrSite {
         const injections = [];
         if (this.isPerRouteLoggingEnabled()) {
             injections.push(`
-      const routeData = ${JSON.stringify(this.useRoutes().map(({ regex, logGroupPath }) => ({
+      if (event.rawPath) {
+        const routeData = ${JSON.stringify(this.useRoutes().map(({ regex, logGroupPath }) => ({
                 regex,
                 logGroupPath,
             })))}.find(({ regex }) => event.rawPath.match(new RegExp(regex)));
-      if (routeData) {
-        console.log("::sst::" + JSON.stringify({
-          action:"log.split",
-          properties: {
-            logGroupName:"/sst/lambda/" + context.functionName + routeData.logGroupPath,
-          },
-        }));
+        if (routeData) {
+          console.log("::sst::" + JSON.stringify({
+            action:"log.split",
+            properties: {
+              logGroupName:"/sst/lambda/" + context.functionName + routeData.logGroupPath,
+            },
+          }));
+        }
       }`);
         }
         fs.writeFileSync(path.join(serverPath, `${wrapperName}.mjs`), experimental?.streaming
@@ -615,8 +617,7 @@ export class NextjsSite extends SsrSite {
                     path: zipPath,
                 });
                 useFunctions().sourcemaps.add(stack.stackName, {
-                    srcBucket: asset.bucket,
-                    srcKey: asset.s3ObjectKey,
+                    asset,
                     tarKey: path.join(server.functionArn, sourcemapKey),
                 });
             });

package/constructs/RDS.d.ts

@@ -53,7 +53,7 @@ export interface RDSProps {
         maxCapacity?: keyof typeof AuroraCapacityUnit;
     };
     /**
-     * Path to the directory that contains the migration scripts. The `RDS` construct uses [Kysely](https://kysely-org.github.io/kysely/) to run and manage schema migrations. The `migrations` prop should point to the folder where your migration files are.
+     * Path to the directory that contains the migration scripts. The `RDS` construct uses [Kysely](https://kysely.dev/) to run and manage schema migrations. The `migrations` prop should point to the folder where your migration files are.
      *
      * @example
      *

package/constructs/RDS.js

@@ -284,7 +284,7 @@ export class RDS extends Construct {
         // For now we will do `__dirname/../dist` to make both cases work.
         this.migratorFunction = new Fn(this, "MigrationFunction", {
             handler: path.resolve(path.join(__dirname, "../support/rds-migrator/index.handler")),
-            runtime: "nodejs16.x",
+            runtime: "nodejs18.x",
             timeout: 900,
             memorySize: 1024,
             environment: {
@@ -318,7 +318,7 @@ export class RDS extends Construct {
         // Create custom resource handler
         const handler = new Function(this, "MigrationHandler", {
             code: Code.fromAsset(path.join(__dirname, "../support/script-function")),
-            runtime: Runtime.NODEJS_16_X,
+            runtime: Runtime.NODEJS_18_X,
             handler: "index.handler",
             timeout: CDKDuration.minutes(15),
             memorySize: 1024,

package/constructs/RemixSite.d.ts

@@ -99,7 +99,7 @@ export declare class RemixSite extends SsrSite {
         data: {
             mode: "placeholder" | "deployed";
             path: string;
-            runtime: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
+            runtime: "nodejs16.x" | "nodejs18.x";
             customDomainUrl: string | undefined;
             url: string | undefined;
             edge: boolean | undefined;

package/constructs/Script.js

@@ -121,7 +121,7 @@ export class Script extends Construct {
     createCustomResourceFunction() {
         const handler = new CdkFunction(this, "ScriptHandler", {
             code: Code.fromAsset(path.join(__dirname, "../support/script-function")),
-            runtime: Runtime.NODEJS_16_X,
+            runtime: Runtime.NODEJS_18_X,
             handler: "index.handler",
             timeout: Duration.minutes(15),
             memorySize: 1024,

package/constructs/SolidStartSite.d.ts

@@ -79,7 +79,7 @@ export declare class SolidStartSite extends SsrSite {
         data: {
             mode: "placeholder" | "deployed";
             path: string;
-            runtime: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
+            runtime: "nodejs16.x" | "nodejs18.x";
             customDomainUrl: string | undefined;
             url: string | undefined;
             edge: boolean | undefined;

package/constructs/SsrFunction.d.ts

@@ -10,7 +10,7 @@ import { Duration } from "./util/duration.js";
 export interface SsrFunctionProps extends Omit<FunctionOptions, "memorySize" | "timeout" | "runtime"> {
     bundle?: string;
     handler: string;
-    runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
+    runtime?: "nodejs16.x" | "nodejs18.x";
     timeout?: number | Duration;
     memorySize?: number | Size;
     permissions?: Permissions;
@@ -50,7 +50,7 @@ export declare class SsrFunction extends Construct implements SSTConstruct {
         type: "Function";
         data: {
             arn: string;
-            runtime: "nodejs14.x" | "nodejs16.x" | "nodejs18.x" | undefined;
+            runtime: "nodejs16.x" | "nodejs18.x" | undefined;
             handler: string;
             missingSourcemap: boolean | undefined;
             localId: string;

package/constructs/SsrFunction.js

@@ -97,11 +97,7 @@ export class SsrFunction extends Construct {
             handler: handler.split(path.sep).join(path.posix.sep),
             logRetention: logRetention ?? RetentionDays.THREE_DAYS,
             code: Code.fromBucket(Bucket.fromBucketName(this, "IServerFunctionBucket", assetBucket), assetKey),
-            runtime: runtime === "nodejs14.x"
-                ? Runtime.NODEJS_14_X
-                : runtime === "nodejs16.x"
-                    ? Runtime.NODEJS_16_X
-                    : Runtime.NODEJS_18_X,
+            runtime: runtime === "nodejs16.x" ? Runtime.NODEJS_16_X : Runtime.NODEJS_18_X,
             architecture: architecture || Architecture.ARM_64,
             memorySize: typeof memorySize === "string"
                 ? toCdkSize(memorySize).toMebibytes()
@@ -195,8 +191,7 @@ export class SsrFunction extends Construct {
             });
             await fs.rm(result.sourcemap);
             useFunctions().sourcemaps.add(stack.stackName, {
-                srcBucket: asset.bucket,
-                srcKey: asset.s3ObjectKey,
+                asset,
                 tarKey: this.functionArn,
             });
         }

package/constructs/SsrSite.d.ts

@@ -138,7 +138,7 @@ export interface SsrSiteProps {
      * runtime: "nodejs16.x",
      * ```
      */
-    runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
+    runtime?: "nodejs16.x" | "nodejs18.x";
     /**
      * Used to configure nodejs function properties
      */
@@ -454,7 +454,7 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
         data: {
             mode: "placeholder" | "deployed";
             path: string;
-            runtime: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
+            runtime: "nodejs16.x" | "nodejs18.x";
             customDomainUrl: string | undefined;
             url: string | undefined;
             edge: boolean | undefined;

package/constructs/SsrSite.js

@@ -568,7 +568,7 @@ function handler(event) {
             return assets;
         }
         function createS3OriginDeployment(copy, s3Assets) {
-            const policy = new Policy(self, "S3UploaderPolicy", {
+            const policy = new Policy(self, "S3AssetUploaderPolicy", {
                 statements: [
                     new PolicyStatement({
                         effect: Effect.ALLOW,
@@ -588,7 +588,7 @@ function handler(event) {
                 ],
             });
             stack.customResourceHandler.role?.attachInlinePolicy(policy);
-            const resource = new CustomResource(self, "S3Uploader", {
+            const resource = new CustomResource(self, "S3AssetUploader", {
                 serviceToken: stack.customResourceHandler.functionArn,
                 resourceType: "Custom::S3Uploader",
                 properties: {

package/constructs/Stack.js

@@ -196,7 +196,7 @@ export class Stack extends CDKStack {
                 assetHash: this.stackName + fs.readFileSync(dir + "/index.mjs").toString(),
             }),
             handler: "index.handler",
-            runtime: lambda.Runtime.NODEJS_16_X,
+            runtime: lambda.Runtime.NODEJS_18_X,
             timeout: CDKDuration.seconds(900),
             memorySize: 1024,
         });

package/constructs/SvelteKitSite.d.ts

@@ -110,7 +110,7 @@ export declare class SvelteKitSite extends SsrSite {
         data: {
             mode: "placeholder" | "deployed";
             path: string;
-            runtime: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
+            runtime: "nodejs16.x" | "nodejs18.x";
             customDomainUrl: string | undefined;
             url: string | undefined;
             edge: boolean | undefined;

package/constructs/WebSocketApi.d.ts

@@ -166,9 +166,13 @@ export interface WebSocketApiProps {
 export interface WebSocketApiFunctionRouteProps {
     type?: "function";
     /**
-     *The function definition used to create the function for this route.
+     * The function definition used to create the function for this route.
      */
     function: FunctionDefinition;
+    /**
+     * Should the route send a response to the client.
+     */
+    returnResponse?: boolean;
 }
 /**
  * Specify a Lambda authorizer and configure additional options.

package/constructs/WebSocketApi.js

@@ -363,6 +363,9 @@ export class WebSocketApi extends Construct {
             routeKey,
             integration: new WebSocketLambdaIntegration(`Integration_${routeKey}`, lambda),
             authorizer: routeKey === "$connect" ? authorizer : undefined,
+            returnResponse: Fn.isInlineDefinition(routeValue)
+                ? undefined
+                : routeValue.returnResponse,
         });
         ///////////////////
         // Configure authorization

package/constructs/cdk/dns-validated-certificate.js

@@ -47,7 +47,7 @@ export class DnsValidatedCertificate extends CertificateBase {
         const requestorFunction = new lambda.Function(this, "CertificateRequestorFunction", {
             code: lambda.Code.fromAsset(path.join(__dirname, "../../support/certificate-requestor")),
             handler: "index.certificateRequestHandler",
-            runtime: lambda.Runtime.NODEJS_16_X,
+            runtime: lambda.Runtime.NODEJS_18_X,
             timeout: Duration.minutes(15),
             role: props.customResourceRole,
         });

package/constructs/deprecated/NextjsSite.d.ts

@@ -83,7 +83,7 @@ export interface NextjsSiteProps {
              * })
              *```
              */
-            runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
+            runtime?: "nodejs16.x" | "nodejs18.x";
         };
     };
     /**

package/constructs/deprecated/NextjsSite.js

@@ -1039,10 +1039,7 @@ export class NextjsSite extends Construct {
         return replaceValues;
     }
     normalizeRuntime(runtime) {
-        if (runtime === "nodejs14.x") {
-            return lambda.Runtime.NODEJS_14_X;
-        }
-        else if (runtime === "nodejs16.x") {
+        if (runtime === "nodejs16.x") {
             return lambda.Runtime.NODEJS_16_X;
         }
         return lambda.Runtime.NODEJS_18_X;

package/constructs/deprecated/cross-region-helper.js

@@ -18,7 +18,7 @@ export function getOrCreateBucket(scope) {
     const provider = new lambda.Function(stack, providerId, {
         code: lambda.Code.fromAsset(path.join(__dirname, "../../support/edge-function")),
         handler: "s3-bucket.handler",
-        runtime: lambda.Runtime.NODEJS_16_X,
+        runtime: lambda.Runtime.NODEJS_18_X,
         timeout: Duration.minutes(15),
         memorySize: 1024,
         initialPolicy: [
@@ -50,7 +50,7 @@ export function createFunction(scope, name, role, bucketName, functionParams) {
         provider = new lambda.Function(stack, providerId, {
             code: lambda.Code.fromAsset(path.join(__dirname, "../../support/edge-function")),
             handler: "edge-lambda.handler",
-            runtime: lambda.Runtime.NODEJS_16_X,
+            runtime: lambda.Runtime.NODEJS_18_X,
             timeout: Duration.minutes(15),
             memorySize: 1024,
             initialPolicy: [
@@ -88,7 +88,7 @@ export function createVersion(scope, name, functionArn) {
         provider = new lambda.Function(stack, providerId, {
             code: lambda.Code.fromAsset(path.join(__dirname, "../../support/edge-function")),
             handler: "edge-lambda-version.handler",
-            runtime: lambda.Runtime.NODEJS_16_X,
+            runtime: lambda.Runtime.NODEJS_18_X,
             timeout: Duration.minutes(15),
             memorySize: 1024,
             initialPolicy: [

package/node/event-bus/index.d.ts

@@ -36,7 +36,7 @@ type Event = {
         metadataFn: any;
     };
 };
-type EventPayload<E extends Event> = {
+export type EventPayload<E extends Event> = {
     type: E["type"];
     properties: E["shape"]["properties"];
     metadata: undefined extends E["shape"]["metadata"] ? E["shape"]["metadataFn"] : E["shape"]["metadata"];

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.36.1",
+  "version": "2.36.3",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -120,7 +120,7 @@
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
-    "astro-sst": "2.36.1",
+    "astro-sst": "2.36.3",
     "async": "^3.2.4",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",

package/project.js

@@ -48,7 +48,7 @@ export async function initProject(globals) {
             // Logger.debug("loaded sst config");
             return [metafile, config];
         }
-        throw new VisibleError("Could not found a configuration file", "Make sure one of the following exists", ...CONFIG_EXTENSIONS.map((x) => `  - sst${x}`));
+        throw new VisibleError("Could not find a configuration file", "Make sure one of the following exists", ...CONFIG_EXTENSIONS.map((x) => `  - sst${x}`));
     })();
     const config = await Promise.resolve(sstConfig.config(globals));
     const stage = process.env.SST_STAGE ||
@@ -163,7 +163,7 @@ async function promptPersonalStage(out, isRetry) {
 async function findRoot() {
     async function find(dir) {
         if (dir === "/")
-            throw new VisibleError("Could not found a configuration file", "Make sure one of the following exists", ...CONFIG_EXTENSIONS.map((ext) => `  - sst${ext}`));
+            throw new VisibleError("Could not find a configuration file", "Make sure one of the following exists", ...CONFIG_EXTENSIONS.map((ext) => `  - sst${ext}`));
         for (const ext of CONFIG_EXTENSIONS) {
             const configPath = path.join(dir, `sst${ext}`);
             if (fsSync.existsSync(configPath)) {