sst 2.28.1 → 2.28.5

package/cli/commands/dev.js

@@ -1,4 +1,3 @@
-import { lazy } from "../../util/lazy.js";
 export const dev = (program) => program.command(["dev", "start"], "Work on your app locally", (yargs) => yargs.option("increase-timeout", {
     type: "boolean",
     description: "Increase function timeout",
@@ -19,6 +18,8 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     const { useProject } = await import("../../project.js");
     const { clear } = await import("../terminal.js");
     const { getCiInfo } = await import("../ci-info.js");
+    const { useMetadataCache } = await import("../../stacks/metadata.js");
+    const { lazy } = await import("../../util/lazy.js");
     try {
         if (args._[0] === "start") {
             console.log(yellow(`Warning: ${bold(`sst start`)} has been renamed to ${bold(`sst dev`)}`));
@@ -320,6 +321,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         await printHeader({ console: true, hint: "ready!" });
         await Promise.all([
             useStackBuilder(),
+            useMetadataCache(),
             useDisconnector(),
             import("../../runtime/workers.js").then((mod) => mod.useRuntimeWorkers()),
             import("../../runtime/iot.js").then((mod) => mod.useIOTBridge()),

package/constructs/Api.d.ts

@@ -201,7 +201,7 @@ export interface ApiProps<Authorizers extends Record<string, ApiAuthorizer> = Re
      */
     cors?: boolean | ApiCorsProps;
     /**
-     * Enable CloudWatch access logs for this API
+     * Enable CloudWatch access logs for this API. Defaults to true.
      *
      * @default true
      *

package/constructs/AstroSite.js

@@ -19,26 +19,6 @@ export class AstroSite extends SsrSite {
         super(scope, id, {
             ...props,
             typesPath: props?.typesPath ?? "src",
-            fileOptions: props?.fileOptions ?? [
-                {
-                    exclude: "*",
-                    include: "*.css",
-                    cacheControl: "public,max-age=0,s-maxage=31536000,must-revalidate",
-                    contentType: "text/css; charset=UTF-8",
-                },
-                {
-                    exclude: "*",
-                    include: "*.js",
-                    cacheControl: "public,max-age=0,s-maxage=31536000,must-revalidate",
-                    contentType: "application/javascript; charset=UTF-8",
-                },
-                {
-                    exclude: "*",
-                    include: "*.html",
-                    cacheControl: "public,max-age=0,s-maxage=31536000,must-revalidate",
-                    contentType: "text/html; charset=UTF-8",
-                },
-            ],
             regional: {
                 ...props?.regional,
             },
@@ -179,14 +159,28 @@ export class AstroSite extends SsrSite {
                 pattern: route,
                 origin: "regionalServer",
             })));
-            const notFoundRoute = buildMeta.routes.find(({ route, type }) => route.match(/^\/404\/?$/) && type === "page");
-            if (notFoundRoute) {
-                plan.errorResponses?.push({
-                    httpStatus: 404,
-                    responsePagePath: "/404.html",
-                    responseHttpStatus: 404,
-                });
-            }
+            buildMeta.routes
+                .filter(({ type, route }) => type === "page" && /^\/\d{3}\/?$/.test(route))
+                .forEach(({ route, prerender }) => {
+                switch (route) {
+                    case "/404":
+                    case "/404/":
+                        plan.errorResponses?.push({
+                            httpStatus: 404,
+                            responsePagePath: prerender ? "/404.html" : "/404",
+                            responseHttpStatus: 404,
+                        });
+                        break;
+                    case "/500":
+                    case "/500/":
+                        plan.errorResponses?.push({
+                            httpStatus: 500,
+                            responsePagePath: prerender ? "/500.html" : "/500",
+                            responseHttpStatus: 500,
+                        });
+                        break;
+                }
+            });
         }
         return this.validatePlan(plan);
     }

package/constructs/NextjsSite.d.ts

@@ -99,6 +99,7 @@ type NextjsSiteNormalizedProps = NextjsSiteProps & SsrSiteNormalizedProps;
  */
 export declare class NextjsSite extends SsrSite {
     props: NextjsSiteNormalizedProps;
+    private buildId?;
     constructor(scope: Construct, id: string, props?: NextjsSiteProps);
     protected plan(bucket: Bucket): {
         cloudFrontFunctions?: {
@@ -189,7 +190,9 @@ export declare class NextjsSite extends SsrSite {
     private createRevalidationQueue;
     private createRevalidationTable;
     getConstructMetadata(): {
+        type: "NextjsSite";
         data: {
+            routes: any[];
             mode: "placeholder" | "deployed";
             path: string;
             runtime: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
@@ -199,7 +202,9 @@ export declare class NextjsSite extends SsrSite {
             server: string;
             secrets: string[];
         };
-        type: "NextjsSite";
     };
+    private wrapHandler;
+    private getRoutes;
+    private useBuildId;
 }
 export {};

package/constructs/NextjsSite.js

@@ -11,6 +11,7 @@ import { SsrSite } from "./SsrSite.js";
 import { toCdkSize } from "./util/size.js";
 import { PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
+import { VisibleError } from "../error.js";
 /**
  * The `NextjsSite` construct is a higher level CDK construct that makes it easy to create a Next.js app.
  * @example
@@ -23,6 +24,7 @@ import { RetentionDays } from "aws-cdk-lib/aws-logs";
  * ```
  */
 export class NextjsSite extends SsrSite {
+    buildId;
     constructor(scope, id, props) {
         const { streaming, disableDynamoDBCache, disableIncrementalCache } = {
             streaming: false,
@@ -32,7 +34,7 @@ export class NextjsSite extends SsrSite {
         };
         super(scope, id, {
             buildCommand: [
-                "npx --yes open-next@2.2.1 build",
+                "npx --yes open-next@2.2.3 build",
                 ...(streaming ? ["--streaming"] : []),
                 ...(disableDynamoDBCache
                     ? ["--dangerously-disable-dynamodb-cache"]
@@ -55,7 +57,7 @@ export class NextjsSite extends SsrSite {
         const serverConfig = {
             description: "Next.js server",
             bundle: path.join(sitePath, ".open-next", "server-function"),
-            handler: "index.handler",
+            handler: this.wrapHandler(),
             environment: {
                 CACHE_BUCKET_NAME: bucket.bucketName,
                 CACHE_BUCKET_KEY_PREFIX: "_cache",
@@ -189,9 +191,7 @@ export class NextjsSite extends SsrSite {
                 "next-router-state-tree",
                 "next-url",
             ],
-            buildId: fs
-                .readFileSync(path.join(sitePath, ".next/BUILD_ID"))
-                .toString(),
+            buildId: this.useBuildId(),
             warmerConfig: {
                 function: path.join(sitePath, ".open-next", "warmer-function"),
             },
@@ -276,9 +276,53 @@ export class NextjsSite extends SsrSite {
         }
     }
     getConstructMetadata() {
+        const metadata = this.getConstructMetadataBase();
         return {
+            ...metadata,
             type: "NextjsSite",
-            ...this.getConstructMetadataBase(),
+            data: {
+                ...metadata.data,
+                routes: this.getRoutes(),
+            },
         };
     }
+    wrapHandler() {
+        const { path: sitePath } = this.props;
+        const wrapperName = "nextjssite-index";
+        const serverPath = path.join(sitePath, ".open-next", "server-function");
+        fs.writeFileSync(path.join(serverPath, `${wrapperName}.mjs`), [
+            `import { handler as rawHandler } from "./index.mjs";`,
+            `export const handler = (event, context) => {`,
+            `  return rawHandler(event, context);`,
+            `};`,
+        ].join("\n"));
+        return `${wrapperName}.handler`;
+    }
+    getRoutes() {
+        const id = this.node.id;
+        const { path: sitePath } = this.props;
+        try {
+            const content = JSON.parse(fs
+                .readFileSync(path.join(sitePath, ".next/routes-manifest.json"))
+                .toString());
+            return [
+                ...[...content.dynamicRoutes, ...content.staticRoutes].map(({ page }) => ({
+                    route: page,
+                })),
+                ...(content.dataRoutes || []).map(({ page }) => ({
+                    route: page.endsWith("/")
+                        ? `/_next/data/${this.useBuildId()}${page}index.json`
+                        : `/_next/data/${this.useBuildId()}${page}.json`,
+                })),
+            ];
+        }
+        catch (e) {
+            console.error(e);
+            throw new VisibleError(`Failed to read routes data from ".next/routes-manifest.json" for the "${id}" site.`);
+        }
+    }
+    useBuildId() {
+        const { path: sitePath } = this.props;
+        return fs.readFileSync(path.join(sitePath, ".next/BUILD_ID")).toString();
+    }
 }

package/constructs/SsrSite.d.ts

@@ -248,7 +248,7 @@ export interface SsrSiteProps {
          * from the server rendering Lambda.
          */
         responseHeadersPolicy?: IResponseHeadersPolicy;
-        server?: Pick<CdkFunctionProps, "vpc" | "vpcSubnets" | "securityGroups" | "allowAllOutbound" | "allowPublicSubnet" | "architecture" | "logRetention"> & Pick<FunctionProps, "copyFiles">;
+        server?: Pick<CdkFunctionProps, "layers" | "vpc" | "vpcSubnets" | "securityGroups" | "allowAllOutbound" | "allowPublicSubnet" | "architecture" | "logRetention"> & Pick<FunctionProps, "copyFiles">;
     };
     /**
      * Pass in a list of file options to customize cache control and content type specific files.

package/constructs/SsrSite.js

@@ -195,7 +195,7 @@ export class SsrSite extends Construct {
                 bind,
                 environment,
                 permissions,
-                // note: do not need to set vpc settings b/c this function is not being used
+                // note: do not need to set vpc and layers settings b/c this function is not being used
             });
         }
         function createWarmer() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.28.1",
+  "version": "2.28.5",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -119,7 +119,7 @@
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
-    "astro-sst": "2.28.1",
+    "astro-sst": "2.28.5",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",
     "vitest": "^0.33.0"