sst 2.18.0 → 2.18.2

package/cli/commands/dev.js

@@ -291,6 +291,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     }
     clear();
     await printHeader({ console: true, hint: "ready!" });
+    await useStackBuilder();
     await Promise.all([
         useDisconnector(),
         useRuntimeWorkers(),
@@ -301,6 +302,5 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         useKyselyTypeGenerator(),
         useRDSWarmer(),
         useFunctionLogger(),
-        useStackBuilder(),
     ]);
 });

package/constructs/NextjsSite.d.ts

@@ -63,7 +63,6 @@ export declare class NextjsSite extends SsrSite {
     protected createCloudFrontDistributionForRegional(): Distribution;
     protected createCloudFrontDistributionForEdge(): Distribution;
     private buildImageBehavior;
-    private buildStaticFileBehavior;
     protected generateBuildId(): string;
     getConstructMetadata(): {
         data: {

package/constructs/NextjsSite.js

@@ -4,7 +4,7 @@ import { Fn, Duration as CdkDuration, RemovalPolicy, CustomResource, } from "aws
 import { Effect, Policy, PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { Code, Runtime, Architecture, Function as CdkFunction, FunctionUrlAuthType, } from "aws-cdk-lib/aws-lambda";
-import { Distribution, ViewerProtocolPolicy, AllowedMethods, CachedMethods, CachePolicy, } from "aws-cdk-lib/aws-cloudfront";
+import { Distribution, ViewerProtocolPolicy, AllowedMethods, CachedMethods, } from "aws-cdk-lib/aws-cloudfront";
 import { S3Origin, HttpOrigin } from "aws-cdk-lib/aws-cloudfront-origins";
 import { Rule, Schedule } from "aws-cdk-lib/aws-events";
 import { LambdaFunction } from "aws-cdk-lib/aws-events-targets";
@@ -254,9 +254,6 @@ export class NextjsSite extends SsrSite {
          */
         const { cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
-        const s3Origin = new S3Origin(this.cdk.bucket, {
-            originPath: "/" + this.buildConfig.clientBuildS3KeyPrefix,
-        });
         const cachePolicy = cdk?.serverCachePolicy ??
             this.buildServerCachePolicy([
                 "accept",
@@ -278,8 +275,6 @@ export class NextjsSite extends SsrSite {
                 "api/*": serverBehavior,
                 "_next/data/*": serverBehavior,
                 "_next/image*": this.buildImageBehavior(cachePolicy),
-                "_next/*": this.buildStaticFileBehavior(s3Origin),
-                ...this.buildStaticFileBehaviors(s3Origin),
                 ...(cfDistributionProps.additionalBehaviors || {}),
             },
         });
@@ -311,8 +306,6 @@ export class NextjsSite extends SsrSite {
                 "api/*": serverBehavior,
                 "_next/data/*": serverBehavior,
                 "_next/image*": this.buildImageBehavior(cachePolicy),
-                "_next/*": this.buildStaticFileBehavior(s3Origin),
-                ...this.buildStaticFileBehaviors(s3Origin),
                 ...(cfDistributionProps.additionalBehaviors || {}),
             },
         });
@@ -333,18 +326,6 @@ export class NextjsSite extends SsrSite {
             responseHeadersPolicy: cdk?.responseHeadersPolicy,
         };
     }
-    buildStaticFileBehavior(s3Origin) {
-        const { cdk } = this.props;
-        return {
-            origin: s3Origin,
-            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-            allowedMethods: AllowedMethods.ALLOW_GET_HEAD_OPTIONS,
-            cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
-            compress: true,
-            cachePolicy: CachePolicy.CACHING_OPTIMIZED,
-            responseHeadersPolicy: cdk?.responseHeadersPolicy,
-        };
-    }
     generateBuildId() {
         const filePath = path.join(this.props.path, ".next/BUILD_ID");
         return fs.readFileSync(filePath).toString();

package/constructs/RDS.d.ts

@@ -13,7 +13,7 @@ export interface RDSProps {
     /**
      * Database engine of the cluster. Cannot be changed once set.
      */
-    engine: "mysql5.6" | "mysql5.7" | "postgresql10.14" | "postgresql11.13" | "postgresql11.16" | "postgresql13.9";
+    engine: "mysql5.6" | "mysql5.7" | "postgresql11.13" | "postgresql11.16" | "postgresql13.9";
     /**
      * Name of a database which is automatically created inside the cluster.
      */
@@ -191,7 +191,7 @@ export declare class RDS extends Construct implements SSTConstruct {
     getConstructMetadata(): {
         type: "RDS";
         data: {
-            engine: "mysql5.6" | "mysql5.7" | "postgresql10.14" | "postgresql11.13" | "postgresql11.16" | "postgresql13.9";
+            engine: "mysql5.6" | "mysql5.7" | "postgresql11.13" | "postgresql11.16" | "postgresql13.9";
             secretArn: string;
             types: RDSTypes | undefined;
             clusterArn: string;

package/constructs/RDS.js

@@ -202,11 +202,6 @@ export class RDS extends Construct {
                 version: AuroraMysqlEngineVersion.VER_2_07_1,
             });
         }
-        else if (engine === "postgresql10.14") {
-            return DatabaseClusterEngine.auroraPostgres({
-                version: AuroraPostgresEngineVersion.VER_10_14,
-            });
-        }
         else if (engine === "postgresql11.13") {
             return DatabaseClusterEngine.auroraPostgres({
                 version: AuroraPostgresEngineVersion.VER_11_13,

package/constructs/SsrSite.d.ts

@@ -1,6 +1,6 @@
 import { Construct } from "constructs";
 import { Bucket, BucketProps, IBucket } from "aws-cdk-lib/aws-s3";
-import { Function as CdkFunction, IFunction as ICdkFunction, FunctionProps } from "aws-cdk-lib/aws-lambda";
+import { IFunction as ICdkFunction, FunctionProps } from "aws-cdk-lib/aws-lambda";
 import { IHostedZone } from "aws-cdk-lib/aws-route53";
 import { Distribution, ICachePolicy, IResponseHeadersPolicy, BehaviorOptions, CachePolicy, Function as CfFunction, FunctionEventType as CfFunctionEventType } from "aws-cdk-lib/aws-cloudfront";
 import { ICertificate } from "aws-cdk-lib/aws-certificatemanager";
@@ -282,7 +282,7 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
     private createS3Deployment;
     protected createFunctionForRegional(): SsrFunction;
     protected createFunctionForEdge(): EdgeFunction;
-    protected createFunctionForDev(): CdkFunction;
+    protected createFunctionForDev(): SsrFunction;
     private grantServerS3Permissions;
     private grantServerCloudFrontPermissions;
     private validateCloudFrontDistributionSettings;
@@ -296,7 +296,7 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
         eventType: CfFunctionEventType;
         function: CfFunction;
     }[];
-    protected buildStaticFileBehaviors(origin: S3Origin): Record<string, BehaviorOptions>;
+    protected addStaticFileBehaviors(): void;
     protected buildServerCachePolicy(allowedHeaders?: string[]): CachePolicy;
     protected buildServerOriginRequestPolicy(): import("aws-cdk-lib/aws-cloudfront").IOriginRequestPolicy;
     private createCloudFrontInvalidation;

package/constructs/SsrSite.js

@@ -122,6 +122,8 @@ export class SsrSite extends Construct {
             const assetFileOptions = this.createS3AssetFileOptions();
             const s3deployCR = this.createS3Deployment(cliLayer, assets, assetFileOptions);
             this.distribution.node.addDependency(s3deployCR);
+            // Add static file behaviors
+            this.addStaticFileBehaviors();
             // Invalidate CloudFront
             this.createCloudFrontInvalidation();
             for (const task of this.deferredTaskCallbacks) {
@@ -353,7 +355,7 @@ export class SsrSite extends Construct {
             if (item === this.buildConfig.clientBuildVersionedSubDir) {
                 fileOptions.push({
                     exclude: "*",
-                    include: `${this.buildConfig.clientBuildVersionedSubDir}/*`,
+                    include: path.posix.join(this.buildConfig.clientBuildS3KeyPrefix ?? "", this.buildConfig.clientBuildVersionedSubDir, "*"),
                     cacheControl: "public,max-age=31536000,immutable",
                 });
             }
@@ -464,7 +466,10 @@ export class SsrSite extends Construct {
             permissions,
             // note: do not need to set vpc settings b/c this function is not being used
         });
-        return ssrFn.function;
+        useDeferredTasks().add(async () => {
+            await ssrFn.build();
+        });
+        return ssrFn;
     }
     grantServerS3Permissions() {
         const server = this.serverLambdaCdkFunctionForEdge || this.serverLambdaForRegional;
@@ -511,7 +516,6 @@ function handler(event) {
     createCloudFrontDistributionForRegional() {
         const { cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
-        const s3Origin = new S3Origin(this.bucket);
         const cachePolicy = cdk?.serverCachePolicy ?? this.buildServerCachePolicy();
         return new Distribution(this, "Distribution", {
             // these values can be overwritten by cfDistributionProps
@@ -523,7 +527,6 @@ function handler(event) {
             certificate: this.certificate,
             defaultBehavior: this.buildDefaultBehaviorForRegional(cachePolicy),
             additionalBehaviors: {
-                ...this.buildStaticFileBehaviors(s3Origin),
                 ...(cfDistributionProps.additionalBehaviors || {}),
             },
         });
@@ -543,7 +546,6 @@ function handler(event) {
             certificate: this.certificate,
             defaultBehavior: this.buildDefaultBehaviorForEdge(s3Origin, cachePolicy),
             additionalBehaviors: {
-                ...this.buildStaticFileBehaviors(s3Origin),
                 ...(cfDistributionProps.additionalBehaviors || {}),
             },
         });
@@ -628,29 +630,23 @@ function handler(event) {
             },
         ];
     }
-    buildStaticFileBehaviors(origin) {
+    addStaticFileBehaviors() {
         const { cdk } = this.props;
-        // Create additional behaviours for statics
-        const staticBehaviourOptions = {
-            viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-            origin,
-            allowedMethods: AllowedMethods.ALLOW_GET_HEAD_OPTIONS,
-            cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
-            compress: true,
-            cachePolicy: CachePolicy.CACHING_OPTIMIZED,
-        };
-        // Add behaviour for public folder statics (excluding build)
-        const staticsBehaviours = {};
+        // Create a template for statics behaviours
         const publicDir = path.join(this.props.path, this.buildConfig.clientBuildOutputDir);
         for (const item of fs.readdirSync(publicDir)) {
-            if (fs.statSync(path.join(publicDir, item)).isDirectory()) {
-                staticsBehaviours[`${item}/*`] = staticBehaviourOptions;
-            }
-            else {
-                staticsBehaviours[item] = staticBehaviourOptions;
-            }
+            const isDir = fs.statSync(path.join(publicDir, item)).isDirectory();
+            this.distribution.addBehavior(isDir ? `${item}/*` : item, new S3Origin(this.bucket, {
+                originPath: "/" + (this.buildConfig.clientBuildS3KeyPrefix ?? ""),
+            }), {
+                viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+                allowedMethods: AllowedMethods.ALLOW_GET_HEAD_OPTIONS,
+                cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
+                compress: true,
+                cachePolicy: CachePolicy.CACHING_OPTIMIZED,
+                responseHeadersPolicy: cdk?.responseHeadersPolicy,
+            });
         }
-        return staticsBehaviours;
     }
     buildServerCachePolicy(allowedHeaders) {
         return new CachePolicy(this, "ServerCache", {

package/package.json

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

package/sst.mjs

@@ -7339,6 +7339,7 @@ Are you sure you want to run this stage in dev mode? [y/N] `,
     }
     clear2();
     await printHeader2({ console: true, hint: "ready!" });
+    await useStackBuilder();
     await Promise.all([
       useDisconnector(),
       useRuntimeWorkers2(),
@@ -7348,8 +7349,7 @@ Are you sure you want to run this stage in dev mode? [y/N] `,
       useMetadata2(),
       useKyselyTypeGenerator2(),
       useRDSWarmer2(),
-      useFunctionLogger(),
-      useStackBuilder()
+      useFunctionLogger()
     ]);
   }
 );