epicshop 6.67.0 → 6.69.0

package/dist/cli.js

@@ -138,6 +138,22 @@ const cli = yargs(args)
     if (!result.success) {
         process.exit(1);
     }
+})
+    .command('setup', 'Install workshop dependencies (uses configured package manager)', (yargs) => {
+    return yargs
+        .option('silent', {
+        alias: 's',
+        type: 'boolean',
+        description: 'Run without output logs',
+        default: false,
+    })
+        .example('$0 setup', 'Install workshop dependencies');
+}, async (argv) => {
+    const { setup } = await import("./commands/setup.js");
+    const result = await setup({ silent: argv.silent });
+    if (!result.success) {
+        process.exit(1);
+    }
 })
     .command('add [repo-name] [destination]', 'Add a workshop by cloning from epicweb-dev GitHub org', (yargs) => {
     return yargs
@@ -1131,6 +1147,10 @@ try {
             name: `${chalk.green('add')} - Add a workshop`,
             value: 'add',
             description: 'Clone a workshop from epicweb-dev GitHub org',
+        }, {
+            name: `${chalk.green('setup')} - Install dependencies`,
+            value: 'setup',
+            description: 'Install workshop dependencies (uses configured manager)',
         }, {
             name: `${chalk.green('remove')} - Remove a workshop`,
             value: 'remove',
@@ -1239,6 +1259,13 @@ try {
                     process.exit(1);
                 break;
             }
+            case 'setup': {
+                const { setup } = await import("./commands/setup.js");
+                const result = await setup({});
+                if (!result.success)
+                    process.exit(1);
+                break;
+            }
             case 'remove': {
                 const { findWorkshopRoot, remove } = await import("./commands/workshops.js");
                 const workshopRoot = await findWorkshopRoot();

package/dist/commands/setup.d.ts

@@ -0,0 +1,18 @@
+export type SetupOptions = {
+    cwd?: string;
+    silent?: boolean;
+};
+export type SetupResult = {
+    success: boolean;
+    message?: string;
+    error?: Error;
+};
+/**
+ * Install workshop dependencies in the current directory.
+ * Must be run from within a workshop directory (containing package.json).
+ *
+ * Automatically detects and uses the package manager based on how epicshop was
+ * invoked (e.g., pnpm dlx epicshop setup uses pnpm, bunx epicshop setup uses bun).
+ * This is handled by pkgmgr, which detects the runtime package manager.
+ */
+export declare function setup(options?: SetupOptions): Promise<SetupResult>;

package/dist/commands/setup.js

@@ -0,0 +1,91 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { getErrorMessage } from '@epic-web/workshop-utils/utils';
+import chalk from 'chalk';
+import { runCommand, } from "../utils/command-runner.js";
+function isPackageJson(value) {
+    if (!value || typeof value !== 'object')
+        return false;
+    if (!('scripts' in value))
+        return true;
+    const scriptsValue = value.scripts;
+    if (scriptsValue === undefined)
+        return true;
+    if (!scriptsValue || typeof scriptsValue !== 'object')
+        return false;
+    return Object.values(scriptsValue).every((script) => typeof script === 'string');
+}
+function formatCommandResultError(result, fallbackMessage) {
+    return {
+        success: false,
+        message: result.message ?? fallbackMessage,
+        error: result.error,
+    };
+}
+/**
+ * Install workshop dependencies in the current directory.
+ * Must be run from within a workshop directory (containing package.json).
+ *
+ * Automatically detects and uses the package manager based on how epicshop was
+ * invoked (e.g., pnpm dlx epicshop setup uses pnpm, bunx epicshop setup uses bun).
+ * This is handled by pkgmgr, which detects the runtime package manager.
+ */
+export async function setup(options = {}) {
+    const { silent = false } = options;
+    const cwd = options.cwd ? path.resolve(options.cwd) : process.cwd();
+    const packageJsonPath = path.join(cwd, 'package.json');
+    try {
+        await fs.promises.access(packageJsonPath);
+    }
+    catch {
+        const message = `package.json not found at ${packageJsonPath}`;
+        if (!silent) {
+            console.error(chalk.red(`❌ ${message}`));
+        }
+        return { success: false, message, error: new Error(message) };
+    }
+    let scripts;
+    try {
+        const parsed = JSON.parse(await fs.promises.readFile(packageJsonPath, 'utf8'));
+        if (isPackageJson(parsed)) {
+            scripts = parsed.scripts;
+        }
+    }
+    catch (error) {
+        const message = getErrorMessage(error, 'Failed to read package.json');
+        if (!silent) {
+            console.error(chalk.red(`❌ ${message}`));
+        }
+        return { success: false, message, error: error };
+    }
+    if (!silent) {
+        console.log(chalk.cyan(`📦 Installing dependencies using ${chalk.bold('pkgmgr')}...`));
+        console.log(chalk.gray(`   pkgmgr automatically detects your package manager (npm, pnpm, yarn, or bun)`));
+        console.log(chalk.gray(`   Running: pkgmgr install`));
+    }
+    const installResult = await runCommand('pkgmgr', ['install'], {
+        cwd,
+        silent,
+    });
+    if (!installResult.success) {
+        return formatCommandResultError(installResult, 'Failed to install dependencies');
+    }
+    const hasCustomSetup = Boolean(scripts?.['setup:custom']);
+    if (hasCustomSetup) {
+        if (!silent) {
+            console.log(chalk.cyan(`🔧 Running npm run setup:custom...`));
+        }
+        const customResult = await runCommand('npm', ['run', 'setup:custom'], {
+            cwd,
+            silent,
+        });
+        if (!customResult.success) {
+            return formatCommandResultError(customResult, 'Failed to run setup:custom');
+        }
+    }
+    const message = 'Workshop setup complete';
+    if (!silent) {
+        console.log(chalk.green(`✅ ${message}`));
+    }
+    return { success: true, message };
+}

package/dist/commands/workshops.js

@@ -6,12 +6,12 @@ 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";
+import { runCommand, runCommandInteractive } from "../utils/command-runner.js";
+import { setup } from "./setup.js";
 const GITHUB_ORG = 'epicweb-dev';
 const TUTORIAL_REPO = 'epicshop-tutorial';
 const GITHUB_TOKEN = process.env.GITHUB_TOKEN;
@@ -343,14 +343,7 @@ async function addSingleWorkshop(repoName, options) {
             error: cloneResult.error,
         };
     }
-    if (!silent) {
-        console.log(chalk.cyan(`🔧 Running npm run setup...`));
-    }
-    // Run npm run setup
-    const setupResult = await runCommand('npm', ['run', 'setup'], {
-        cwd: workshopPath,
-        silent,
-    });
+    const setupResult = await setup({ cwd: workshopPath, silent });
     if (!setupResult.success) {
         // Clean up the cloned directory on setup failure
         if (!silent) {
@@ -364,7 +357,7 @@ async function addSingleWorkshop(repoName, options) {
         }
         return {
             success: false,
-            message: `Failed to run setup: ${setupResult.message}`,
+            message: `Failed to set up workshop: ${setupResult.message}`,
             error: setupResult.error,
         };
     }
@@ -794,12 +787,13 @@ export async function list({ silent = false, } = {}) {
                 });
             },
         });
