@embeddable.com/sdk-core 3.7.2 → 3.7.4

package/lib/index.js

@@ -566,10 +566,9 @@ const CREDENTIALS_DIR = path__namespace.resolve(os__namespace.homedir(), ".embed
 const CREDENTIALS_FILE = path__namespace.resolve(CREDENTIALS_DIR, "credentials");
 
 const oraP$3 = import('ora');
-let ora$2;
 const checkNodeVersion = async () => {
-    ora$2 = (await oraP$3).default;
-    const spinner = ora$2("Checking node version...");
+    const ora = (await oraP$3).default;
+    const spinner = ora("Checking node version...").start();
     const [major, minor] = process.versions.node.split(".").map(Number);
     const packageJson = await Promise.resolve().then(function () { return _package$1; });
     const { engines: { node }, } = packageJson;
@@ -578,13 +577,11 @@ const checkNodeVersion = async () => {
         .map((v) => v.replace(/[^\d]/g, ""))
         .map(Number);
     if (major < minMajor || (major === minMajor && minor < minMinor)) {
-        spinner.fail({
-            text: `Node version ${minMajor}.${minMinor} or higher is required. You are running ${major}.${minor}.`,
-            color: "red",
-        });
+        spinner.fail(`Node version ${minMajor}.${minMinor} or higher is required. You are running ${major}.${minor}.`);
         process.exit(1);
     }
     else {
+        spinner.stop();
         return true;
     }
 };
@@ -20564,8 +20561,58 @@ async function resolveFiles() {
     }
 }
 
-const oraP$1 = import('ora');
 const inquirerSelect = import('@inquirer/select');
+async function getWorkspaces(ctx, token, workspaceSpinner) {
+    var _a;
+    try {
+        const response = await axios.get(`${ctx.pushBaseUrl}/workspace`, {
+            headers: {
+                Authorization: `Bearer ${token}`,
+            },
+        });
+        return (_a = response.data) === null || _a === void 0 ? void 0 : _a.filter((w) => !w.devWorkspace);
+    }
+    catch (e) {
+        if (e.response.status === 401) {
+            workspaceSpinner.fail('Unauthorized. Please login using "embeddable login" command.');
+        }
+        else {
+            workspaceSpinner.fail("Failed to fetch workspaces");
+        }
+        process.exit(1);
+    }
+}
+async function selectWorkspace(ora, ctx, token) {
+    const workspaceSpinner = ora({
+        text: `Fetching workspaces using ${ctx.pushBaseUrl}...`,
+        color: "green",
+        discardStdin: false,
+    }).start();
+    const availableWorkspaces = await getWorkspaces(ctx, token, workspaceSpinner);
+    let selectedWorkspace;
+    if (availableWorkspaces.length === 0) {
+        workspaceSpinner.fail("No workspaces found");
+        process.exit(1);
+    }
+    workspaceSpinner.info(`Found ${availableWorkspaces.length} workspace(s)`);
+    if (availableWorkspaces.length === 1) {
+        selectedWorkspace = availableWorkspaces[0];
+    }
+    else {
+        const select = (await inquirerSelect).default;
+        selectedWorkspace = await select({
+            message: "Select workspace to push changes",
+            choices: availableWorkspaces.map((workspace) => ({
+                name: `${workspace.name} (${workspace.workspaceId})`,
+                value: workspace,
+            })),
+        });
+    }
+    workspaceSpinner.succeed(`Workspace: ${selectedWorkspace.name} (${selectedWorkspace.workspaceId})`);
+    return selectedWorkspace;
+}
+
+const oraP$1 = import('ora');
 // grab .cube.yml|js and .sc.yml|js files
 const YAML_OR_JS_FILES = /^(.*)\.(cube|sc)\.(ya?ml|js)$/;
 // grab all files in self-serve-customization folder
@@ -20594,7 +20641,7 @@ var push = async () => {
         spinnerPushing = ora$1()
             .start()
             .info("No API Key provided. Standard login will be used.");
-        const { workspaceId, name: workspaceName } = await selectWorkspace(config, token);
+        const { workspaceId, name: workspaceName } = await selectWorkspace(ora$1, config, token);
         const workspacePreviewUrl = `${config.previewBaseUrl}/workspace/${workspaceId}`;
         await buildArchive(config);
         spinnerPushing.info(`Publishing to ${workspaceName} using ${workspacePreviewUrl}...`);
@@ -20633,35 +20680,6 @@ async function pushByApiKey(config, spinner) {
         message,
     });
 }
