sst 2.16.0 → 2.16.2

package/cli/commands/dev.js

@@ -114,6 +114,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     const useStackBuilder = Context.memo(async () => {
         const watcher = useWatcher();
         const project = useProject();
+        const scriptVersion = Date.now().toString();
         let lastDeployed;
         let isWorking = false;
         let isDirty = false;
@@ -135,6 +136,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
                 project.stacks = sstConfig.stacks;
                 const assembly = await Stacks.synth({
                     increaseTimeout: args["increase-timeout"],
+                    scriptVersion,
                     fn: project.stacks,
                     outDir: `.sst/cdk.out`,
                     mode: "dev",

package/cli/commands/diff.d.ts

@@ -14,4 +14,6 @@ export declare const diff: (program: Program) => import("yargs").Argv<{
     future: boolean | undefined;
 } & {
     dev: boolean | undefined;
+} & {
+    to: string | undefined;
 }>;

package/cli/commands/diff.js

@@ -1,7 +1,12 @@
 import { stackNameToId } from "../ui/stack.js";
-export const diff = (program) => program.command("diff", "Compare your app with what is deployed on AWS", (yargs) => yargs.option("dev", {
+export const diff = (program) => program.command("diff", "Compare your app with what is deployed on AWS", (yargs) => yargs
+    .option("dev", {
     type: "boolean",
     describe: "Compare in dev mode",
+})
+    .option("to", {
+    type: "string",
+    describe: "Output directory, defaults to .sst/dist",
 }), async (args) => {
     const { useProject } = await import("../../project.js");
     const { Stacks } = await import("../../stacks/index.js");
@@ -14,6 +19,7 @@ export const diff = (program) => program.command("diff", "Compare your app with
     const [_metafile, sstConfig] = await Stacks.load(project.paths.config);
     const assembly = await Stacks.synth({
         fn: sstConfig.stacks,
+        buildDir: args.to,
         mode: args.dev ? "dev" : "deploy",
     });
     // Diff each stack

package/constructs/App.d.ts

@@ -30,7 +30,7 @@ export interface AppDeployProps {
     readonly region?: string;
     readonly buildDir?: string;
     readonly account?: string;
-    readonly debugStartedAt?: number;
+    readonly debugScriptVersion?: string;
     readonly debugIncreaseTimeout?: boolean;
     readonly mode: "deploy" | "dev" | "remove";
     readonly isActiveStack?: (stackName: string) => boolean;
@@ -66,7 +66,7 @@ export declare class App extends CDKApp {
      */
     readonly account: string;
     /** @internal */
-    readonly debugStartedAt?: number;
+    readonly debugScriptVersion?: string;
     /** @internal */
     readonly debugIncreaseTimeout?: boolean;
     /** @internal */

package/constructs/App.js

@@ -50,7 +50,7 @@ export class App extends CDKApp {
      */
     account;
     /** @internal */
-    debugStartedAt;
+    debugScriptVersion;
     /** @internal */
     debugIncreaseTimeout;
     /** @internal */
@@ -82,7 +82,7 @@ export class App extends CDKApp {
         this.isActiveStack = deployProps.isActiveStack;
         this.defaultFunctionProps = [];
         if (this.mode === "dev") {
-            this.debugStartedAt = deployProps.debugStartedAt;
+            this.debugScriptVersion = deployProps.debugScriptVersion;
             this.debugIncreaseTimeout = deployProps.debugIncreaseTimeout;
         }
     }

package/constructs/Script.js

@@ -144,9 +144,8 @@ export class Script extends Construct {
         //       when rebuilding infrastructure. Otherwise, there will always be
         //       a change when rebuilding infrastructure b/c the "version" property
         //       changes on each build.
-        const version = app.mode === "dev"
-            ? app.debugStartedAt
-            : this.props.version ?? Date.now().toString();
+        const defaultVersion = app.mode === "dev" ? app.debugScriptVersion : Date.now().toString();
+        const version = this.props.version ?? defaultVersion;
         new CustomResource(this, "ScriptResource", {
             serviceToken: crFunction.functionArn,
             resourceType: "Custom::SSTScript",

package/constructs/StaticSite.d.ts

@@ -10,6 +10,7 @@ export interface StaticSiteFileOptions {
     exclude: string | string[];
     include: string | string[];
     cacheControl: string;
+    contentType?: string;
 }
 export interface StaticSiteProps {
     /**

package/constructs/StaticSite.js

@@ -358,18 +358,19 @@ interface ImportMeta {
                     BucketName: filenamesAsset.s3BucketName,
                     ObjectKey: filenamesAsset.s3ObjectKey,
                 },
-                FileOptions: (fileOptions || []).map(({ exclude, include, cacheControl }) => {
+                FileOptions: (fileOptions || []).map(({ exclude, include, cacheControl, contentType }) => {
                     if (typeof exclude === "string") {
                         exclude = [exclude];
                     }
                     if (typeof include === "string") {
                         include = [include];
                     }
-                    const options = [];
-                    exclude.forEach((per) => options.push("--exclude", per));
-                    include.forEach((per) => options.push("--include", per));
-                    options.push("--cache-control", cacheControl);
-                    return options;
+                    return [
+                        ...exclude.map((per) => ["--exclude", per]),
+                        ...include.map((per) => ["--include", per]),
+                        ["--cache-control", cacheControl],
+                        contentType ? ["--content-type", contentType] : [],
+                    ].flat();
                 }),
                 ReplaceValues: this.getS3ContentReplaceValues(),
             },
@@ -482,6 +483,10 @@ function handler(event) {
   var request = event.request;
   var uri = request.uri;
   
+  if (uri.startsWith("/.well-known/")) {
+    return request;
+  }
+
   if (uri.endsWith("/")) {
     request.uri += "index.html";
   } else if (!uri.split("/").pop().includes(".")) {

package/package.json

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

package/runtime/handlers/python.js

@@ -95,6 +95,7 @@ export const usePythonHandler = Context.memo(async () => {
                 installCommands: input.props.python?.installCommands,
                 entry: src,
                 runtime: RUNTIME_MAP[input.props.runtime],
+                architecture: input.props.architecture,
                 outputPathSuffix: ".",
                 out: input.out,
             });

package/runtime/handlers/pythonBundling.d.ts

@@ -1,4 +1,5 @@
 import { Runtime } from "aws-cdk-lib/aws-lambda";
+import { FunctionProps } from "../../constructs/Function.js";
 import { AssetHashType } from "aws-cdk-lib/core";
 /**
  * Dependency files to exclude from the asset hash.
@@ -20,6 +21,10 @@ export interface BundlingOptions {
      * The runtime of the lambda function
      */
     readonly runtime: Runtime;
+    /**
+     * Architecture used by the lambda function
+     */
+    readonly architecture: FunctionProps["architecture"];
     /**
      * Output path suffix ('python' for a layer, '.' otherwise)
      */

package/runtime/handlers/pythonBundling.js

@@ -18,7 +18,7 @@ export const BUNDLER_DEPENDENCIES_CACHE = "/var/dependencies";
  * Produce bundled Lambda asset code
  */
 export function bundle(options) {
-    const { entry, runtime, outputPathSuffix, installCommands } = options;
+    const { entry, runtime, architecture, outputPathSuffix, installCommands } = options;
     const stagedir = FileSystem.mkdtemp("python-bundling-");
     const hasDeps = stageDependencies(entry, stagedir);
     const hasInstallCommands = stageInstallCommands(installCommands || [], stagedir);
@@ -35,7 +35,9 @@ export function bundle(options) {
     fs.copyFileSync(path.join(__dirname, "../../support/python-runtime", dockerfile), path.join(stagedir, dockerfile));
     const image = DockerImage.fromBuild(stagedir, {
         buildArgs: {
-            IMAGE: runtime.bundlingImage.image,
+            IMAGE: runtime.bundlingImage.image +
+                // the default x86_64 doesn't need to be set explicitly
+                (architecture == "arm_64" ? ":latest-arm64" : ""),
         },
         file: dockerfile,
     });

package/sst.mjs

@@ -4815,7 +4815,7 @@ import url5 from "url";
 import path11 from "path";
 import { DockerImage, FileSystem } from "aws-cdk-lib/core";
 function bundle(options) {
-  const { entry, runtime, outputPathSuffix, installCommands } = options;
+  const { entry, runtime, architecture, outputPathSuffix, installCommands } = options;
   const stagedir = FileSystem.mkdtemp("python-bundling-");
   const hasDeps = stageDependencies(entry, stagedir);
   const hasInstallCommands = stageInstallCommands(
@@ -4829,7 +4829,7 @@ function bundle(options) {
   );
   const image = DockerImage.fromBuild(stagedir, {
     buildArgs: {
-      IMAGE: runtime.bundlingImage.image
+      IMAGE: runtime.bundlingImage.image + (architecture == "arm_64" ? ":latest-arm64" : "")
     },
     file: dockerfile
   });
@@ -4985,6 +4985,7 @@ var init_python = __esm({
             installCommands: input.props.python?.installCommands,
             entry: src,
             runtime: RUNTIME_MAP[input.props.runtime],
+            architecture: input.props.architecture,
             outputPathSuffix: ".",
             out: input.out
           });
@@ -5151,6 +5152,7 @@ async function synth(opts) {
         region: project.config.region,
         mode: opts.mode,
         debugIncreaseTimeout: opts.increaseTimeout,
+        debugScriptVersion: opts.scriptVersion,
         isActiveStack: opts.isActiveStack
       },
       {
@@ -7140,6 +7142,7 @@ var dev = (program2) => program2.command(
     const useStackBuilder = Context2.memo(async () => {
       const watcher = useWatcher2();
       const project = useProject2();
+      const scriptVersion = Date.now().toString();
       let lastDeployed;
       let isWorking = false;
       let isDirty = false;
@@ -7163,6 +7166,7 @@ var dev = (program2) => program2.command(
           project.stacks = sstConfig.stacks;
           const assembly = await Stacks.synth({
             increaseTimeout: args["increase-timeout"],
+            scriptVersion,
             fn: project.stacks,
             outDir: `.sst/cdk.out`,
             mode: "dev"
@@ -8294,6 +8298,9 @@ var diff2 = (program2) => program2.command(
   (yargs2) => yargs2.option("dev", {
     type: "boolean",
     describe: "Compare in dev mode"
+  }).option("to", {
+    type: "string",
+    describe: "Output directory, defaults to .sst/dist"
   }),
   async (args) => {
     const { useProject: useProject2 } = await Promise.resolve().then(() => (init_project(), project_exports));
@@ -8306,6 +8313,7 @@ var diff2 = (program2) => program2.command(
     const [_metafile, sstConfig] = await Stacks.load(project.paths.config);
     const assembly = await Stacks.synth({
       fn: sstConfig.stacks,
+      buildDir: args.to,
       mode: args.dev ? "dev" : "deploy"
     });
     let changesAcc = 0;

package/stacks/synth.d.ts

@@ -3,6 +3,7 @@ interface SynthOptions {
     buildDir?: string;
     outDir?: string;
     increaseTimeout?: boolean;
+    scriptVersion?: string;
     mode: App["mode"];
     fn: (app: App) => Promise<void> | void;
     isActiveStack?: (stackName: string) => boolean;

package/stacks/synth.js

@@ -46,6 +46,7 @@ export async function synth(opts) {
             region: project.config.region,
             mode: opts.mode,
             debugIncreaseTimeout: opts.increaseTimeout,
+            debugScriptVersion: opts.scriptVersion,
             isActiveStack: opts.isActiveStack,
         }, {
             outdir: opts.buildDir,