sst 2.34.7 → 2.35.1

package/constructs/App.d.ts

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

package/constructs/App.js

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

package/constructs/Distribution.d.ts

@@ -127,6 +127,7 @@ export declare class Distribution extends Construct {
         version?: string;
         paths?: string[];
         wait?: boolean;
+        dependsOn?: IConstruct[];
     }): CustomResource;
     private validateCloudFrontDistributionSettings;
     private validateCustomDomainSettings;

package/constructs/Distribution.js

@@ -71,7 +71,7 @@ export class Distribution extends Construct {
         };
     }
     createInvalidation(props) {
-        const { version, paths, wait } = props ?? {};
+        const { version, paths, wait, dependsOn } = props ?? {};
         const stack = Stack.of(this);
         const policy = new Policy(this.scope, "CloudFrontInvalidatorPolicy", {
             statements: [
@@ -100,6 +100,7 @@ export class Distribution extends Construct {
             },
         });
         resource.node.addDependency(policy);
+        dependsOn?.forEach((c) => resource.node.addDependency(c));
         return resource;
     }
     validateCloudFrontDistributionSettings() {

package/constructs/EdgeFunction.js

@@ -1,6 +1,7 @@
 import fs from "fs";
 import url from "url";
 import path from "path";
+import zlib from "zlib";
 import crypto from "crypto";
 import spawn from "cross-spawn";
 import { Construct } from "constructs";
@@ -107,19 +108,34 @@ export class EdgeFunction extends Construct {
             },
         });
         // Build function
-        const bundle = await useRuntimeHandlers().build(this.node.addr, "deploy");
+        const result = await useRuntimeHandlers().build(this.node.addr, "deploy");
         // create wrapper that calls the handler
-        if (bundle.type === "error")
+        if (result.type === "error")
             throw new Error([
                 `There was a problem bundling the SSR function for the "${this.scope.node.id}" Site.`,
-                ...bundle.errors,
+                ...result.errors,
             ].join("\n"));
+        // upload sourcemap
+        const stack = Stack.of(this);
+        if (result.sourcemap) {
+            const data = await fs.promises.readFile(result.sourcemap);
+            await fs.promises.writeFile(result.sourcemap, zlib.gzipSync(data));
+            const asset = new Asset(this, "Sourcemap", {
+                path: result.sourcemap,
+            });
+            await fs.promises.rm(result.sourcemap);
+            useFunctions().sourcemaps.add(stack.stackName, {
+                srcBucket: asset.bucket,
+                srcKey: asset.s3ObjectKey,
+                tarKey: this.functionArn,
+            });
+        }
         const asset = new Asset(this.scope, `FunctionAsset`, {
-            path: bundle.out,
+            path: result.out,
         });
         // Get handler filename
         const isESM = (nodejs?.format || "esm") === "esm";
-        const parsed = path.parse(bundle.handler);
+        const parsed = path.parse(result.handler);
         const handlerFilename = `${parsed.dir}/${parsed.name}${isESM ? ".mjs" : ".cjs"}`;
         return { asset, handlerFilename };
     }

package/constructs/Function.d.ts

