sst 2.39.8 → 2.39.10

package/bootstrap.js

@@ -20,7 +20,7 @@ const CDK_STACK_NAME = "CDKToolkit";
 const SST_STACK_NAME = "SSTBootstrap";
 const OUTPUT_VERSION = "Version";
 const OUTPUT_BUCKET = "BucketName";
-const LATEST_VERSION = "7.2";
+const LATEST_VERSION = "7.3";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 export const useBootstrap = lazy(async () => {
     Logger.debug("Initializing bootstrap context");

package/constructs/AstroSite.d.ts

@@ -64,10 +64,6 @@ export declare class AstroSite extends SsrSite {
             allowedHeaders?: string[] | undefined;
         } | undefined;
         buildId?: string | undefined;
-        warmerConfig?: {
-            function: string;
-            schedule?: import("aws-cdk-lib/aws-events").Schedule | undefined;
-        } | undefined;
     };
     getConstructMetadata(): {
         data: {

package/constructs/Job.d.ts

@@ -61,7 +61,7 @@ export interface JobProps {
     architecture?: "x86_64" | "arm_64";
     /**
      * The runtime environment for the job.
-     * @default "nodejs"
+     * @default "nodejs18.x"
      * @example
      * ```js
      * new Job(stack, "MyJob", {
@@ -70,7 +70,7 @@ export interface JobProps {
      * })
      *```
      */
-    runtime?: "nodejs" | "container";
+    runtime?: "nodejs" | "nodejs16.x" | "nodejs18.x" | "nodejs20.x" | "container";
     /**
      * For "nodejs" runtime, point to the entry point and handler function.
      * Of the format: `/path/to/file.function`.

package/constructs/Job.js

@@ -275,11 +275,23 @@ export class Job extends Construct {
             const code = AssetCode.fromAsset(result.out);
             const codeConfig = code.bind(this);
             const project = this.job.node.defaultChild;
+            const dockerImageMap = {
+                arm_64: {
+                    nodejs: "amazon/aws-lambda-nodejs:16.2023.07.13.14",
+                    "nodejs16.x": "amazon/aws-lambda-nodejs:16.2023.07.13.14",
+                    "nodejs18.x": "amazon/aws-lambda-nodejs:18.2023.12.14.13",
+                    "nodejs20.x": "amazon/aws-lambda-nodejs:20.2023.12.14.13",
+                },
+                x86_64: {
+                    nodejs: "amazon/aws-lambda-nodejs:16",
+                    "nodejs16.x": "amazon/aws-lambda-nodejs:16",
+                    "nodejs18.x": "amazon/aws-lambda-nodejs:18",
+                    "nodejs20.x": "amazon/aws-lambda-nodejs:20",
+                },
+            };
             const image = LinuxBuildImage.fromDockerRegistry(
             // ARM images can be found here https://hub.docker.com/r/amazon/aws-lambda-nodejs
-            architecture === "arm_64"
-                ? "amazon/aws-lambda-nodejs:16.2023.07.13.14"
-                : "amazon/aws-lambda-nodejs:16");
+            dockerImageMap[architecture ?? "x86_64"][runtime ?? "nodejs18.x"]);
             project.environment = {
                 ...project.environment,
                 type: architecture === "arm_64" ? "ARM_CONTAINER" : "LINUX_CONTAINER",

package/constructs/NextjsSite.d.ts

@@ -43,6 +43,19 @@ export interface NextjsSiteProps extends Omit<SsrSiteProps, "nodejs"> {
          */
         memorySize?: number | Size;
     };
+    openNext?: {
+        /**
+         * Specify a custom build output path for cases when running OpenNext from
+         * a monorepo with decentralized build output. This is passed to the
+         * `--build-output-path` flag of OpenNext.
+         * @default Default build output path
+         * @example
+         * ```js
+         * buildOutputPath: "dist/apps/example-app"
+         * ```
+         */
+        buildOutputPath?: string;
+    };
     experimental?: {
         /**
          * Enable streaming. Currently an experimental feature in OpenNext.
@@ -221,10 +234,6 @@ export declare class NextjsSite extends SsrSite {
             allowedHeaders?: string[] | undefined;
         } | undefined;
         buildId?: string | undefined;
-        warmerConfig?: {
-            function: string;
-            schedule?: import("aws-cdk-lib/aws-events").Schedule | undefined;
-        } | undefined;
     };
     private createRevalidationQueue;
     private createRevalidationTable;

package/constructs/NextjsSite.js

@@ -63,6 +63,9 @@ export class NextjsSite extends SsrSite {
                 "--yes",
                 `open-next@${props?.openNextVersion ?? DEFAULT_OPEN_NEXT_VERSION}`,
                 "build",
+                ...(props.openNext?.buildOutputPath
+                    ? ["--build-output-path", props.openNext.buildOutputPath]
+                    : []),
                 ...(props.experimental.streaming ? ["--streaming"] : []),
                 ...(props.experimental.disableDynamoDBCache
                     ? ["--dangerously-disable-dynamodb-cache"]
@@ -237,9 +240,6 @@ export class NextjsSite extends SsrSite {
                 allowedHeaders: DEFAULT_CACHE_POLICY_ALLOWED_HEADERS,
             },
             buildId: this.getBuildId(),
-            warmerConfig: {
-                function: path.join(sitePath, ".open-next", "warmer-function"),
-            },
         });
     }
     createRevalidationQueue() {

package/constructs/RemixSite.d.ts

@@ -90,10 +90,6 @@ export declare class RemixSite extends SsrSite {
             allowedHeaders?: string[] | undefined;
         } | undefined;
         buildId?: string | undefined;
-        warmerConfig?: {
-            function: string;
-            schedule?: import("aws-cdk-lib/aws-events").Schedule | undefined;
-        } | undefined;
     };
     protected getServerModuleFormat(): "cjs" | "esm";
     private createServerLambdaBundle;

package/constructs/SolidStartSite.d.ts

@@ -72,10 +72,6 @@ export declare class SolidStartSite extends SsrSite {
             allowedHeaders?: string[] | undefined;
         } | undefined;
         buildId?: string | undefined;
-        warmerConfig?: {
-            function: string;
-            schedule?: import("aws-cdk-lib/aws-events").Schedule | undefined;
-        } | undefined;
     };
     getConstructMetadata(): {
         data: {

package/constructs/SsrFunction.js

@@ -274,10 +274,10 @@ export class SsrFunction extends Construct {
         const newHandlerFunction = "handler";
         await fs.writeFile(path.join(bundle, handlerDir, `${newHandlerName}.mjs`), streaming
             ? [
-                `export const ${newHandlerFunction} = awslambda.streamifyResponse(async (event, context) => {`,
+                `export const ${newHandlerFunction} = awslambda.streamifyResponse(async (event, responseStream, context) => {`,
                 ...injections,
                 `  const { ${oldHandlerFunction}: rawHandler} = await import("./${oldHandlerName}.mjs");`,
-                `  return rawHandler(event, context);`,
+                `  return rawHandler(event, responseStream);`,
                 `});`,
             ].join("\n")
             : [

package/constructs/SsrSite.d.ts

@@ -3,7 +3,6 @@ import { Bucket, BucketProps, IBucket } from "aws-cdk-lib/aws-s3";
 import { Function as CdkFunction, FunctionProps as CdkFunctionProps } from "aws-cdk-lib/aws-lambda";
 import { ICachePolicy, IResponseHeadersPolicy, ViewerProtocolPolicy, AllowedMethods, CachePolicyProps, ErrorResponse } from "aws-cdk-lib/aws-cloudfront";
 import { S3OriginProps } from "aws-cdk-lib/aws-cloudfront-origins";
-import { Schedule } from "aws-cdk-lib/aws-events";
 import { DistributionDomainProps } from "./Distribution.js";
 import { SSTConstruct } from "./Construct.js";
 import { NodeJSProps, FunctionProps } from "./Function.js";
@@ -391,6 +390,9 @@ export interface SsrSiteProps {
          */
         viewerProtocolPolicy?: ViewerProtocolPolicy;
         server?: Pick<CdkFunctionProps, "layers" | "vpc" | "vpcSubnets" | "securityGroups" | "allowAllOutbound" | "allowPublicSubnet" | "architecture" | "logRetention"> & Pick<FunctionProps, "copyFiles">;
+        /**
+         * @hidden Need to fix tsdoc generation to support the `Plan` type
+         */
         transform?: (args: Plan) => void;
     };
 }
@@ -493,10 +495,6 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
             allowedHeaders?: string[];
         };
         buildId?: string;
-        warmerConfig?: {
-            function: string;
-            schedule?: Schedule;
-        };
     }): {
         cloudFrontFunctions?: CloudFrontFunctions | undefined;
         edgeFunctions?: EdgeFunctions | undefined;
@@ -515,10 +513,6 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
             allowedHeaders?: string[] | undefined;
         } | undefined;
         buildId?: string | undefined;
