sst 2.30.2 → 2.30.4

package/constructs/BaseSite.d.ts

@@ -1,8 +1,10 @@
 import { ErrorResponse, DistributionProps, BehaviorOptions, IOrigin } from "aws-cdk-lib/aws-cloudfront";
+export interface BaseSiteFileOptionsFilter {
+    include?: string;
+    exclude?: string;
+}
 export interface BaseSiteFileOptions {
-    filters: {
-        [key in "include" | "exclude"]?: string;
-    }[];
+    filters: BaseSiteFileOptionsFilter[];
     cacheControl?: string;
     contentType?: string;
     contentEncoding?: string;

package/constructs/NextjsSite.d.ts

@@ -1,8 +1,11 @@
 import { Construct } from "constructs";
+import { Duration as CdkDuration } from "aws-cdk-lib/core";
 import { Runtime, FunctionProps, Architecture } from "aws-cdk-lib/aws-lambda";
 import { SsrSite, SsrSiteNormalizedProps, SsrSiteProps } from "./SsrSite.js";
 import { Size } from "./util/size.js";
 import { Bucket } from "aws-cdk-lib/aws-s3";
+import { PolicyStatement } from "aws-cdk-lib/aws-iam";
+import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { CachePolicyProps } from "aws-cdk-lib/aws-cloudfront";
 export interface NextjsSiteProps extends Omit<SsrSiteProps, "nodejs"> {
     /**
@@ -14,6 +17,17 @@ 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 "combined"
+     * @example
+     * ```js
+     * logging: "per-route",
+     * ```
+     */
+    _logging?: "combined" | "per-route";
     imageOptimization?: {
         /**
          * The amount of memory in MB allocated for image optimization function.
@@ -109,6 +123,7 @@ type NextjsSiteNormalizedProps = NextjsSiteProps & SsrSiteNormalizedProps;
  */
 export declare class NextjsSite extends SsrSite {
     props: NextjsSiteNormalizedProps;
+    private routes?;
     constructor(scope: Construct, id: string, props?: NextjsSiteProps);
     static buildDefaultServerCachePolicyProps(): CachePolicyProps;
     protected plan(bucket: Bucket): {
@@ -122,14 +137,64 @@ export declare class NextjsSite extends SsrSite {
             edgeServer: {
                 constructId: string;
                 function: {
-                    description: string;
-                    bundle: string;
+                    layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
                     handler: string;
-                    environment: {
-                        CACHE_BUCKET_NAME: string;
-                        CACHE_BUCKET_KEY_PREFIX: string;
-                        CACHE_BUCKET_REGION: string;
-                    };
+                    bundle?: string | undefined;
+                    runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x" | undefined;
+                    timeout?: number | `${number} second` | `${number} seconds` | `${number} minute` | `${number} minutes` | `${number} hour` | `${number} hours` | `${number} day` | `${number} days` | undefined;
+                    memorySize?: number | `${number} MB` | `${number} GB` | undefined;
+                    permissions?: import("./index.js").Permissions | undefined;
+                    environment?: Record<string, string> | undefined;
+                    bind?: import("./Construct.js").SSTConstruct[] | undefined;
+                    nodejs?: import("./Function.js").NodeJSProps | undefined;
+                    copyFiles?: import("./Function.js").FunctionCopyFilesProps[] | undefined;
+                    logRetention?: RetentionDays | undefined;
+                    functionName?: string | undefined;
+                    tracing?: import("aws-cdk-lib/aws-lambda").Tracing | undefined;
+                    architecture?: Architecture | undefined;
+                    description?: string | undefined;
+                    ephemeralStorageSize?: import("aws-cdk-lib/core").Size | undefined;
+                    initialPolicy?: PolicyStatement[] | undefined;
+                    role?: import("aws-cdk-lib/aws-iam").IRole | undefined;
+                    vpc?: import("aws-cdk-lib/aws-ec2").IVpc | undefined;
+                    vpcSubnets?: import("aws-cdk-lib/aws-ec2").SubnetSelection | undefined;
+                    securityGroups?: import("aws-cdk-lib/aws-ec2").ISecurityGroup[] | undefined;
+                    allowAllOutbound?: boolean | undefined;
+                    deadLetterQueueEnabled?: boolean | undefined;
+                    deadLetterQueue?: import("aws-cdk-lib/aws-sqs").IQueue | undefined;
+                    deadLetterTopic?: import("aws-cdk-lib/aws-sns").ITopic | undefined;
+                    snapStart?: import("aws-cdk-lib/aws-lambda").SnapStartConf | undefined;
+                    profiling?: boolean | undefined;
+                    profilingGroup?: import("aws-cdk-lib/aws-codeguruprofiler").IProfilingGroup | undefined;
+                    insightsVersion?: import("aws-cdk-lib/aws-lambda").LambdaInsightsVersion | undefined;
+                    adotInstrumentation?: import("aws-cdk-lib/aws-lambda").AdotInstrumentationConfig | undefined;
+                    paramsAndSecrets?: import("aws-cdk-lib/aws-lambda").ParamsAndSecretsLayerVersion | undefined;
+                    reservedConcurrentExecutions?: number | undefined;
+                    events?: import("aws-cdk-lib/aws-lambda").IEventSource[] | undefined;
+                    logRetentionRole?: import("aws-cdk-lib/aws-iam").IRole | undefined;
+                    logRetentionRetryOptions?: import("aws-cdk-lib/aws-lambda").LogRetentionRetryOptions | undefined;
+                    currentVersionOptions?: import("aws-cdk-lib/aws-lambda").VersionOptions | undefined;
+                    filesystem?: import("aws-cdk-lib/aws-lambda").FileSystem | undefined;
+                    allowPublicSubnet?: boolean | undefined;
+                    environmentEncryption?: import("aws-cdk-lib/aws-kms").IKey | undefined;
+                    codeSigningConfig?: import("aws-cdk-lib/aws-lambda").ICodeSigningConfig | undefined;
+                    runtimeManagementMode?: import("aws-cdk-lib/aws-lambda").RuntimeManagementMode | undefined;
+                    onFailure?: import("aws-cdk-lib/aws-lambda").IDestination | undefined;
+                    onSuccess?: import("aws-cdk-lib/aws-lambda").IDestination | undefined;
+                    maxEventAge?: CdkDuration | undefined;
+                    retryAttempts?: number | undefined;
+                } | {
+                    layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
+                    handler: string;
+                    bundle?: string | undefined;
+                    runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x" | undefined;
+                    timeout?: number | `${number} second` | `${number} seconds` | `${number} minute` | `${number} minutes` | `${number} hour` | `${number} hours` | `${number} day` | `${number} days` | undefined;
+                    memorySize?: number | `${number} MB` | `${number} GB` | undefined;
+                    permissions?: import("./index.js").Permissions | undefined;
+                    environment?: Record<string, string> | undefined;
+                    bind?: import("./Construct.js").SSTConstruct[] | undefined;
+                    nodejs?: import("./Function.js").NodeJSProps | undefined;
+                    scopeOverride?: import("constructs").IConstruct | undefined;
                 };
             };
         } | undefined;
@@ -169,14 +234,64 @@ export declare class NextjsSite extends SsrSite {
                 type: "function";
                 constructId: string;
                 function: {
-                    description: string;
-                    bundle: string;
+                    layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
                     handler: string;
-                    environment: {
-                        CACHE_BUCKET_NAME: string;
-                        CACHE_BUCKET_KEY_PREFIX: string;
-                        CACHE_BUCKET_REGION: string;
-                    };
+                    bundle?: string | undefined;
+                    runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x" | undefined;
+                    timeout?: number | `${number} second` | `${number} seconds` | `${number} minute` | `${number} minutes` | `${number} hour` | `${number} hours` | `${number} day` | `${number} days` | undefined;
+                    memorySize?: number | `${number} MB` | `${number} GB` | undefined;
+                    permissions?: import("./index.js").Permissions | undefined;
+                    environment?: Record<string, string> | undefined;
+                    bind?: import("./Construct.js").SSTConstruct[] | undefined;
+                    nodejs?: import("./Function.js").NodeJSProps | undefined;
+                    copyFiles?: import("./Function.js").FunctionCopyFilesProps[] | undefined;
+                    logRetention?: RetentionDays | undefined;
+                    functionName?: string | undefined;
+                    tracing?: import("aws-cdk-lib/aws-lambda").Tracing | undefined;
+                    architecture?: Architecture | undefined;
+                    description?: string | undefined;
+                    ephemeralStorageSize?: import("aws-cdk-lib/core").Size | undefined;
+                    initialPolicy?: PolicyStatement[] | undefined;
+                    role?: import("aws-cdk-lib/aws-iam").IRole | undefined;
+                    vpc?: import("aws-cdk-lib/aws-ec2").IVpc | undefined;
+                    vpcSubnets?: import("aws-cdk-lib/aws-ec2").SubnetSelection | undefined;
+                    securityGroups?: import("aws-cdk-lib/aws-ec2").ISecurityGroup[] | undefined;
+                    allowAllOutbound?: boolean | undefined;
+                    deadLetterQueueEnabled?: boolean | undefined;
+                    deadLetterQueue?: import("aws-cdk-lib/aws-sqs").IQueue | undefined;
+                    deadLetterTopic?: import("aws-cdk-lib/aws-sns").ITopic | undefined;
+                    snapStart?: import("aws-cdk-lib/aws-lambda").SnapStartConf | undefined;
+                    profiling?: boolean | undefined;
+                    profilingGroup?: import("aws-cdk-lib/aws-codeguruprofiler").IProfilingGroup | undefined;
+                    insightsVersion?: import("aws-cdk-lib/aws-lambda").LambdaInsightsVersion | undefined;
+                    adotInstrumentation?: import("aws-cdk-lib/aws-lambda").AdotInstrumentationConfig | undefined;
+                    paramsAndSecrets?: import("aws-cdk-lib/aws-lambda").ParamsAndSecretsLayerVersion | undefined;
+                    reservedConcurrentExecutions?: number | undefined;
+                    events?: import("aws-cdk-lib/aws-lambda").IEventSource[] | undefined;
+                    logRetentionRole?: import("aws-cdk-lib/aws-iam").IRole | undefined;
+                    logRetentionRetryOptions?: import("aws-cdk-lib/aws-lambda").LogRetentionRetryOptions | undefined;
+                    currentVersionOptions?: import("aws-cdk-lib/aws-lambda").VersionOptions | undefined;
+                    filesystem?: import("aws-cdk-lib/aws-lambda").FileSystem | undefined;
+                    allowPublicSubnet?: boolean | undefined;
+                    environmentEncryption?: import("aws-cdk-lib/aws-kms").IKey | undefined;
+                    codeSigningConfig?: import("aws-cdk-lib/aws-lambda").ICodeSigningConfig | undefined;
+                    runtimeManagementMode?: import("aws-cdk-lib/aws-lambda").RuntimeManagementMode | undefined;
+                    onFailure?: import("aws-cdk-lib/aws-lambda").IDestination | undefined;
+                    onSuccess?: import("aws-cdk-lib/aws-lambda").IDestination | undefined;
+                    maxEventAge?: CdkDuration | undefined;
+                    retryAttempts?: number | undefined;
+                } | {
+                    layers: import("aws-cdk-lib/aws-lambda").ILayerVersion[] | undefined;
+                    handler: string;
+                    bundle?: string | undefined;
+                    runtime?: "nodejs14.x" | "nodejs16.x" | "nodejs18.x" | undefined;
+                    timeout?: number | `${number} second` | `${number} seconds` | `${number} minute` | `${number} minutes` | `${number} hour` | `${number} hours` | `${number} day` | `${number} days` | undefined;
+                    memorySize?: number | `${number} MB` | `${number} GB` | undefined;
+                    permissions?: import("./index.js").Permissions | undefined;
+                    environment?: Record<string, string> | undefined;
+                    bind?: import("./Construct.js").SSTConstruct[] | undefined;
+                    nodejs?: import("./Function.js").NodeJSProps | undefined;
+                    scopeOverride?: import("constructs").IConstruct | undefined;
                 };
                 streaming: boolean | undefined;
             } | undefined;
@@ -203,8 +318,12 @@ export declare class NextjsSite extends SsrSite {
         type: "NextjsSite";
         data: {
             routes: {
-                route: string;
-            }[] | undefined;
+                logGroupPrefix: string;
+                data: {
+                    route: string;
+                    logGroupPath: string;
+                }[];
+            } | undefined;
             mode: "placeholder" | "deployed";
             path: string;
             runtime: "nodejs14.x" | "nodejs16.x" | "nodejs18.x";
@@ -215,8 +334,15 @@ export declare class NextjsSite extends SsrSite {
             secrets: string[];
         };
     };
-    private wrapHandler;
-    private getRoutes;
+    private wrapServerFunction;
+    private useRoutes;
     private getBuildId;
+    private isPerRouteLoggingEnabled;
+    private disableDefaultLogging;
+    private static buildCloudWatchRouteName;
+    private static buildCloudWatchRouteHash;
+    static _test: {
+        buildCloudWatchRouteName: typeof NextjsSite.buildCloudWatchRouteName;
+    };
 }
 export {};

package/constructs/NextjsSite.js

@@ -1,7 +1,8 @@
 import fs from "fs";
 import path from "path";
+import crypto from "crypto";
 import { Duration as CdkDuration, RemovalPolicy, CustomResource, } from "aws-cdk-lib/core";
-import { Code, Runtime, Function as CdkFunction, Architecture, } from "aws-cdk-lib/aws-lambda";
+import { Code, Runtime, Function as CdkFunction, Architecture, LayerVersion, } from "aws-cdk-lib/aws-lambda";
 import { AttributeType, Billing, TableV2 as Table, } from "aws-cdk-lib/aws-dynamodb";
 import { Provider } from "aws-cdk-lib/custom-resources";
 import { Queue } from "aws-cdk-lib/aws-sqs";
@@ -9,9 +10,10 @@ import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
 import { Stack } from "./Stack.js";
 import { SsrSite } from "./SsrSite.js";
 import { toCdkSize } from "./util/size.js";
-import { PolicyStatement } from "aws-cdk-lib/aws-iam";
+import { Effect, Policy, PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { VisibleError } from "../error.js";
+const LAYER_VERSION = "9";
 const DEFAULT_OPEN_NEXT_VERSION = "2.2.4";
 const DEFAULT_CACHE_POLICY_ALLOWED_HEADERS = [
     "accept",
@@ -32,13 +34,11 @@ const DEFAULT_CACHE_POLICY_ALLOWED_HEADERS = [
  * ```
  */
 export class NextjsSite extends SsrSite {
+    routes;
     constructor(scope, id, props) {
-        const { streaming, disableDynamoDBCache, disableIncrementalCache } = {
-            streaming: false,
-            disableDynamoDBCache: false,
-            disableIncrementalCache: false,
-            ...props?.experimental,
-        };
+        const streaming = props?.experimental?.streaming ?? false;
+        const disableDynamoDBCache = props?.experimental?.disableDynamoDBCache ?? false;
+        const disableIncrementalCache = props?.experimental?.disableIncrementalCache ?? false;
         super(scope, id, {
             buildCommand: [
                 "npx",
@@ -55,6 +55,9 @@ export class NextjsSite extends SsrSite {
             ].join(" "),
             ...props,
         });
+        if (this.isPerRouteLoggingEnabled()) {
+            this.disableDefaultLogging();
+        }
         if (!disableIncrementalCache) {
             this.createRevalidationQueue();
             if (!disableDynamoDBCache) {
@@ -67,16 +70,16 @@ export class NextjsSite extends SsrSite {
     }
     plan(bucket) {
         const { path: sitePath, edge, experimental, imageOptimization, } = this.props;
-        const serverConfig = {
+        const serverConfig = this.wrapServerFunction({
             description: "Next.js server",
             bundle: path.join(sitePath, ".open-next", "server-function"),
-            handler: this.wrapHandler(),
+            handler: "index.handler",
             environment: {
                 CACHE_BUCKET_NAME: bucket.bucketName,
                 CACHE_BUCKET_KEY_PREFIX: "_cache",
                 CACHE_BUCKET_REGION: Stack.of(this).region,
             },
-        };
+        });
         return this.validatePlan({
             cloudFrontFunctions: {
                 serverCfFunction: {
@@ -289,50 +292,98 @@ export class NextjsSite extends SsrSite {
             type: "NextjsSite",
             data: {
                 ...metadata.data,
-                routes: this.props.edge || this.doNotDeploy ? undefined : this.getRoutes(),
+                routes: this.isPerRouteLoggingEnabled()
+                    ? {
+                        logGroupPrefix: `/sst/lambda/${this.serverFunction.functionName}`,
+                        data: this.useRoutes().map(({ route, logGroupPath }) => ({
+                            route,
+                            logGroupPath,
+                        })),
+                    }
+                    : undefined,
             },
         };
     }
-    wrapHandler() {
+    wrapServerFunction(config) {
         const { path: sitePath, experimental } = this.props;
+        const stack = Stack.of(this);
         const wrapperName = "nextjssite-index";
         const serverPath = path.join(sitePath, ".open-next", "server-function");
+        const injections = [];
+        if (this.isPerRouteLoggingEnabled()) {
+            injections.push(`
+      const routeData = ${JSON.stringify(this.useRoutes())}.find(({ regex }) => event.rawPath.match(new RegExp(regex)));
+      if (routeData) {
+        console.log("::sst::" + JSON.stringify({
+          action:"log.split",
+          properties: {
+            logGroupName:"/sst/lambda/" + context.functionName + routeData.logGroupPath,
+          },
+        }));
+      }`);
+        }
         fs.writeFileSync(path.join(serverPath, `${wrapperName}.mjs`), experimental?.streaming
             ? [
-                `export const handler = awslambda.streamifyResponse(async (...args) => {`,
+                `export const handler = awslambda.streamifyResponse(async (event, context) => {`,
+                ...injections,
                 `  const { handler: rawHandler} = await import("./index.mjs");`,
-                `  return rawHandler(...args);`,
+                `  return rawHandler(event, context);`,
                 `});`,
             ].join("\n")
             : [
-                `export const handler = async (...args) => {`,
+                `export const handler = async (event, context) => {`,
+                ...injections,
                 `  const { handler: rawHandler} = await import("./index.mjs");`,
-                `  return rawHandler(...args);`,
+                `  return rawHandler(event, context);`,
                 `};`,
             ].join("\n"));
-        return `${wrapperName}.handler`;
+        return {
+            ...config,
+            layers: this.isPerRouteLoggingEnabled()
+                ? [
+                    LayerVersion.fromLayerVersionArn(this, "SSTExtension", `arn:aws:lambda:${stack.region}:226609089145:layer:sst-extension:${LAYER_VERSION}`),
+                ]
+                : undefined,
+            handler: `${wrapperName}.handler`,
+        };
     }
-    getRoutes() {
+    useRoutes() {
+        if (this.routes)
+            return this.routes;
         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 [
+            this.routes = [
                 ...[...content.dynamicRoutes, ...content.staticRoutes]
-                    .map(({ page }) => ({
-                    route: page,
-                }))
+                    .map(({ page, regex }) => {
+                    const cwRoute = NextjsSite.buildCloudWatchRouteName(page);
+                    const cwHash = NextjsSite.buildCloudWatchRouteHash(page);
+                    return {
+                        route: page,
+                        regex,
+                        logGroupPath: `/${cwHash}${cwRoute}`,
+                    };
+                })
                     .sort((a, b) => a.route.localeCompare(b.route)),
                 ...(content.dataRoutes || [])
-                    .map(({ page }) => ({
-                    route: page.endsWith("/")
+                    .map(({ page, dataRouteRegex }) => {
+                    const routeDisplayName = page.endsWith("/")
                         ? `/_next/data/BUILD_ID${page}index.json`
-                        : `/_next/data/BUILD_ID${page}.json`,
-                }))
+                        : `/_next/data/BUILD_ID${page}.json`;
+                    const cwRoute = NextjsSite.buildCloudWatchRouteName(routeDisplayName);
+                    const cwHash = NextjsSite.buildCloudWatchRouteHash(`data:${page}`);
+                    return {
+                        route: routeDisplayName,
+                        regex: dataRouteRegex,
+                        logGroupPath: `/${cwHash}${cwRoute}`,
+                    };
+                })
                     .sort((a, b) => a.route.localeCompare(b.route)),
             ];
+            return this.routes;
         }
         catch (e) {
             console.error(e);
@@ -343,4 +394,41 @@ export class NextjsSite extends SsrSite {
         const { path: sitePath } = this.props;
         return fs.readFileSync(path.join(sitePath, ".next/BUILD_ID")).toString();
     }
+    isPerRouteLoggingEnabled() {
+        return (!this.doNotDeploy &&
+            !this.props.edge &&
+            this.props._logging === "per-route");
+    }
+    disableDefaultLogging() {
+        const stack = Stack.of(this);
+        const server = this.serverFunction;
+        const policy = new Policy(this, "DisableLoggingPolicy", {
+            statements: [
+                new PolicyStatement({
+                    effect: Effect.DENY,
+                    actions: [
+                        "logs:CreateLogGroup",
+                        "logs:CreateLogStream",
+                        "logs:PutLogEvents",
+                    ],
+                    resources: [
+                        `arn:aws:logs:${stack.region}:${stack.account}:log-group:/aws/lambda/${server.functionName}`,
+                        `arn:aws:logs:${stack.region}:${stack.account}:log-group:/aws/lambda/${server.functionName}:*`,
+                    ],
+                }),
+            ],
+        });
+        server.role?.attachInlinePolicy(policy);
+    }
+    static buildCloudWatchRouteName(route) {
+        return route.replace(/[^a-zA-Z0-9_\-/.#]/g, "");
+    }
+    static buildCloudWatchRouteHash(route) {
+        const hash = crypto.createHash("sha256");
+        hash.update(route);
+        return hash.digest("hex").substring(0, 8);
+    }
+    static _test = {
+        buildCloudWatchRouteName: NextjsSite.buildCloudWatchRouteName,
+    };
 }

package/constructs/SsrSite.d.ts

@@ -8,7 +8,7 @@ import { SSTConstruct } from "./Construct.js";
 import { NodeJSProps, FunctionProps } from "./Function.js";
 import { SsrFunction, SsrFunctionProps } from "./SsrFunction.js";
 import { EdgeFunction, EdgeFunctionProps } from "./EdgeFunction.js";
-import { BaseSiteFileOptions, BaseSiteFileOptionsDeprecated, BaseSiteReplaceProps, BaseSiteCdkDistributionProps } from "./BaseSite.js";
+import { BaseSiteFileOptions, BaseSiteFileOptionsFilter, BaseSiteFileOptionsDeprecated, BaseSiteReplaceProps, BaseSiteCdkDistributionProps } from "./BaseSite.js";
 import { Size } from "./util/size.js";
 import { Duration } from "./util/duration.js";
 import { Permissions } from "./util/permission.js";
@@ -52,7 +52,10 @@ export interface SsrSiteNodeJSProps extends NodeJSProps {
 }
 export interface SsrDomainProps extends DistributionDomainProps {
 }
+export interface SsrSiteFileOptionsFilter extends BaseSiteFileOptionsFilter {
+}
 export interface SsrSiteFileOptions extends BaseSiteFileOptions {
+    filters: SsrSiteFileOptionsFilter[];
 }
 export interface SsrSiteFileOptionsDeprecated extends BaseSiteFileOptionsDeprecated {
 }
@@ -288,6 +291,7 @@ export interface SsrSiteProps {
          *     },
          *   ],
          * }
+         * ```
          */
         fileOptions?: SsrSiteFileOptions[];
     };

package/constructs/StaticSite.d.ts

@@ -2,7 +2,7 @@ import { Construct } from "constructs";
 import { Bucket, BucketProps, IBucket } from "aws-cdk-lib/aws-s3";
 import { IDistribution } from "aws-cdk-lib/aws-cloudfront";
 import { DistributionDomainProps } from "./Distribution.js";
-import { BaseSiteFileOptions, BaseSiteReplaceProps, BaseSiteCdkDistributionProps, BaseSiteFileOptionsDeprecated } from "./BaseSite.js";
+import { BaseSiteFileOptions, BaseSiteFileOptionsFilter, BaseSiteReplaceProps, BaseSiteCdkDistributionProps, BaseSiteFileOptionsDeprecated } from "./BaseSite.js";
 import { SSTConstruct } from "./Construct.js";
 import { FunctionBindingProps } from "./util/functionBinding.js";
 export interface StaticSiteProps {
@@ -263,7 +263,10 @@ export interface StaticSiteProps {
 }
 export interface StaticSiteDomainProps extends DistributionDomainProps {
 }
+export interface StaticSiteFileOptionsFilter extends BaseSiteFileOptionsFilter {
+}
 export interface StaticSiteFileOptions extends BaseSiteFileOptions {
+    filters: StaticSiteFileOptionsFilter[];
 }
 export interface StaticSiteFileOptionsDeprecated extends BaseSiteFileOptionsDeprecated {
 }

package/credentials.d.ts

@@ -1,4 +1,5 @@
 import { SdkProvider } from "sst-aws-cdk/lib/api/aws-auth/sdk-provider.js";
+export type {} from "@smithy/types";
 export declare const useAWSCredentialsProvider: () => import("@smithy/types").AwsCredentialIdentityProvider;
 export declare const useAWSCredentials: () => Promise<import("@smithy/types").AwsCredentialIdentity>;
 export declare const useSTSIdentity: () => Promise<import("@aws-sdk/client-sts").GetCallerIdentityCommandOutput>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.30.2",
+  "version": "2.30.4",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -25,29 +25,29 @@
   },
   "homepage": "https://sst.dev",
   "dependencies": {
-    "@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-cdk/aws-apigatewayv2-alpha": "^2.101.1-alpha.0",
+    "@aws-cdk/aws-apigatewayv2-authorizers-alpha": "^2.101.1-alpha.0",
+    "@aws-cdk/aws-apigatewayv2-integrations-alpha": "^2.101.1-alpha.0",
+    "@aws-cdk/cloud-assembly-schema": "2.101.1",
+    "@aws-cdk/cloudformation-diff": "2.101.1",
+    "@aws-cdk/cx-api": "2.101.1",
     "@aws-crypto/sha256-js": "^5.0.0",
-    "@aws-sdk/client-cloudformation": "^3.405.0",
-    "@aws-sdk/client-ecs": "^3.405.0",
-    "@aws-sdk/client-eventbridge": "^3.405.0",
-    "@aws-sdk/client-iam": "^3.405.0",
-    "@aws-sdk/client-iot": "^3.405.0",
-    "@aws-sdk/client-iot-data-plane": "^3.405.0",
-    "@aws-sdk/client-lambda": "^3.405.0",
-    "@aws-sdk/client-rds-data": "^3.405.0",
-    "@aws-sdk/client-s3": "^3.405.0",
-    "@aws-sdk/client-ssm": "^3.405.0",
-    "@aws-sdk/client-sts": "^3.405.0",
+    "@aws-sdk/client-cloudformation": "^3.430.0",
+    "@aws-sdk/client-ecs": "^3.430.0",
+    "@aws-sdk/client-eventbridge": "^3.430.0",
+    "@aws-sdk/client-iam": "^3.430.0",
+    "@aws-sdk/client-iot": "^3.430.0",
+    "@aws-sdk/client-iot-data-plane": "^3.430.0",
+    "@aws-sdk/client-lambda": "^3.430.0",
+    "@aws-sdk/client-rds-data": "^3.430.0",
+    "@aws-sdk/client-s3": "^3.430.0",
+    "@aws-sdk/client-ssm": "^3.430.0",
+    "@aws-sdk/client-sts": "^3.430.0",
     "@aws-sdk/config-resolver": "^3.374.0",
-    "@aws-sdk/credential-providers": "^3.405.0",
+    "@aws-sdk/credential-providers": "^3.430.0",
     "@aws-sdk/middleware-retry": "^3.374.0",
-    "@aws-sdk/middleware-signing": "^3.398.0",
-    "@aws-sdk/signature-v4-crt": "^3.398.0",
+    "@aws-sdk/middleware-signing": "^3.428.0",
+    "@aws-sdk/signature-v4-crt": "^3.428.0",
     "@aws-sdk/smithy-client": "^3.374.0",
     "@babel/core": "^7.0.0-0",
     "@babel/generator": "^7.20.5",
@@ -55,11 +55,11 @@
     "@smithy/signature-v4": "^2.0.4",
     "@trpc/server": "9.16.0",
     "adm-zip": "^0.5.10",
-    "aws-cdk-lib": "2.95.1",
+    "aws-cdk-lib": "2.101.1",
     "aws-iot-device-sdk": "^2.2.12",
     "aws-sdk": "^2.1326.0",
     "builtin-modules": "3.2.0",
-    "cdk-assets": "2.95.1",
+    "cdk-assets": "2.101.1",
     "chalk": "^5.2.0",
     "chokidar": "^3.5.3",
     "ci-info": "^3.7.0",
@@ -87,7 +87,7 @@
     "ora": "^6.1.2",
     "react": "18.2.0",
     "remeda": "^1.3.0",
-    "sst-aws-cdk": "2.95.1",
+    "sst-aws-cdk": "2.101.1",
     "tree-kill": "^1.2.2",
     "undici": "^5.12.0",
     "uuid": "^9.0.0",
@@ -96,15 +96,16 @@
     "zod": "^3.21.4"
   },
   "devDependencies": {
-    "@aws-sdk/client-api-gateway": "^3.208.0",
-    "@aws-sdk/client-cloudfront": "^3.279.0",
-    "@aws-sdk/client-codebuild": "^3.279.0",
-    "@aws-sdk/client-sqs": "^3.341.0",
-    "@aws-sdk/types": "^3.272.0",
+    "@aws-sdk/client-api-gateway": "^3.430.0",
+    "@aws-sdk/client-cloudfront": "^3.430.0",
+    "@aws-sdk/client-codebuild": "^3.430.0",
+    "@aws-sdk/client-sqs": "^3.430.0",
+    "@aws-sdk/types": "^3.428.0",
     "@graphql-tools/merge": "^8.3.16",
     "@sls-next/lambda-at-edge": "^3.7.0",
-    "@smithy/types": "^2.2.2",
+    "@smithy/types": "^2.3.5",
     "@tsconfig/node16": "^1.0.3",
+    "@tsconfig/node18": "^18.2.2",
     "@types/adm-zip": "^0.5.0",
     "@types/aws-iot-device-sdk": "^2.2.4",
     "@types/aws-lambda": "^8.10.108",
@@ -119,7 +120,7 @@
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
-    "astro-sst": "2.30.2",
+    "astro-sst": "2.30.4",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",
     "vitest": "^0.33.0"

package/stacks/synth.js

@@ -4,7 +4,6 @@ import { useAWSProvider, useSTSIdentity } from "../credentials.js";
 import * as contextproviders from "sst-aws-cdk/lib/context-providers/index.js";
 import path from "path";
 import { VisibleError } from "../error.js";
-import fs from "fs/promises";
 import { Semaphore } from "../util/semaphore.js";
 const sem = new Semaphore(1);
 export async function synth(opts) {
@@ -32,8 +31,8 @@ export async function synth(opts) {
             ...opts,
             buildDir: opts.buildDir || path.join(project.paths.out, "dist"),
         };
-        await fs.rm(opts.buildDir, { recursive: true, force: true });
-        await fs.mkdir(opts.buildDir, { recursive: true });
+        // await fs.rm(opts.buildDir!, { recursive: true, force: true });
+        // await fs.mkdir(opts.buildDir!, { recursive: true });
         const cfg = new Configuration();
         await cfg.load();
         let previous = new Set();