+        const startCommand = 'npm run start';
         // Show actions for selected workshop
         const actionChoices = [
             {
                 name: 'Start workshop',
                 value: 'start',
-                description: 'Run npm start in the workshop directory',
+                description: `Run ${startCommand} in the workshop directory`,
             },
             {
                 name: 'Open in editor',
@@ -1084,8 +1078,8 @@ export async function startWorkshop(options = {}) {
             console.log(chalk.cyan(`🚀 Starting ${chalk.bold(workshopToStart.title)}...`));
             console.log(chalk.gray(`   Path: ${workshopToStart.path}\n`));
         }
-        // Run npm start in the workshop directory
-        const startResult = await runCommandInteractive('npm', ['start'], {
+        // Run start script in the workshop directory
+        const startResult = await runCommandInteractive('npm', ['run', 'start'], {
             cwd: workshopToStart.path,
         });
         if (!startResult.success) {
@@ -1282,14 +1276,20 @@ export async function config(options = {}) {
                 return { success: true, message: 'Cancelled' };
             }
         }
+        // Handle CLI flags for setting config values
+        const messages = [];
         if (options.reposDir) {
             // Set the repos directory directly via CLI flag
             const resolvedPath = path.resolve(options.reposDir);
             await setReposDirectory(resolvedPath);
             const message = `Repos directory set to: ${resolvedPath}`;
+            messages.push(message);
             if (!silent)
                 console.log(chalk.green(`✅ ${message}`));
-            return { success: true, message };
+        }
+        // If either option was set, return now
+        if (messages.length > 0) {
+            return { success: true, message: messages.join('; ') };
         }
         if (silent) {
             // In silent mode, just return current config
@@ -1719,7 +1719,7 @@ async function promptAndSetupAccessibleWorkshops() {
     const { workshopExists } = await import('@epic-web/workshop-utils/workshops.server');
     console.log(chalk.bold.cyan('\n📚 Workshop Setup\n'));
     console.log(chalk.cyan('🐨 Next, you can select any workshops you’d like me to set up for you.'));
-    console.log(chalk.gray('   This will clone each workshop repo into your workshops directory and run `npm run setup`.\n' +
+    console.log(chalk.gray(`   This will clone each workshop repo into your workshops directory and run setup.\n` +
         '   (If something fails, we’ll keep going and you can retry later with `npx epicshop add`.)\n'));
     assertCanPrompt({
         reason: 'select workshops to set up',
@@ -2000,12 +2000,7 @@ async function ensureTutorialAndStart() {
             error: cloneResult.error,
         };
     }
-    console.log(chalk.cyan(`\n🔧 Running npm run setup...\n`));
-    // Run npm run setup
-    const setupResult = await runCommand('npm', ['run', 'setup'], {
-        cwd: workshopPath,
-        silent: false,
-    });
+    const setupResult = await setup({ cwd: workshopPath, silent: false });
     if (!setupResult.success) {
         // Clean up on failure
         console.log(chalk.yellow(`🧹 Cleaning up cloned directory...`));
@@ -2015,10 +2010,10 @@ async function ensureTutorialAndStart() {
         catch {
             // Ignore cleanup errors
         }
-        console.error(chalk.red(`❌ Failed to run setup: ${setupResult.message}`));
+        console.error(chalk.red(`❌ Failed to set up workshop: ${setupResult.message}`));
         return {
             success: false,
-            message: `Failed to run setup: ${setupResult.message}`,
+            message: `Failed to set up workshop: ${setupResult.message}`,
             error: setupResult.error,
         };
     }
@@ -2034,7 +2029,7 @@ async function ensureTutorialAndStart() {
     await promptToStartTutorial(workshopTitle);
     console.log(chalk.cyan(`\n🚀 Starting ${chalk.bold(workshopTitle)}...\n`));
     // Start the workshop
-    const startResult = await runCommandInteractive('npm', ['start'], {
+    const startResult = await runCommandInteractive('npm', ['run', 'start'], {
         cwd: workshopPath,
     });
     if (!startResult.success) {
@@ -2200,40 +2195,3 @@ async function directoryExists(dirPath) {
         return false;
     }
 }
-function resolveCliCommand(command) {
-    // On Windows, package manager binaries are typically shimmed as *.cmd files.
-    // Spawning "npm" directly can fail with ENOENT even though "npm.cmd" exists.
-    if (process.platform === 'win32' &&
-        (command === 'npm' || command === 'npx')) {
-        return `${command}.cmd`;
-    }
-    return command;
-}
-function runCommand(command, args, options) {
-    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 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/dist/utils/command-runner.d.ts

@@ -0,0 +1,13 @@
+export type CommandResult = {
+    success: boolean;
+    message?: string;
+    error?: Error;
+};
+export declare function resolveCliCommand(command: string): string;
+export declare function runCommand(command: string, args: string[], options: {
+    cwd: string;
+    silent?: boolean;
+}): Promise<CommandResult>;
+export declare function runCommandInteractive(command: string, args: string[], options: {
+    cwd: string;
+}): Promise<CommandResult>;

package/dist/utils/command-runner.js

@@ -0,0 +1,41 @@
+import { getErrorMessage } from '@epic-web/workshop-utils/utils';
+import { execa } from 'execa';
+export function resolveCliCommand(command) {
+    // On Windows, package manager binaries are typically shimmed as *.cmd files.
+    if (process.platform === 'win32' &&
+        (command === 'npm' ||
+            command === 'npx' ||
+            command === 'pnpm' ||
+            command === 'yarn')) {
+        return `${command}.cmd`;
+    }
+    return command;
+}
+export function runCommand(command, args, options) {
+    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 };
+    });
+}
+export function runCommandInteractive(command, args, options) {
+    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/dist/utils/sentry-cli.js

@@ -1,5 +1,5 @@
-import * as Sentry from '@sentry/node';
 import { getEnv } from '@epic-web/workshop-utils/init-env';
+import * as Sentry from '@sentry/node';
 const HELP_FLAGS = new Set(['--help', '-h']);
 function extractFlags(args) {
     const flags = new Set();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epicshop",
-  "version": "6.67.0",
+  "version": "6.69.0",
   "publishConfig": {
     "access": "public"
   },
@@ -14,6 +14,7 @@
     "exports": {
       "./package.json": "./package.json",
       "./cleanup": "./src/commands/cleanup.ts",
+      "./setup": "./src/commands/setup.ts",
       "./warm": "./src/commands/warm.ts",
       "./start": "./src/commands/start.ts",
       "./update": "./src/commands/update.ts",
@@ -33,6 +34,11 @@
       "types": "./dist/commands/cleanup.d.ts",
       "default": "./dist/commands/cleanup.js"
     },
+    "./setup": {
+      "import": "./dist/commands/setup.js",
+      "types": "./dist/commands/setup.d.ts",
+      "default": "./dist/commands/setup.js"
+    },
     "./warm": {
       "import": "./dist/commands/warm.js",
       "types": "./dist/commands/warm.d.ts",
@@ -93,7 +99,7 @@
     "build:watch": "nx watch --projects=epicshop -- nx run \\$NX_PROJECT_NAME:build"
   },
   "dependencies": {
-    "@epic-web/workshop-utils": "6.67.0",
+    "@epic-web/workshop-utils": "6.69.0",
     "@inquirer/prompts": "^8.2.0",
     "@sentry/node": "^10.35.0",
     "chalk": "^5.6.2",