@@ -14,7 +14,6 @@ import { IBucket } from "aws-cdk-lib/aws-s3";
 declare const supportedRuntimes: {
     container: CDKRuntime;
     rust: CDKRuntime;
-    "nodejs12.x": CDKRuntime;
     "nodejs14.x": CDKRuntime;
     "nodejs16.x": CDKRuntime;
     "nodejs18.x": CDKRuntime;
@@ -123,12 +122,12 @@ export interface FunctionProps extends Omit<FunctionOptions, "functionName" | "m
     handler?: string;
     /**
      * The runtime environment for the function.
-     * @default "nodejs16.x"
+     * @default "nodejs18.x"
      * @example
      * ```js
      * new Function(stack, "Function", {
      *   handler: "function.handler",
-     *   runtime: "nodejs18.x",
+     *   runtime: "nodejs16.x",
      * })
      *```
      */
@@ -703,7 +702,7 @@ export declare class Function extends CDKFunction implements SSTConstruct {
         type: "Function";
         data: {
             arn: string;
-            runtime: "container" | "rust" | "nodejs12.x" | "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" | "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;
             handler: string | undefined;
             localId: string;
             secrets: 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,
-    "nodejs12.x": CDKRuntime.NODEJS_12_X,
     "nodejs14.x": CDKRuntime.NODEJS_14_X,
     "nodejs16.x": CDKRuntime.NODEJS_16_X,
     "nodejs18.x": CDKRuntime.NODEJS_18_X,
@@ -80,7 +79,7 @@ export class Function extends CDKFunction {
             .forEach((per) => {
             props = Function.mergeProps(per, props);
         });
-        props.runtime = props.runtime || "nodejs16.x";
+        props.runtime = props.runtime || "nodejs18.x";
         if (props.runtime === "go1.x")
             useWarning().add("go.deprecated");
         // Set defaults
@@ -126,7 +125,7 @@ export class Function extends CDKFunction {
             });
         }
         // Handle local development (ie. sst start)
-        // - set runtime to nodejs12.x for non-Node runtimes (b/c the stub is in Node)
+        // - set runtime to nodejs for non-Node runtimes (b/c the stub is in Node)
         // - set retry to 0. When the debugger is disconnected, the Cron construct
         //   will still try to periodically invoke the Lambda, and the requests would
         //   fail and retry. So when launching `sst start`, a couple of retry requests

package/constructs/Job.js

@@ -399,6 +399,6 @@ export class Job extends Construct {
     }
     convertJobRuntimeToFunctionRuntime() {
         const { runtime } = this.props;
-        return runtime === "container" ? "container" : "nodejs16.x";
+        return runtime === "container" ? "container" : "nodejs18.x";
     }
 }

package/constructs/NextjsSite.d.ts

@@ -149,14 +149,7 @@ export declare class NextjsSite extends SsrSite {
                 function: {
                     layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
                     handler: string;
-                    bundle?: string | undefined; /**
-                     * OpenNext version for building the Next.js site.
-                     * @default Latest OpenNext version
-                     * @example
-                     * ```js
-                     * openNextVersion: "2.2.4",
-                     * ```
-                     */
+                    bundle?: string | undefined;
                     runtime?: "nodejs14.x" | "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;
@@ -208,6 +201,16 @@ export declare class NextjsSite extends SsrSite {
                     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 "combined"
+                     * @example
+                     * ```js
+                     * logging: "per-route",
+                     * ```
+                     */
                     environment?: Record<string, string> | undefined;
                     bind?: import("./Construct.js").SSTConstruct[] | undefined;
                     nodejs?: import("./Function.js").NodeJSProps | undefined;
@@ -253,14 +256,7 @@ export declare class NextjsSite extends SsrSite {
                 function: {
                     layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
                     handler: string;
-                    bundle?: string | undefined; /**
-                     * OpenNext version for building the Next.js site.
-                     * @default Latest OpenNext version
-                     * @example
-                     * ```js
-                     * openNextVersion: "2.2.4",
-                     * ```
-                     */
+                    bundle?: string | undefined;
                     runtime?: "nodejs14.x" | "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;
@@ -312,6 +308,16 @@ export declare class NextjsSite extends SsrSite {
                     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 "combined"
+                     * @example
+                     * ```js
+                     * logging: "per-route",
+                     * ```
+                     */
                     environment?: Record<string, string> | undefined;
                     bind?: import("./Construct.js").SSTConstruct[] | undefined;
                     nodejs?: import("./Function.js").NodeJSProps | undefined;

package/constructs/RemixSite.d.ts

@@ -1,4 +1,5 @@
 import { SsrSite, SsrSiteNormalizedProps, SsrSiteProps } from "./SsrSite.js";
+import { Construct } from "constructs";
 export interface RemixSiteProps extends SsrSiteProps {
     /**
      * The server function is deployed to Lambda in a single region. Alternatively, you can enable this option to deploy to Lambda@Edge.
@@ -22,6 +23,7 @@ type RemixSiteNormalizedProps = RemixSiteProps & SsrSiteNormalizedProps;
  */
 export declare class RemixSite extends SsrSite {
     props: RemixSiteNormalizedProps;
+    constructor(scope: Construct, id: string, props?: RemixSiteProps);
     protected plan(): {
         cloudFrontFunctions?: {
             serverCfFunction: {

package/constructs/RemixSite.js

@@ -21,6 +21,9 @@ const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
  * ```
  */
 export class RemixSite extends SsrSite {
+    constructor(scope, id, props) {
+        super(scope, id, props);
+    }
     plan() {
         const { path: sitePath, edge } = this.props;
         const { handler, inject } = this.createServerLambdaBundle(edge ? "edge-server.js" : "regional-server.js");

package/constructs/Service.js

@@ -210,7 +210,9 @@ export class Service extends Construct {
                 this.updateContainerImage(dockerfile, taskDefinition, container);
             }
             // Invalidate CloudFront
-            this.distribution?.createInvalidation();
+            this.distribution?.createInvalidation({
+                wait: this.props.waitForInvalidation,
+            });
         });
         app.registerTypes(this);
     }

package/constructs/SolidStartSite.d.ts

@@ -1,4 +1,5 @@
 import { SsrSite, SsrSiteNormalizedProps, SsrSiteProps } from "./SsrSite.js";
+import { Construct } from "constructs";
 export interface SolidStartSiteProps extends SsrSiteProps {
     /**
      * The server function is deployed to Lambda in a single region. Alternatively, you can enable this option to deploy to Lambda@Edge.
@@ -20,6 +21,7 @@ type SolidStartSiteNormalizedProps = SolidStartSiteProps & SsrSiteNormalizedProp
  */
 export declare class SolidStartSite extends SsrSite {
     props: SolidStartSiteNormalizedProps;
+    constructor(scope: Construct, id: string, props?: SolidStartSiteProps);
     protected plan(): {
         cloudFrontFunctions?: {
             serverCfFunction: {

package/constructs/SolidStartSite.js

@@ -13,6 +13,9 @@ import { SsrSite } from "./SsrSite.js";
  * ```
  */
 export class SolidStartSite extends SsrSite {
+    constructor(scope, id, props) {
+        super(scope, id, props);
+    }
     plan() {
         const { path: sitePath, edge } = this.props;
         const serverConfig = {

package/constructs/SsrFunction.js

@@ -1,5 +1,7 @@
 import url from "url";
 import path from "path";
+import zlib from "zlib";
+import fs from "fs/promises";
 import spawn from "cross-spawn";
 import { Construct } from "constructs";
 import { Effect, Policy, PolicyStatement, } from "aws-cdk-lib/aws-iam";
@@ -16,6 +18,7 @@ import { attachPermissionsToRole } from "./util/permission.js";
 import { toCdkSize } from "./util/size.js";
 import { toCdkDuration } from "./util/duration.js";
 import { useDeferredTasks } from "./deferred_task.js";
+import { Asset } from "aws-cdk-lib/aws-s3-assets";
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 /////////////////////
 // Construct
@@ -170,15 +173,30 @@ export class SsrFunction extends Construct {
             nodejs: this.props.nodejs,
             copyFiles: this.props.copyFiles,
         });
-        // Build function
-        const bundle = await useRuntimeHandlers().build(this.node.addr, "deploy");
+        // build function
+        const result = await useRuntimeHandlers().build(this.node.addr, "deploy");
         // create wrapper that calls the handler
-        if (bundle.type === "error")
+        if (result.type === "error")
             throw new Error([
                 `There was a problem bundling the SSR function for the "${this.node.id}" Site.`,
-                ...bundle.errors,
+                ...result.errors,
             ].join("\n"));
-        return AssetCode.fromAsset(bundle.out);
+        // upload sourcemap
+        const stack = Stack.of(this);
+        if (result.sourcemap) {
+            const data = await fs.readFile(result.sourcemap);
+            await fs.writeFile(result.sourcemap, zlib.gzipSync(data));
+            const asset = new Asset(this, "Sourcemap", {
+                path: result.sourcemap,
+            });
+            await fs.rm(result.sourcemap);
+            useFunctions().sourcemaps.add(stack.stackName, {
+                srcBucket: asset.bucket,
+                srcKey: asset.s3ObjectKey,
+                tarKey: this.functionArn,
+            });
+        }
+        return AssetCode.fromAsset(result.out);
     }
     async buildAssetFromBundle(bundle) {
         // Note: cannot point the bundle to the `.open-next/server-function`

package/constructs/SsrSite.d.ts

@@ -2,6 +2,7 @@ import { Construct } from "constructs";
 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";
@@ -329,6 +330,20 @@ export interface SsrSiteProps {
          * create the CDK `Distribution` internally.
          */
         distribution?: SsrCdkDistributionProps;
+        /**
+         * Override the CloudFront S3 origin properties.
+         * @example
+         * ```js
+         * import { OriginAccessIdenty } from "aws-cdk-lib/aws-cloudfront";
+         *
+         * cdk: {
+         *   s3Origin: {
+         *     originAccessIdentity: OriginAccessIdentity.fromOriginAccessIdentityId(stack, "OriginAccessIdentity", "XXXXXXXX" ),
+         *   },
+         * }
+         * ```
+         */
+        s3Origin?: S3OriginProps;
         /**
          * Override the CloudFront cache policy properties for responses from the
          * server rendering Lambda.
@@ -341,12 +356,12 @@ export interface SsrSiteProps {
          *
          * ```js
          * serverCachePolicy: new CachePolicy(this, "ServerCache", {
-         *   queryStringBehavior: CacheQueryStringBehavior.all()
-         *   headerBehavior: CacheHeaderBehavior.none()
-         *   cookieBehavior: CacheCookieBehavior.none()
-         *   defaultTtl: Duration.days(0)
-         *   maxTtl: Duration.days(365)
-         *   minTtl: Duration.days(0)
+         *   queryStringBehavior: CacheQueryStringBehavior.all(),
+         *   headerBehavior: CacheHeaderBehavior.none(),
+         *   cookieBehavior: CacheCookieBehavior.none(),
+         *   defaultTtl: Duration.days(0),
+         *   maxTtl: Duration.days(365),
+         *   minTtl: Duration.days(0),
          * })
          * ```
          */

package/constructs/SsrSite.js

@@ -414,6 +414,7 @@ function handler(event) {
         function createS3Origin(props) {
             const s3Origin = new S3Origin(bucket, {
                 originPath: "/" + (props.originPath ?? ""),
+                ...(cdk?.s3Origin ?? {}),
             });
             const assets = createS3OriginAssets(props.copy);
             const s3deployCR = createS3OriginDeployment(props.copy, assets);
@@ -757,6 +758,7 @@ function handler(event) {
                 version: invalidationBuildId,
                 paths: invalidationPaths,
                 wait: invalidation.wait,
+                dependsOn: s3DeployCRs,
             });
         }
     }

package/constructs/StaticSite.js

@@ -75,6 +75,8 @@ export class StaticSite extends Construct {
             // Invalidate CloudFront
             this.distribution.createInvalidation({
                 version: this.generateInvalidationId(assets),
+                wait: this.props.waitForInvalidation,
+                dependsOn: [s3deployCR],
             });
         });
         app.registerTypes(this);

package/constructs/deprecated/NextjsSite.d.ts

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

package/constructs/deprecated/NextjsSite.js

@@ -1039,13 +1039,13 @@ export class NextjsSite extends Construct {
         return replaceValues;
     }
     normalizeRuntime(runtime) {
-        if (runtime === "nodejs12.x") {
-            return lambda.Runtime.NODEJS_12_X;
-        }
-        else if (runtime === "nodejs14.x") {
+        if (runtime === "nodejs14.x") {
             return lambda.Runtime.NODEJS_14_X;
         }
-        return lambda.Runtime.NODEJS_16_X;
+        else if (runtime === "nodejs16.x") {
+            return lambda.Runtime.NODEJS_16_X;
+        }
+        return lambda.Runtime.NODEJS_18_X;
     }
 }
 export const useSites = createAppContext(() => {

package/package.json

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