epicshop 6.68.0 → 6.69.0

package/dist/cli.js

@@ -1,12 +1,10 @@
 #!/usr/bin/env node
 import '@epic-web/workshop-utils/init-env';
-import { PACKAGE_MANAGERS, getPackageManager, isPackageManagerConfigured, setPackageManager, } from '@epic-web/workshop-utils/workshops.server';
 import chalk from 'chalk';
 import { matchSorter } from 'match-sorter';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
-import { assertCanPrompt, hasTty, isCiEnvironment, } from "./utils/cli-runtime.js";
-import { detectRuntimePackageManager } from "./utils/package-manager.js";
+import { assertCanPrompt } from "./utils/cli-runtime.js";
 import { initCliSentry } from "./utils/sentry-cli.js";
 // Check for --help on start command before yargs parses
 // (yargs exits before command handler when help is requested)
@@ -30,43 +28,6 @@ function formatHelp(helpText) {
         .replace(/--[\w-]+/g, (match) => chalk.yellow(match))
         .replace(/-\w(?=\s|,)/g, (match) => chalk.yellow(match));
 }
-async function maybePromptToUpdatePackageManager(parsedArgs) {
-    if (parsedArgs.includes('--help') || parsedArgs.includes('-h'))
-        return;
-    if (parsedArgs.includes('--silent') || parsedArgs.includes('-s'))
-        return;
-    if (parsedArgs[0] === 'config')
-        return;
-    if (isCiEnvironment() || !hasTty())
-        return;
-    const runtimeManager = detectRuntimePackageManager();
-    if (!runtimeManager)
-        return;
-    const isConfigured = await isPackageManagerConfigured();
-    if (!isConfigured)
-        return;
-    const configuredManager = await getPackageManager();
-    if (configuredManager === runtimeManager)
-        return;
-    const { confirm } = await import('@inquirer/prompts');
-    const shouldUpdate = await confirm({
-        message: `You ran epicshop with ${runtimeManager}, but your default package manager is ${configuredManager}. Update the default?`,
-        default: true,
-    });
-    if (shouldUpdate) {
-        await setPackageManager(runtimeManager);
-        console.log(chalk.green(`✅ Default package manager updated to ${runtimeManager}.`));
-    }
-}
-try {
-    await maybePromptToUpdatePackageManager(args);
-}
-catch (error) {
-    if (error.message === 'USER_QUIT') {
-        process.exit(0);
-    }
-    // Silently ignore other errors during package manager prompt to avoid disrupting CLI startup
-}
 // Set up yargs CLI
 const cli = yargs(args)
     .scriptName('epicshop')
