sst 2.42.0 → 2.43.1

package/cli/commands/secrets/list.js

@@ -30,7 +30,7 @@ export const list = (program) => program.command("list [format]", "Fetch all the
                 break;
             case "env":
                 for (const [key, value] of Object.entries(secrets)) {
-                    console.log(`${key}=${value.value || `${value.fallback} #fallback`}`);
+                    console.log(`${key}=${`'${value.value}'` || `'${value.fallback}' #fallback`}`);
                 }
                 break;
             case "table":

package/constructs/AstroSite.d.ts

@@ -18,38 +18,9 @@ export declare class AstroSite extends SsrSite {
     private static getBuildMeta;
     private static getCFRoutingFunction;
     protected plan(): {
-        cloudFrontFunctions?: Record<string, {
-            constructId: string;
-            injections: string[];
-        }> | undefined;
-        edgeFunctions?: Record<string, {
-            constructId: string;
-            function: import("./EdgeFunction.js").EdgeFunctionProps;
-        }> | undefined;
-        origins: Record<string, {
-            type: "function";
-            constructId: string;
-            function: import("./SsrFunction.js").SsrFunctionProps;
-            injections?: string[] | undefined;
-            streaming?: boolean | undefined;
-        } | {
-            type: "image-optimization-function";
-            function: import("aws-cdk-lib/aws-lambda").FunctionProps;
-        } | {
-            type: "s3";
-            originPath?: string | undefined;
-            copy: {
-                from: string;
-                to: string;
-                cached: boolean;
-                versionedSubDir?: string | undefined;
-            }[];
-        } | {
-            type: "group";
-            primaryOriginName: string;
-            fallbackOriginName: string;
-            fallbackStatusCodes?: number[] | undefined;
-        }>;
+        cloudFrontFunctions?: Record<string, import("./SsrSite.js").CloudFrontFunctionConfig> | undefined;
+        edgeFunctions?: Record<string, import("./SsrSite.js").EdgeFunctionConfig> | undefined;
+        origins: Record<string, import("./SsrSite.js").FunctionOriginConfig | import("./SsrSite.js").ImageOptimizationFunctionOriginConfig | import("./SsrSite.js").S3OriginConfig | import("./SsrSite.js").OriginGroupConfig>;
         edge: boolean;
         behaviors: {
             cacheType: "server" | "static";
@@ -64,6 +35,9 @@ export declare class AstroSite extends SsrSite {
             allowedHeaders?: string[] | undefined;
         } | undefined;
         buildId?: string | undefined;
+        warmer?: {
+            function: string;
+        } | undefined;
     };
     getConstructMetadata(): {
         data: {

package/constructs/NextjsSite.d.ts

@@ -1,9 +1,18 @@
 import { Construct } from "constructs";
-import { Runtime, FunctionProps, Architecture } from "aws-cdk-lib/aws-lambda";
-import { SsrSite, SsrSiteNormalizedProps, SsrSiteProps } from "./SsrSite.js";
+import { Runtime, FunctionProps as CdkFunctionProps, Architecture } from "aws-cdk-lib/aws-lambda";
+import { EdgeFunctionConfig, FunctionOriginConfig, SsrSite, SsrSiteNormalizedProps, SsrSiteProps } from "./SsrSite.js";
 import { Size } from "./util/size.js";
 import { Bucket } from "aws-cdk-lib/aws-s3";
-import { CachePolicyProps } from "aws-cdk-lib/aws-cloudfront";
+type OpenNextS3Origin = {
+    type: "s3";
+    originPath: string;
+    copy: {
+        from: string;
+        to: string;
+        cached: boolean;
+        versionedSubDir?: string;
+    }[];
+};
 export interface NextjsSiteProps extends Omit<SsrSiteProps, "nodejs"> {
     /**
      * OpenNext version for building the Next.js site.
@@ -14,17 +23,6 @@ export interface NextjsSiteProps extends Omit<SsrSiteProps, "nodejs"> {
      * ```
      */
     openNextVersion?: string;
-    /**
-     * 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 "per-route"
-     * @example
-     * ```js
-     * logging: "combined",
-     * ```
-     */
-    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
@@ -42,59 +40,20 @@ export interface NextjsSiteProps extends Omit<SsrSiteProps, "nodejs"> {
          * ```
          */
         memorySize?: number | Size;
-    };
-    openNext?: {
-        /**
-         * Specify a custom build output path for cases when running OpenNext from
-         * a monorepo with decentralized build output. This is passed to the
-         * `--build-output-path` flag of OpenNext.
-         * @default Default build output path
-         * @example
-         * ```js
-         * buildOutputPath: "dist/apps/example-app"
-         * ```
-         */
-        buildOutputPath?: string;
-    };
-    experimental?: {
-        /**
-         * Enable streaming. Currently an experimental feature in OpenNext.
-         * @default false
-         * @example
-         * ```js
-         * experimental: {
-         *   streaming: true,
-         * }
-         * ```
-         */
-        streaming?: boolean;
         /**
-         * Disabling incremental cache will cause the entire page to be revalidated on each request. This can result in ISR and SSG pages to be in an inconsistent state. Specify this option if you are using SSR pages only.
-         *
-         * Note that it is possible to disable incremental cache while leaving on-demand revalidation enabled.
+         * If set to true, already computed image will return 304 Not Modified.
+         * This means that image needs to be immutable, the etag will be computed based on the image href, format and width and the next BUILD_ID.
          * @default false
          * @example
          * ```js
-         * experimental: {
-         *   disableIncrementalCache: true,
-         * }
-         * ```
-         */
-        disableIncrementalCache?: boolean;
-        /**
-         * Disabling DynamoDB cache will cause on-demand revalidation by path (`revalidatePath`) and by cache tag (`revalidateTag`) to fail silently.
-         * @default false
-         * @example
-         * ```js
-         * experimental: {
-         *   disableDynamoDBCache: true,
+         * imageOptimization: {
+         *  staticImageOptimization: true,
          * }
-         * ```
          */
-        disableDynamoDBCache?: boolean;
+        staticImageOptimization?: boolean;
     };
     cdk?: SsrSiteProps["cdk"] & {
-        revalidation?: Pick<FunctionProps, "vpc" | "vpcSubnets">;
+        revalidation?: Pick<CdkFunctionProps, "vpc" | "vpcSubnets">;
         /**
          * Override the CloudFront cache policy properties for responses from the
          * server rendering Lambda.
@@ -145,8 +104,11 @@ export declare class NextjsSite extends SsrSite {
     private appPathsManifest?;
     private pagesManifest?;
     private prerenderManifest?;
-    constructor(scope: Construct, id: string, rawProps?: NextjsSiteProps);
-    static buildDefaultServerCachePolicyProps(): CachePolicyProps;
+    private openNextOutput?;
+    constructor(scope: Construct, id: string, props?: NextjsSiteProps);
+    private createFunctionOrigin;
+    private createEcsOrigin;
+    private createEdgeOrigin;
     protected plan(bucket: Bucket): {
         cloudFrontFunctions?: {
             serverCfFunction: {
@@ -154,26 +116,11 @@ export declare class NextjsSite extends SsrSite {
                 injections: string[];
             };
         } | undefined;
-        edgeFunctions?: {
-            edgeServer: {
-                constructId: string;
-                function: {
-                    description: string;
-                    bundle: string;
-                    handler: string;
-                    environment: {
-                        CACHE_BUCKET_NAME: string;
-                        CACHE_BUCKET_KEY_PREFIX: string;
-                        CACHE_BUCKET_REGION: string;
-                    };
-                    layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
-                };
-            };
-        } | undefined;
+        edgeFunctions?: Record<string, EdgeFunctionConfig> | undefined;
         origins: {
+            s3: OpenNextS3Origin;
             imageOptimizer: {
                 type: "image-optimization-function";
-                constructId: string;
                 function: {
                     description: string;
                     handler: string;
@@ -181,73 +128,39 @@ export declare class NextjsSite extends SsrSite {
                     runtime: Runtime;
                     architecture: Architecture;
                     environment: {
+                        OPENNEXT_STATIC_ETAG?: string | undefined;
                         BUCKET_NAME: string;
                         BUCKET_KEY_PREFIX: string;
                     };
+                    permissions: string[];
                     memorySize: number;
                 };
             };
-            s3: {
-                type: "s3";
-                originPath: string;
-                copy: ({
-                    from: string;
-                    to: string;
-                    cached: true;
-                    versionedSubDir: string;
-                } | {
-                    from: string;
-                    to: string;
-                    cached: false;
-                    versionedSubDir?: undefined;
-                })[];
-            };
-            regionalServer?: {
-                type: "function";
-                constructId: string;
-                function: {
-                    description: string;
-                    bundle: string;
-                    handler: string;
-                    environment: {
-                        CACHE_BUCKET_NAME: string;
-                        CACHE_BUCKET_KEY_PREFIX: string;
-                        CACHE_BUCKET_REGION: string;
-                    };
-                    layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
-                };
-                streaming: boolean | undefined;
-                injections: string[];
-            } | undefined;
+            default: FunctionOriginConfig;
         };
         edge: boolean;
         behaviors: {
             cacheType: "server" | "static";
             pattern?: string | undefined;
-            origin: "s3" | "regionalServer" | "imageOptimizer";
+            origin: "default" | "s3" | "imageOptimizer";
             allowedMethods?: import("aws-cdk-lib/aws-cloudfront").AllowedMethods | undefined;
             cfFunction?: "serverCfFunction" | undefined;
-            edgeFunction?: "edgeServer" | undefined;
+            edgeFunction?: string | undefined;
         }[];
         errorResponses?: import("aws-cdk-lib/aws-cloudfront").ErrorResponse[] | undefined;
         serverCachePolicy?: {
             allowedHeaders?: string[] | undefined;
         } | undefined;
         buildId?: string | undefined;
+        warmer?: {
+            function: string;
+        } | undefined;
     };
-    private prefixPattern;
+    private setMiddlewareEnv;
     private createRevalidationQueue;
     private createRevalidationTable;
     getConstructMetadata(): {
-        type: "NextjsSite";
         data: {
-            routes: {
-                logGroupPrefix: string;
-                data: {
-                    route: string;
-                    logGroupPath: string;
-                }[];
-            } | undefined;
             mode: "placeholder" | "deployed";
             path: string;
             runtime: "nodejs16.x" | "nodejs18.x" | "nodejs20.x";
@@ -258,23 +171,20 @@ export declare class NextjsSite extends SsrSite {
             secrets: string[];
             prefetchSecrets: boolean | undefined;
         };
+        type: "NextjsSite";
     };
-    private removeSourcemaps;
     private useRoutes;
     private useRoutesManifest;
     private useAppPathRoutesManifest;
     private useAppPathsManifest;
     private usePagesManifest;
     private usePrerenderManifest;
-    private useServerFunctionPerRouteLoggingInjection;
-    private useCloudFrontFunctionPrerenderBypassHeaderInjection;
+    private useCloudFrontFunctionCacheHeaderKey;
+    private useCloudfrontGeoHeadersInjection;
     private getBuildId;
     private getSourcemapForAppRoute;
     private getSourcemapForPagesRoute;
-    private isPerRouteLoggingEnabled;
     private handleMissingSourcemap;
-    private disableDefaultLogging;
-    private uploadSourcemaps;
     private static buildCloudWatchRouteName;
     private static buildCloudWatchRouteHash;
     static _test: {