sst 2.0.38 → 2.1.0

package/cdk/cloudformation-deployments-wrapper.js

@@ -47,13 +47,14 @@ const useDeployment = Context.memo(() => {
     const state = new Map();
     return {
         async get(sdkProvider, options) {
-            if (!state.has(sdkProvider)) {
+            const region = options.stack.environment.region;
+            if (!state.has(region)) {
                 const deployment = new CloudFormationDeployments({ sdkProvider });
                 const { stackSdk, resolvedEnvironment, cloudFormationRoleArn } = await deployment.prepareSdkFor(options.stack, options.roleArn);
                 const toolkitInfo = await ToolkitInfo.lookup(resolvedEnvironment, stackSdk, options.toolkitStackName);
                 // Do a verification of the bootstrap stack version
                 await deployment.validateBootstrapStackVersion(options.stack.stackName, options.stack.requiresBootstrapStackVersion, options.stack.bootstrapStackVersionSsmParameter, toolkitInfo);
-                state.set(sdkProvider, {
+                state.set(region, {
                     deployment,
                     toolkitInfo,
                     stackSdk,
@@ -61,7 +62,7 @@ const useDeployment = Context.memo(() => {
                     cloudFormationRoleArn,
                 });
             }
-            return state.get(sdkProvider);
+            return state.get(region);
         },
     };
 });

package/cli/commands/plugins/kysely.js

@@ -85,7 +85,7 @@ export const useKyselyTypeGenerator = Context.memo(async () => {
             defaultDatabaseName: c.data.defaultDatabaseName,
             secretArn: c.data.secretArn,
         }));
-        databases.map((db) => generate(db));
+        databases.map((db) => generate(db).catch());
     });
     bus.subscribe("function.success", async (evt) => {
         if (!evt.properties.body?.results)

package/cli/sst.js

@@ -62,4 +62,9 @@ process.on("uncaughtException", (err) => {
     process.exit(1);
 });
 process.on("beforeExit", () => { });
+// Check Node version
+const nodeVersion = process.versions.node;
+if (Number(nodeVersion.split(".")[0]) < 16) {
+    throw new VisibleError(`Node.js version ${nodeVersion} is not supported by SST. Please upgrade to Node.js 16 or later.`);
+}
 program.parse();

package/constructs/SsrSite.d.ts

@@ -211,7 +211,7 @@ export declare class SsrSite extends Construct implements SSTConstruct {
         distribution: Distribution;
         hostedZone: IHostedZone | undefined;
         certificate: ICertificate | undefined;
-    };
+    } | undefined;
     /**
      * Attaches the given list of permissions to allow the Astro server side
      * rendering to access other AWS resources.

package/constructs/SsrSite.js

@@ -26,7 +26,6 @@ import { attachPermissionsToRole } from "./util/permission.js";
 import { getParameterPath, } from "./util/functionBinding.js";
 import { SiteEnv } from "../site-env.js";
 import { useProject } from "../project.js";
-import { VisibleError } from "../error.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /**
  * The `SsrSite` construct is a higher level CDK construct that makes it easy to create modern web apps with Server Side Rendering capabilities.
@@ -111,9 +110,8 @@ export class SsrSite extends Construct {
      * The CloudFront URL of the website.
      */
     get url() {
-        if (this.doNotDeploy) {
+        if (this.doNotDeploy)
             return;
-        }
         return `https://${this.distribution.distributionDomainName}`;
     }
     /**
@@ -121,13 +119,11 @@ export class SsrSite extends Construct {
      * custom domain.
      */
     get customDomainUrl() {
-        if (this.doNotDeploy) {
+        if (this.doNotDeploy)
             return;
-        }
         const { customDomain } = this.props;
-        if (!customDomain) {
+        if (!customDomain)
             return;
-        }
         if (typeof customDomain === "string") {
             return `https://${customDomain}`;
         }
@@ -139,9 +135,8 @@ export class SsrSite extends Construct {
      * The internally created CDK resources.
      */
     get cdk() {
-        if (this.doNotDeploy) {
-            throw new VisibleError(`Cannot access CDK resources for the "${this.node.id}" site in dev mode`);
-        }
+        if (this.doNotDeploy)
+            return;
         return {
             function: this.serverLambdaForRegional,
             bucket: this.bucket,

package/constructs/StaticSite.d.ts

@@ -305,7 +305,7 @@ export declare class StaticSite extends Construct implements SSTConstruct {
         distribution: Distribution;
         hostedZone: IHostedZone | undefined;
         certificate: ICertificate | undefined;
-    };
+    } | undefined;
     getConstructMetadata(): {
         type: "StaticSite";
         data: {
@@ -321,9 +321,10 @@ export declare class StaticSite extends Construct implements SSTConstruct {
     private createS3Bucket;
     private createS3Deployment;
     private validateCloudFrontDistributionSettings;
-    protected buildDistributionDomainNames(): string[];
     private createCfDistribution;
     private createCloudFrontInvalidation;
+    protected buildDistributionDomainNames(): string[];
+    private buildDistributionBehavior;
     protected validateCustomDomainSettings(): void;
     protected lookupHostedZone(): IHostedZone | undefined;
     private createCertificate;

package/constructs/StaticSite.js

@@ -11,7 +11,7 @@ import { Effect, Policy, PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { Code, Function, Runtime } from "aws-cdk-lib/aws-lambda";
 import { HostedZone, ARecord, AaaaRecord, RecordTarget, } from "aws-cdk-lib/aws-route53";
 import { CloudFrontTarget } from "aws-cdk-lib/aws-route53-targets";
-import { Distribution, ViewerProtocolPolicy } from "aws-cdk-lib/aws-cloudfront";
+import { Distribution, 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";
@@ -23,7 +23,6 @@ import { getParameterPath, } from "./util/functionBinding.js";
 import { gray } from "colorette";
 import { useProject } from "../project.js";
 import { SiteEnv } from "../site-env.js";
-import { VisibleError } from "../error.js";
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 /////////////////////
 // Construct
@@ -100,22 +99,19 @@ export class StaticSite extends Construct {
      * The CloudFront URL of the website.
      */
     get url() {
-        if (this.doNotDeploy) {
+        if (this.doNotDeploy)
             return;
-        }
         return `https://${this.distribution.distributionDomainName}`;
     }
     /**
      * If the custom domain is enabled, this is the URL of the website with the custom domain.
      */
     get customDomainUrl() {
-        if (this.doNotDeploy) {
+        if (this.doNotDeploy)
             return;
-        }
         const { customDomain } = this.props;
-        if (!customDomain) {
+        if (!customDomain)
             return;
-        }
         if (typeof customDomain === "string") {
             return `https://${customDomain}`;
         }
@@ -127,9 +123,8 @@ export class StaticSite extends Construct {
      * The internally created CDK resources.
      */
     get cdk() {
-        if (this.doNotDeploy) {
-            throw new VisibleError(`Cannot access CDK resources for the "${this.node.id}" site in dev mode`);
-        }
+        if (this.doNotDeploy)
+            return;
         return {
             bucket: this.bucket,
             distribution: this.distribution,
@@ -387,25 +382,6 @@ interface ImportMeta {
             throw new Error(`Cannot configure the "cfDistribution.errorResponses" when "errorPage" is passed in. Use one or the other to configure the behavior for error pages.`);
         }
     }
-    buildDistributionDomainNames() {
-        const { customDomain } = this.props;
-        const domainNames = [];
-        if (!customDomain) {
-            // no domain
-        }
-        else if (typeof customDomain === "string") {
-            domainNames.push(customDomain);
-        }
-        else {
-            domainNames.push(customDomain.domainName);
-            if (customDomain.alternateNames) {
-                if (!customDomain.cdk?.certificate)
-                    throw new Error("Certificates for alternate domains cannot be automatically created. Please specify certificate to use");
-                domainNames.push(...customDomain.alternateNames);
-            }
-        }
-        return domainNames;
-    }
     createCfDistribution() {
         const { cdk, errorPage } = this.props;
         const indexPage = this.props.indexPage || "index.html";
@@ -420,11 +396,7 @@ interface ImportMeta {
             // these values can NOT be overwritten by cfDistributionProps
             domainNames: this.buildDistributionDomainNames(),
             certificate: this.certificate,
-            defaultBehavior: {
-                origin: new S3Origin(this.bucket),
-                viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-                ...cdk?.distribution?.defaultBehavior,
-            },
+            defaultBehavior: this.buildDistributionBehavior(),
         });
     }
     createCloudFrontInvalidation(assets) {
@@ -462,6 +434,54 @@ interface ImportMeta {
         resource.node.addDependency(policy);
         return resource;
     }
+    buildDistributionDomainNames() {
+        const { customDomain } = this.props;
+        const domainNames = [];
+        if (!customDomain) {
+            // no domain
+        }
+        else if (typeof customDomain === "string") {
+            domainNames.push(customDomain);
+        }
+        else {
+            domainNames.push(customDomain.domainName);
+            if (customDomain.alternateNames) {
+                if (!customDomain.cdk?.certificate)
+                    throw new Error("Certificates for alternate domains cannot be automatically created. Please specify certificate to use");
+                domainNames.push(...customDomain.alternateNames);
+            }
+        }
+        return domainNames;
+    }
+    buildDistributionBehavior() {
+        const { cdk } = this.props;
+        return {
+            origin: new S3Origin(this.bucket),
+            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            functionAssociations: [
+                {
+                    function: new CfFunction(this, "CloudFrontFunction", {
+                        code: CfFunctionCode.fromInline(`
+function handler(event) {
+  var request = event.request;
+  var uri = request.uri;
+  
+  if (uri.endsWith("/")) {
+    request.uri += "index.html";
+  } else if (!uri.split("/").pop().includes(".")) {
+    request.uri += ".html";
+  }
+
+  return request;
+}
+          `),
+                    }),
+                    eventType: CfFunctionEventType.VIEWER_REQUEST,
+                },
+            ],
+            ...cdk?.distribution?.defaultBehavior,
+        };
+    }
     /////////////////////
     // Custom Domain
     /////////////////////

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.38",
+  "version": "2.1.0",
   "bin": {
     "sst": "cli/sst.js"
   },

package/sst.mjs

@@ -4249,7 +4249,8 @@ var init_cloudformation_deployments_wrapper = __esm({
       const state2 = /* @__PURE__ */ new Map();
       return {
         async get(sdkProvider, options) {
-          if (!state2.has(sdkProvider)) {
+          const region = options.stack.environment.region;
+          if (!state2.has(region)) {
             const deployment = new CloudFormationDeployments({ sdkProvider });
             const { stackSdk, resolvedEnvironment, cloudFormationRoleArn } = await deployment.prepareSdkFor(options.stack, options.roleArn);
             const toolkitInfo = await ToolkitInfo2.lookup(
@@ -4263,7 +4264,7 @@ var init_cloudformation_deployments_wrapper = __esm({
               options.stack.bootstrapStackVersionSsmParameter,
               toolkitInfo
             );
-            state2.set(sdkProvider, {
+            state2.set(region, {
               deployment,
               toolkitInfo,
               stackSdk,
@@ -4271,7 +4272,7 @@ var init_cloudformation_deployments_wrapper = __esm({
               cloudFormationRoleArn
             });
           }
-          return state2.get(sdkProvider);
+          return state2.get(region);
         }
       };
     });
@@ -6319,7 +6320,7 @@ var init_kysely = __esm({
           defaultDatabaseName: c.data.defaultDatabaseName,
           secretArn: c.data.secretArn
         }));
-        databases.map((db) => generate2(db));
+        databases.map((db) => generate2(db).catch());
       });
       bus.subscribe("function.success", async (evt) => {
         if (!evt.properties.body?.results)
@@ -7789,4 +7790,10 @@ process.on("uncaughtException", (err) => {
 });
 process.on("beforeExit", () => {
 });
+var nodeVersion = process.versions.node;
+if (Number(nodeVersion.split(".")[0]) < 16) {
+  throw new VisibleError(
+    `Node.js version ${nodeVersion} is not supported by SST. Please upgrade to Node.js 16 or later.`
+  );
+}
 program.parse();