sst 2.30.4 → 2.31.0

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, BaseSiteFileOptionsFilter, BaseSiteReplaceProps, BaseSiteCdkDistributionProps, BaseSiteFileOptionsDeprecated } from "./BaseSite.js";
+import { BaseSiteFileOptions, BaseSiteReplaceProps, BaseSiteCdkDistributionProps } from "./BaseSite.js";
 import { SSTConstruct } from "./Construct.js";
 import { FunctionBindingProps } from "./util/functionBinding.js";
 export interface StaticSiteProps {
@@ -67,33 +67,6 @@ export interface StaticSiteProps {
      * ```
      */
     buildOutput?: string;
-    /**
-     * Pass in a list of file options to configure cache control for different files. Behind the scenes, the `StaticSite` construct uses a combination of the `s3 cp` and `s3 sync` commands to upload the website content to the S3 bucket. An `s3 cp` command is run for each file option block, and the options are passed in as the command options.
-     * @default No cache control for HTML files, and a 1 year cache control for JS/CSS files.
-     * ```js
-     * [
-     *   {
-     *     filters: [{ exclude: "*" }, { include: "*.html" }],
-     *     cacheControl: "max-age=0,no-cache,no-store,must-revalidate",
-     *   },
-     *   {
-     *     filters: [{ exclude: "*" }, { include: "*.js" }, { include: "*.css" }],
-     *     cacheControl: "max-age=31536000,public,immutable",
-     *   },
-     * ]
-     * ```
-     * @example
-     * ```js
-     * new StaticSite(stack, "Site", {
-     *   buildOutput: "dist",
-     *   fileOptions: [{
-     *     filters: [{ exclude: "*" }, { include: "*.js" }],
-     *     cacheControl: "max-age=31536000,public,immutable",
-     *   }]
-     * });
-     * ```
-     */
-    fileOptions?: StaticSiteFileOptions[] | StaticSiteFileOptionsDeprecated[];
     /**
      * Pass in a list of placeholder values to be replaced in the website content. For example, the follow configuration:
      *
@@ -169,6 +142,50 @@ export interface StaticSiteProps {
      * ```
      */
     purgeFiles?: boolean;
+    assets?: {
+        /**
+         * Character encoding for text based assets uploaded to S3 (ex: html, css, js, etc.). If "none" is specified, no charset will be returned in header.
+         * @default utf-8
+         * @example
+         * ```js
+         * assets: {
+         *   textEncoding: "iso-8859-1"
+         * }
+         * ```
+         */
+        textEncoding?: "utf-8" | "iso-8859-1" | "windows-1252" | "ascii" | "none";
+        /**
+         * Pass in a list of file options to configure cache control for different files. Behind the scenes, the `StaticSite` construct uses a combination of the `s3 cp` and `s3 sync` commands to upload the website content to the S3 bucket. An `s3 cp` command is run for each file option block, and the options are passed in as the command options.
+         * @default No cache control for HTML files, and a 1 year cache control for JS/CSS files.
+         * ```js
+         * assets: {
+         *   fileOptions: [
+         *     {
+         *       files: "**",
+         *       cacheControl: "max-age=0,no-cache,no-store,must-revalidate",
+         *     },
+         *     {
+         *       files: "**\/*.{js,css}",
+         *       cacheControl: "max-age=31536000,public,immutable",
+         *     },
+         *   ],
+         * }
+         * ```
+         * @example
+         * ```js
+         * assets: {
+         *   fileOptions: [
+         *     {
+         *       files: "**\/*.zip",
+         *       cacheControl: "private,no-cache,no-store,must-revalidate",
+         *       contentType: "application/zip",
+         *     },
+         *   ],
+         * }
+         * ```
+         */
+        fileOptions?: StaticSiteFileOptions[];
+    };
     dev?: {
         /**
          * When running `sst dev, site is not deployed. This is to ensure `sst dev` can start up quickly.
@@ -263,12 +280,7 @@ 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 {
 }
 export interface StaticSiteReplaceProps extends BaseSiteReplaceProps {
 }
@@ -327,6 +339,7 @@ export declare class StaticSite extends Construct implements SSTConstruct {
     };
     /** @internal */
     getFunctionBinding(): FunctionBindingProps;
+    private validateDeprecatedFileOptions;
     private generateViteTypes;
     private buildApp;
     private createS3Assets;

package/constructs/StaticSite.js

@@ -4,13 +4,11 @@ import fs from "fs";
 import crypto from "crypto";
 import { execSync } from "child_process";
 import { Construct } from "constructs";
-import { Token, Duration, RemovalPolicy, CustomResource, } from "aws-cdk-lib/core";
+import { Token, RemovalPolicy, CustomResource } from "aws-cdk-lib/core";
 import { BlockPublicAccess, Bucket, } from "aws-cdk-lib/aws-s3";
 import { Asset } from "aws-cdk-lib/aws-s3-assets";
-import { Code, Function, Runtime } from "aws-cdk-lib/aws-lambda";
 import { Function as CfFunction, FunctionCode as CfFunctionCode, FunctionEventType as CfFunctionEventType, ViewerProtocolPolicy, } from "aws-cdk-lib/aws-cloudfront";
 import { S3Origin } from "aws-cdk-lib/aws-cloudfront-origins";
-import { AwsCliLayer } from "aws-cdk-lib/lambda-layer-awscli";
 import { Stack } from "./Stack.js";
 import { Distribution } from "./Distribution.js";
 import { getBuildCmdEnvironment, buildErrorResponsesFor404ErrorPage, buildErrorResponsesForRedirectToIndex, } from "./BaseSite.js";
@@ -20,6 +18,8 @@ import { getParameterPath, } from "./util/functionBinding.js";
 import { gray } from "colorette";
 import { useProject } from "../project.js";
 import { createAppContext } from "./context.js";
+import { Effect, Policy, PolicyStatement } from "aws-cdk-lib/aws-iam";
+import { VisibleError } from "../error.js";
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 /**
  * The `StaticSite` construct is a higher level CDK construct that makes it easy to create a static website.
@@ -54,6 +54,7 @@ export class StaticSite extends Construct {
         };
         this.doNotDeploy =
             !stack.isActive || (app.mode === "dev" && !this.props.dev?.deploy);
+        this.validateDeprecatedFileOptions();
         this.generateViteTypes();
         useSites().add(stack.stackName, id, this.props);
         if (this.doNotDeploy) {
@@ -68,10 +69,9 @@ export class StaticSite extends Construct {
             // Build app
             this.buildApp();
             // Create S3 Deployment
-            const cliLayer = new AwsCliLayer(this, "AwsCliLayer");
             const assets = this.createS3Assets();
             const filenamesAsset = this.bundleFilenamesAsset();
-            const s3deployCR = this.createS3Deployment(cliLayer, assets, filenamesAsset);
+            const s3deployCR = this.createS3Deployment(assets, filenamesAsset);
             this.distribution.node.addDependency(s3deployCR);
             // Invalidate CloudFront
             this.distribution.createInvalidation(this.generateInvalidationId(assets));
@@ -153,6 +153,12 @@ export class StaticSite extends Construct {
             },
         };
     }
+    validateDeprecatedFileOptions() {
+        // @ts-expect-error
+        if (this.props.fileOptions) {
+            throw new VisibleError(`In the "${this.node.id}" construct, the "fileOptions" property has been replaced by "assets.fileOptions". More details on upgrading - https://docs.sst.dev/upgrade-guide#upgrade-to-v2310`);
+        }
+    }
     generateViteTypes() {
         const { path: sitePath, environment } = this.props;
         // Build the path
@@ -295,81 +301,58 @@ interface ImportMeta {
             });
         }
     }
-    createS3Deployment(cliLayer, assets, filenamesAsset) {
-        const fileOptions = this.props.fileOptions ?? [
-            {
-                filters: [{ exclude: "*" }, { include: "*.html" }],
-                cacheControl: "max-age=0,no-cache,no-store,must-revalidate",
-            },
-            {
-                filters: [{ exclude: "*" }, { include: "*.js" }, { include: "*.css" }],
-                cacheControl: "max-age=31536000,public,immutable",
-            },
-        ];
-        // Create a Lambda function that will be doing the uploading
-        const uploader = new Function(this, "S3Uploader", {
-            code: Code.fromAsset(path.join(__dirname, "../support/base-site-custom-resource")),
-            layers: [cliLayer],
-            runtime: Runtime.PYTHON_3_11,
-            handler: "s3-upload.handler",
-            timeout: Duration.minutes(15),
-            memorySize: 1024,
-        });
-        this.bucket.grantReadWrite(uploader);
-        assets.forEach((asset) => asset.grantRead(uploader));
-        // Create the custom resource function
-        const handler = new Function(this, "S3Handler", {
-            code: Code.fromAsset(path.join(__dirname, "../support/base-site-custom-resource")),
-            layers: [cliLayer],
-            runtime: Runtime.PYTHON_3_11,
-            handler: "s3-handler.handler",
-            timeout: Duration.minutes(15),
-            memorySize: 1024,
-            environment: {
-                UPLOADER_FUNCTION_NAME: uploader.functionName,
-            },
+    createS3Deployment(assets, filenamesAsset) {
+        const stack = Stack.of(this);
+        const policy = new Policy(this, "S3UploaderPolicy", {
+            statements: [
+                new PolicyStatement({
+                    effect: Effect.ALLOW,
+                    actions: ["lambda:InvokeFunction"],
+                    resources: [stack.customResourceHandler.functionArn],
+                }),
+                new PolicyStatement({
+                    effect: Effect.ALLOW,
+                    actions: ["s3:ListBucket", "s3:PutObject", "s3:DeleteObject"],
+                    resources: [this.bucket.bucketArn, `${this.bucket.bucketArn}/*`],
+                }),
+                new PolicyStatement({
+                    effect: Effect.ALLOW,
+                    actions: ["s3:GetObject"],
+                    resources: [`${assets[0].bucket.bucketArn}/*`],
+                }),
+            ],
         });
-        this.bucket.grantReadWrite(handler);
-        filenamesAsset?.grantRead(handler);
-        uploader.grantInvoke(handler);
-        // Create custom resource
-        return new CustomResource(this, "S3Deployment", {
-            serviceToken: handler.functionArn,
-            resourceType: "Custom::SSTBucketDeployment",
+        stack.customResourceHandler.role?.attachInlinePolicy(policy);
+        const resource = new CustomResource(this, "S3Uploader", {
+            serviceToken: stack.customResourceHandler.functionArn,
+            resourceType: "Custom::S3Uploader",
             properties: {
-                Sources: assets.map((asset) => ({
-                    BucketName: asset.s3BucketName,
-                    ObjectKey: asset.s3ObjectKey,
+                sources: assets.map((asset) => ({
+                    bucketName: asset.s3BucketName,
+                    objectKey: asset.s3ObjectKey,
                 })),
-                DestinationBucketName: this.bucket.bucketName,
-                Filenames: filenamesAsset && {
-                    BucketName: filenamesAsset.s3BucketName,
-                    ObjectKey: filenamesAsset.s3ObjectKey,
+                destinationBucketName: this.bucket.bucketName,
+                filenames: filenamesAsset && {
+                    bucketName: filenamesAsset.s3BucketName,
+                    objectKey: filenamesAsset.s3ObjectKey,
                 },
-                FileOptions: (fileOptions || []).map((o) => {
-                    const { filters, cacheControl, contentType, contentEncoding } = o;
-                    const { include, exclude } = o;
-                    return [
-                        ...(typeof exclude === "string" ? [exclude] : exclude ?? [])
-                            .map((entry) => ["--exclude", entry])
-                            .flat(2),
-                        ...(typeof include === "string" ? [include] : include ?? [])
-                            .map((entry) => ["--include", entry])
-                            .flat(2),
-                        ...(filters || [])
-                            .map((filter) => Object.entries(filter).map(([key, value]) => [
-                            `--${key}`,
-                            value,
-                        ]))
-                            .flat(2),
-                        cacheControl ? ["--cache-control", cacheControl] : [],
-                        contentType ? ["--content-type", contentType] : [],
-                        contentEncoding ? ["--content-encoding", contentEncoding] : [],
-                    ].flat();
-                }),
-                ReplaceValues: this.getS3ContentReplaceValues(),
+                textEncoding: this.props.assets?.textEncoding ?? "utf-8",
+                fileOptions: [
+                    {
+                        files: "**",
+                        cacheControl: "max-age=0,no-cache,no-store,must-revalidate",
+                    },
+                    {
+                        files: ["**/*.js", "**/*.css"],
+                        cacheControl: "max-age=31536000,public,immutable",
+                    },
+                    ...(this.props.assets?.fileOptions || []),
+                ],
+                replaceValues: this.getS3ContentReplaceValues(),
             },
         });
+        resource.node.addDependency(policy);
+        return resource;
     }
     /////////////////////
     // CloudFront Distribution

package/constructs/deprecated/NextjsSite.js

@@ -6,7 +6,7 @@ import { execSync } from "child_process";
 import { Construct } from "constructs";
 import { Token, Duration, RemovalPolicy, CustomResource, } from "aws-cdk-lib/core";
 import * as s3 from "aws-cdk-lib/aws-s3";
-import { Role, Effect, PolicyStatement, CompositePrincipal, ServicePrincipal, ManagedPolicy, } from "aws-cdk-lib/aws-iam";
+import { Role, Effect, PolicyStatement, CompositePrincipal, ServicePrincipal, ManagedPolicy, Policy, } from "aws-cdk-lib/aws-iam";
 import * as sqs from "aws-cdk-lib/aws-sqs";
 import * as logs from "aws-cdk-lib/aws-logs";
 import * as lambda from "aws-cdk-lib/aws-lambda";
@@ -518,81 +518,67 @@ export class NextjsSite extends Construct {
         }
     }
     createS3Deployment() {
-        // Create a Lambda function that will be doing the uploading
-        const uploader = new lambda.Function(this, "S3Uploader", {
-            code: lambda.Code.fromAsset(path.join(__dirname, "../../support/base-site-custom-resource")),
-            layers: [this.awsCliLayer],
-            runtime: lambda.Runtime.PYTHON_3_7,
-            handler: "s3-upload.handler",
-            timeout: Duration.minutes(15),
-            memorySize: 1024,
-        });
-        this.cdk.bucket.grantReadWrite(uploader);
-        this.assets.forEach((asset) => asset.grantRead(uploader));
-        // Create the custom resource function
-        const handler = new lambda.Function(this, "S3Handler", {
-            code: lambda.Code.fromAsset(path.join(__dirname, "../../support/base-site-custom-resource")),
-            layers: [this.awsCliLayer],
-            runtime: lambda.Runtime.PYTHON_3_7,
-            handler: "s3-handler.handler",
-            timeout: Duration.minutes(15),
-            memorySize: 1024,
-            environment: {
-                UPLOADER_FUNCTION_NAME: uploader.functionName,
-            },
+        const stack = Stack.of(this);
+        const policy = new Policy(this, "S3UploaderPolicy", {
+            statements: [
+                new PolicyStatement({
+                    effect: Effect.ALLOW,
+                    actions: ["lambda:InvokeFunction"],
+                    resources: [stack.customResourceHandler.functionArn],
+                }),
+                new PolicyStatement({
+                    effect: Effect.ALLOW,
+                    actions: ["s3:ListBucket", "s3:PutObject", "s3:DeleteObject"],
+                    resources: [
+                        this.cdk.bucket.bucketArn,
+                        `${this.cdk.bucket.bucketArn}/*`,
+                    ],
+                }),
+                new PolicyStatement({
+                    effect: Effect.ALLOW,
+                    actions: ["s3:GetObject"],
+                    resources: [`${this.assets[0].bucket.bucketArn}/*`],
+                }),
+            ],
         });
-        this.cdk.bucket.grantReadWrite(handler);
-        uploader.grantInvoke(handler);
-        // Create custom resource
-        const fileOptions = [
-            {
-                exclude: "*",
-                include: "public/*",
-                cacheControl: "public,max-age=31536000,must-revalidate",
-            },
-            {
-                exclude: "*",
-                include: "static/*",
-                cacheControl: "public,max-age=31536000,must-revalidate",
-            },
-            {
-                exclude: "*",
-                include: "static-pages/*",
-                cacheControl: "public,max-age=0,s-maxage=2678400,must-revalidate",
-            },
-            {
-                exclude: "*",
-                include: "_next/data/*",
-                cacheControl: "public,max-age=0,s-maxage=2678400,must-revalidate",
-            },
-            {
-                exclude: "*",
-                include: "_next/static/*",
-                cacheControl: "public,max-age=31536000,immutable",
-            },
-        ];
-        return new CustomResource(this, "S3Deployment", {
-            serviceToken: handler.functionArn,
-            resourceType: "Custom::SSTBucketDeployment",
+        stack.customResourceHandler.role?.attachInlinePolicy(policy);
+        const resource = new CustomResource(this, "S3Uploader", {
+            serviceToken: stack.customResourceHandler.functionArn,
+            resourceType: "Custom::S3Uploader",
             properties: {
-                Sources: this.assets.map((asset) => ({
-                    BucketName: asset.s3BucketName,
-                    ObjectKey: asset.s3ObjectKey,
+                sources: this.assets.map((asset) => ({
+                    bucketName: asset.s3BucketName,
+                    objectKey: asset.s3ObjectKey,
                 })),
-                DestinationBucketName: this.cdk.bucket.bucketName,
-                FileOptions: (fileOptions || []).map(({ exclude, include, cacheControl }) => {
-                    return [
-                        "--exclude",
-                        exclude,
-                        "--include",
-                        include,
-                        "--cache-control",
-                        cacheControl,
-                    ];
-                }),
-                ReplaceValues: this.getS3ContentReplaceValues(),
+                destinationBucketName: this.cdk.bucket.bucketName,
+                textEncoding: "UTF-8",
+                fileOptions: [
+                    {
+                        files: "/public/**",
+                        cacheControl: "public,max-age=31536000,must-revalidate",
+                    },
+                    {
+                        files: "/static/**",
+                        cacheControl: "public,max-age=31536000,must-revalidate",
+                    },
+                    {
+                        files: "/static-pages/**",
+                        cacheControl: "public,max-age=0,s-maxage=2678400,must-revalidate",
+                    },
+                    {
+                        files: "/_next/data/**",
+                        cacheControl: "public,max-age=0,s-maxage=2678400,must-revalidate",
+                    },
+                    {
+                        files: "/_next/static/**",
+                        cacheControl: "public,max-age=31536000,immutable",
+                    },
+                ],
+                replaceValues: this.getS3ContentReplaceValues(),
             },
         });
+        resource.node.addDependency(policy);
+        return resource;
     }
     /////////////////////
     // Build App

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.30.4",
+  "version": "2.31.0",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -73,7 +73,7 @@
     "express": "^4.18.2",
     "fast-jwt": "^3.1.1",
     "get-port": "^6.1.2",
-    "glob": "^8.0.3",
+    "glob": "^10.0.0",
     "graphql": "*",
     "graphql-yoga": "^3.9.0",
     "immer": "9",
@@ -107,20 +107,21 @@
     "@tsconfig/node16": "^1.0.3",
     "@tsconfig/node18": "^18.2.2",
     "@types/adm-zip": "^0.5.0",
+    "@types/async": "^3.2.22",
     "@types/aws-iot-device-sdk": "^2.2.4",
     "@types/aws-lambda": "^8.10.108",
     "@types/babel__core": "^7.1.20",
     "@types/babel__generator": "^7.6.4",
     "@types/cross-spawn": "^6.0.2",
     "@types/express": "^4.17.14",
-    "@types/glob": "^8.0.0",
     "@types/node": "^18.11.9",
     "@types/react": "^17.0.33",
     "@types/uuid": "^8.3.4",
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
-    "astro-sst": "2.30.4",
+    "astro-sst": "2.31.0",
+    "async": "^3.2.4",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",
     "vitest": "^0.33.0"