sst 2.18.2 → 2.18.4

package/constructs/App.d.ts

@@ -42,7 +42,7 @@ export type AppProps = CDKAppProps;
  */
 export declare class App extends CDKApp {
     /**
-     * Whether or not the app is running locally under `sst start`
+     * Whether or not the app is running locally under `sst dev`
      */
     readonly local: boolean;
     /**
@@ -160,6 +160,7 @@ export declare class App extends CDKApp {
     private removeGovCloudUnsupportedResourceProperties;
     private ensureUniqueConstructIds;
     private codegenTypes;
+    private foreachConstruct;
     stack<T extends FunctionalStack<any>>(fn: T, props?: StackProps & {
         id?: string;
     }): ReturnType<T> extends Promise<any> ? Promise<void> : App;

package/constructs/App.js

@@ -26,7 +26,7 @@ function exitWithMessage(message) {
  */
 export class App extends CDKApp {
     /**
-     * Whether or not the app is running locally under `sst start`
+     * Whether or not the app is running locally under `sst dev`
      */
     local = false;
     /**
@@ -427,43 +427,53 @@ export class App extends CDKApp {
             `  }`,
             `}`,
         ].join("\n"));
-        class CodegenTypes {
-            visit(c) {
-                if (!isSSTConstruct(c)) {
-                    return;
-                }
-                if (c instanceof Function && c._doNotAllowOthersToBind) {
-                    return;
-                }
-                const binding = bindType(c);
-                if (!binding) {
-                    return;
-                }
-                const className = c.constructor.name;
-                const id = c.id;
-                // Case 1: variable does not have properties, ie. Secrets and Parameters
-                fs.appendFileSync(`${typesPath}/index.ts`, (binding.variables[0] === "."
-                    ? [
-                        `import "sst/node/${binding.clientPackage}";`,
-                        `declare module "sst/node/${binding.clientPackage}" {`,
-                        `  export interface ${className}Resources {`,
-                        `    "${id}": string;`,
-                        `  }`,
-                        `}`,
-                    ]
-                    : [
-                        `import "sst/node/${binding.clientPackage}";`,
-                        `declare module "sst/node/${binding.clientPackage}" {`,
-                        `  export interface ${className}Resources {`,
-                        `    "${id}": {`,
-                        ...binding.variables.map((p) => `      ${p}: string;`),
-                        `    }`,
-                        `  }`,
-                        `}`,
-                    ]).join("\n"));
+        this.foreachConstruct((c) => {
+            if (!isSSTConstruct(c)) {
+                return;
+            }
+            if (c instanceof Function && c._doNotAllowOthersToBind) {
+                return;
+            }
+            const binding = bindType(c);
+            if (!binding) {
+                return;
+            }
+            const className = c.constructor.name;
+            const id = c.id;
+            // Case 1: variable does not have properties, ie. Secrets and Parameters
+            fs.appendFileSync(`${typesPath}/index.ts`, (binding.variables[0] === "."
+                ? [
+                    `import "sst/node/${binding.clientPackage}";`,
+                    `declare module "sst/node/${binding.clientPackage}" {`,
+                    `  export interface ${className}Resources {`,
+                    `    "${id}": string;`,
+                    `  }`,
+                    `}`,
+                ]
+                : [
+                    `import "sst/node/${binding.clientPackage}";`,
+                    `declare module "sst/node/${binding.clientPackage}" {`,
+                    `  export interface ${className}Resources {`,
+                    `    "${id}": {`,
+                    ...binding.variables.map((p) => `      ${p}: string;`),
+                    `    }`,
+                    `  }`,
+                    `}`,
+                ]).join("\n"));
+        });
+    }
+    foreachConstruct(fn) {
+        const loop = (parent) => {
+            for (const child of parent.node.children) {
+                fn(child);
+                loop(child);
+            }
+        };
+        for (const child of this.node.children) {
+            if (child instanceof Stack) {
+                loop(child);
             }
         }
-        Aspects.of(this).add(new CodegenTypes());
     }
     // Functional Stack
     // This is a magical global to avoid having to pass app everywhere.

package/constructs/Function.d.ts

@@ -26,6 +26,7 @@ declare const supportedRuntimes: {
     "python3.7": CDKRuntime;
     "python3.8": CDKRuntime;
     "python3.9": CDKRuntime;
+    "python3.10": CDKRuntime;
     "dotnetcore1.0": CDKRuntime;
     "dotnetcore2.0": CDKRuntime;
     "dotnetcore2.1": CDKRuntime;

package/constructs/Function.js

@@ -38,6 +38,7 @@ const supportedRuntimes = {
     "python3.7": CDKRuntime.PYTHON_3_7,
     "python3.8": CDKRuntime.PYTHON_3_8,
     "python3.9": CDKRuntime.PYTHON_3_9,
+    "python3.10": CDKRuntime.PYTHON_3_10,
     "dotnetcore1.0": CDKRuntime.DOTNET_CORE_1,
     "dotnetcore2.0": CDKRuntime.DOTNET_CORE_2,
     "dotnetcore2.1": CDKRuntime.DOTNET_CORE_2_1,

package/constructs/NextjsSite.js

@@ -5,7 +5,7 @@ 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, } from "aws-cdk-lib/aws-cloudfront";
-import { S3Origin, HttpOrigin } from "aws-cdk-lib/aws-cloudfront-origins";
+import { 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";
 import { Queue } from "aws-cdk-lib/aws-sqs";
@@ -29,7 +29,7 @@ import { toCdkSize } from "./util/size.js";
 export class NextjsSite extends SsrSite {
     constructor(scope, id, props) {
         super(scope, id, {
-            buildCommand: "npx --yes open-next@2.0.3 build",
+            buildCommand: "npx --yes open-next@2.0.4 build",
             ...props,
         });
         this.deferredTaskCallbacks.push(() => {
@@ -282,9 +282,6 @@ export class NextjsSite extends SsrSite {
     createCloudFrontDistributionForEdge() {
         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",
@@ -292,7 +289,7 @@ export class NextjsSite extends SsrSite {
                 "next-router-prefetch",
                 "next-router-state-tree",
             ]);
-        const serverBehavior = this.buildDefaultBehaviorForEdge(s3Origin, cachePolicy);
+        const serverBehavior = this.buildDefaultBehaviorForEdge(cachePolicy);
         return new Distribution(this, "Distribution", {
             // these values can be overwritten by cfDistributionProps
             defaultRootObject: "",

package/constructs/SsrSite.d.ts

@@ -4,7 +4,6 @@ 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";
-import { S3Origin } from "aws-cdk-lib/aws-cloudfront-origins";
 import { SSTConstruct } from "./Construct.js";
 import { NodeJSProps } from "./Function.js";
 import { SsrFunction } from "./SsrFunction.js";
@@ -224,6 +223,7 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
     private serverLambdaForDev?;
     protected bucket: Bucket;
     private cfFunction;
+    private s3Origin;
     private distribution;
     private hostedZone?;
     private certificate?;
@@ -286,12 +286,13 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
     private grantServerS3Permissions;
     private grantServerCloudFrontPermissions;
     private validateCloudFrontDistributionSettings;
+    private createCloudFrontS3Origin;
     private createCloudFrontFunction;
     protected createCloudFrontDistributionForRegional(): Distribution;
     protected createCloudFrontDistributionForEdge(): Distribution;
     protected buildDistributionDomainNames(): string[];
     protected buildDefaultBehaviorForRegional(cachePolicy: ICachePolicy): BehaviorOptions;
-    protected buildDefaultBehaviorForEdge(origin: S3Origin, cachePolicy: ICachePolicy): BehaviorOptions;
+    protected buildDefaultBehaviorForEdge(cachePolicy: ICachePolicy): BehaviorOptions;
     protected buildBehaviorFunctionAssociations(): {
         eventType: CfFunctionEventType;
         function: CfFunction;

package/constructs/SsrSite.js

@@ -54,6 +54,7 @@ export class SsrSite extends Construct {
     serverLambdaForDev;
     bucket;
     cfFunction;
+    s3Origin;
     distribution;
     hostedZone;
     certificate;
@@ -79,7 +80,7 @@ export class SsrSite extends Construct {
         useSites().add(id, this.constructor.name, this.props);
         if (this.doNotDeploy) {
             // @ts-ignore
-            this.cfFunction = this.bucket = this.distribution = null;
+            this.cfFunction = this.bucket = this.s3Origin = this.distribution = null;
             this.serverLambdaForDev = this.createFunctionForDev();
             return;
         }
@@ -103,6 +104,7 @@ export class SsrSite extends Construct {
         this.certificate = this.createCertificate();
         // Create CloudFront
         this.validateCloudFrontDistributionSettings();
+        this.s3Origin = this.createCloudFrontS3Origin();
         this.cfFunction = this.createCloudFrontFunction();
         this.distribution = this.props.edge
             ? this.createCloudFrontDistributionForEdge()
@@ -502,6 +504,11 @@ export class SsrSite extends Construct {
             throw new Error(`Do not configure the "cfDistribution.domainNames". Use the "customDomain" to configure the domain name.`);
         }
     }
+    createCloudFrontS3Origin() {
+        return new S3Origin(this.bucket, {
+            originPath: "/" + (this.buildConfig.clientBuildS3KeyPrefix ?? ""),
+        });
+    }
     createCloudFrontFunction() {
         return new CfFunction(this, "CloudFrontFunction", {
             code: CfFunctionCode.fromInline(`
@@ -534,7 +541,6 @@ function handler(event) {
     createCloudFrontDistributionForEdge() {
         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
@@ -544,7 +550,7 @@ function handler(event) {
             // these values can NOT be overwritten by cfDistributionProps
             domainNames: this.buildDistributionDomainNames(),
             certificate: this.certificate,
-            defaultBehavior: this.buildDefaultBehaviorForEdge(s3Origin, cachePolicy),
+            defaultBehavior: this.buildDefaultBehaviorForEdge(cachePolicy),
             additionalBehaviors: {
                 ...(cfDistributionProps.additionalBehaviors || {}),
             },
@@ -595,12 +601,12 @@ function handler(event) {
             ],
         };
     }
-    buildDefaultBehaviorForEdge(origin, cachePolicy) {
+    buildDefaultBehaviorForEdge(cachePolicy) {
         const { cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
         return {
             viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-            origin,
+            origin: this.s3Origin,
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
@@ -636,9 +642,7 @@ function handler(event) {
         const publicDir = path.join(this.props.path, this.buildConfig.clientBuildOutputDir);
         for (const item of fs.readdirSync(publicDir)) {
             const isDir = fs.statSync(path.join(publicDir, item)).isDirectory();
-            this.distribution.addBehavior(isDir ? `${item}/*` : item, new S3Origin(this.bucket, {
-                originPath: "/" + (this.buildConfig.clientBuildS3KeyPrefix ?? ""),
-            }), {
+            this.distribution.addBehavior(isDir ? `${item}/*` : item, this.s3Origin, {
                 viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
                 allowedMethods: AllowedMethods.ALLOW_GET_HEAD_OPTIONS,
                 cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,

package/package.json

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

package/runtime/handlers/node.js

@@ -177,7 +177,7 @@ export const useNodeHandler = Context.memo(async () => {
                     const json = JSON.parse(await fs
                         .readFile(path.join(src, "package.json"))
                         .then((x) => x.toString()));
-                    fs.writeFile(path.join(input.out, "package.json"), JSON.stringify({
+                    await fs.writeFile(path.join(input.out, "package.json"), JSON.stringify({
                         dependencies: Object.fromEntries(installPackages.map((x) => [x, json.dependencies?.[x] || "*"])),
                     }));
                     const cmd = ["npm install"];

package/runtime/handlers/python.js

@@ -17,6 +17,7 @@ const RUNTIME_MAP = {
     "python3.7": Runtime.PYTHON_3_7,
     "python3.8": Runtime.PYTHON_3_8,
     "python3.9": Runtime.PYTHON_3_9,
+    "python3.10": Runtime.PYTHON_3_10,
 };
 export const usePythonHandler = Context.memo(async () => {
     const workers = await useRuntimeWorkers();

package/sst.mjs

@@ -4505,7 +4505,7 @@ var init_node = __esm({
               const json = JSON.parse(
                 await fs8.readFile(path8.join(src, "package.json")).then((x) => x.toString())
               );
-              fs8.writeFile(
+              await fs8.writeFile(
                 path8.join(input.out, "package.json"),
                 JSON.stringify({
                   dependencies: Object.fromEntries(
@@ -4905,7 +4905,8 @@ var init_python = __esm({
       "python3.6": Runtime.PYTHON_3_6,
       "python3.7": Runtime.PYTHON_3_7,
       "python3.8": Runtime.PYTHON_3_8,
-      "python3.9": Runtime.PYTHON_3_9
+      "python3.9": Runtime.PYTHON_3_9,
+      "python3.10": Runtime.PYTHON_3_10
     };
     usePythonHandler = Context.memo(async () => {
       const workers = await useRuntimeWorkers();