sst 2.31.0 → 2.32.0

package/constructs/SsrSite.js

@@ -55,18 +55,22 @@ export class SsrSite extends Construct {
         const props = {
             path: ".",
             typesPath: ".",
-            waitForInvalidation: false,
             runtime: "nodejs18.x",
             timeout: "10 seconds",
             memorySize: "1024 MB",
             ...rawProps,
+            invalidation: {
+                wait: rawProps?.waitForInvalidation,
+                paths: "all",
+                ...rawProps?.invalidation,
+            },
         };
         this.id = id;
         this.props = props;
         const app = scope.node.root;
         const stack = Stack.of(this);
         const self = this;
-        const { path: sitePath, typesPath, buildCommand, runtime, timeout, memorySize, edge, regional, dev, assets, nodejs, permissions, environment, bind, customDomain, waitForInvalidation, warm, cdk, } = props;
+        const { path: sitePath, typesPath, buildCommand, runtime, timeout, memorySize, edge, regional, dev, assets, nodejs, permissions, environment, bind, customDomain, invalidation, warm, cdk, } = props;
         this.doNotDeploy = !stack.isActive || (app.mode === "dev" && !dev?.deploy);
         validateSiteExists();
         validateTimeout();
@@ -259,7 +263,6 @@ export class SsrSite extends Construct {
             const distribution = new Distribution(self, "CDN", {
                 scopeOverride: self,
                 customDomain,
-                waitForInvalidation,
                 cdk: {
                     distribution: {
                         // these values can be overwritten
@@ -689,18 +692,7 @@ function handler(event) {
             return replaceValues;
         }
         function createDistributionInvalidation() {
-            const cdnInvalidationStrategy = assets?.cdnInvalidationStrategy ?? "all";
-            if (cdnInvalidationStrategy === "never")
-                return;
-            if (plan.buildId) {
-                distribution.createInvalidation(plan.buildId);
-                return;
-            }
-            if (cdnInvalidationStrategy === "always") {
-                const buildId = Date.now().toString(16) + Math.random().toString(16).slice(2);
-                distribution.createInvalidation(buildId);
-                return;
-            }
+            const paths = invalidation.paths;
             // We will generate a hash based on the contents of the S3 files with cache enabled.
             // This will be used to determine if we need to invalidate our CloudFront cache.
             const s3Origin = Object.values(plan.origins).find((origin) => origin.type === "s3");
@@ -711,46 +703,64 @@ function handler(event) {
                 return;
             // Build invalidation paths
             const invalidationPaths = [];
-            if (cdnInvalidationStrategy === "versioned") {
+            if (paths === "none") {
+            }
+            else if (paths === "all") {
+                invalidationPaths.push("/*");
+            }
+            else if (paths === "versioned") {
                 cachedS3Files.forEach((item) => {
                     if (!item.versionedSubDir)
                         return;
                     invalidationPaths.push(path.posix.join("/", item.to, item.versionedSubDir, "*"));
                 });
             }
+            else {
+                invalidationPaths.push(...paths);
+            }
             if (invalidationPaths.length === 0)
-                invalidationPaths.push("/*");
+                return;
             // Build build ID
-            const hash = crypto.createHash("md5");
-            cachedS3Files.forEach((item) => {
-                // The below options are needed to support following symlinks when building zip files:
-                // - nodir: This will prevent symlinks themselves from being copied into the zip.
-                // - follow: This will follow symlinks and copy the files within.
-                // For versioned files, use file path for digest since file version in name should change on content change
-                if (item.versionedSubDir) {
-                    globSync("**", {
-                        dot: true,
-                        nodir: true,
-                        follow: true,
-                        cwd: path.resolve(sitePath, item.from, item.versionedSubDir),
-                    }).forEach((filePath) => hash.update(filePath));
-                }
-                // For non-versioned files, use file content for digest
-                if (cdnInvalidationStrategy === "all") {
-                    globSync("**", {
-                        ignore: item.versionedSubDir
-                            ? [path.posix.join(item.versionedSubDir, "**")]
-                            : undefined,
-                        dot: true,
-                        nodir: true,
-                        follow: true,
-                        cwd: path.resolve(sitePath, item.from),
-                    }).forEach((filePath) => hash.update(fs.readFileSync(path.resolve(sitePath, item.from, filePath))));
-                }
+            let invalidationBuildId;
+            if (plan.buildId) {
+                invalidationBuildId = plan.buildId;
+            }
+            else {
+                const hash = crypto.createHash("md5");
+                cachedS3Files.forEach((item) => {
+                    // The below options are needed to support following symlinks when building zip files:
+                    // - nodir: This will prevent symlinks themselves from being copied into the zip.
+                    // - follow: This will follow symlinks and copy the files within.
+                    // For versioned files, use file path for digest since file version in name should change on content change
+                    if (item.versionedSubDir) {
+                        globSync("**", {
+                            dot: true,
+                            nodir: true,
+                            follow: true,
+                            cwd: path.resolve(sitePath, item.from, item.versionedSubDir),
+                        }).forEach((filePath) => hash.update(filePath));
+                    }
+                    // For non-versioned files, use file content for digest
+                    if (paths !== "versioned") {
+                        globSync("**", {
+                            ignore: item.versionedSubDir
+                                ? [path.posix.join(item.versionedSubDir, "**")]
+                                : undefined,
+                            dot: true,
+                            nodir: true,
+                            follow: true,
+                            cwd: path.resolve(sitePath, item.from),
+                        }).forEach((filePath) => hash.update(fs.readFileSync(path.resolve(sitePath, item.from, filePath))));
+                    }
+                });
+                invalidationBuildId = hash.digest("hex");
+                Logger.debug(`Generated build ID ${invalidationBuildId}`);
+            }
+            distribution.createInvalidation({
+                version: invalidationBuildId,
+                paths: invalidationPaths,
+                wait: invalidation.wait,
             });
-            const buildId = hash.digest("hex");
-            Logger.debug(`Generated build ID ${buildId}`);
-            distribution.createInvalidation(buildId, invalidationPaths);
         }
     }
     static buildDefaultServerCachePolicyProps(allowedHeaders) {

package/constructs/StaticSite.js

@@ -49,7 +49,6 @@ export class StaticSite extends Construct {
         this.id = id;
         this.props = {
             path: ".",
-            waitForInvalidation: false,
             ...props,
         };
         this.doNotDeploy =
@@ -74,7 +73,9 @@ export class StaticSite extends Construct {
             const s3deployCR = this.createS3Deployment(assets, filenamesAsset);
             this.distribution.node.addDependency(s3deployCR);
             // Invalidate CloudFront
-            this.distribution.createInvalidation(this.generateInvalidationId(assets));
+            this.distribution.createInvalidation({
+                version: this.generateInvalidationId(assets),
+            });
         });
         app.registerTypes(this);
     }

package/package.json

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