sst 2.33.4 → 2.34.0

package/constructs/AstroSite.d.ts

@@ -1,34 +1,6 @@
 import { SsrSite, SsrSiteNormalizedProps, SsrSiteProps } from "./SsrSite.js";
 import { AllowedMethods } from "aws-cdk-lib/aws-cloudfront";
 import { Construct } from "constructs";
-export interface AstroSiteProps extends SsrSiteProps {
-    regional?: SsrSiteProps["regional"] & {
-        /**
-         * List all routes that will be handling non-GET requests. For example, routes like form submissions, logins, and API endpoints.
-         *
-         * Route patterns are case sensitive. And the following wildcard characters can be used:
-         *   - "*" matches 0 or more characters.
-         *   - "?" matches exactly 1 character.
-         *
-         * Matched routes will be handled directly by the server function.
-         * @deprecated Define `serverRoutes` in `astro.config.mjs` instead.
-         * @default true
-         * @example
-         * ```js
-         * regional: {
-         *   serverRoutes: [
-         *     "feedback", // Feedback page which requires POST method
-         *     "login",    // Login page which requires POST method
-         *     "user/*",   // Directory of user routes which are all SSR
-         *     "api/*"     // Directory of API endpoints which require all methods
-         *   ]
-         * }
-         * ```
-         */
-        serverRoutes?: string[];
-    };
-}
-type AstroSiteNormalizedProps = AstroSiteProps & SsrSiteNormalizedProps;
 /**
  * The `AstroSite` construct is a higher level CDK construct that makes it easy to create a Astro app.
  * @example
@@ -41,8 +13,8 @@ type AstroSiteNormalizedProps = AstroSiteProps & SsrSiteNormalizedProps;
  * ```
  */
 export declare class AstroSite extends SsrSite {
-    props: AstroSiteNormalizedProps;
-    constructor(scope: Construct, id: string, props?: AstroSiteProps);
+    props: SsrSiteNormalizedProps;
+    constructor(scope: Construct, id: string, props?: SsrSiteProps);
     private static getBuildMeta;
     private static getCFRoutingFunction;
     protected plan(): {
@@ -77,6 +49,7 @@ export declare class AstroSite extends SsrSite {
             fallbackOriginName: string;
             fallbackStatusCodes?: number[] | undefined;
         }>;
+        edge: boolean;
         behaviors: {
             cacheType: "server" | "static";
             pattern?: string | undefined;
@@ -107,4 +80,3 @@ export declare class AstroSite extends SsrSite {
         type: "AstroSite";
     };
 }
-export {};

package/constructs/AstroSite.js

@@ -19,9 +19,6 @@ export class AstroSite extends SsrSite {
         super(scope, id, {
             ...props,
             typesPath: props?.typesPath ?? "src",
-            regional: {
-                ...props?.regional,
-            },
         });
     }
     static getBuildMeta(filePath) {
@@ -65,20 +62,22 @@ export class AstroSite extends SsrSite {
   // End AstroSite CF Routing Function`;
     }
     plan() {
-        const { path: sitePath, edge, regional } = this.props;
+        const { path: sitePath } = this.props;
         const buildMeta = AstroSite.getBuildMeta(join(sitePath, "dist", BUILD_META_FILE_NAME));
         const isStatic = buildMeta.outputMode === "static";
+        const edge = buildMeta.deploymentStrategy === "edge";
         const serverConfig = {
             description: "Server handler for Astro",
             handler: join(sitePath, "dist", "server", "entry.handler"),
         };
         const plan = {
+            edge,
             cloudFrontFunctions: {
                 serverCfFunction: {
                     constructId: "CloudFrontFunction",
                     injections: [
                         this.useCloudFrontFunctionHostHeaderInjection(),
-                        ...(!edge ? [AstroSite.getCFRoutingFunction(buildMeta)] : []),
+                        AstroSite.getCFRoutingFunction(buildMeta),
                     ],
                 },
             },
@@ -120,18 +119,6 @@ export class AstroSite extends SsrSite {
                     : item,
                 origin: "staticsServer",
             })));
-            plan.behaviors.push({
-                cacheType: "server",
-                cfFunction: "serverCfFunction",
-                edgeFunction: "edgeServer",
-                origin: "staticsServer",
-            }, ...readdirSync(join(sitePath, buildMeta.clientBuildOutputDir)).map((item) => ({
-                cacheType: "static",
-                pattern: statSync(join(sitePath, buildMeta.clientBuildOutputDir, item)).isDirectory()
-                    ? `${item}/*`
-                    : item,
-                origin: "staticsServer",
-            })));
         }
         else {
             if (isStatic) {
@@ -163,7 +150,7 @@ export class AstroSite extends SsrSite {
                     cacheType: "static",
                     pattern: `${buildMeta.clientBuildVersionedSubDir}/*`,
                     origin: "staticsServer",
-                }, ...(buildMeta.serverRoutes ?? regional?.serverRoutes ?? []).map((route) => ({
+                }, ...buildMeta.serverRoutes?.map((route) => ({
                     cacheType: "server",
                     pattern: route,
                     origin: "regionalServer",

package/constructs/NextjsSite.d.ts

@@ -28,6 +28,11 @@ export interface NextjsSiteProps extends Omit<SsrSiteProps, "nodejs"> {
      * ```
      */
     logging?: "combined" | "per-route";
+    /**
+     * The server function is deployed to Lambda in a single region. Alternatively, you can enable this option to deploy to Lambda@Edge.
+     * @default false
+     */
+    edge?: boolean;
     imageOptimization?: {
         /**
          * The amount of memory in MB allocated for image optimization function.
@@ -128,6 +133,7 @@ export declare class NextjsSite extends SsrSite {
     private appPathRoutesManifest?;
     private appPathsManifest?;
     private pagesManifest?;
+    private prerenderManifest?;
     constructor(scope: Construct, id: string, props?: NextjsSiteProps);
     static buildDefaultServerCachePolicyProps(): CachePolicyProps;
     protected plan(bucket: Bucket): {
@@ -143,7 +149,14 @@ export declare class NextjsSite extends SsrSite {
                 function: {
                     layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
                     handler: string;
-                    bundle?: string | undefined;
+                    bundle?: string | undefined; /**
+                     * OpenNext version for building the Next.js site.
+                     * @default Latest OpenNext version
+                     * @example
+                     * ```js
+                     * openNextVersion: "2.2.4",
+                     * ```
+                     */
                     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;
@@ -240,7 +253,14 @@ export declare class NextjsSite extends SsrSite {
                 function: {
                     layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
                     handler: string;
-                    bundle?: string | undefined;
+                    bundle?: string | undefined; /**
+                     * OpenNext version for building the Next.js site.
+                     * @default Latest OpenNext version
+                     * @example
+                     * ```js
+                     * openNextVersion: "2.2.4",
+                     * ```
+                     */
                     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;
@@ -300,6 +320,7 @@ export declare class NextjsSite extends SsrSite {
                 streaming: boolean | undefined;
             } | undefined;
         };
+        edge: boolean;
         behaviors: {
             cacheType: "server" | "static";
             pattern?: string | undefined;
@@ -345,6 +366,7 @@ export declare class NextjsSite extends SsrSite {
     private useAppPathRoutesManifest;
     private useAppPathsManifest;
     private usePagesManifest;
+    private usePrerenderManifest;
     private getBuildId;
     private getSourcemapForAppRoute;
     private getSourcemapForPagesRoute;

package/constructs/NextjsSite.js

@@ -18,8 +18,9 @@ import { VisibleError } from "../error.js";
 import { Asset } from "aws-cdk-lib/aws-s3-assets";
 import { useFunctions } from "./Function.js";
 import { useDeferredTasks } from "./deferred_task.js";
+import { Logger } from "../logger.js";
 const LAYER_VERSION = "2";
-const DEFAULT_OPEN_NEXT_VERSION = "2.2.4";
+const DEFAULT_OPEN_NEXT_VERSION = "2.3.0";
 const DEFAULT_CACHE_POLICY_ALLOWED_HEADERS = [
     "accept",
     "rsc",
@@ -44,6 +45,7 @@ export class NextjsSite extends SsrSite {
     appPathRoutesManifest;
     appPathsManifest;
     pagesManifest;
+    prerenderManifest;
     constructor(scope, id, props) {
         const streaming = props?.experimental?.streaming ?? false;
         const disableDynamoDBCache = props?.experimental?.disableDynamoDBCache ?? false;
@@ -92,6 +94,7 @@ export class NextjsSite extends SsrSite {
         });
         this.removeSourcemaps();
         return this.validatePlan({
+            edge: edge ?? false,
             cloudFrontFunctions: {
                 serverCfFunction: {
                     constructId: "CloudFrontFunction",
@@ -264,12 +267,17 @@ export class NextjsSite extends SsrSite {
         table.grantReadWriteData(server.role);
         const dynamodbProviderPath = path.join(sitePath, ".open-next", "dynamodb-provider");
         if (fs.existsSync(dynamodbProviderPath)) {
+            // Provision 128MB of memory for every 4,000 prerendered routes,
+            // 1GB per 40,000, up to 10GB. This tends to use ~70% of the memory
+            // provisioned when testing.
+            const prerenderedRouteCount = Object.keys(this.usePrerenderManifest()?.routes ?? {}).length;
             const insertFn = new CdkFunction(this, "RevalidationInsertFunction", {
                 description: "Next.js revalidation data insert",
                 handler: "index.handler",
                 code: Code.fromAsset(dynamodbProviderPath),
                 runtime: Runtime.NODEJS_18_X,
                 timeout: CdkDuration.minutes(15),
+                memorySize: Math.min(10240, Math.max(128, Math.ceil(prerenderedRouteCount / 4000) * 128)),
                 initialPolicy: [
                     new PolicyStatement({
                         actions: [
@@ -473,6 +481,21 @@ export class NextjsSite extends SsrSite {
             return {};
         }
     }
+    usePrerenderManifest() {
+        if (this.prerenderManifest)
+            return this.prerenderManifest;
+        const { path: sitePath } = this.props;
+        try {
+            const content = fs
+                .readFileSync(path.join(sitePath, ".next/prerender-manifest.json"))
+                .toString();
+            this.prerenderManifest = JSON.parse(content);
+            return this.prerenderManifest;
+        }
+        catch (e) {
+            Logger.debug("Failed to load prerender-manifest.json", e);
+        }
+    }
     getBuildId() {
         const { path: sitePath } = this.props;
         return fs.readFileSync(path.join(sitePath, ".next/BUILD_ID")).toString();

package/constructs/RemixSite.d.ts

@@ -1,4 +1,12 @@
-import { SsrSite } from "./SsrSite.js";
+import { SsrSite, SsrSiteNormalizedProps, SsrSiteProps } from "./SsrSite.js";
+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.
+     * @default false
+     */
+    edge?: boolean;
+}
+type RemixSiteNormalizedProps = RemixSiteProps & SsrSiteNormalizedProps;
 /**
  * The `RemixSite` construct is a higher level CDK construct that makes it easy to create a Remix app.
  *
@@ -13,6 +21,7 @@ import { SsrSite } from "./SsrSite.js";
  * ```
  */
 export declare class RemixSite extends SsrSite {
+    props: RemixSiteNormalizedProps;
     protected plan(): {
         cloudFrontFunctions?: {
             serverCfFunction: {
@@ -65,6 +74,7 @@ export declare class RemixSite extends SsrSite {
                 };
             } | undefined;
         };
+        edge: boolean;
         behaviors: {
             cacheType: "server" | "static";
             pattern?: string | undefined;
@@ -97,3 +107,4 @@ export declare class RemixSite extends SsrSite {
         type: "RemixSite";
     };
 }
+export {};

package/constructs/RemixSite.js

@@ -36,6 +36,7 @@ export class RemixSite extends SsrSite {
             },
         };
         return this.validatePlan({
+            edge: edge ?? false,
             cloudFrontFunctions: {
                 serverCfFunction: {
                     constructId: "CloudFrontFunction",

package/constructs/SolidStartSite.d.ts

@@ -1,4 +1,12 @@
-import { SsrSite } from "./SsrSite.js";
+import { SsrSite, SsrSiteNormalizedProps, SsrSiteProps } from "./SsrSite.js";
+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.
+     * @default false
+     */
+    edge?: boolean;
+}
+type SolidStartSiteNormalizedProps = SolidStartSiteProps & SsrSiteNormalizedProps;
 /**
  * The `SolidStartSite` construct is a higher level CDK construct that makes it easy to create a SolidStart app.
  * @example
@@ -11,6 +19,7 @@ import { SsrSite } from "./SsrSite.js";
  * ```
  */
 export declare class SolidStartSite extends SsrSite {
+    props: SolidStartSiteNormalizedProps;
     protected plan(): {
         cloudFrontFunctions?: {
             serverCfFunction: {
@@ -47,6 +56,7 @@ export declare class SolidStartSite extends SsrSite {
                 };
             } | undefined;
         };
+        edge: boolean;
         behaviors: {
             cacheType: "server" | "static";
             pattern?: string | undefined;
@@ -77,3 +87,4 @@ export declare class SolidStartSite extends SsrSite {
         type: "SolidStartSite";
     };
 }
+export {};

package/constructs/SolidStartSite.js

@@ -20,6 +20,7 @@ export class SolidStartSite extends SsrSite {
             handler: path.join(sitePath, "dist", "server", "index.handler"),
         };
         return this.validatePlan({
+            edge: edge ?? false,
             cloudFrontFunctions: {
                 serverCfFunction: {
                     constructId: "CloudFrontFunction",

package/constructs/SsrSite.d.ts

@@ -111,11 +111,6 @@ export interface SsrSiteProps {
      * ```
      */
     customDomain?: string | SsrDomainProps;
-    /**
-     * The SSR function is deployed to Lambda in a single region. Alternatively, you can enable this option to deploy to Lambda@Edge.
-     * @default false
-     */
-    edge?: boolean;
     /**
      * The execution timeout in seconds for SSR function.
      * @default 10 seconds
@@ -406,6 +401,7 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
     protected bucket: Bucket;
     protected serverFunction?: EdgeFunction | SsrFunction;
     private serverFunctionForDev?;
+    private edge?;
     private distribution;
     constructor(scope: Construct, id: string, rawProps?: SsrSiteProps);
     protected static buildDefaultServerCachePolicyProps(allowedHeaders: string[]): CachePolicyProps;
@@ -460,6 +456,7 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
         cloudFrontFunctions?: CloudFrontFunctions;
         edgeFunctions?: EdgeFunctions;
         origins: Origins;
+        edge: boolean;
         behaviors: {
             cacheType: "server" | "static";
             pattern?: string;
@@ -479,6 +476,7 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
         cloudFrontFunctions?: CloudFrontFunctions | undefined;
         edgeFunctions?: EdgeFunctions | undefined;
         origins: Origins;
+        edge: boolean;
         behaviors: {
             cacheType: "server" | "static";
             pattern?: string;

package/constructs/SsrSite.js

@@ -49,6 +49,7 @@ export class SsrSite extends Construct {
     bucket;
     serverFunction;
     serverFunctionForDev;
+    edge;
     distribution;
     constructor(scope, id, rawProps) {
         super(scope, rawProps?.cdk?.id || id);
@@ -70,10 +71,9 @@ export class SsrSite extends Construct {
         const app = scope.node.root;
         const stack = Stack.of(this);
         const self = this;
-        const { path: sitePath, typesPath, buildCommand, runtime, timeout, memorySize, edge, regional, dev, assets, nodejs, permissions, environment, bind, customDomain, invalidation, warm, cdk, } = props;
+        const { path: sitePath, typesPath, buildCommand, runtime, timeout, memorySize, regional, dev, assets, nodejs, permissions, environment, bind, customDomain, invalidation, warm, cdk, } = props;
         this.doNotDeploy = !stack.isActive || (app.mode === "dev" && !dev?.deploy);
         validateSiteExists();
-        validateTimeout();
         validateDeprecatedFileOptions();
         writeTypesFile(typesPath);
         useSites().add(stack.stackName, id, this.constructor.name, props);
@@ -94,6 +94,7 @@ export class SsrSite extends Construct {
         // Build app
         buildApp();
         const plan = this.plan(bucket);
+        validateTimeout();
         // Create CloudFront
         const cfFunctions = createCloudFrontFunctions();
         const edgeFunctions = createEdgeFunctions();
@@ -104,12 +105,8 @@ export class SsrSite extends Construct {
         createWarmer();
         this.bucket = bucket;
         this.distribution = distribution;
-        this.serverFunction =
-            ssrFunctions.length > 0
-                ? ssrFunctions[0]
-                : Object.values(edgeFunctions).length > 0
-                    ? Object.values(edgeFunctions)[0]
-                    : undefined;
+        this.serverFunction = ssrFunctions[0] ?? Object.values(edgeFunctions)[0];
+        this.edge = plan.edge;
         app.registerTypes(this);
         function validateSiteExists() {
             if (!fs.existsSync(sitePath)) {
@@ -120,10 +117,10 @@ export class SsrSite extends Construct {
             const num = typeof timeout === "number"
                 ? timeout
                 : toCdkDuration(timeout).toSeconds();
-            const limit = edge ? 30 : 180;
+            const limit = plan.edge ? 30 : 180;
             if (num > limit) {
-                throw new VisibleError(edge
-                    ? `In the "${id}" construct, timeout must be less than or equal to 30 seconds when the "edge" flag is enabled.`
+                throw new VisibleError(plan.edge
+                    ? `In the "${id}" construct, timeout must be less than or equal to 30 seconds when deploying to the edge.`
                     : `In the "${id}" construct, timeout must be less than or equal to 180 seconds.`);
             }
         }
@@ -213,7 +210,7 @@ export class SsrSite extends Construct {
             //       need to handle warming multiple functions.
             if (!warm)
                 return;
-            if (warm && edge) {
+            if (warm && plan.edge) {
                 throw new VisibleError(`In the "${id}" Site, warming is currently supported only for the regional mode.`);
             }
             if (ssrFunctions.length === 0)
@@ -836,7 +833,7 @@ function handler(event) {
                 runtime: this.props.runtime,
                 customDomainUrl: this.customDomainUrl,
                 url: this.url,
-                edge: this.props.edge,
+                edge: this.edge,
                 server: (this.serverFunctionForDev || this.serverFunction)
                     ?.functionArn,
                 secrets: (this.props.bind || [])

package/constructs/SvelteKitSite.d.ts

@@ -1,4 +1,13 @@
-import { SsrSite } from "./SsrSite.js";
+import { SsrSite, SsrSiteNormalizedProps, SsrSiteProps } from "./SsrSite.js";
+import { Construct } from "constructs";
+export interface SvelteKitSiteProps extends SsrSiteProps {
+    /**
+     * The server function is deployed to Lambda in a single region. Alternatively, you can enable this option to deploy to Lambda@Edge.
+     * @default false
+     */
+    edge?: boolean;
+}
+type SvelteKitSiteNormalizedProps = SvelteKitSiteProps & SsrSiteNormalizedProps;
 /**
  * The `SvelteKitSite` construct is a higher level CDK construct that makes it easy to create a SvelteKit app.
  * @example
@@ -11,7 +20,8 @@ import { SsrSite } from "./SsrSite.js";
  * ```
  */
 export declare class SvelteKitSite extends SsrSite {
-    protected typesPath: string;
+    props: SvelteKitSiteNormalizedProps;
+    constructor(scope: Construct, id: string, props?: SvelteKitSiteProps);
     protected plan(): {
         cloudFrontFunctions?: {
             serverCfFunction: {
@@ -79,6 +89,7 @@ export declare class SvelteKitSite extends SsrSite {
                 };
             } | undefined;
         };
+        edge: boolean;
         behaviors: {
             cacheType: "server" | "static";
             pattern?: string | undefined;
@@ -109,3 +120,4 @@ export declare class SvelteKitSite extends SsrSite {
         type: "SvelteKitSite";
     };
 }
+export {};

package/constructs/SvelteKitSite.js

@@ -13,7 +13,12 @@ import { SsrSite } from "./SsrSite.js";
  * ```
  */
 export class SvelteKitSite extends SsrSite {
-    typesPath = "src";
+    constructor(scope, id, props) {
+        super(scope, id, {
+            ...props,
+            typesPath: props?.typesPath ?? "src",
+        });
+    }
     plan() {
         const { path: sitePath, edge } = this.props;
         const serverDir = ".svelte-kit/svelte-kit-sst/server";
@@ -39,6 +44,7 @@ export class SvelteKitSite extends SsrSite {
             ],
         };
         return this.validatePlan({
+            edge: edge ?? false,
             buildId: JSON.parse(fs
                 .readFileSync(path.join(sitePath, clientDir, "_app/version.json"))
                 .toString()).version,

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.33.4",
+  "version": "2.34.0",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -124,7 +124,7 @@
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",
     "vitest": "^0.33.0",
-    "astro-sst": "2.33.4"
+    "astro-sst": "2.34.0"
   },
   "peerDependencies": {
     "@sls-next/lambda-at-edge": "^3.7.0"