sst 2.8.22 → 2.8.23

package/constructs/SsrFunction.js

@@ -72,7 +72,7 @@ export class SsrFunction extends Construct {
         const { runtime, timeout, memorySize, handler } = this.props;
         return new CdkFunction(this, `ServerFunction`, {
             ...this.props,
-            handler,
+            handler: handler.split(path.sep).join(path.posix.sep),
             logRetention: RetentionDays.THREE_DAYS,
             code: Code.fromBucket(Bucket.fromBucketName(this, "IServerFunctionBucket", assetBucket), assetKey),
             runtime: runtime === "nodejs14.x"

package/constructs/SsrSite.js

@@ -359,16 +359,13 @@ export class SsrSite extends Construct {
             return cdk.bucket;
         }
         // cdk.bucket is a prop
-        else {
-            const bucketProps = cdk?.bucket;
-            return new Bucket(this, "S3Bucket", {
-                publicReadAccess: false,
-                blockPublicAccess: BlockPublicAccess.BLOCK_ALL,
-                autoDeleteObjects: true,
-                removalPolicy: RemovalPolicy.DESTROY,
-                ...bucketProps,
-            });
-        }
+        return new Bucket(this, "S3Bucket", {
+            publicReadAccess: false,
+            blockPublicAccess: BlockPublicAccess.BLOCK_ALL,
+            autoDeleteObjects: true,
+            removalPolicy: RemovalPolicy.DESTROY,
+            ...cdk?.bucket,
+        });
     }
     createS3Deployment(cliLayer, assets, fileOptions) {
         // Create a Lambda function that will be doing the uploading
@@ -545,7 +542,6 @@ function handler(event) {
         });
         return {
             viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-            functionAssociations: this.buildBehaviorFunctionAssociations(),
             origin: new HttpOrigin(Fn.parseDomainName(fnUrl.url)),
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
@@ -553,6 +549,10 @@ function handler(event) {
             cachePolicy: cdk?.serverCachePolicy ?? this.buildServerCachePolicy(),
             originRequestPolicy: this.buildServerOriginRequestPolicy(),
             ...(cfDistributionProps.defaultBehavior || {}),
+            functionAssociations: [
+                ...this.buildBehaviorFunctionAssociations(),
+                ...(cfDistributionProps.defaultBehavior?.functionAssociations || []),
+            ],
         };
     }
     buildDefaultBehaviorForEdge(origin) {
@@ -560,7 +560,6 @@ function handler(event) {
         const cfDistributionProps = cdk?.distribution || {};
         return {
             viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-            functionAssociations: this.buildBehaviorFunctionAssociations(),
             origin,
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
@@ -568,6 +567,10 @@ function handler(event) {
             cachePolicy: cdk?.serverCachePolicy ?? this.buildServerCachePolicy(),
             originRequestPolicy: this.buildServerOriginRequestPolicy(),
             ...(cfDistributionProps.defaultBehavior || {}),
+            functionAssociations: [
+                ...this.buildBehaviorFunctionAssociations(),
+                ...(cfDistributionProps.defaultBehavior?.functionAssociations || []),
+            ],
             edgeLambdas: [
                 {
                     includeBody: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.8.22",
+  "version": "2.8.23",
   "bin": {
     "sst": "cli/sst.js"
   },