sst 2.5.4 → 2.5.6

package/sst.mjs

@@ -317,6 +317,7 @@ var init_build = __esm({
 var project_exports = {};
 __export(project_exports, {
   ProjectContext: () => ProjectContext,
+  exportedForTesting: () => exportedForTesting,
   initProject: () => initProject,
   useProject: () => useProject
 });
@@ -353,14 +354,18 @@ async function initProject(globals) {
   }();
   const config = await Promise.resolve(sstConfig.config(globals));
   const stage = globals.stage || config.stage || await usePersonalStage(out) || await promptPersonalStage(out);
-  const [version2, cdkVersion] = await (async () => {
+  const [version2, cdkVersion, constructsVersion] = await (async () => {
     try {
       const packageJson = JSON.parse(
         await fs4.readFile(
           url2.fileURLToPath(new URL("./package.json", import.meta.url))
         ).then((x) => x.toString())
       );
-      return [packageJson.version, packageJson.dependencies["aws-cdk-lib"]];
+      return [
+        packageJson.version,
+        packageJson.dependencies["aws-cdk-lib"],
+        packageJson.dependencies["constructs"]
+      ];
     } catch {
       return ["unknown", "unknown"];
     }
@@ -368,6 +373,7 @@ async function initProject(globals) {
   const project = {
     version: version2,
     cdkVersion,
+    constructsVersion,
     config: {
       ...config,
       stage,
@@ -415,26 +421,29 @@ async function usePersonalStage(out) {
     return;
   }
 }
-async function promptPersonalStage(out) {
+async function promptPersonalStage(out, isRetry) {
   const readline = await import("readline");
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout
   });
-  return new Promise((resolve) => {
-    const suggested = os.userInfo().username;
+  const stage = await new Promise((resolve) => {
+    const suggested = sanitizeStageName(os.userInfo().username) || "local";
+    const instruction = !isRetry ? `Please enter a name you\u2019d like to use for your personal stage.` : `Please enter a name that starts with a letter, followed by letters, numbers, or hyphens.`;
     rl.question(
-      `Please enter a name you\u2019d like to use for your personal stage. Or hit enter to use ${blue(
-        suggested
-      )}: `,
+      `${instruction} Or hit enter to use ${blue(suggested)}: `,
       async (input) => {
         rl.close();
-        const result = input || suggested;
-        await fs4.writeFile(path4.join(out, "stage"), result);
+        const result = input === "" ? suggested : input;
         resolve(result);
       }
     );
   });
+  if (isValidStageName(stage)) {
+    await fs4.writeFile(path4.join(out, "stage"), stage);
+    return stage;
+  }
+  return await promptPersonalStage(out, true);
 }
 async function findRoot() {
   async function find2(dir) {
@@ -455,7 +464,13 @@ async function findRoot() {
   const result = await find2(process.cwd());
   return result;
 }
-var ProjectContext, CONFIG_EXTENSIONS;
+function sanitizeStageName(stage) {
+  return stage.replace(/[^A-Za-z0-9-]/g, "-").replace(/--+/g, "-").replace(/^[^A-Za-z]/, "").replace(/-$/, "") || "local";
+}
+function isValidStageName(stage) {
+  return Boolean(stage.match(/^[A-Za-z][A-Za-z0-9-]*$/));
+}
+var ProjectContext, CONFIG_EXTENSIONS, exportedForTesting;
 var init_project = __esm({
   "src/project.ts"() {
     "use strict";
@@ -472,6 +487,10 @@ var init_project = __esm({
       ".config.mjs",
       ".config.js"
     ];
+    exportedForTesting = {
+      sanitizeStageName,
+      isValidStageName
+    };
   }
 });
 
@@ -6518,12 +6537,12 @@ async function* scan(prefix) {
     token = results.NextToken;
   }
 }
-function parse(ssmName) {
-  const parts = ssmName.split("/");
+function parse(ssmName, prefix) {
+  const parts = ssmName.substring(prefix.length).split("/");
   return {
-    type: parts[4],
-    id: parts[5],
-    prop: parts.slice(6).join("/")
+    type: parts[0],
+    id: parts[1],
+    prop: parts.slice(2).join("/")
   };
 }
 async function restartFunction(arn) {
@@ -6564,7 +6583,7 @@ var init_config = __esm({
       async function parameters() {
         const result = [];
         for await (const p of scan(PREFIX.FALLBACK)) {
-          const parsed = parse(p.Name);
+          const parsed = parse(p.Name, PREFIX.FALLBACK);
           if (parsed.type === "secrets")
             continue;
           result.push({
@@ -6573,7 +6592,7 @@ var init_config = __esm({
           });
         }
         for await (const p of scan(PREFIX.STAGE)) {
-          const parsed = parse(p.Name);
+          const parsed = parse(p.Name, PREFIX.STAGE);
           if (parsed.type === "secrets")
             continue;
           result.push({
@@ -6599,13 +6618,13 @@ var init_config = __esm({
       async function secrets2() {
         const result = {};
         for await (const p of scan(PREFIX.STAGE + "Secret")) {
-          const parsed = parse(p.Name);
+          const parsed = parse(p.Name, PREFIX.STAGE);
           if (!result[parsed.id])
             result[parsed.id] = {};
           result[parsed.id].value = p.Value;
         }
         for await (const p of scan(PREFIX.FALLBACK + "Secret")) {
-          const parsed = parse(p.Name);
+          const parsed = parse(p.Name, PREFIX.FALLBACK);
           if (!result[parsed.id])
             result[parsed.id] = {};
           result[parsed.id].fallback = p.Value;
@@ -6716,7 +6735,7 @@ var init_config = __esm({
     PREFIX = {
       get STAGE() {
         const project = useProject();
-        return `/sst/${project.config.name}/${project.config.stage}/`;
+        return project.config.ssmPrefix;
       },
       get FALLBACK() {
         const project = useProject();
@@ -7113,12 +7132,7 @@ Are you sure you want to run this stage in dev mode? [y/N] `,
 // src/cli/commands/bind.ts
 init_error();
 import path18 from "path";
-var SSR_SITE_CONFIG = {
-  NextjsSite: "next.config",
-  AstroSite: "astro.config",
-  RemixSite: "remix.config",
-  SolidStartSite: "vite.config",
-  SlsNextjsSite: "next.config"
+var OutdatedMetadataError = class extends Error {
 };
 var bind = (program2) => program2.command(
   ["bind <command..>", "env <command..>"],
@@ -7147,21 +7161,32 @@ var bind = (program2) => program2.command(
     const bus = useBus2();
     const project = useProject2();
     const command = args.command?.join(" ");
-    const isSsrSite = await isRunningInSsrSite();
+    const isSite = await isRunningInSite();
     let p;
     let timer;
     let siteConfigCache;
     if (!command) {
       throw new VisibleError(
-        `Command is required, e.g. sst bind ${isSsrSite ? "next dev" : "env"}`
+        `Command is required, e.g. sst bind ${isSite ? "next dev" : "vitest run"}`
       );
     }
-    const initialMetadata = await getSiteMetadata();
-    if (!initialMetadata && !isSsrSite) {
+    if (!isSite) {
       Logger2.debug("Running in script mode.");
       return await bindScript();
     }
-    await bindSite("init");
+    try {
+      await bindSite("init");
+    } catch (e) {
+      if (e instanceof OutdatedMetadataError) {
+        Colors2.line(
+          Colors2.warning(
+            "Warning: This was deployed with an old version of SST. Run `sst dev` or `sst deploy` to update."
+          )
+        );
+        return await bindScript();
+      }
+      throw e;
+    }
     bus.subscribe(
       "stacks.metadata.updated",
       () => bindSite("metadata_updated")
@@ -7172,9 +7197,7 @@ var bind = (program2) => program2.command(
     );
     bus.subscribe("config.secret.updated", (payload) => {
       const secretName = payload.properties.name;
-      if (siteConfigCache?.secrets === void 0)
-        return;
-      if (!siteConfigCache.secrets.includes(secretName))
+      if (!(siteConfigCache?.secrets || []).includes(secretName))
         return;
       Colors2.line(
         `
@@ -7183,26 +7206,47 @@ var bind = (program2) => program2.command(
       );
       bindSite("secrets_updated");
     });
-    async function isRunningInSsrSite() {
+    async function isRunningInSite() {
       const { existsAsync: existsAsync3 } = await Promise.resolve().then(() => (init_fs(), fs_exports));
       const { readFile } = await import("fs/promises");
+      const SITE_CONFIGS = [
+        { file: "next.config", multiExtension: true },
+        { file: "astro.config", multiExtension: true },
+        { file: "remix.config", multiExtension: true },
+        { file: "svelte.config", multiExtension: true },
+        { file: "gatsby-config", multiExtension: true },
+        { file: "angular.json" },
+        { file: "ember-cli-build.js" },
+        {
+          file: "vite.config",
+          multiExtension: true,
+          match: /solid-start|plugin-vue|plugin-react|@preact\/preset-vite/
+        },
+        { file: "package.json", match: /react-scripts/ },
+        { file: "index.html" }
+      ];
       const results = await Promise.all(
-        Object.values(SSR_SITE_CONFIG).map(
-          (config) => [".js", ".cjs", ".mjs", ".ts"].map(async (ext) => {
-            const exists = await existsAsync3(`${config}${ext}`);
-            if (exists && config === "vite.config") {
-              const content = await readFile(`${config}${ext}`);
-              return content.includes("solid-start");
+        SITE_CONFIGS.map((site) => {
+          const files = site.multiExtension ? [".js", ".cjs", ".mjs", ".ts"].map(
+            (ext) => `${site.file}${ext}`
+          ) : [site.file];
+          return files.map(async (file) => {
+            const exists = await existsAsync3(file);
+            if (!exists)
+              return false;
+            if (site.match) {
+              const content = await readFile(file);
+              return content.toString().match(site.match);
             }
-            return exists;
-          })
-        ).flat()
+            return true;
+          });
+        }).flat()
       );
       return results.some(Boolean);
     }
     async function bindSite(reason) {
-      const siteMetadata = reason === "init" ? initialMetadata : await getSiteMetadataUntilAvailable();
-      const siteConfig = await parseSiteConfig(siteMetadata);
+      const siteMetadata = await getSiteMetadataUntilAvailable();
+      const siteConfig = await parseSiteMetadata(siteMetadata);
       if (reason === "metadata_updated") {
         if (areEnvsSame(siteConfig.envs, siteConfigCache?.envs || {}))
           return;
@@ -7247,42 +7291,13 @@ var bind = (program2) => program2.command(
         ...await localIamCredentials()
       });
     }
-    async function parseSiteConfig(metadata3) {
-      const { LambdaClient: LambdaClient2, GetFunctionCommand } = await import("@aws-sdk/client-lambda");
-      const { useAWSClient: useAWSClient2 } = await Promise.resolve().then(() => (init_credentials(), credentials_exports));
-      const isBindSupported = metadata3.type !== "StaticSite" && metadata3.type !== "SlsNextjsSite";
-      if (!isBindSupported) {
-        return { envs: metadata3.data.environment };
-      }
-      const lambda = useAWSClient2(LambdaClient2);
-      const { Configuration: functionConfig } = await lambda.send(
-        new GetFunctionCommand({
-          FunctionName: metadata3.data.server
-        })
-      );
-      return {
-        role: functionConfig?.Role,
-        envs: functionConfig?.Environment?.Variables || {},
-        secrets: metadata3.data.secrets
-      };
-    }
     async function getSiteMetadataUntilAvailable() {
       const { createSpinner: createSpinner2 } = await Promise.resolve().then(() => (init_spinner(), spinner_exports));
       const spinner = createSpinner2({});
       while (true) {
         const data2 = await getSiteMetadata();
         if (!data2) {
-          spinner.start(
-            "Make sure `sst dev` is running..."
-          );
-          await new Promise((resolve) => setTimeout(resolve, 1e3));
-          continue;
-        }
-        const isBindSupported = data2.type !== "StaticSite" && data2.type !== "SlsNextjsSite";
-        if (isBindSupported && !data2.data.server || !isBindSupported && !data2.data.environment) {
-          spinner.start(
-            "This was deployed with an old version of SST. Make sure to restart `sst dev`..."
-          );
+          spinner.start("Make sure `sst dev` is running...");
           await new Promise((resolve) => setTimeout(resolve, 1e3));
           continue;
         }
@@ -7294,12 +7309,40 @@ var bind = (program2) => program2.command(
       const { metadata: metadata3 } = await Promise.resolve().then(() => (init_metadata(), metadata_exports));
       const metadataData = await metadata3();
       return Object.values(metadataData).flat().filter(
-        (c) => Boolean(c)
-      ).filter(
-        (c) => c.type === "StaticSite" || Boolean(SSR_SITE_CONFIG[c.type])
-      ).find(
-        (c) => path18.resolve(project.paths.root, c.data.path) === process.cwd()
+        (c) => [
+          "StaticSite",
+          "NextjsSite",
+          "AstroSite",
+          "RemixSite",
+          "SolidStartSite",
+          "SlsNextjsSite"
+        ].includes(c.type)
+      ).find((c) => {
+        const isSsr = c.type !== "StaticSite" && c.type !== "SlsNextjsSite";
+        if (!c.data.path || isSsr && !c.data.server || !isSsr && !c.data.environment) {
+          throw new OutdatedMetadataError();
+        }
+        return path18.resolve(project.paths.root, c.data.path) === process.cwd();
+      });
+    }
+    async function parseSiteMetadata(metadata3) {
+      const { LambdaClient: LambdaClient2, GetFunctionCommand } = await import("@aws-sdk/client-lambda");
+      const { useAWSClient: useAWSClient2 } = await Promise.resolve().then(() => (init_credentials(), credentials_exports));
+      const isBindSupported = metadata3.type !== "StaticSite" && metadata3.type !== "SlsNextjsSite";
+      if (!isBindSupported) {
+        return { envs: metadata3.data.environment };
+      }
+      const lambda = useAWSClient2(LambdaClient2);
+      const { Configuration: functionConfig } = await lambda.send(
+        new GetFunctionCommand({
+          FunctionName: metadata3.data.server
+        })
       );
+      return {
+        role: functionConfig?.Role,
+        envs: functionConfig?.Environment?.Variables || {},
+        secrets: metadata3.data.secrets
+      };
     }
     async function assumeSsrRole(roleArn) {
       const { STSClient: STSClient2, AssumeRoleCommand } = await import("@aws-sdk/client-sts");
@@ -8034,6 +8077,7 @@ var version = (program2) => program2.command(
     const project = useProject2();
     Colors2.line(Colors2.bold(`SST:`), `v${project.version}`);
     Colors2.line(Colors2.bold(`CDK:`), `v${project.cdkVersion}`);
+    Colors2.line(Colors2.bold(`Constructs:`), `v${project.constructsVersion}`);
   }
 );