sst 2.24.28 → 2.25.1

package/constructs/App.js

@@ -17,6 +17,7 @@ import { Bucket } from "aws-cdk-lib/aws-s3";
 import { Effect, Policy, PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { CfnLogGroup } from "aws-cdk-lib/aws-logs";
 import { useBootstrap } from "../bootstrap.js";
+import { useWarning } from "./util/warning.js";
 /**
  * The App construct extends cdk.App and is used internally by SST.
  */
@@ -188,6 +189,7 @@ export class App extends CDKApp {
         await useDeferredTasks().run();
         this.createBindingSsmParameters();
         this.removeGovCloudUnsupportedResourceProperties();
+        useWarning().print();
         const bootstrap = await useBootstrap();
         for (const child of this.node.children) {
             if (isStackConstruct(child)) {

package/constructs/NextjsSite.d.ts

@@ -1,6 +1,5 @@
 import { Construct } from "constructs";
 import { FunctionProps } from "aws-cdk-lib/aws-lambda";
-import { CachePolicy } from "aws-cdk-lib/aws-cloudfront";
 import { Distribution } from "./Distribution.js";
 import { SsrFunction } from "./SsrFunction.js";
 import { EdgeFunction } from "./EdgeFunction.js";
@@ -18,11 +17,6 @@ export interface NextjsSiteProps extends Omit<SsrSiteProps, "nodejs"> {
          */
         memorySize?: number | Size;
     };
-    /**
-     * The number of server functions to keep warm. This option is only supported for the regional mode.
-     * @default Server function is not kept warm
-     */
-    warm?: number;
     cdk?: SsrSiteProps["cdk"] & {
         revalidation?: Pick<FunctionProps, "vpc" | "vpcSubnets">;
         /**
@@ -84,14 +78,14 @@ export declare class NextjsSite extends SsrSite {
         clientBuildS3KeyPrefix: string;
         prerenderedBuildOutputDir: string;
         prerenderedBuildS3KeyPrefix: string;
+        warmerFunctionAssetPath: string;
     };
     protected createFunctionForRegional(): SsrFunction;
     protected createFunctionForEdge(): EdgeFunction;
     private createImageOptimizationFunction;
-    private createWarmer;
     protected createCloudFrontDistributionForRegional(): Distribution;
     protected createCloudFrontDistributionForEdge(): Distribution;
-    protected useServerBehaviorCachePolicy(): CachePolicy;
+    protected useServerBehaviorCachePolicy(): import("aws-cdk-lib/aws-cloudfront").CachePolicy;
     private buildImageBehavior;
     protected generateBuildId(): string;
     getConstructMetadata(): {

package/constructs/NextjsSite.js

@@ -1,13 +1,11 @@
 import fs from "fs";
 import path from "path";
-import { Fn, Duration as CdkDuration, RemovalPolicy, CustomResource, } from "aws-cdk-lib/core";
-import { Effect, Policy, PolicyStatement } from "aws-cdk-lib/aws-iam";
+import { Fn, Duration as CdkDuration, RemovalPolicy } from "aws-cdk-lib/core";
+import { PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { Code, Runtime, Architecture, Function as CdkFunction, FunctionUrlAuthType, } from "aws-cdk-lib/aws-lambda";
 import { ViewerProtocolPolicy, AllowedMethods, CachedMethods, LambdaEdgeEventType, } from "aws-cdk-lib/aws-cloudfront";
 import { HttpOrigin } from "aws-cdk-lib/aws-cloudfront-origins";
-import { Rule, Schedule } from "aws-cdk-lib/aws-events";
-import { LambdaFunction } from "aws-cdk-lib/aws-events-targets";
 import { Queue } from "aws-cdk-lib/aws-sqs";
 import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
 import { Stack } from "./Stack.js";
@@ -34,7 +32,6 @@ export class NextjsSite extends SsrSite {
             ...props,
         });
         this.deferredTaskCallbacks.push(() => {
-            this.createWarmer();
             this.createRevalidation();
         });
     }
@@ -70,6 +67,7 @@ export class NextjsSite extends SsrSite {
             clientBuildS3KeyPrefix: "_assets",
             prerenderedBuildOutputDir: ".open-next/cache",
             prerenderedBuildS3KeyPrefix: "_cache",
+            warmerFunctionAssetPath: path.join(this.props.path, ".open-next/warmer-function"),
         };
     }
     createFunctionForRegional() {
@@ -153,56 +151,6 @@ export class NextjsSite extends SsrSite {
         });
         return fn;
     }
-    createWarmer() {
-        const { warm, edge } = this.props;
-        if (!warm)
-            return;
-        if (warm && edge) {
-            throw new Error(`Warming is currently supported only for the regional mode.`);
-        }
-        if (!this.serverLambdaForRegional)
-            return;
-        // Create warmer function
-        const warmer = new CdkFunction(this, "WarmerFunction", {
-            description: "Next.js warmer",
-            code: Code.fromAsset(path.join(this.props.path, ".open-next/warmer-function")),
-            runtime: Runtime.NODEJS_18_X,
-            handler: "index.handler",
-            timeout: CdkDuration.minutes(15),
-            memorySize: 1024,
-            environment: {
-                FUNCTION_NAME: this.serverLambdaForRegional.functionName,
-                CONCURRENCY: warm.toString(),
-            },
-        });
-        this.serverLambdaForRegional.grantInvoke(warmer);
-        // Create cron job
-        new Rule(this, "WarmerRule", {
-            schedule: Schedule.rate(CdkDuration.minutes(5)),
-            targets: [new LambdaFunction(warmer, { retryAttempts: 0 })],
-        });
-        // Create custom resource to prewarm on deploy
-        const stack = Stack.of(this);
-        const policy = new Policy(this, "PrewarmerPolicy", {
-            statements: [
-                new PolicyStatement({
-                    effect: Effect.ALLOW,
-                    actions: ["lambda:InvokeFunction"],
-                    resources: [warmer.functionArn],
-                }),
-            ],
-        });
-        stack.customResourceHandler.role?.attachInlinePolicy(policy);
-        const resource = new CustomResource(this, "Prewarmer", {
-            serviceToken: stack.customResourceHandler.functionArn,
-            resourceType: "Custom::FunctionInvoker",
-            properties: {
-                version: Date.now().toString(),
-                functionName: warmer.functionName,
-            },
-        });
-        resource.node.addDependency(policy);
-    }
     createCloudFrontDistributionForRegional() {
         /**
          * Next.js requests

package/constructs/RemixSite.d.ts

@@ -15,6 +15,7 @@ import { EdgeFunction } from "./EdgeFunction.js";
  * ```
  */
 export declare class RemixSite extends SsrSite {
+    private serverModuleFormat;
     protected initBuildConfig(): {
         typesPath: string;
         serverBuildOutputFile: string;

package/constructs/RemixSite.js

@@ -6,6 +6,8 @@ const require = createRequire(import.meta.url);
 import { SsrSite } from "./SsrSite.js";
 import { SsrFunction } from "./SsrFunction.js";
 import { EdgeFunction } from "./EdgeFunction.js";
+import { VisibleError } from "../error.js";
+import { useWarning } from "./util/warning.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /**
  * The `RemixSite` construct is a higher level CDK construct that makes it easy to create a Remix app.
@@ -21,31 +23,36 @@ const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
  * ```
  */
 export class RemixSite extends SsrSite {
+    serverModuleFormat = "cjs";
     initBuildConfig() {
         const { path: sitePath } = this.props;
         const configDefaults = {
             assetsBuildDirectory: "public/build",
             publicPath: "/build/",
             serverBuildPath: "build/index.js",
-            serverModuleFormat: "cjs",
+            serverModuleFormat: "esm",
             serverPlatform: "node",
         };
         // Validate config path
         const configPath = path.resolve(sitePath, "remix.config.js");
         if (!fs.existsSync(configPath)) {
-            throw new Error(`Could not find "remix.config.js" at expected path "${configPath}".`);
+            throw new VisibleError(`In the "${this.node.id}" Site, could not find "remix.config.js" at expected path "${configPath}".`);
         }
         // Load config
         const userConfig = require(configPath);
+        this.serverModuleFormat = userConfig.serverModuleFormat ?? "cjs";
+        if (userConfig.serverModuleFormat !== "esm") {
+            useWarning().add("remix.cjs");
+        }
+        // Validate config
         const config = {
             ...configDefaults,
             ...userConfig,
         };
-        // Validate config
         Object.keys(configDefaults).forEach((key) => {
             const k = key;
             if (config[k] !== configDefaults[k]) {
-                throw new Error(`RemixSite: remix.config.js "${key}" must be "${configDefaults[k]}".`);
+                throw new VisibleError(`In the "${this.node.id}" Site, remix.config.js "${key}" must be "${configDefaults[k]}".`);
             }
         });
         return {
@@ -106,7 +113,7 @@ export class RemixSite extends SsrSite {
             memorySize,
             timeout,
             nodejs: {
-                format: "cjs",
+                format: this.serverModuleFormat,
                 ...nodejs,
                 esbuild: {
                     ...esbuild,
@@ -133,7 +140,7 @@ export class RemixSite extends SsrSite {
             environment,
             permissions,
             nodejs: {
-                format: "cjs",
+                format: this.serverModuleFormat,
                 ...nodejs,
                 esbuild: {
                     ...esbuild,

package/constructs/SsrSite.d.ts

@@ -1,10 +1,10 @@
 import { Construct } from "constructs";
 import { Bucket, BucketProps, IBucket } from "aws-cdk-lib/aws-s3";
-import { FunctionProps } from "aws-cdk-lib/aws-lambda";
+import { FunctionProps as CdkFunctionProps } from "aws-cdk-lib/aws-lambda";
 import { ICachePolicy, IResponseHeadersPolicy, BehaviorOptions, CachePolicy, Function as CfFunction, FunctionEventType as CfFunctionEventType } from "aws-cdk-lib/aws-cloudfront";
 import { Distribution, DistributionDomainProps } from "./Distribution.js";
 import { SSTConstruct } from "./Construct.js";
-import { NodeJSProps } from "./Function.js";
+import { NodeJSProps, FunctionProps } from "./Function.js";
 import { SsrFunction } from "./SsrFunction.js";
 import { EdgeFunction } from "./EdgeFunction.js";
 import { BaseSiteFileOptions, BaseSiteReplaceProps, BaseSiteCdkDistributionProps } from "./BaseSite.js";
@@ -22,6 +22,7 @@ export type SsrBuildConfig = {
     clientCFFunctionInjection?: string;
     prerenderedBuildOutputDir?: string;
     prerenderedBuildS3KeyPrefix?: string;
+    warmerFunctionAssetPath?: string;
 };
 export interface SsrSiteNodeJSProps extends NodeJSProps {
 }
@@ -137,6 +138,11 @@ export interface SsrSiteProps {
      * ```
      */
     environment?: Record<string, string>;
+    /**
+     * The number of server functions to keep warm. This option is only supported for the regional mode.
+     * @default Server function is not kept warm
+     */
+    warm?: number;
     regional?: {
         /**
          * Secure the server function URL using AWS IAM authentication. By default, the server function URL is publicly accessible. When this flag is enabled, the server function URL will require IAM authorization, and a Lambda@Edge function will sign the requests. Be aware that this introduces added latency to the requests.
@@ -213,7 +219,7 @@ export interface SsrSiteProps {
          * from the server rendering Lambda.
          */
         responseHeadersPolicy?: IResponseHeadersPolicy;
-        server?: Pick<FunctionProps, "vpc" | "vpcSubnets" | "securityGroups" | "allowAllOutbound" | "allowPublicSubnet" | "architecture" | "logRetention">;
+        server?: Pick<CdkFunctionProps, "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.
@@ -364,6 +370,7 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
     protected createFunctionForDev(): SsrFunction;
     private grantServerS3Permissions;
     private grantServerCloudFrontPermissions;
+    private createWarmer;
     private createCloudFrontS3Origin;
     protected createCloudFrontDistributionForRegional(): Distribution;
     protected createCloudFrontDistributionForEdge(): Distribution;

package/constructs/SsrSite.js

@@ -8,12 +8,14 @@ import { execSync } from "child_process";
 import { Construct } from "constructs";
 import { Fn, Token, Duration as CdkDuration, RemovalPolicy, CustomResource, } from "aws-cdk-lib/core";
 import { BlockPublicAccess, Bucket, } from "aws-cdk-lib/aws-s3";
-import { Role, Policy, PolicyStatement, AccountPrincipal, ServicePrincipal, CompositePrincipal, } from "aws-cdk-lib/aws-iam";
+import { Effect, Role, Policy, PolicyStatement, AccountPrincipal, ServicePrincipal, CompositePrincipal, } from "aws-cdk-lib/aws-iam";
 import { Function as CdkFunction, Code, Runtime, FunctionUrlAuthType, InvokeMode, } from "aws-cdk-lib/aws-lambda";
 import { Asset } from "aws-cdk-lib/aws-s3-assets";
 import { ViewerProtocolPolicy, AllowedMethods, CachedMethods, LambdaEdgeEventType, CachePolicy, CacheQueryStringBehavior, CacheHeaderBehavior, CacheCookieBehavior, OriginRequestPolicy, Function as CfFunction, FunctionCode as CfFunctionCode, FunctionEventType as CfFunctionEventType, } from "aws-cdk-lib/aws-cloudfront";
 import { AwsCliLayer } from "aws-cdk-lib/lambda-layer-awscli";
 import { S3Origin, HttpOrigin } from "aws-cdk-lib/aws-cloudfront-origins";
+import { Rule, Schedule } from "aws-cdk-lib/aws-events";
+import { LambdaFunction } from "aws-cdk-lib/aws-events-targets";
 import { Stack } from "./Stack.js";
 import { Distribution } from "./Distribution.js";
 import { Logger } from "../logger.js";
@@ -28,6 +30,7 @@ import { toCdkDuration } from "./util/duration.js";
 import { attachPermissionsToRole } from "./util/permission.js";
 import { getParameterPath, } from "./util/functionBinding.js";
 import { useProject } from "../project.js";
+import { VisibleError } from "../error.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /**
  * The `SsrSite` construct is a higher level CDK construct that makes it easy to create modern web apps with Server Side Rendering capabilities.
@@ -106,6 +109,10 @@ export class SsrSite extends Construct {
             await this.serverLambdaForEdge?.build();
             await this.serverLambdaForRegional?.build();
             await this.serverUrlSigningFunction?.build();
+            // Create warmer
+            // Note: create warmer after build app b/c the warmer code
+            //       for NextjsSite depends on OpenNext build output
+            this.createWarmer();
             // Create S3 Deployment
             const cliLayer = new AwsCliLayer(this, "AwsCliLayer");
             const assets = this.createS3Assets();
@@ -480,6 +487,57 @@ export class SsrSite extends Construct {
         });
         server?.role?.attachInlinePolicy(policy);
     }
+    createWarmer() {
+        const { warm, edge } = this.props;
+        if (!warm)
+            return;
+        if (warm && edge) {
+            throw new VisibleError(`In the "${this.node.id}" Site, warming is currently supported only for the regional mode.`);
+        }
+        if (!this.serverLambdaForRegional)
+            return;
+        // Create warmer function
+        const warmer = new CdkFunction(this, "WarmerFunction", {
+            description: "Next.js warmer",
+            code: Code.fromAsset(this.buildConfig.warmerFunctionAssetPath ??
+                path.join(__dirname, "../support/ssr-warmer")),
+            runtime: Runtime.NODEJS_18_X,
+            handler: "index.handler",
+            timeout: CdkDuration.minutes(15),
+            memorySize: 1024,
+            environment: {
+                FUNCTION_NAME: this.serverLambdaForRegional.functionName,
+                CONCURRENCY: warm.toString(),
+            },
+        });
+        this.serverLambdaForRegional.grantInvoke(warmer);
+        // Create cron job
+        new Rule(this, "WarmerRule", {
+            schedule: Schedule.rate(CdkDuration.minutes(5)),
+            targets: [new LambdaFunction(warmer, { retryAttempts: 0 })],
+        });
+        // Create custom resource to prewarm on deploy
+        const stack = Stack.of(this);
+        const policy = new Policy(this, "PrewarmerPolicy", {
+            statements: [
+                new PolicyStatement({
+                    effect: Effect.ALLOW,
+                    actions: ["lambda:InvokeFunction"],
+                    resources: [warmer.functionArn],
+                }),
+            ],
+        });
+        stack.customResourceHandler.role?.attachInlinePolicy(policy);
+        const resource = new CustomResource(this, "Prewarmer", {
+            serviceToken: stack.customResourceHandler.functionArn,
+            resourceType: "Custom::FunctionInvoker",
+            properties: {
+                version: Date.now().toString(),
+                functionName: warmer.functionName,
+            },
+        });
+        resource.node.addDependency(policy);
+    }
     /////////////////////
     // CloudFront Distribution
     /////////////////////

package/constructs/StaticSite.js

@@ -310,7 +310,7 @@ interface ImportMeta {
         const uploader = new Function(this, "S3Uploader", {
             code: Code.fromAsset(path.join(__dirname, "../support/base-site-custom-resource")),
             layers: [cliLayer],
-            runtime: Runtime.PYTHON_3_7,
+            runtime: Runtime.PYTHON_3_11,
             handler: "s3-upload.handler",
             timeout: Duration.minutes(15),
             memorySize: 1024,
@@ -321,7 +321,7 @@ interface ImportMeta {
         const handler = new Function(this, "S3Handler", {
             code: Code.fromAsset(path.join(__dirname, "../support/base-site-custom-resource")),
             layers: [cliLayer],
-            runtime: Runtime.PYTHON_3_7,
+            runtime: Runtime.PYTHON_3_11,
             handler: "s3-handler.handler",
             timeout: Duration.minutes(15),
             memorySize: 1024,

package/constructs/util/warning.d.ts

@@ -2,6 +2,7 @@ declare const WARNINGS: {
     "config.deprecated": string;
     "permissions.noConstructs": string;
     "go.deprecated": string;
+    "remix.cjs": string;
 };
 export declare const useWarning: () => {
     add(message: keyof typeof WARNINGS): void;

package/constructs/util/warning.js

@@ -1,8 +1,10 @@
 import { createAppContext } from "../context.js";
+import { Colors } from "../../cli/colors.js";
 const WARNINGS = {
-    "config.deprecated": `WARNING: The "config" prop is deprecated, and will be removed in SST v2. Pass Parameters and Secrets in through the "bind" prop. Read more about how to upgrade here — https://docs.serverless-stack.com/upgrade-guide#upgrade-to-v116`,
-    "permissions.noConstructs": `WARNING: Passing SST constructs into "permissions" is deprecated, and will be removed in SST v2. Pass them into the "bind" prop. Read more about how to upgrade here — https://docs.serverless-stack.com/upgrade-guide#upgrade-to-v116`,
-    "go.deprecated": `WARNING: The "go1.x" runtime is deprecated and replaced by the "go" runtime`,
+    "config.deprecated": `The "config" prop is deprecated, and will be removed in SST v2. Pass Parameters and Secrets in through the "bind" prop. Read more about how to upgrade here — https://docs.serverless-stack.com/upgrade-guide#upgrade-to-v116`,
+    "permissions.noConstructs": `Passing SST constructs into "permissions" is deprecated, and will be removed in SST v2. Pass them into the "bind" prop. Read more about how to upgrade here — https://docs.serverless-stack.com/upgrade-guide#upgrade-to-v116`,
+    "go.deprecated": `The "go1.x" runtime is deprecated and replaced by the "go" runtime`,
+    "remix.cjs": `"RemixSite" will soon deprecate support for the "cjs" output format. Please update your "remix.config.js" to set "serverModuleFormat" to "esm".`,
 };
 export const useWarning = createAppContext(() => {
     const set = new Set();
@@ -12,7 +14,7 @@ export const useWarning = createAppContext(() => {
         },
         print() {
             for (const key of set) {
-                console.warn(WARNINGS[key]);
+                Colors.line(Colors.warning(`Warning: ${WARNINGS[key]}`));
             }
         },
     };

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.24.28",
+  "version": "2.25.1",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -25,12 +25,12 @@
   },
   "homepage": "https://sst.dev",
   "dependencies": {
-    "@aws-cdk/aws-apigatewayv2-alpha": "^2.91.0-alpha.0",
-    "@aws-cdk/aws-apigatewayv2-authorizers-alpha": "^2.91.0-alpha.0",
-    "@aws-cdk/aws-apigatewayv2-integrations-alpha": "^2.91.0-alpha.0",
-    "@aws-cdk/cloud-assembly-schema": "2.91.0",
-    "@aws-cdk/cloudformation-diff": "2.91.0",
-    "@aws-cdk/cx-api": "2.91.0",
+    "@aws-cdk/aws-apigatewayv2-alpha": "^2.95.1-alpha.0",
+    "@aws-cdk/aws-apigatewayv2-authorizers-alpha": "^2.95.1-alpha.0",
+    "@aws-cdk/aws-apigatewayv2-integrations-alpha": "^2.95.1-alpha.0",
+    "@aws-cdk/cloud-assembly-schema": "2.95.1",
+    "@aws-cdk/cloudformation-diff": "2.95.1",
+    "@aws-cdk/cx-api": "2.95.1",
     "@aws-crypto/sha256-js": "^5.0.0",
     "@aws-sdk/client-cloudformation": "^3.279.0",
     "@aws-sdk/client-ecs": "^3.279.0",
@@ -55,11 +55,11 @@
     "@smithy/signature-v4": "^2.0.4",
     "@trpc/server": "9.16.0",
     "adm-zip": "^0.5.10",
-    "aws-cdk-lib": "2.91.0",
+    "aws-cdk-lib": "2.95.1",
     "aws-iot-device-sdk": "^2.2.12",
     "aws-sdk": "^2.1326.0",
     "builtin-modules": "3.2.0",
-    "cdk-assets": "2.91.0",
+    "cdk-assets": "2.95.1",
     "chalk": "^5.2.0",
     "chokidar": "^3.5.3",
     "ci-info": "^3.7.0",