sst 2.0.0-rc.49 → 2.0.0-rc.50

package/cli/commands/console.js

@@ -3,6 +3,7 @@ export const consoleCommand = async (program) => program.command("console", "Sta
     const { useRuntimeServer } = await import("../../runtime/server.js");
     const { useLocalServer } = await import("../local/server.js");
     const { printHeader } = await import("../ui/header.js");
+    const { clear } = await import("../terminal.js");
     await Promise.all([
         useRuntimeServer(),
         useLocalServer({
@@ -11,6 +12,6 @@ export const consoleCommand = async (program) => program.command("console", "Sta
             live: false,
         }),
     ]);
-    console.clear();
+    clear();
     printHeader({ console: true, hint: "ready!" });
 });

package/cli/commands/dev.js

@@ -31,6 +31,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     const { useRDSWarmer } = await import("./plugins/warmer.js");
     const { useProject } = await import("../../project.js");
     const { useMetadata } = await import("../../stacks/metadata.js");
+    const { clear } = await import("../terminal.js");
     if (args._[0] === "start") {
         console.log(yellow(`Warning: ${bold(`sst start`)} has been renamed to ${bold(`sst dev`)}`));
     }
@@ -218,7 +219,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         cert: "",
         live: true,
     });
-    console.clear();
+    clear();
     await printHeader({ console: true, hint: "ready!" });
     /*
     console.log(`  ${primary(`➜`)}  ${bold(dim(`Outputs:`))}`);

package/cli/terminal.d.ts

@@ -0,0 +1 @@
+export declare function clear(): void;

package/cli/terminal.js

@@ -0,0 +1,8 @@
+export function clear() {
+    // console.clear() removes the content in the viewport in VSCode
+    // and on Windows. This is a workaround to preserve the viewport.
+    for (let i = 0, l = process.stdout.rows; i < l - 1; i++) {
+        console.log("");
+    }
+    console.clear();
+}

package/credentials.js

@@ -31,6 +31,16 @@ export function useAWSClient(client, force = false) {
     if (existing && !force)
         return existing;
     const [project, credentials] = [useProject(), useAWSCredentialsProvider()];
+    const printNoInternet = (() => {
+        let lastPrinted = 0;
+        return () => {
+            const now = Date.now();
+            if (now - lastPrinted > 5000) {
+                console.log("Waiting for internet connection...");
+                lastPrinted = now;
+            }
+        };
+    })();
     const result = new client({
         region: project.config.region,
         credentials: credentials,
@@ -42,6 +52,10 @@ export function useAWSClient(client, force = false) {
                     return false;
                 if (err.message === "Could not load credentials from any providers")
                     return false;
+                // Handle no internet connection
+                if (err.code === "ENOTFOUND") {
+                    printNoInternet();
+                }
                 return true;
             },
             delayDecider: (_, attempts) => {

package/package.json

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

package/project.js

@@ -43,8 +43,8 @@ export async function initProject(globals) {
         throw new VisibleError("Could not found a configuration file", "Make sure one of the following exists", ...CONFIG_EXTENSIONS.map((x) => `  - sst${x}`));
     })();
     const config = await Promise.resolve(sstConfig.config(globals));
-    const stage = config.stage ||
-        globals.stage ||
+    const stage = globals.stage ||
+        config.stage ||
         (await usePersonalStage(out)) ||
         (await promptPersonalStage(out));
     const [version, cdkVersion] = await (async () => {
@@ -64,9 +64,9 @@ export async function initProject(globals) {
         config: {
             ...config,
             stage,
-            profile: config.profile || globals.profile,
-            region: config.region || globals.region,
-            role: config.role || globals.role,
+            profile: globals.profile || config.profile,
+            region: globals.region || config.region,
+            role: globals.role || config.role,
             ssmPrefix: config.ssmPrefix || `/sst/${config.name}/${stage}/`,
         },
         stacks: sstConfig.stacks,

package/sst.mjs

@@ -1003,6 +1003,16 @@ function useAWSClient(client, force = false) {
   if (existing && !force)
     return existing;
   const [project, credentials] = [useProject(), useAWSCredentialsProvider()];
+  const printNoInternet = (() => {
+    let lastPrinted = 0;
+    return () => {
+      const now = Date.now();
+      if (now - lastPrinted > 5e3) {
+        console.log("Waiting for internet connection...");
+        lastPrinted = now;
+      }
+    };
+  })();
   const result = new client({
     region: project.config.region,
     credentials,
@@ -1014,6 +1024,9 @@ function useAWSClient(client, force = false) {
           return false;
         if (err.message === "Could not load credentials from any providers")
           return false;
+        if (err.code === "ENOTFOUND") {
+          printNoInternet();
+        }
         return true;
       },
       delayDecider: (_, attempts) => {
@@ -4320,7 +4333,7 @@ async function initProject(globals) {
     );
   }();
   const config = await Promise.resolve(sstConfig.config(globals));
-  const stage = config.stage || globals.stage || await usePersonalStage(out) || await promptPersonalStage(out);
+  const stage = globals.stage || config.stage || await usePersonalStage(out) || await promptPersonalStage(out);
   const [version2, cdkVersion] = await (async () => {
     try {
       const packageJson = JSON.parse(
@@ -4339,9 +4352,9 @@ async function initProject(globals) {
     config: {
       ...config,
       stage,
-      profile: config.profile || globals.profile,
-      region: config.region || globals.region,
-      role: config.role || globals.role,
+      profile: globals.profile || config.profile,
+      region: globals.region || config.region,
+      role: globals.role || config.role,
       ssmPrefix: config.ssmPrefix || `/sst/${config.name}/${stage}/`
     },
     stacks: sstConfig.stacks,
@@ -5713,6 +5726,23 @@ var init_warmer = __esm({
   }
 });
 
+// src/cli/terminal.ts
+var terminal_exports = {};
+__export(terminal_exports, {
+  clear: () => clear
+});
+function clear() {
+  for (let i = 0, l = process.stdout.rows; i < l - 1; i++) {
+    console.log("");
+  }
+  console.clear();
+}
+var init_terminal = __esm({
+  "src/cli/terminal.ts"() {
+    "use strict";
+  }
+});
+
 // src/config.ts
 var config_exports = {};
 __export(config_exports, {
@@ -6050,6 +6080,7 @@ var dev = (program2) => program2.command(
     const { useRDSWarmer: useRDSWarmer2 } = await Promise.resolve().then(() => (init_warmer(), warmer_exports));
     const { useProject: useProject2 } = await Promise.resolve().then(() => (init_project(), project_exports));
     const { useMetadata: useMetadata2 } = await Promise.resolve().then(() => (init_metadata(), metadata_exports));
+    const { clear: clear2 } = await Promise.resolve().then(() => (init_terminal(), terminal_exports));
     if (args._[0] === "start") {
       console.log(
         yellow(
@@ -6267,7 +6298,7 @@ var dev = (program2) => program2.command(
       cert: "",
       live: true
     });
-    console.clear();
+    clear2();
     await printHeader({ console: true, hint: "ready!" });
     await Promise.all([
       useRuntimeWorkers2(),
@@ -6479,6 +6510,7 @@ var consoleCommand = async (program2) => program2.command(
     const { useRuntimeServer: useRuntimeServer2 } = await Promise.resolve().then(() => (init_server(), server_exports));
     const { useLocalServer: useLocalServer2 } = await Promise.resolve().then(() => (init_server2(), server_exports2));
     const { printHeader: printHeader2 } = await Promise.resolve().then(() => (init_header(), header_exports));
+    const { clear: clear2 } = await Promise.resolve().then(() => (init_terminal(), terminal_exports));
     await Promise.all([
       useRuntimeServer2(),
       useLocalServer2({
@@ -6487,7 +6519,7 @@ var consoleCommand = async (program2) => program2.command(
         live: false
       })
     ]);
-    console.clear();
+    clear2();
     printHeader2({ console: true, hint: "ready!" });
   }
 );