sst 2.39.10 → 2.39.12

package/constructs/Function.js

@@ -207,22 +207,9 @@ export class Function extends CDKFunction {
                 ...props,
                 ...(props.runtime === "container"
                     ? {
-                        code: Code.fromAssetImage(props.handler, {
-                            ...(architecture?.dockerPlatform
-                                ? { platform: Platform.custom(architecture.dockerPlatform) }
-                                : {}),
-                            ...(props.container?.cmd ? { cmd: props.container.cmd } : {}),
-                            ...(props.container?.file
-                                ? { file: props.container.file }
-                                : {}),
-                            ...(props.container?.buildArgs
-                                ? { buildArgs: props.container.buildArgs }
-                                : {}),
-                            exclude: [".sst/dist", ".sst/artifacts"],
-                            ignoreMode: IgnoreMode.GLOB,
-                        }),
-                        handler: CDKHandler.FROM_IMAGE,
-                        runtime: CDKRuntime.FROM_IMAGE,
+                        code: Code.fromInline("export function placeholder() {}"),
+                        handler: "index.placeholder",
+                        runtime: CDKRuntime.NODEJS_18_X,
                         layers: undefined,
                     }
                     : {
@@ -244,7 +231,6 @@ export class Function extends CDKFunction {
             useDeferredTasks().add(async () => {
                 if (props.runtime === "container")
                     Colors.line(`➜  Building the container image for the "${this.node.id}" function...`);
-                const project = useProject();
                 // Build function
                 const result = await useRuntimeHandlers().build(this.node.addr, "deploy");
                 if (result.type === "error") {
@@ -253,9 +239,32 @@ export class Function extends CDKFunction {
                         ...result.errors,
                     ].join("\n"));
                 }
-                // No need to update code if runtime is container
-                if (props.runtime === "container")
+                // Update function code for container
+                const cfnFunction = this.node.defaultChild;
+                if (props.runtime === "container") {
+                    const code = Code.fromAssetImage(props.handler, {
+                        ...(architecture?.dockerPlatform
+                            ? { platform: Platform.custom(architecture.dockerPlatform) }
+                            : {}),
+                        ...(props.container?.cmd ? { cmd: props.container.cmd } : {}),
+                        ...(props.container?.file ? { file: props.container.file } : {}),
+                        ...(props.container?.buildArgs
+                            ? { buildArgs: props.container.buildArgs }
+                            : {}),
+                        exclude: [".sst/dist", ".sst/artifacts"],
+                        ignoreMode: IgnoreMode.GLOB,
+                    });
+                    const codeConfig = code.bind(this);
+                    cfnFunction.packageType = "Image";
+                    cfnFunction.code = {
+                        imageUri: codeConfig.image?.imageUri,
+                    };
+                    delete cfnFunction.runtime;
+                    delete cfnFunction.handler;
+                    code.bindToResource(cfnFunction);
                     return;
+                }
+                // Update function code for non-container
                 if (result.sourcemap) {
                     const data = await fs.readFile(result.sourcemap);
                     await fs.writeFile(result.sourcemap, zlib.gzipSync(data));
@@ -270,7 +279,6 @@ export class Function extends CDKFunction {
                 }
                 this.missingSourcemap = !result.sourcemap;
                 // Update code
-                const cfnFunction = this.node.defaultChild;
                 const code = AssetCode.fromAsset(result.out);
                 const codeConfig = code.bind(this);
                 cfnFunction.code = {

package/constructs/NextjsSite.js

@@ -78,7 +78,7 @@ export class NextjsSite extends SsrSite {
         });
         this.handleMissingSourcemap();
         if (this.isPerRouteLoggingEnabled()) {
-            this.disableDefaultLogging();
+            //this.disableDefaultLogging();
             this.uploadSourcemaps();
         }
         if (!props.experimental.disableIncrementalCache) {
@@ -359,36 +359,56 @@ export class NextjsSite extends SsrSite {
         if (this._routes)
             return this._routes;
         const routesManifest = this.useRoutesManifest();
+        const appPathRoutesManifest = this.useAppPathRoutesManifest();
+        const dynamicAndStaticRoutes = [
+            ...routesManifest.dynamicRoutes,
+            ...routesManifest.staticRoutes,
+        ].map(({ page, regex }) => {
+            const cwRoute = NextjsSite.buildCloudWatchRouteName(page);
+            const cwHash = NextjsSite.buildCloudWatchRouteHash(page);
+            const sourcemapPath = this.getSourcemapForAppRoute(page) ||
+                this.getSourcemapForPagesRoute(page);
+            return {
+                route: page,
+                regexMatch: regex,
+                logGroupPath: `/${cwHash}${cwRoute}`,
+                sourcemapPath: sourcemapPath,
+                sourcemapKey: cwHash,
+            };
+        });
+        // Some app routes are not in the routes manifest, so we need to add them
+        // ie. app/api/route.ts => IS NOT in the routes manifest
+        //     app/items/[slug]/route.ts => IS in the routes manifest (dynamicRoutes)
+        const appRoutes = Object.values(appPathRoutesManifest)
+            .filter((page) => routesManifest.dynamicRoutes.every((route) => route.page !== page) &&
+            routesManifest.staticRoutes.every((route) => route.page !== page))
+            .map((page) => {
+            const cwRoute = NextjsSite.buildCloudWatchRouteName(page);
+            const cwHash = NextjsSite.buildCloudWatchRouteHash(page);
+            const sourcemapPath = this.getSourcemapForAppRoute(page);
+            return {
+                route: page,
+                prefixMatch: page,
+                logGroupPath: `/${cwHash}${cwRoute}`,
+                sourcemapPath: sourcemapPath,
+                sourcemapKey: cwHash,
+            };
+        });
+        const dataRoutes = (routesManifest.dataRoutes || []).map(({ page, dataRouteRegex }) => {
+            const routeDisplayName = page.endsWith("/")
+                ? `/_next/data/BUILD_ID${page}index.json`
+                : `/_next/data/BUILD_ID${page}.json`;
+            const cwRoute = NextjsSite.buildCloudWatchRouteName(routeDisplayName);
+            const cwHash = NextjsSite.buildCloudWatchRouteHash(page);
+            return {
+                route: routeDisplayName,
+                regexMatch: dataRouteRegex,
+                logGroupPath: `/${cwHash}${cwRoute}`,
+            };
+        });
         this._routes = [
-            ...[...routesManifest.dynamicRoutes, ...routesManifest.staticRoutes]
-                .map(({ page, regex }) => {
-                const cwRoute = NextjsSite.buildCloudWatchRouteName(page);
-                const cwHash = NextjsSite.buildCloudWatchRouteHash(page);
-                const sourcemapPath = this.getSourcemapForAppRoute(page) ||
-                    this.getSourcemapForPagesRoute(page);
-                return {
-                    route: page,
-                    regex,
-                    logGroupPath: `/${cwHash}${cwRoute}`,
-                    sourcemapPath: sourcemapPath,
-                    sourcemapKey: cwHash,
-                };
-            })
-                .sort((a, b) => a.route.localeCompare(b.route)),
-            ...(routesManifest.dataRoutes || [])
-                .map(({ page, dataRouteRegex }) => {
-                const routeDisplayName = page.endsWith("/")
-                    ? `/_next/data/BUILD_ID${page}index.json`
-                    : `/_next/data/BUILD_ID${page}.json`;
-                const cwRoute = NextjsSite.buildCloudWatchRouteName(routeDisplayName);
-                const cwHash = NextjsSite.buildCloudWatchRouteHash(page);
-                return {
-                    route: routeDisplayName,
-                    regex: dataRouteRegex,
-                    logGroupPath: `/${cwHash}${cwRoute}`,
-                };
-            })
-                .sort((a, b) => a.route.localeCompare(b.route)),
+            ...[...dynamicAndStaticRoutes, ...appRoutes].sort((a, b) => a.route.localeCompare(b.route)),
+            ...dataRoutes.sort((a, b) => a.route.localeCompare(b.route)),
         ];
         return this._routes;
     }
@@ -410,6 +430,15 @@ export class NextjsSite extends SsrSite {
         }
     }
     useAppPathRoutesManifest() {
+        // Example
+        // {
+        //   "/_not-found": "/_not-found",
+        //   "/page": "/",
+        //   "/favicon.ico/route": "/favicon.ico",
+        //   "/api/route": "/api",                    <- app/api/route.js
+        //   "/api/sub/route": "/api/sub",            <- app/api/sub/route.js
+        //   "/items/[slug]/route": "/items/[slug]"   <- app/items/[slug]/route.js
+        // }
         if (this.appPathRoutesManifest)
             return this.appPathRoutesManifest;
         const { path: sitePath } = this.props;
@@ -472,10 +501,17 @@ export class NextjsSite extends SsrSite {
     useServerFunctionPerRouteLoggingInjection() {
         return `
 if (event.rawPath) {
-  const routeData = ${JSON.stringify(this.useRoutes().map(({ regex, logGroupPath }) => ({
-            regex,
+  const routeData = ${JSON.stringify(
+        // @ts-expect-error
+        this.useRoutes().map(({ regexMatch, prefixMatch, logGroupPath }) => ({
+            regex: regexMatch,
+            prefix: prefixMatch,
             logGroupPath,
-        })))}.find(({ regex }) => event.rawPath.match(new RegExp(regex)));
+        })))}.find(({ regex, prefix }) => {
+    if (regex) return event.rawPath.match(new RegExp(regex));
+    if (prefix) return event.rawPath === prefix || (event.rawPath === prefix + "/");
+    return false;
+  });
   if (routeData) {
     console.log("::sst::" + JSON.stringify({
       action:"log.split",

package/package.json

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