sst 2.35.1 → 2.36.1

package/cli/local/server.js

@@ -123,6 +123,7 @@ export async function useLocalServer(opts) {
             properties: {
                 app: project.config.name,
                 stage: project.config.stage,
+                region: project.config.region,
             },
         }));
         for (const invocation of invocations) {

package/constructs/App.js

@@ -241,14 +241,17 @@ export class App extends CDKApp {
         this.isFinished = true;
         const { config, paths } = useProject();
         Auth.injectConfig();
-        this.buildConstructsMetadata();
         this.ensureUniqueConstructIds();
         // Run deferred tasks
-        // - after codegen b/c some frontend frameworks (ie. Next.js apps) runs
+        // - After codegen b/c some frontend frameworks (ie. Next.js apps) runs
         //   type checking in the build step
-        // - before remove govcloud unsupported resource properties b/c deferred
+        // - Before remove govcloud unsupported resource properties b/c deferred
         //   tasks may add govcloud unsupported resource properties
         await useDeferredTasks().run();
+        // Build constructs metadata after running deferred tasks
+        // - Metadata for Functions needs to know if sourcemaps are enabled, which
+        //   is not known until after build
+        this.buildConstructsMetadata();
         this.createBindingSsmParameters();
         this.removeGovCloudUnsupportedResourceProperties();
         useWarning().print();

package/constructs/Function.d.ts

@@ -671,6 +671,7 @@ export declare class Function extends CDKFunction implements SSTConstruct {
     readonly _isLiveDevEnabled: boolean;
     /** @internal */
     readonly _doNotAllowOthersToBind?: boolean;
+    private missingSourcemap?;
     private functionUrl?;
     private props;
     private allBindings;
@@ -704,6 +705,7 @@ export declare class Function extends CDKFunction implements SSTConstruct {
             arn: string;
             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;
+            missingSourcemap: boolean | undefined;
             localId: string;
             secrets: string[];
         };

package/constructs/Function.js

@@ -65,6 +65,7 @@ export class Function extends CDKFunction {
     _isLiveDevEnabled;
     /** @internal */
     _doNotAllowOthersToBind;
+    missingSourcemap;
     functionUrl;
     props;
     allBindings = [];
@@ -261,6 +262,7 @@ export class Function extends CDKFunction {
                         tarKey: this.functionArn,
                     });
                 }
+                this.missingSourcemap = !result.sourcemap;
                 // Update code
                 const cfnFunction = this.node.defaultChild;
                 const code = AssetCode.fromAsset(result.out);
@@ -369,6 +371,7 @@ export class Function extends CDKFunction {
                 arn: this.functionArn,
                 runtime: this.props.runtime,
                 handler: this.props.handler,
+                missingSourcemap: this.missingSourcemap === true ? true : undefined,
                 localId: this.node.addr,
                 secrets: this.allBindings
                     .filter((c) => c instanceof Secret)

package/constructs/NextjsSite.d.ts

@@ -21,10 +21,10 @@ export interface NextjsSiteProps extends Omit<SsrSiteProps, "nodejs"> {
      * 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"
+     * @default "per-route"
      * @example
      * ```js
-     * logging: "per-route",
+     * logging: "combined",
      * ```
      */
     logging?: "combined" | "per-route";
@@ -134,7 +134,7 @@ export declare class NextjsSite extends SsrSite {
     private appPathsManifest?;
     private pagesManifest?;
     private prerenderManifest?;
-    constructor(scope: Construct, id: string, props?: NextjsSiteProps);
+    constructor(scope: Construct, id: string, rawProps?: NextjsSiteProps);
     static buildDefaultServerCachePolicyProps(): CachePolicyProps;
     protected plan(bucket: Bucket): {
         cloudFrontFunctions?: {
@@ -205,10 +205,10 @@ export declare class NextjsSite extends SsrSite {
                      * 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"
+                     * @default "per-route"
                      * @example
                      * ```js
-                     * logging: "per-route",
+                     * logging: "combined",
                      * ```
                      */
                     environment?: Record<string, string> | undefined;
@@ -312,10 +312,10 @@ export declare class NextjsSite extends SsrSite {
                      * 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"
+                     * @default "per-route"
                      * @example
                      * ```js
-                     * logging: "per-route",
+                     * logging: "combined",
                      * ```
                      */
                     environment?: Record<string, string> | undefined;
@@ -377,6 +377,7 @@ export declare class NextjsSite extends SsrSite {
     private getSourcemapForAppRoute;
     private getSourcemapForPagesRoute;
     private isPerRouteLoggingEnabled;
+    private handleMissingSourcemap;
     private disableDefaultLogging;
     private uploadSourcemaps;
     private static buildCloudWatchRouteName;

package/constructs/NextjsSite.js

@@ -20,7 +20,7 @@ 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.3.0";
+const DEFAULT_OPEN_NEXT_VERSION = "2.3.1";
 const DEFAULT_CACHE_POLICY_ALLOWED_HEADERS = [
     "accept",
     "rsc",
@@ -46,33 +46,41 @@ export class NextjsSite extends SsrSite {
     appPathsManifest;
     pagesManifest;
     prerenderManifest;
-    constructor(scope, id, props) {
-        const streaming = props?.experimental?.streaming ?? false;
-        const disableDynamoDBCache = props?.experimental?.disableDynamoDBCache ?? false;
-        const disableIncrementalCache = props?.experimental?.disableIncrementalCache ?? false;
+    constructor(scope, id, rawProps) {
+        const props = {
+            logging: rawProps?.logging ?? "per-route",
+            experimental: {
+                streaming: rawProps?.experimental?.streaming ?? false,
+                disableDynamoDBCache: rawProps?.experimental?.disableDynamoDBCache ?? false,
+                disableIncrementalCache: rawProps?.experimental?.disableIncrementalCache ?? false,
+                ...rawProps?.experimental,
+            },
+            ...rawProps,
+        };
         super(scope, id, {
             buildCommand: [
                 "npx",
                 "--yes",
                 `open-next@${props?.openNextVersion ?? DEFAULT_OPEN_NEXT_VERSION}`,
                 "build",
-                ...(streaming ? ["--streaming"] : []),
-                ...(disableDynamoDBCache
+                ...(props.experimental.streaming ? ["--streaming"] : []),
+                ...(props.experimental.disableDynamoDBCache
                     ? ["--dangerously-disable-dynamodb-cache"]
                     : []),
-                ...(disableIncrementalCache
+                ...(props.experimental.disableIncrementalCache
                     ? ["--dangerously-disable-incremental-cache"]
                     : []),
             ].join(" "),
             ...props,
         });
+        this.handleMissingSourcemap();
         if (this.isPerRouteLoggingEnabled()) {
             this.disableDefaultLogging();
             this.uploadSourcemaps();
         }
-        if (!disableIncrementalCache) {
+        if (!props.experimental.disableIncrementalCache) {
             this.createRevalidationQueue();
-            if (!disableDynamoDBCache) {
+            if (!props.experimental.disableDynamoDBCache) {
                 this.createRevalidationTable();
             }
         }
@@ -563,9 +571,15 @@ export class NextjsSite extends SsrSite {
             !this.props.edge &&
             this.props.logging === "per-route");
     }
+    handleMissingSourcemap() {
+        if (this.doNotDeploy || this.props.edge)
+            return;
+        const hasMissingSourcemap = this.useRoutes().every(({ sourcemapPath, sourcemapKey }) => !sourcemapPath || !sourcemapKey);
+        if (!hasMissingSourcemap)
+            return;
+        this.serverFunction._overrideMissingSourcemap();
+    }
     disableDefaultLogging() {
-        // Note: keep default logs enabled
-        return;
         const stack = Stack.of(this);
         const server = this.serverFunction;
         const policy = new Policy(this, "DisableLoggingPolicy", {

package/constructs/SsrFunction.d.ts

@@ -27,6 +27,7 @@ export declare class SsrFunction extends Construct implements SSTConstruct {
     function: CdkFunction;
     private assetReplacer;
     private assetReplacerPolicy;
+    private missingSourcemap?;
     private props;
     constructor(scope: Construct, id: string, props: SsrFunctionProps);
     get role(): import("aws-cdk-lib/aws-iam").IRole | undefined;
@@ -36,6 +37,7 @@ export declare class SsrFunction extends Construct implements SSTConstruct {
     addFunctionUrl(props?: FunctionUrlOptions): import("aws-cdk-lib/aws-lambda").FunctionUrl;
     grantInvoke(grantee: IGrantable): import("aws-cdk-lib/aws-iam").Grant;
     attachPermissions(permissions: Permissions): void;
+    _overrideMissingSourcemap(): void;
     private createFunction;
     private createCodeReplacer;
     private bind;
@@ -50,6 +52,7 @@ export declare class SsrFunction extends Construct implements SSTConstruct {
             arn: string;
             runtime: "nodejs14.x" | "nodejs16.x" | "nodejs18.x" | undefined;
             handler: string;
+            missingSourcemap: boolean | undefined;
             localId: string;
             secrets: string[];
         };

package/constructs/SsrFunction.js

@@ -30,6 +30,7 @@ export class SsrFunction extends Construct {
     function;
     assetReplacer;
     assetReplacerPolicy;
+    missingSourcemap;
     props;
     constructor(scope, id, props) {
         super(scope, id);
@@ -86,6 +87,9 @@ export class SsrFunction extends Construct {
     attachPermissions(permissions) {
         attachPermissionsToRole(this.function.role, permissions);
     }
+    _overrideMissingSourcemap() {
+        this.missingSourcemap = true;
+    }
     createFunction(assetBucket, assetKey) {
         const { architecture, runtime, timeout, memorySize, handler, logRetention, } = this.props;
         return new CdkFunction(this, `ServerFunction`, {
@@ -196,6 +200,7 @@ export class SsrFunction extends Construct {
                 tarKey: this.functionArn,
             });
         }
+        this.missingSourcemap = !result.sourcemap;
         return AssetCode.fromAsset(result.out);
     }
     async buildAssetFromBundle(bundle) {
@@ -237,6 +242,7 @@ export class SsrFunction extends Construct {
                 arn: this.functionArn,
                 runtime: this.props.runtime,
                 handler: this.props.handler,
+                missingSourcemap: this.missingSourcemap === true ? true : undefined,
                 localId: this.node.addr,
                 secrets: [],
             },

package/package.json

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