epicshop 6.48.1 → 6.48.3

package/dist/commands/workshops.js

@@ -1,5 +1,4 @@
 import '@epic-web/workshop-utils/init-env';
-import { spawn } from 'node:child_process';
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
@@ -7,7 +6,9 @@ import { cachified, githubCache } from '@epic-web/workshop-utils/cache.server';
 import { parseEpicshopConfig } from '@epic-web/workshop-utils/config.server';
 import { getAuthInfo } from '@epic-web/workshop-utils/db.server';
 import { userHasAccessToWorkshop } from '@epic-web/workshop-utils/epic-api.server';
+import { getErrorMessage } from '@epic-web/workshop-utils/utils';
 import chalk from 'chalk';
+import { execa } from 'execa';
 import { matchSorter, rankings } from 'match-sorter';
 import ora from 'ora';
 import { assertCanPrompt, isCiEnvironment } from "../utils/cli-runtime.js";
@@ -375,10 +376,13 @@ export async function add(options) {
             if (await workshopExists(repoName)) {
                 const message = `Workshop "${repoName}" already exists`;
                 if (!silent) {
+                    const { getWorkshop } = await import('@epic-web/workshop-utils/workshops.server');
                     const reposDir = await getReposDirectory();
-                    const workshopPath = path.join(reposDir, repoName);
-                    const openCommand = `npx epicshop open ${repoName}`;
-                    const startCommand = `npx epicshop start ${repoName}`;
+                    const workshop = await getWorkshop(repoName);
+                    const workshopPath = workshop?.path ?? path.join(reposDir, repoName);
+                    const workshopRepoName = workshop?.repoName ?? repoName;
+                    const openCommand = `npx epicshop open ${workshopRepoName}`;
+                    const startCommand = `npx epicshop start ${workshopRepoName}`;
                     console.log(chalk.yellow(`⚠️  ${message}`));
                     console.log(chalk.gray(`   Location on disk: ${workshopPath}`));
                     console.log(chalk.gray(`   You can run:`));
@@ -1829,48 +1833,30 @@ function resolveCliCommand(command) {
     return command;
 }
 function runCommand(command, args, options) {
-    return new Promise((resolve) => {
-        const child = spawn(resolveCliCommand(command), args, {
-            cwd: options.cwd,
-            stdio: options.silent ? 'pipe' : 'inherit',
-            shell: true,
-        });
-        child.on('error', (error) => {
-            resolve({ success: false, message: error.message, error });
-        });
-        child.on('close', (code) => {
-            if (code === 0) {
-                resolve({ success: true });
-            }
-            else {
-                resolve({
-                    success: false,
-                    message: `Command exited with code ${code}`,
-                });
-            }
-        });
+    return execa(resolveCliCommand(command), args, {
+        cwd: options.cwd,
+        stdio: options.silent ? 'pipe' : 'inherit',
+    }).then(() => ({ success: true }), (error) => {
+        const message = getErrorMessage(error, 'Command failed');
+        const err = error instanceof Error ? error : new Error(message);
+        return { success: false, message, error: err };
     });
 }
 function runCommandInteractive(command, args, options) {
-    return new Promise((resolve) => {
-        const child = spawn(resolveCliCommand(command), args, {
-            cwd: options.cwd,
-            stdio: 'inherit',
-            shell: true,
-        });
-        child.on('error', (error) => {
-            resolve({ success: false, message: error.message, error });
-        });
-        child.on('close', (code) => {
-            if (code === 0 || code === null) {
-                resolve({ success: true });
-            }
-            else {
-                resolve({
-                    success: false,
-                    message: `Command exited with code ${code}`,
-                });
-            }
-        });
+    return execa(resolveCliCommand(command), args, {
+        cwd: options.cwd,
+        stdio: 'inherit',
+    }).then(() => ({ success: true }), (error) => {
+        // If the process was terminated by a signal (e.g. user presses Ctrl+C),
+        // treat it as success so we don't show a confusing error message.
+        if (error &&
+            typeof error === 'object' &&
+            'signal' in error &&
+            typeof error.signal === 'string') {
+            return { success: true };
+        }
+        const message = getErrorMessage(error, 'Command failed');
+        const err = error instanceof Error ? error : new Error(message);
+        return { success: false, message, error: err };
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epicshop",
-  "version": "6.48.1",
+  "version": "6.48.3",
   "publishConfig": {
     "access": "public"
   },
@@ -50,10 +50,11 @@
     "build:watch": "nx watch --projects=epicshop -- nx run \\$NX_PROJECT_NAME:build"
   },
   "dependencies": {
-    "@epic-web/workshop-utils": "6.48.1",
+    "@epic-web/workshop-utils": "6.48.3",
     "@inquirer/prompts": "^7.5.1",
     "chalk": "^5.6.2",
     "close-with-grace": "^2.3.0",
+    "execa": "^9.6.0",
     "get-port": "^7.1.0",
     "match-sorter": "^8.2.0",
     "openid-client": "^6.8.1",