-async function selectWorkspace(ctx, token) {
-    const workspaceSpinner = ora$1({
-        text: `Fetching workspaces using ${ctx.pushBaseUrl}...`,
-        color: "green",
-        discardStdin: false,
-    }).start();
-    const availableWorkspaces = await getWorkspaces(ctx, token, workspaceSpinner);
-    let selectedWorkspace;
-    if (availableWorkspaces.length === 0) {
-        workspaceSpinner.fail("No workspaces found");
-        process.exit(1);
-    }
-    workspaceSpinner.info(`Found ${availableWorkspaces.length} workspace(s)`);
-    if (availableWorkspaces.length === 1) {
-        selectedWorkspace = availableWorkspaces[0];
-    }
-    else {
-        const select = (await inquirerSelect).default;
-        selectedWorkspace = await select({
-            message: "Select workspace to push changes",
-            choices: availableWorkspaces.map((workspace) => ({
-                name: `${workspace.name} (${workspace.workspaceId})`,
-                value: workspace,
-            })),
-        });
-    }
-    workspaceSpinner.succeed(`Workspace: ${selectedWorkspace.name} (${selectedWorkspace.workspaceId})`);
-    return selectedWorkspace;
-}
 async function verify(ctx) {
     try {
         await fs__namespace.access(ctx.client.buildDir);
@@ -20751,26 +20769,6 @@ async function uploadFile(formData, url, token) {
         maxBodyLength: Infinity,
     });
 }
-async function getWorkspaces(ctx, token, workspaceSpinner) {
-    var _a;
-    try {
-        const response = await axios.get(`${ctx.pushBaseUrl}/workspace`, {
-            headers: {
-                Authorization: `Bearer ${token}`,
-            },
-        });
-        return (_a = response.data) === null || _a === void 0 ? void 0 : _a.filter((w) => !w.devWorkspace);
-    }
-    catch (e) {
-        if (e.response.status === 401) {
-            workspaceSpinner.fail('Unauthorized. Please login using "embeddable login" command.');
-        }
-        else {
-            workspaceSpinner.fail("Failed to fetch workspaces");
-        }
-        process.exit(1);
-    }
-}
 
 const minimist = require("minimist");
 const oraP = import('ora');
@@ -20831,7 +20829,7 @@ var dev = async () => {
     const serveSelfeServe = serveStatic(config.client.selfServeCustomizationDir);
     const workspacePreparation = ora("Preparing workspace...").start();
     try {
-        previewWorkspace = await getPreviewWorkspace(config);
+        previewWorkspace = await getPreviewWorkspace(workspacePreparation, config);
     }
     catch (e) {
         workspacePreparation.fail((_a = e.response.data) === null || _a === void 0 ? void 0 : _a.errorMessage);
@@ -20994,10 +20992,16 @@ const onClose = async (server, sys, watchers, config) => {
     await sys.destroy();
     process.exit(0);
 };
-const getPreviewWorkspace = async (ctx) => {
+const getPreviewWorkspace = async (startedOra, ctx) => {
     const token = await getToken();
     const params = minimist(process.argv.slice(2));
-    const primaryWorkspace = params.w || params.workspace;
+    let primaryWorkspace = params.w || params.workspace;
+    if (!primaryWorkspace) {
+        startedOra.stop(); // Stop current Ora, otherwise the last option will get hidden by it.
+        const { workspaceId } = await selectWorkspace(ora, ctx, token);
+        primaryWorkspace = workspaceId;
+        startedOra.start();
+    }
     try {
         const response = await axios.get(`${ctx.pushBaseUrl}/workspace/dev-workspace`, {
             params: { primaryWorkspace },
@@ -21011,7 +21015,7 @@ const getPreviewWorkspace = async (ctx) => {
         if (e.response.status === 401) {
             // login and retry
             await login();
-            return await getPreviewWorkspace(ctx);
+            return await getPreviewWorkspace(startedOra, ctx);
         }
         else {
             throw e;
@@ -21072,7 +21076,7 @@ var defineConfig = ({ plugins, pushBaseUrl, audienceUrl, authDomain, authClientI
 };
 
 var name = "@embeddable.com/sdk-core";
-var version = "3.7.2";
+var version = "3.7.4";
 var description = "Core Embeddable SDK module responsible for web-components bundling and publishing.";
 var keywords = [
 	"embeddable",