sst 2.5.4 → 2.5.5

package/constructs/StaticSite.d.ts

@@ -273,7 +273,7 @@ export interface StaticSiteCdkDistributionProps extends BaseSiteCdkDistributionP
  * Deploys a plain HTML website in the `path/to/src` directory.
  *
  * ```js
- * import { StaticSite } from "@serverless-stack/resources";
+ * import { StaticSite } from "sst/constructs";
  *
  * new StaticSite(stack, "Site", {
  *   path: "path/to/src",

package/constructs/StaticSite.js

@@ -34,7 +34,7 @@ const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
  * Deploys a plain HTML website in the `path/to/src` directory.
  *
  * ```js
- * import { StaticSite } from "@serverless-stack/resources";
+ * import { StaticSite } from "sst/constructs";
  *
  * new StaticSite(stack, "Site", {
  *   path: "path/to/src",

package/constructs/Table.d.ts

@@ -259,7 +259,7 @@ export interface TableProps {
  * Deploys a plain HTML website in the `path/to/src` directory.
  *
  * ```js
- * import { Table } from "@serverless-stack/resources";
+ * import { Table } from "sst/constructs";
  *
  * new Table(stack, "Notes", {
  *   fields: {

package/constructs/Table.js

@@ -15,7 +15,7 @@ import { Function as Fn, } from "./Function.js";
  * Deploys a plain HTML website in the `path/to/src` directory.
  *
  * ```js
- * import { Table } from "@serverless-stack/resources";
+ * import { Table } from "sst/constructs";
  *
  * new Table(stack, "Notes", {
  *   fields: {

package/constructs/Topic.d.ts

@@ -117,7 +117,7 @@ export interface TopicProps {
  * @example
  *
  * ```js
- * import { Topic } from "@serverless-stack/resources";
+ * import { Topic } from "sst/constructs";
  *
  * new Topic(stack, "Topic", {
  *   subscribers: {

package/constructs/Topic.js

@@ -13,7 +13,7 @@ import { Queue } from "./Queue.js";
  * @example
  *
  * ```js
- * import { Topic } from "@serverless-stack/resources";
+ * import { Topic } from "sst/constructs";
  *
  * new Topic(stack, "Topic", {
  *   subscribers: {

package/constructs/WebSocketApi.d.ts

@@ -202,7 +202,7 @@ export interface WebSocketApiCdkStageProps extends Omit<apig.WebSocketStageProps
  *
  * @example
  * ```js
- * import { WebSocketApi } from "@serverless-stack/resources";
+ * import { WebSocketApi } from "sst/constructs";
  *
  * new WebSocketApi(stack, "Api", {
  *   routes: {

package/constructs/WebSocketApi.js

@@ -18,7 +18,7 @@ import * as apigV2AccessLog from "./util/apiGatewayV2AccessLog.js";
  *
  * @example
  * ```js
- * import { WebSocketApi } from "@serverless-stack/resources";
+ * import { WebSocketApi } from "sst/constructs";
  *
  * new WebSocketApi(stack, "Api", {
  *   routes: {

package/constructs/future/Auth.d.ts

@@ -55,7 +55,7 @@ export interface ApiAttachmentProps {
  * SST Auth is a lightweight authentication solution for your applications. With a simple set of configuration you can deploy a function attached to your API that can handle various authentication flows.  *
  * @example
  * ```
- * import { Auth } from "@serverless-stack/resources"
+ * import { Auth } from "sst/constructs"
  *
  * new Auth(stack, "auth", {
  *   authenticator: "functions/authenticator.handler"

package/constructs/future/Auth.js

@@ -9,7 +9,7 @@ import { CustomResource } from "aws-cdk-lib";
  * SST Auth is a lightweight authentication solution for your applications. With a simple set of configuration you can deploy a function attached to your API that can handle various authentication flows.  *
  * @example
  * ```
- * import { Auth } from "@serverless-stack/resources"
+ * import { Auth } from "sst/constructs"
  *
  * new Auth(stack, "auth", {
  *   authenticator: "functions/authenticator.handler"

package/package.json

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

package/project.d.ts

@@ -33,6 +33,7 @@ interface Project {
     }>;
     version: string;
     cdkVersion: string;
+    constructsVersion: string;
     paths: {
         root: string;
         config: string;

package/project.js

@@ -47,12 +47,16 @@ export async function initProject(globals) {
         config.stage ||
         (await usePersonalStage(out)) ||
         (await promptPersonalStage(out));
-    const [version, cdkVersion] = await (async () => {
+    const [version, cdkVersion, constructsVersion] = await (async () => {
         try {
             const packageJson = JSON.parse(await fs
                 .readFile(url.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"];
@@ -61,6 +65,7 @@ export async function initProject(globals) {
     const project = {
         version,
         cdkVersion,
+        constructsVersion,
         config: {
             ...config,
             stage,

package/sst.mjs

@@ -353,14 +353,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 +372,7 @@ async function initProject(globals) {
   const project = {
     version: version2,
     cdkVersion,
+    constructsVersion,
     config: {
       ...config,
       stage,
@@ -7113,12 +7118,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 +7147,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 +7183,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 +7192,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 +7277,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 +7295,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 +8063,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}`);
   }
 );