sst 2.0.0-rc.19 → 2.0.0-rc.20

package/constructs/SsrSite.d.ts

@@ -229,8 +229,10 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     private buildApp;
     protected validateBuildOutput(): void;
     private runBuild;
-    private createStaticsS3Assets;
-    private createStaticsS3AssetsWithStub;
+    private createS3Assets;
+    private createS3AssetFileOptions;
+    private createS3AssetsForStub;
+    private createS3AssetFileOptionsForStub;
     private createS3Bucket;
     private createS3Deployment;
     protected createFunctionForRegional(): lambda.Function;

package/constructs/SsrSite.js

@@ -94,9 +94,12 @@ export class SsrSite extends Construct {
         this.cdk.certificate = this.createCertificate();
         // Create S3 Deployment
         const assets = this.isPlaceholder
-            ? this.createStaticsS3AssetsWithStub()
-            : this.createStaticsS3Assets();
-        const s3deployCR = this.createS3Deployment(assets);
+            ? this.createS3AssetsForStub()
+            : this.createS3Assets();
+        const assetFileOptions = this.isPlaceholder
+            ? this.createS3AssetFileOptionsForStub()
+            : this.createS3AssetFileOptions();
+        const s3deployCR = this.createS3Deployment(assets, assetFileOptions);
         // Create CloudFront
         this.validateCloudFrontDistributionSettings();
         if (this.props.edge) {
@@ -272,7 +275,7 @@ export class SsrSite extends Construct {
     /////////////////////
     // Bundle S3 Assets
     /////////////////////
-    createStaticsS3Assets() {
+    createS3Assets() {
         // Create temp folder, clean up if exists
         const zipOutDir = path.resolve(path.join(this.sstBuildDir, `Site-${this.node.id}-${this.node.addr}`));
         fs.rmSync(zipOutDir, { recursive: true, force: true });
@@ -308,13 +311,49 @@ export class SsrSite extends Construct {
         }
         return assets;
     }
-    createStaticsS3AssetsWithStub() {
+    createS3AssetFileOptions() {
+        // Build file options
+        const fileOptions = [];
+        const clientPath = path.join(this.props.path, this.buildConfig.clientBuildOutputDir);
+        for (const item of fs.readdirSync(clientPath)) {
+            // Versioned files will be cached for 1 year (immutable) both at
+            // CDN and browser level.
+            if (item === this.buildConfig.clientBuildVersionedSubDir) {
+                fileOptions.push({
+                    exclude: "*",
+                    include: `${this.buildConfig.clientBuildVersionedSubDir}/*`,
+                    cacheControl: "public,max-age=31536000,immutable",
+                });
+            }
+            // Un-versioned files will be cached for 1 year at the CDN level.
+            // But not at the browser level. CDN cache will be invalidated on deploy.
+            else {
+                const itemPath = path.join(clientPath, item);
+                fileOptions.push({
+                    exclude: "*",
+                    include: fs.statSync(itemPath).isDirectory()
+                        ? `${item}/*`
+                        : `${item}`,
+                    cacheControl: "public,max-age=0,s-maxage=31536000,must-revalidate",
+                });
+            }
+        }
+        return fileOptions;
+    }
+    createS3AssetsForStub() {
         return [
             new s3Assets.Asset(this, "Asset", {
                 path: this.buildConfig.siteStub,
             }),
         ];
     }
+    createS3AssetFileOptionsForStub() {
+        return [{
+                exclude: "*",
+                include: "*",
+                cacheControl: "public,max-age=0,s-maxage=31536000,must-revalidate",
+            }];
+    }
     createS3Bucket() {
         const { cdk } = this.props;
         // cdk.bucket is an imported construct
@@ -332,7 +371,7 @@ export class SsrSite extends Construct {
             });
         }
     }
-    createS3Deployment(assets) {
+    createS3Deployment(assets, fileOptions) {
         // 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")),
@@ -358,32 +397,6 @@ export class SsrSite extends Construct {
         });
         this.cdk.bucket.grantReadWrite(handler);
         uploader.grantInvoke(handler);
-        // Build file options
-        const fileOptions = [];
-        const clientPath = path.join(this.props.path, this.buildConfig.clientBuildOutputDir);
-        for (const item of fs.readdirSync(clientPath)) {
-            // Versioned files will be cached for 1 year (immutable) both at
-            // CDN and browser level.
-            if (item === this.buildConfig.clientBuildVersionedSubDir) {
-                fileOptions.push({
-                    exclude: "*",
-                    include: `${this.buildConfig.clientBuildVersionedSubDir}/*`,
-                    cacheControl: "public,max-age=31536000,immutable",
-                });
-            }
-            // Un-versioned files will be cached for 1 year at the CDN level.
-            // But not at the browser level. CDN cache will be invalidated on deploy.
-            else {
-                const itemPath = path.join(clientPath, item);
-                fileOptions.push({
-                    exclude: "*",
-                    include: fs.statSync(itemPath).isDirectory()
-                        ? `${item}/*`
-                        : `${item}`,
-                    cacheControl: "public,max-age=0,s-maxage=31536000,must-revalidate",
-                });
-            }
-        }
         // Create custom resource
         return new CustomResource(this, "S3Deployment", {
             serviceToken: handler.functionArn,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.0-rc.19",
+  "version": "2.0.0-rc.20",
   "bin": {
     "sst": "cli/sst.js"
   },

package/support/custom-resources/index.mjs

@@ -106469,7 +106469,7 @@ async function ssmPutParameter(params) {
 }
 __name(ssmPutParameter, "ssmPutParameter");
 function isRetryableException(e) {
-  return e.code === "ThrottlingException" && e.message === "Rate exceeded" || e.code === "Throttling" && e.message === "Rate exceeded" || e.code === "TooManyRequestsException" && e.message === "Too Many Requests" || e.code === "TooManyUpdates" || e.code === "OperationAbortedException" || e.code === "TimeoutError" || e.code === "NetworkingError";
+  return e.code === "ThrottlingException" && e.message === "Rate exceeded" || e.code === "Throttling" && e.message === "Rate exceeded" || e.code === "TooManyRequestsException" && e.message === "Too Many Requests" || e.code === "TooManyUpdates" || e.code === "OperationAbortedException" || e.code === "TimeoutError" || e.code === "NetworkingError" || e.code === "ResourceConflictException";
 }
 __name(isRetryableException, "isRetryableException");
 

package/support/edge-function/edge-lambda.mjs

@@ -1,3 +1,3 @@
 import { createRequire as topLevelCreateRequire } from 'module';const require = topLevelCreateRequire(import.meta.url);
-var h=Object.defineProperty;var s=(o,e)=>h(o,"name",{value:e,configurable:!0});import{createRequire as E}from"module";function t(o,...e){console.log("[provider-framework]",o,...e.map(n=>typeof n=="object"?JSON.stringify(n,void 0,2):n))}s(t,"log");import C from"https";import R from"url";var y="AWSCDK::CustomResourceProviderFramework::CREATE_FAILED",f="AWSCDK::CustomResourceProviderFramework::MISSING_PHYSICAL_ID";async function d(o,e,n={}){let r={Status:o,Reason:n.reason||o,StackId:e.StackId,RequestId:e.RequestId,PhysicalResourceId:e.PhysicalResourceId||f,LogicalResourceId:e.LogicalResourceId,NoEcho:n.noEcho,Data:e.Data};t("submit response to cloudformation",r);let a=JSON.stringify(r),i=R.parse(e.ResponseURL);await S({hostname:i.hostname,path:i.path,method:"PUT",headers:{"content-type":"","content-length":a.length}},a)}s(d,"submitResponse");function m(o){return async e=>{if(e.RequestType==="Delete"&&e.PhysicalResourceId===y){t("ignoring DELETE event caused by a failed CREATE event"),await d("SUCCESS",e);return}try{await o(e)}catch(n){if(t(n),n instanceof u)throw t("retry requested by handler"),n;e.PhysicalResourceId||(e.RequestType==="Create"?(t("CREATE failed, responding with a marker physical resource id so that the subsequent DELETE will be ignored"),e.PhysicalResourceId=y):t(`ERROR: Malformed event. "PhysicalResourceId" is required: ${JSON.stringify(e)}`));let r=[n.message,`Logs: https://${process.env.AWS_REGION}.console.aws.amazon.com/cloudwatch/home?region=${process.env.AWS_REGION}#logsV2:log-groups/log-group/${encodeURIComponent(process.env.AWS_LAMBDA_LOG_GROUP_NAME)}/log-events/${encodeURIComponent(process.env.AWS_LAMBDA_LOG_STREAM_NAME)}`].join(`
-`);await d("FAILED",e,{reason:r})}}}s(m,"safeHandler");var u=class extends Error{};s(u,"Retry");async function S(o,e){return new Promise((n,r)=>{try{let a=C.request(o,n);a.on("error",r),a.write(e),a.end()}catch(a){r(a)}})}s(S,"httpRequest");var F=E(import.meta.url),p=F("aws-sdk");p.config.logger=console;var w=new p.S3({region:"us-east-1"}),l=new p.Lambda({region:"us-east-1"}),K=m(async o=>{t("onEventHandler",o);let e=o.RequestType==="Create"?I(o.ResourceProperties.FunctionNamePrefix):o.PhysicalResourceId.split(":").pop(),n,r,a=o.ResourceProperties.FunctionBucket,i=o.ResourceProperties.FunctionParams;switch(o.RequestType){case"Create":{await g(a,i);let c=await P(e,i);n=c.FunctionArn,r={FunctionArn:c.FunctionArn};break}case"Update":{let c=o.OldResourceProperties.FunctionParams;b(i,c)&&await L(e,i),k(i,c)&&(await g(a,i),await _(e,i)),n=o.PhysicalResourceId,r={FunctionArn:o.PhysicalResourceId};break}case"Delete":{await N(e);break}default:throw new Error("Unsupported request type")}return d("SUCCESS",{...o,PhysicalResourceId:n,Data:r})});function I(o){let r="abcdefghijklmnopqrstuvwxyz",a=r.length,i=`${o.toLowerCase().slice(0,64-20-1)}-`;for(let c=0;c<20;c++)i+=r.charAt(Math.floor(Math.random()*a));return i}s(I,"generateFunctionName");async function g(o,e){t("copyAsset() called with params",o,e),t("copy");let n=await w.copyObject({Bucket:o,CopySource:`/${e.Code.S3Bucket}/${e.Code.S3Key}`,Key:e.Code.S3Key}).promise();t("response",n),e.Code.S3Bucket=o}s(g,"copyAsset");async function P(o,e){t("createFunction() called with params",e);let n=await l.createFunction({...e,FunctionName:o}).promise();return t("response",n),{FunctionArn:n.FunctionArn}}s(P,"createFunction");async function L(o,e){t("updateFunctionConfiguration() called with params",e);let n=await l.updateFunctionConfiguration({FunctionName:o,...e,Code:void 0}).promise();t("response",n)}s(L,"updateFunctionConfiguration");async function _(o,e){t("updateFunctionCode() called with params",e);let n=await l.updateFunctionCode({FunctionName:o,Publish:!1,...e.Code}).promise();t("response",n)}s(_,"updateFunctionCode");async function N(o){t("deleteFunction() called with functionName",o);let e=await l.deleteFunction({FunctionName:o}).promise();t("response",e)}s(N,"deleteFunction");function b(o,e){return Object.keys(o).length!==Object.keys(o).length||["Description","Handler","Runtime","MemorySize","Timeout","Role"].some(n=>o[n]!==e[n])}s(b,"isConfigurationChanged");function k(o,e){return o.Code.S3Bucket!==e.Code.S3Bucket||o.Code.S3Key!==e.Code.S3Key}s(k,"isCodeChanged");export{K as handler};
+var E=Object.defineProperty;var r=(e,o)=>E(e,"name",{value:o,configurable:!0});import{createRequire as I}from"module";function n(e,...o){console.log("[provider-framework]",e,...o.map(t=>typeof t=="object"?JSON.stringify(t,void 0,2):t))}r(n,"log");import f from"https";import S from"url";var y="AWSCDK::CustomResourceProviderFramework::CREATE_FAILED",w="AWSCDK::CustomResourceProviderFramework::MISSING_PHYSICAL_ID";async function d(e,o,t={}){let s={Status:e,Reason:t.reason||e,StackId:o.StackId,RequestId:o.RequestId,PhysicalResourceId:o.PhysicalResourceId||w,LogicalResourceId:o.LogicalResourceId,NoEcho:t.noEcho,Data:o.Data};n("submit response to cloudformation",s);let a=JSON.stringify(s),i=S.parse(o.ResponseURL);await A({hostname:i.hostname,path:i.path,method:"PUT",headers:{"content-type":"","content-length":a.length}},a)}r(d,"submitResponse");function g(e){return async o=>{if(o.RequestType==="Delete"&&o.PhysicalResourceId===y){n("ignoring DELETE event caused by a failed CREATE event"),await d("SUCCESS",o);return}try{await e(o)}catch(t){if(n(t),t instanceof u)throw n("retry requested by handler"),t;o.PhysicalResourceId||(o.RequestType==="Create"?(n("CREATE failed, responding with a marker physical resource id so that the subsequent DELETE will be ignored"),o.PhysicalResourceId=y):n(`ERROR: Malformed event. "PhysicalResourceId" is required: ${JSON.stringify(o)}`));let s=[t.message,`Logs: https://${process.env.AWS_REGION}.console.aws.amazon.com/cloudwatch/home?region=${process.env.AWS_REGION}#logsV2:log-groups/log-group/${encodeURIComponent(process.env.AWS_LAMBDA_LOG_GROUP_NAME)}/log-events/${encodeURIComponent(process.env.AWS_LAMBDA_LOG_STREAM_NAME)}`].join(`
+`);await d("FAILED",o,{reason:s})}}}r(g,"safeHandler");var u=class extends Error{};r(u,"Retry");async function A(e,o){return new Promise((t,s)=>{try{let a=f.request(e,t);a.on("error",s),a.write(o),a.end()}catch(a){s(a)}})}r(A,"httpRequest");var P=I(import.meta.url),p=P("aws-sdk");p.config.logger=console;var L=new p.S3({region:"us-east-1"}),l=new p.Lambda({region:"us-east-1"}),K=g(async e=>{n("onEventHandler",e);let o=e.RequestType==="Create"?_(e.ResourceProperties.FunctionNamePrefix):e.PhysicalResourceId.split(":").pop(),t,s,a=e.ResourceProperties.FunctionBucket,i=e.ResourceProperties.FunctionParams;switch(e.RequestType){case"Create":{await h(a,i);let c=await b(o,i);t=c.FunctionArn,s={FunctionArn:c.FunctionArn};break}case"Update":{let c=e.OldResourceProperties.FunctionParams;k(i,c)&&await m(o,i),x(i,c)&&(await h(a,i),await R(o,i)),t=e.PhysicalResourceId,s={FunctionArn:e.PhysicalResourceId};break}case"Delete":{await T(o);break}default:throw new Error("Unsupported request type")}return d("SUCCESS",{...e,PhysicalResourceId:t,Data:s})});function _(e){let s="abcdefghijklmnopqrstuvwxyz",a=s.length,i=`${e.toLowerCase().slice(0,64-20-1)}-`;for(let c=0;c<20;c++)i+=s.charAt(Math.floor(Math.random()*a));return i}r(_,"generateFunctionName");async function h(e,o){n("copyAsset() called with params",e,o),n("copy");let t=await L.copyObject({Bucket:e,CopySource:`/${o.Code.S3Bucket}/${o.Code.S3Key}`,Key:o.Code.S3Key}).promise();n("response",t),o.Code.S3Bucket=e}r(h,"copyAsset");async function b(e,o){n("createFunction() called with params",o);let t=await l.createFunction({...o,FunctionName:e}).promise();return n("response",t),{FunctionArn:t.FunctionArn}}r(b,"createFunction");async function m(e,o){n("updateFunctionConfiguration() called with params",o);try{let t=await l.updateFunctionConfiguration({FunctionName:e,...o,Code:void 0}).promise();n("response",t);return}catch(t){if(C(t)){await m(e,o);return}throw t}}r(m,"updateFunctionConfiguration");async function R(e,o){n("updateFunctionCode() called with params",o);try{let t=await l.updateFunctionCode({FunctionName:e,Publish:!1,...o.Code}).promise();n("response",t);return}catch(t){if(C(t)){await R(e,o);return}throw t}}r(R,"updateFunctionCode");async function T(e){n("deleteFunction() called with functionName",e);let o=await l.deleteFunction({FunctionName:e}).promise();n("response",o)}r(T,"deleteFunction");function k(e,o){return Object.keys(e).length!==Object.keys(e).length||["Description","Handler","Runtime","MemorySize","Timeout","Role"].some(t=>e[t]!==o[t])}r(k,"isConfigurationChanged");function x(e,o){return e.Code.S3Bucket!==o.Code.S3Bucket||e.Code.S3Key!==o.Code.S3Key}r(x,"isCodeChanged");function C(e){return e.code==="ThrottlingException"&&e.message==="Rate exceeded"||e.code==="Throttling"&&e.message==="Rate exceeded"||e.code==="TooManyRequestsException"&&e.message==="Too Many Requests"||e.code==="TooManyUpdates"||e.code==="OperationAbortedException"||e.code==="TimeoutError"||e.code==="NetworkingError"||e.code==="ResourceConflictException"}r(C,"isRetryableException");export{K as handler};