sst 2.0.0-rc.43 → 2.0.0-rc.45

package/cli/commands/deploy.js

@@ -44,7 +44,7 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
         Colors.line(`No stacks found matching ${blue(args.filter)}`);
         process.exit(1);
     }
-    const component = render(React.createElement(DeploymentUI, { stacks: assembly.stacks.map((s) => s.stackName) }));
+    const component = render(React.createElement(DeploymentUI, { assembly: assembly }));
     const results = await Stacks.deployMany(assembly.stacks);
     component.clear();
     component.unmount();

package/cli/commands/dev.js

@@ -114,6 +114,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
                 project.metafile = metafile;
                 project.stacks = sstConfig.stacks;
                 const assembly = await Stacks.synth({
+                    increaseTimeout: args["increase-timeout"],
                     fn: project.stacks,
                     outDir: `.sst/cdk.out`,
                     mode: "dev",
@@ -159,7 +160,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
             pending = undefined;
             if (lastDeployed)
                 console.log();
-            const component = render(React.createElement(DeploymentUI, { stacks: assembly.stacks.map((s) => s.stackName) }));
+            const component = render(React.createElement(DeploymentUI, { assembly: assembly }));
             const results = await Stacks.deployMany(assembly.stacks);
             component.clear();
             component.unmount();

package/cli/commands/remove.js

@@ -32,7 +32,7 @@ export const remove = (program) => program.command("remove [filter]", "Remove yo
         console.log(`No stacks found matching ${blue(args.filter)}`);
         process.exit(1);
     }
-    const component = render(React.createElement(DeploymentUI, { stacks: assembly.stacks.map((s) => s.stackName) }));
+    const component = render(React.createElement(DeploymentUI, { assembly: assembly }));
     const results = await Stacks.removeMany(target);
     component.clear();
     component.unmount();

package/cli/sst.js

@@ -5,7 +5,9 @@ import { VisibleError } from "../error.js";
 import { useSpinners } from "./spinner.js";
 import { Logger } from "../logger.js";
 import dotenv from "dotenv";
-dotenv.config();
+dotenv.config({
+    override: true,
+});
 import { env } from "./commands/env.js";
 import { dev } from "./commands/dev.js";
 import { bind } from "./commands/bind.js";

package/cli/ui/deploy.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" resolution-mode="require"/>
 import { Stacks } from "../../stacks/index.js";
-import { CloudAssembly } from "aws-cdk-lib/cx-api";
+import type { CloudAssembly } from "aws-cdk-lib/cx-api";
 interface Props {
-    stacks: string[];
+    assembly: CloudAssembly;
 }
 export declare const DeploymentUI: (props: Props) => JSX.Element;
 export declare function printDeploymentResults(assembly: CloudAssembly, results: Awaited<ReturnType<typeof Stacks.deployMany>>): void;

package/cli/ui/deploy.js

@@ -19,7 +19,8 @@ export const DeploymentUI = (props) => {
                 return;
             setResources((previous) => {
                 if (Stacks.isFinal(event.ResourceStatus)) {
-                    Colors.line(Colors.warning(Colors.prefix), Colors.dim(`${event.StackName} ${event.ResourceType} ${event.LogicalResourceId}`), Stacks.isFailed(event.ResourceStatus)
+                    const readable = Stacks.logicalIdToCdkPath(props.assembly, event.StackName, event.LogicalResourceId);
+                    Colors.line(Colors.warning(Colors.prefix), Colors.dim(`${event.StackName} ${readable} ${event.ResourceType}`), Stacks.isFailed(event.ResourceStatus)
                         ? Colors.danger(event.ResourceStatus)
                         : Colors.dim(event.ResourceStatus));
                     const { [event.LogicalResourceId]: _, ...next } = previous;
@@ -44,63 +45,61 @@ export const DeploymentUI = (props) => {
     }
     return (React.createElement(Box, { flexDirection: "column" },
         Object.entries(resources).map(([_, evt]) => {
+            const readable = Stacks.logicalIdToCdkPath(props.assembly, evt.StackName, evt.LogicalResourceId);
             return (React.createElement(Box, { key: evt.LogicalResourceId },
                 React.createElement(Text, null,
                     React.createElement(Spinner, null),
                     "  ",
                     evt.StackName,
                     " ",
-                    evt.ResourceType,
+                    readable,
                     " ",
-                    evt.LogicalResourceId,
+                    evt.ResourceType,
                     " "),
                 React.createElement(Text, { color: color(evt.ResourceStatus || "") }, evt.ResourceStatus)));
         }),
         Object.entries(resources).length === 0 && (React.createElement(Box, null,
             React.createElement(Text, null,
                 React.createElement(Spinner, null),
-                "  ",
-                React.createElement(Text, { dimColor: true }, "Waiting for changes"))))));
+                "  ")))));
 };
 export function printDeploymentResults(assembly, results) {
-    Colors.gap();
-    Colors.line(Colors.success(`✔`), Colors.bold(` Deployed`));
-    for (const [stack, result] of Object.entries(results)) {
-        if (Object.values(result.errors).length)
-            continue;
-        const outputs = Object.entries(result.outputs).filter(([key, _]) => {
-            if (key.startsWith("Export"))
-                return false;
-            if (key.includes("SstSiteEnv"))
-                return false;
-            if (key === "SSTMetadata")
-                return false;
-            return true;
-        });
-        Colors.line(`   ${Colors.dim(stack)}`);
-        if (outputs.length > 0) {
-            for (const key of Object.keys(Object.fromEntries(outputs)).sort()) {
-                const value = result.outputs[key];
-                Colors.line(`   ${Colors.bold.dim(key)}: ${value}`);
+    // Print success stacks
+    const success = Object.entries(results)
+        .filter(([_stack, result]) => Object.keys(result.errors).length === 0);
+    if (success.length) {
+        Colors.gap();
+        Colors.line(Colors.success(`✔`), Colors.bold(` Deployed`));
+        for (const [stack, result] of success) {
+            const outputs = Object.entries(result.outputs).filter(([key, _]) => {
+                if (key.startsWith("Export"))
+                    return false;
+                if (key.includes("SstSiteEnv"))
+                    return false;
+                if (key === "SSTMetadata")
+                    return false;
+                return true;
+            });
+            Colors.line(`   ${Colors.dim(stack)}`);
+            if (outputs.length > 0) {
+                for (const key of Object.keys(Object.fromEntries(outputs)).sort()) {
+                    const value = result.outputs[key];
+                    Colors.line(`   ${Colors.bold.dim(key + ":")} ${value}`);
+                }
             }
         }
     }
-    Colors.gap();
-    if (Object.values(results).flatMap((s) => Object.keys(s.errors)).length) {
+    // Print failed stacks
+    const failed = Object.entries(results)
+        .filter(([_stack, result]) => Object.keys(result.errors).length > 0);
+    if (failed.length) {
+        Colors.gap();
         Colors.line(`${Colors.danger(`✖`)}  ${Colors.bold.dim(`Errors`)}`);
-        for (const [stack, result] of Object.entries(results)) {
-            const hasErrors = Object.entries(result.errors).length > 0;
-            if (!hasErrors)
-                continue;
+        for (const [stack, result] of failed) {
             Colors.line(`   ${Colors.dim(stack)}`);
             for (const [id, error] of Object.entries(result.errors)) {
-                const found = Object.entries(assembly.manifest.artifacts?.[stack].metadata || {}).find(([_key, value]) => value[0]?.type === "aws:cdk:logicalId" && value[0]?.data === id)?.[0] || "";
-                const readable = found
-                    .split("/")
-                    .filter(Boolean)
-                    .slice(1, -1)
-                    .join("/");
-                Colors.line(`  ${Colors.danger.bold(readable)}: ${error}`);
+                const readable = Stacks.logicalIdToCdkPath(assembly, stack, id);
+                Colors.line(`   ${Colors.danger.bold(readable + ":")} ${error}`);
             }
         }
         Colors.gap();

package/cli/ui/header.js

@@ -1,12 +1,15 @@
+import { useProject } from "../../project.js";
 import { Colors } from "../colors.js";
 import { useLocalServerConfig } from "../local/server.js";
 export async function printHeader(input) {
-    const local = await useLocalServerConfig();
+    const project = useProject();
     Colors.line(`${Colors.primary.bold("SST v2.0.4")}  ${Colors.dim(`ready!`)}`);
     Colors.gap();
-    Colors.line(`${Colors.primary(`➜`)}  ${Colors.bold("Stage:")}   dev`);
-    if (input.console)
+    Colors.line(`${Colors.primary(`➜`)}  ${Colors.bold("Stage:")}   ${project.config.stage}`);
+    if (input.console) {
+        const local = await useLocalServerConfig();
         Colors.line(`${Colors.primary(`➜`)}  ${Colors.bold("Console:")} ${Colors.link(local.url)}`);
+    }
     Colors.gap();
 }
 export function printConsole() { }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.0-rc.43",
+  "version": "2.0.0-rc.45",
   "bin": {
     "sst": "cli/sst.js"
   },

package/project.js

@@ -81,6 +81,7 @@ export async function initProject(globals) {
     await initBootstrap();
     dotenv.config({
         path: path.join(project.paths.root, `.env.${project.config.stage}`),
+        override: true,
     });
     Logger.debug("Config loaded", project);
 }

package/sst.mjs

@@ -1101,6 +1101,17 @@ async function loadAssembly(from) {
   const { CloudAssembly } = await import("aws-cdk-lib/cx-api");
   return new CloudAssembly(from);
 }
+function logicalIdToCdkPath(assembly, stack, logicalId) {
+  const found = Object.entries(
+    assembly.manifest.artifacts?.[stack].metadata || {}
+  ).find(
+    ([_key, value]) => value[0]?.type === "aws:cdk:logicalId" && value[0]?.data === logicalId
+  )?.[0];
+  if (!found) {
+    return logicalId;
+  }
+  return found.split("/").filter(Boolean).slice(1, -1).join("/");
+}
 var init_assembly = __esm({
   "src/stacks/assembly.ts"() {
     "use strict";
@@ -3993,6 +4004,7 @@ __export(stacks_exports, {
   isSuccess: () => isSuccess,
   load: () => load,
   loadAssembly: () => loadAssembly,
+  logicalIdToCdkPath: () => logicalIdToCdkPath,
   metadata: () => metadata,
   metadataForStack: () => metadataForStack,
   monitor: () => monitor,
@@ -4338,7 +4350,8 @@ async function initProject(globals) {
   const { initBootstrap: initBootstrap2 } = await Promise.resolve().then(() => (init_bootstrap(), bootstrap_exports));
   await initBootstrap2();
   dotenv.config({
-    path: path13.join(project.paths.root, `.env.${project.config.stage}`)
+    path: path13.join(project.paths.root, `.env.${project.config.stage}`),
+    override: true
   });
   Logger.debug("Config loaded", project);
 }
@@ -5121,44 +5134,38 @@ import React, { useState, useEffect } from "react";
 import { Box, Text } from "ink";
 import inkSpinner from "ink-spinner";
 function printDeploymentResults(assembly, results) {
-  Colors.gap();
-  Colors.line(Colors.success(`\u2714`), Colors.bold(` Deployed`));
-  for (const [stack, result] of Object.entries(results)) {
-    if (Object.values(result.errors).length)
-      continue;
-    const outputs = Object.entries(result.outputs).filter(([key, _]) => {
-      if (key.startsWith("Export"))
-        return false;
-      if (key.includes("SstSiteEnv"))
-        return false;
-      if (key === "SSTMetadata")
-        return false;
-      return true;
-    });
-    Colors.line(`   ${Colors.dim(stack)}`);
-    if (outputs.length > 0) {
-      for (const key of Object.keys(Object.fromEntries(outputs)).sort()) {
-        const value = result.outputs[key];
-        Colors.line(`   ${Colors.bold.dim(key)}: ${value}`);
+  const success = Object.entries(results).filter(([_stack, result]) => Object.keys(result.errors).length === 0);
+  if (success.length) {
+    Colors.gap();
+    Colors.line(Colors.success(`\u2714`), Colors.bold(` Deployed`));
+    for (const [stack, result] of success) {
+      const outputs = Object.entries(result.outputs).filter(([key, _]) => {
+        if (key.startsWith("Export"))
+          return false;
+        if (key.includes("SstSiteEnv"))
+          return false;
+        if (key === "SSTMetadata")
+          return false;
+        return true;
+      });
+      Colors.line(`   ${Colors.dim(stack)}`);
+      if (outputs.length > 0) {
+        for (const key of Object.keys(Object.fromEntries(outputs)).sort()) {
+          const value = result.outputs[key];
+          Colors.line(`   ${Colors.bold.dim(key + ":")} ${value}`);
+        }
       }
     }
   }
-  Colors.gap();
-  if (Object.values(results).flatMap((s) => Object.keys(s.errors)).length) {
+  const failed = Object.entries(results).filter(([_stack, result]) => Object.keys(result.errors).length > 0);
+  if (failed.length) {
+    Colors.gap();
     Colors.line(`${Colors.danger(`\u2716`)}  ${Colors.bold.dim(`Errors`)}`);
-    for (const [stack, result] of Object.entries(results)) {
-      const hasErrors = Object.entries(result.errors).length > 0;
-      if (!hasErrors)
-        continue;
+    for (const [stack, result] of failed) {
       Colors.line(`   ${Colors.dim(stack)}`);
       for (const [id, error2] of Object.entries(result.errors)) {
-        const found = Object.entries(
-          assembly.manifest.artifacts?.[stack].metadata || {}
-        ).find(
-          ([_key, value]) => value[0]?.type === "aws:cdk:logicalId" && value[0]?.data === id
-        )?.[0] || "";
-        const readable = found.split("/").filter(Boolean).slice(1, -1).join("/");
-        Colors.line(`  ${Colors.danger.bold(readable)}: ${error2}`);
+        const readable = stacks_exports.logicalIdToCdkPath(assembly, stack, id);
+        Colors.line(`   ${Colors.danger.bold(readable + ":")} ${error2}`);
       }
     }
     Colors.gap();
@@ -5185,11 +5192,10 @@ var init_deploy2 = __esm({
             return;
           setResources((previous2) => {
             if (stacks_exports.isFinal(event2.ResourceStatus)) {
+              const readable = stacks_exports.logicalIdToCdkPath(props.assembly, event2.StackName, event2.LogicalResourceId);
               Colors.line(
                 Colors.warning(Colors.prefix),
-                Colors.dim(
-                  `${event2.StackName} ${event2.ResourceType} ${event2.LogicalResourceId}`
-                ),
+                Colors.dim(`${event2.StackName} ${readable} ${event2.ResourceType}`),
                 stacks_exports.isFailed(event2.ResourceStatus) ? Colors.danger(event2.ResourceStatus) : Colors.dim(event2.ResourceStatus)
               );
               const { [event2.LogicalResourceId]: _, ...next } = previous2;
@@ -5213,8 +5219,9 @@ var init_deploy2 = __esm({
         return "yellow";
       }
       return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column" }, Object.entries(resources).map(([_, evt]) => {
-        return /* @__PURE__ */ React.createElement(Box, { key: evt.LogicalResourceId }, /* @__PURE__ */ React.createElement(Text, null, /* @__PURE__ */ React.createElement(Spinner, null), "  ", evt.StackName, " ", evt.ResourceType, " ", evt.LogicalResourceId, " "), /* @__PURE__ */ React.createElement(Text, { color: color(evt.ResourceStatus || "") }, evt.ResourceStatus));
-      }), Object.entries(resources).length === 0 && /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, null, /* @__PURE__ */ React.createElement(Spinner, null), "  ", /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "Waiting for changes"))));
+        const readable = stacks_exports.logicalIdToCdkPath(props.assembly, evt.StackName, evt.LogicalResourceId);
+        return /* @__PURE__ */ React.createElement(Box, { key: evt.LogicalResourceId }, /* @__PURE__ */ React.createElement(Text, null, /* @__PURE__ */ React.createElement(Spinner, null), "  ", evt.StackName, " ", readable, " ", evt.ResourceType, " "), /* @__PURE__ */ React.createElement(Text, { color: color(evt.ResourceStatus || "") }, evt.ResourceStatus));
+      }), Object.entries(resources).length === 0 && /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, null, /* @__PURE__ */ React.createElement(Spinner, null), "  ")));
     };
   }
 });
@@ -5904,19 +5911,24 @@ init_colors();
 import chalk2 from "chalk";
 
 // src/cli/ui/header.ts
+init_project();
 init_colors();
 init_server2();
 async function printHeader(input) {
-  const local = await useLocalServerConfig();
+  const project = useProject();
   Colors.line(`${Colors.primary.bold("SST v2.0.4")}  ${Colors.dim(`ready!`)}`);
   Colors.gap();
-  Colors.line(`${Colors.primary(`\u279C`)}  ${Colors.bold("Stage:")}   dev`);
-  if (input.console)
+  Colors.line(
+    `${Colors.primary(`\u279C`)}  ${Colors.bold("Stage:")}   ${project.config.stage}`
+  );
+  if (input.console) {
+    const local = await useLocalServerConfig();
     Colors.line(
       `${Colors.primary(`\u279C`)}  ${Colors.bold("Console:")} ${Colors.link(
         local.url
       )}`
     );
+  }
   Colors.gap();
 }
 
@@ -6068,6 +6080,7 @@ var dev = (program2) => program2.command(
           project2.metafile = metafile;
           project2.stacks = sstConfig.stacks;
           const assembly = await Stacks.synth({
+            increaseTimeout: args["increase-timeout"],
             fn: project2.stacks,
             outDir: `.sst/cdk.out`,
             mode: "dev"
@@ -6111,7 +6124,7 @@ var dev = (program2) => program2.command(
         if (lastDeployed)
           console.log();
         const component = render(
-          /* @__PURE__ */ React2.createElement(DeploymentUI2, { stacks: assembly.stacks.map((s) => s.stackName) })
+          /* @__PURE__ */ React2.createElement(DeploymentUI2, { assembly })
         );
         const results = await Stacks.deployMany(assembly.stacks);
         component.clear();
@@ -6294,7 +6307,7 @@ var deploy2 = (program2) => program2.command(
       process.exit(1);
     }
     const component = render(
-      /* @__PURE__ */ React2.createElement(DeploymentUI2, { stacks: assembly.stacks.map((s) => s.stackName) })
+      /* @__PURE__ */ React2.createElement(DeploymentUI2, { assembly })
     );
     const results = await Stacks.deployMany(assembly.stacks);
     component.clear();
@@ -6351,7 +6364,7 @@ var remove2 = (program2) => program2.command(
       process.exit(1);
     }
     const component = render(
-      /* @__PURE__ */ React2.createElement(DeploymentUI2, { stacks: assembly.stacks.map((s) => s.stackName) })
+      /* @__PURE__ */ React2.createElement(DeploymentUI2, { assembly })
     );
     const results = await Stacks.removeMany(target);
     component.clear();
@@ -6758,7 +6771,9 @@ var diff2 = (program2) => program2.command(
 );
 
 // src/cli/sst.ts
-dotenv2.config();
+dotenv2.config({
+  override: true
+});
 dev(program);
 deploy2(program);
 build(program);

package/stacks/assembly.d.ts

@@ -1 +1,3 @@
-export declare function loadAssembly(from: string): Promise<import("aws-cdk-lib/cx-api").CloudAssembly>;
+import type { CloudAssembly } from "aws-cdk-lib/cx-api";
+export declare function loadAssembly(from: string): Promise<CloudAssembly>;
+export declare function logicalIdToCdkPath(assembly: CloudAssembly, stack: string, logicalId: string): string;

package/stacks/assembly.js

@@ -2,3 +2,14 @@ export async function loadAssembly(from) {
     const { CloudAssembly } = await import("aws-cdk-lib/cx-api");
     return new CloudAssembly(from);
 }
+export function logicalIdToCdkPath(assembly, stack, logicalId) {
+    const found = Object.entries(assembly.manifest.artifacts?.[stack].metadata || {}).find(([_key, value]) => value[0]?.type === "aws:cdk:logicalId" && value[0]?.data === logicalId)?.[0];
+    if (!found) {
+        return logicalId;
+    }
+    return found
+        .split("/")
+        .filter(Boolean)
+        .slice(1, -1)
+        .join("/");
+}