@@ -323,11 +284,6 @@ const cli = yargs(args)
         .option('repos-dir', {
         type: 'string',
         description: 'Set the default directory for workshop repos',
-    })
-        .option('package-manager', {
-        type: 'string',
-        choices: PACKAGE_MANAGERS,
-        description: 'Set the default package manager',
     })
         .option('silent', {
         alias: 's',
@@ -343,7 +299,6 @@ const cli = yargs(args)
     const result = await config({
         subcommand: argv.subcommand === 'reset' ? 'reset' : undefined,
         reposDir: argv.reposDir,
-        packageManager: argv.packageManager,
         silent: argv.silent,
     });
     if (!result.success) {

package/dist/commands/setup.d.ts

@@ -7,4 +7,12 @@ export type SetupResult = {
     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

@@ -1,11 +1,8 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { getErrorMessage } from '@epic-web/workshop-utils/utils';
-import { getPackageManager, isPackageManagerConfigured, } from '@epic-web/workshop-utils/workshops.server';
 import chalk from 'chalk';
-import { execa } from 'execa';
-import { resolveCliCommand, runCommand, } from "../utils/command-runner.js";
-import { formatPackageManagerCommand, getPackageManagerInstallArgs, getPackageManagerRunArgs, } from "../utils/package-manager.js";
+import { runCommand, } from "../utils/command-runner.js";
 function isPackageJson(value) {
     if (!value || typeof value !== 'object')
         return false;
@@ -18,27 +15,6 @@ function isPackageJson(value) {
         return false;
     return Object.values(scriptsValue).every((script) => typeof script === 'string');
 }
-async function getPackageManagerVersion(packageManager) {
-    try {
-        const result = await execa(resolveCliCommand(packageManager), ['--version'], {
-            stdio: 'pipe',
-        });
-        return { success: true, version: result.stdout.trim() };
-    }
-    catch (error) {
-        const message = getErrorMessage(error, 'Failed to check package manager');
-        const err = error instanceof Error ? error : new Error(message);
-        return { success: false, error: err };
-    }
-}
-function isNpmVersionSupported(version) {
-    const [majorString, minorString] = version.split('.');
-    const major = Number(majorString);
-    const minor = Number(minorString);
-    if (!Number.isFinite(major) || !Number.isFinite(minor))
-        return false;
-    return major > 8 || (major === 8 && minor >= 16);
-}
 function formatCommandResultError(result, fallbackMessage) {
     return {
         success: false,
@@ -46,6 +22,14 @@ function formatCommandResultError(result, 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();
@@ -74,39 +58,12 @@ export async function setup(options = {}) {
         }
         return { success: false, message, error: error };
     }
-    const packageManager = await getPackageManager();
-    const isConfigured = await isPackageManagerConfigured();
-    const managerLabel = isConfigured
-        ? packageManager
-        : `${packageManager} (default)`;
-    const versionResult = await getPackageManagerVersion(packageManager);
-    if (!versionResult.success || !versionResult.version) {
-        const message = `Failed to run ${packageManager} --version. Please ensure ${packageManager} is installed.`;
-        if (!silent) {
-            console.error(chalk.red(`❌ ${message}`));
-        }
-        return {
-            success: false,
-            message,
-            error: versionResult.error ?? new Error(message),
-        };
-    }
-    if (packageManager === 'npm' &&
-        !isNpmVersionSupported(versionResult.version)) {
-        const message = `npm version is ${versionResult.version} which is out of date. Please install npm@8.16.0 or greater.`;
-        if (!silent) {
-            console.error(chalk.red(`❌ ${message}`));
-        }
-        return { success: false, message, error: new Error(message) };
-    }
-    const installArgs = getPackageManagerInstallArgs(packageManager);
-    const installCommand = formatPackageManagerCommand(packageManager, installArgs);
     if (!silent) {
-        console.log(chalk.cyan(`📦 Installing dependencies using ${chalk.bold(managerLabel)}...`));
-        console.log(chalk.gray(`   To change this, run: npx epicshop config --package-manager <npm|pnpm|yarn|bun>`));
-        console.log(chalk.gray(`   Running: ${installCommand}`));
+        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(packageManager, installArgs, {
+    const installResult = await runCommand('pkgmgr', ['install'], {
         cwd,
         silent,
     });
@@ -115,12 +72,10 @@ export async function setup(options = {}) {
     }
     const hasCustomSetup = Boolean(scripts?.['setup:custom']);
     if (hasCustomSetup) {
-        const customArgs = getPackageManagerRunArgs(packageManager, 'setup:custom');
-        const customCommand = formatPackageManagerCommand(packageManager, customArgs);
         if (!silent) {
-            console.log(chalk.cyan(`🔧 Running ${customCommand}...`));
+            console.log(chalk.cyan(`🔧 Running npm run setup:custom...`));
         }
-        const customResult = await runCommand(packageManager, customArgs, {
+        const customResult = await runCommand('npm', ['run', 'setup:custom'], {
             cwd,
             silent,
         });

package/dist/commands/workshops.d.ts

@@ -1,5 +1,4 @@
 import '@epic-web/workshop-utils/init-env';
-import { type PackageManager } from '@epic-web/workshop-utils/workshops.server';
 /**
  * Find the workshop root directory by walking up from the current directory
  * looking for a package.json with an epicshop field.
@@ -28,7 +27,6 @@ export type StartOptions = {
 };
 export type ConfigOptions = {
     reposDir?: string;
-    packageManager?: PackageManager;
     silent?: boolean;
     subcommand?: 'reset' | 'delete';
 };

package/dist/commands/workshops.js

@@ -6,13 +6,11 @@ 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 { PACKAGE_MANAGERS, clearPackageManager, getPackageManager, isPackageManagerConfigured, setPackageManager, } from '@epic-web/workshop-utils/workshops.server';
 import chalk from 'chalk';
 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 { formatPackageManagerCommand, getPackageManagerRunArgs, } from "../utils/package-manager.js";
 import { setup } from "./setup.js";
 const GITHUB_ORG = 'epicweb-dev';
 const TUTORIAL_REPO = 'epicshop-tutorial';
@@ -789,8 +787,7 @@ export async function list({ silent = false, } = {}) {
                 });
             },
         });
-        const packageManager = await getPackageManager();
-        const startCommand = formatPackageManagerCommand(packageManager, getPackageManagerRunArgs(packageManager, 'start'));
+        const startCommand = 'npm run start';
         // Show actions for selected workshop
         const actionChoices = [
             {
@@ -1081,10 +1078,8 @@ export async function startWorkshop(options = {}) {
             console.log(chalk.cyan(`🚀 Starting ${chalk.bold(workshopToStart.title)}...`));
             console.log(chalk.gray(`   Path: ${workshopToStart.path}\n`));
         }
-        const packageManager = await getPackageManager();
-        const startArgs = getPackageManagerRunArgs(packageManager, 'start');
         // Run start script in the workshop directory
-        const startResult = await runCommandInteractive(packageManager, startArgs, {
+        const startResult = await runCommandInteractive('npm', ['run', 'start'], {
             cwd: workshopToStart.path,
         });
         if (!startResult.success) {
@@ -1292,13 +1287,6 @@ export async function config(options = {}) {
             if (!silent)
                 console.log(chalk.green(`✅ ${message}`));
         }
-        if (options.packageManager) {
-            await setPackageManager(options.packageManager);
-            const message = `Package manager set to: ${options.packageManager}`;
-            messages.push(message);
-            if (!silent)
-                console.log(chalk.green(`✅ ${message}`));
-        }
         // If either option was set, return now
         if (messages.length > 0) {
             return { success: true, message: messages.join('; ') };
@@ -1313,16 +1301,13 @@ export async function config(options = {}) {
             reason: 'select a configuration option',
             hints: [
                 'Set repos dir directly: npx epicshop config --repos-dir <path>',
-                'Set package manager directly: npx epicshop config --package-manager <npm|pnpm|yarn|bun>',
                 'Delete config non-interactively: npx epicshop config reset --silent',
             ],
         });
-        const { search, confirm, select } = await import('@inquirer/prompts');
+        const { search, confirm } = await import('@inquirer/prompts');
         const reposDir = await getReposDirectory();
         const isConfigured = await isReposDirectoryConfigured();
         const defaultDir = getDefaultReposDir();
-        const packageManager = await getPackageManager();
-        const isPackageManagerSet = await isPackageManagerConfigured();
         // Build config options
         const configOptions = [
             {
@@ -1330,13 +1315,6 @@ export async function config(options = {}) {
                 value: 'repos-dir',
                 description: isConfigured ? reposDir : `${reposDir} (default)`,
             },
-            {
-                name: `Package manager`,
-                value: 'package-manager',
-                description: isPackageManagerSet
-                    ? packageManager
-                    : `${packageManager} (default)`,
-            },
             {
                 name: `Reset config file`,
                 value: 'reset',
@@ -1455,87 +1433,6 @@ export async function config(options = {}) {
                 return { success: true, message: 'Cancelled' };
             }
         }
-        if (selectedConfig === 'package-manager') {
-            console.log();
-            console.log(chalk.bold('  Current value:'));
-            if (isPackageManagerSet) {
-                console.log(chalk.white(`  ${packageManager}`));
-            }
-            else {
-                console.log(chalk.gray(`  ${packageManager} (default, not explicitly set)`));
-            }
-            console.log();
-            const actionChoices = [
-                {
-                    name: 'Edit',
-                    value: 'edit',
-                    description: 'Change the default package manager',
-                },
-                ...(isPackageManagerSet
-                    ? [
-                        {
-                            name: 'Remove',
-                            value: 'remove',
-                            description: 'Reset to default (npm)',
-                        },
-                    ]
-                    : []),
-                {
-                    name: 'Cancel',
-                    value: 'cancel',
-                    description: 'Go back without changes',
-                },
-            ];
-            const action = await search({
-                message: 'What would you like to do?',
-                source: async (input) => {
-                    if (!input)
-                        return actionChoices;
-                    return matchSorter(actionChoices, input, {
-                        keys: ['name', 'value', 'description'],
-                    });
-                },
-            });
-            if (action === 'edit') {
-                const selectedManager = await select({
-                    message: 'Select a package manager:',
-                    choices: PACKAGE_MANAGERS.map((manager) => ({
-                        name: manager,
-                        value: manager,
-                    })),
-                });
-                await setPackageManager(selectedManager);
-                console.log();
-                console.log(chalk.green(`✅ Package manager set to: ${chalk.bold(selectedManager)}`));
-                return {
-                    success: true,
-                    message: `Package manager set to: ${selectedManager}`,
-                };
-            }
-            else if (action === 'remove') {
-                const shouldRemove = await confirm({
-                    message: 'Reset package manager to default (npm)?',
-                    default: false,
-                });
-                if (shouldRemove) {
-                    await clearPackageManager();
-                    console.log();
-                    console.log(chalk.green(`✅ Package manager reset to default (npm).`));
-                    return {
-                        success: true,
-                        message: 'Package manager reset to default (npm).',
-                    };
-                }
-                else {
-                    console.log(chalk.gray('\nNo changes made.'));
-                    return { success: true, message: 'Cancelled' };
-                }
-            }
-            else {
-                console.log(chalk.gray('\nNo changes made.'));
-                return { success: true, message: 'Cancelled' };
-            }
-        }
         return { success: true, message: 'Config viewed' };
     }
     catch (error) {
@@ -1822,8 +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.'));
-    const packageManager = await getPackageManager();
-    console.log(chalk.gray(`   This will clone each workshop repo into your workshops directory and run setup using ${packageManager}.\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',
@@ -2132,10 +2028,8 @@ async function ensureTutorialAndStart() {
     }
     await promptToStartTutorial(workshopTitle);
     console.log(chalk.cyan(`\n🚀 Starting ${chalk.bold(workshopTitle)}...\n`));
-    const packageManager = await getPackageManager();
-    const startArgs = getPackageManagerRunArgs(packageManager, 'start');
     // Start the workshop
-    const startResult = await runCommandInteractive(packageManager, startArgs, {
+    const startResult = await runCommandInteractive('npm', ['run', 'start'], {
         cwd: workshopPath,
     });
     if (!startResult.success) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epicshop",
-  "version": "6.68.0",
+  "version": "6.69.0",
   "publishConfig": {
     "access": "public"
   },
@@ -99,7 +99,7 @@
     "build:watch": "nx watch --projects=epicshop -- nx run \\$NX_PROJECT_NAME:build"
   },
   "dependencies": {
-    "@epic-web/workshop-utils": "6.68.0",
+    "@epic-web/workshop-utils": "6.69.0",
     "@inquirer/prompts": "^8.2.0",
     "@sentry/node": "^10.35.0",
     "chalk": "^5.6.2",

package/dist/utils/package-manager.d.ts

@@ -1,5 +0,0 @@
-import { type PackageManager } from '@epic-web/workshop-utils/workshops.server';
-export declare function detectRuntimePackageManager(): PackageManager | null;
-export declare function getPackageManagerInstallArgs(_packageManager: PackageManager): string[];
-export declare function getPackageManagerRunArgs(_packageManager: PackageManager, script: string): string[];
-export declare function formatPackageManagerCommand(packageManager: PackageManager, args: string[]): string;

package/dist/utils/package-manager.js

@@ -1,27 +0,0 @@
-function detectPackageManager(value) {
-    if (!value)
-        return null;
-    if (value.includes('pnpm'))
-        return 'pnpm';
-    if (value.includes('yarn'))
-        return 'yarn';
-    if (value.includes('bun'))
-        return 'bun';
-    if (value.includes('npm'))
-        return 'npm';
-    return null;
-}
-export function detectRuntimePackageManager() {
-    const userAgent = (process.env.npm_config_user_agent ?? '').toLowerCase();
-    const execPath = (process.env.npm_execpath ?? '').toLowerCase();
-    return detectPackageManager(userAgent) ?? detectPackageManager(execPath);
-}
-export function getPackageManagerInstallArgs(_packageManager) {
-    return ['install'];
-}
-export function getPackageManagerRunArgs(_packageManager, script) {
-    return ['run', script];
-}
-export function formatPackageManagerCommand(packageManager, args) {
-    return `${packageManager} ${args.join(' ')}`.trim();
-}