sst 2.28.3 → 2.28.6

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/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,11 @@ export declare class NextjsSite extends SsrSite {
     private createRevalidationQueue;
     private createRevalidationTable;
     getConstructMetadata(): {
+        type: "NextjsSite";
         data: {
+            routes: {
+                route: string;
+            }[] | undefined;
             mode: "placeholder" | "deployed";
             path: string;
             runtime: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
@@ -199,7 +204,9 @@ export declare class NextjsSite extends SsrSite {
             server: string;
             secrets: string[];
         };
-        type: "NextjsSite";
     };
+    private wrapHandler;
+    private getRoutes;
+    private getBuildId;
 }
 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.getBuildId(),
             warmerConfig: {
                 function: path.join(sitePath, ".open-next", "warmer-function"),
             },
@@ -276,9 +276,57 @@ export class NextjsSite extends SsrSite {
         }
     }
     getConstructMetadata() {
+        const metadata = this.getConstructMetadataBase();
         return {
+            ...metadata,
             type: "NextjsSite",
-            ...this.getConstructMetadataBase(),
+            data: {
+                ...metadata.data,
+                routes: this.props.edge || this.doNotDeploy ? undefined : 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,
+                }))
+                    .sort((a, b) => a.route.localeCompare(b.route)),
+                ...(content.dataRoutes || [])
+                    .map(({ page }) => ({
+                    route: page.endsWith("/")
+                        ? `/_next/data/BUILD_ID${page}index.json`
+                        : `/_next/data/BUILD_ID${page}.json`,
+                }))
+                    .sort((a, b) => a.route.localeCompare(b.route)),
+            ];
+        }
+        catch (e) {
+            console.error(e);
+            throw new VisibleError(`Failed to read routes data from ".next/routes-manifest.json" for the "${id}" site.`);
+        }
+    }
+    getBuildId() {
+        const { path: sitePath } = this.props;
+        return fs.readFileSync(path.join(sitePath, ".next/BUILD_ID")).toString();
+    }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.28.3",
+  "version": "2.28.6",
   "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.3",
+    "astro-sst": "2.28.6",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",
     "vitest": "^0.33.0"