-        warmerConfig?: {
-            function: string;
-            schedule?: Schedule | undefined;
-        } | undefined;
     };
 }
 export declare const useSites: () => {

package/constructs/SsrSite.js

@@ -223,8 +223,7 @@ export class SsrSite extends Construct {
             // Create warmer function
             const warmer = new CdkFunction(self, "WarmerFunction", {
                 description: "SSR warmer",
-                code: Code.fromAsset(plan.warmerConfig?.function ??
-                    path.join(__dirname, "../support/ssr-warmer")),
+                code: Code.fromAsset(path.join(__dirname, "../support/ssr-warmer")),
                 runtime: Runtime.NODEJS_18_X,
                 handler: "index.handler",
                 timeout: CdkDuration.minutes(15),
@@ -237,7 +236,7 @@ export class SsrSite extends Construct {
             ssrFunctions[0].grantInvoke(warmer);
             // Create cron job
             new Rule(self, "WarmerRule", {
-                schedule: plan.warmerConfig?.schedule ?? Schedule.rate(CdkDuration.minutes(5)),
+                schedule: Schedule.rate(CdkDuration.minutes(5)),
                 targets: [new LambdaFunction(warmer, { retryAttempts: 0 })],
             });
             // Create custom resource to prewarm on deploy
@@ -456,7 +455,7 @@ function handler(event) {
                 ...cdk?.server,
                 streaming: props.streaming,
                 injections: [
-                    ...(warm ? [useServerFunctionWarmingInjection()] : []),
+                    ...(warm ? [useServerFunctionWarmingInjection(props.streaming)] : []),
                     ...(props.injections || []),
                 ],
                 prefetchSecrets: regional?.prefetchSecrets,
@@ -649,15 +648,24 @@ function handler(event) {
                     OriginRequestPolicy.fromOriginRequestPolicyId(self, "ServerOriginRequestPolicy", "b689b0a8-53d0-40ab-baf2-68738e2966ac");
             return singletonOriginRequestPolicy;
         }
-        function useServerFunctionWarmingInjection() {
-            return `
-if (event.type === "warmer") {
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      resolve({ serverId: "server-" + Math.random().toString(36).slice(2, 8) });
-    }, event.delay);
-  });
-}`;
+        function useServerFunctionWarmingInjection(streaming) {
+            return [
+                `if (event.type === "warmer") {`,
+                `  const p = new Promise((resolve) => {`,
+                `    setTimeout(() => {`,
+                `      resolve({ serverId: "server-" + Math.random().toString(36).slice(2, 8) });`,
+                `    }, event.delay);`,
+                `  });`,
+                ...(streaming
+                    ? [
+                        `  const response = await p;`,
+                        `  responseStream.write(JSON.stringify(response));`,
+                        `  responseStream.end();`,
+                        `  return;`,
+                    ]
+                    : [`  return p;`]),
+                `}`,
+            ].join("\n");
         }
         function getS3FileOptions(copy) {
             const fileOptions = [];

package/constructs/SvelteKitSite.d.ts

@@ -103,10 +103,6 @@ export declare class SvelteKitSite extends SsrSite {
             allowedHeaders?: string[] | undefined;
         } | undefined;
         buildId?: string | undefined;
-        warmerConfig?: {
-            function: string;
-            schedule?: import("aws-cdk-lib/aws-events").Schedule | undefined;
-        } | undefined;
     };
     getConstructMetadata(): {
         data: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.39.8",
+  "version": "2.39.10",
   "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.39.8",
+    "astro-sst": "2.39.10",
     "async": "^3.2.4",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",