@epic-web/workshop-utils 6.68.0 → 6.69.1

package/dist/git.server.d.ts

@@ -102,12 +102,12 @@ export declare function checkForUpdatesCached(): Promise<{
 export declare function updateLocalRepo(): Promise<{
     readonly status: "success";
     readonly message: "The app is deployed" | "You are offline" | "Not in a git repo" | "Cannot find remote" | "No updates available.";
-} | {
-    readonly status: "success";
-    readonly message: "Updated successfully.";
 } | {
     readonly status: "error";
     readonly message: string;
+} | {
+    readonly status: "success";
+    readonly message: "Updated successfully.";
 }>;
 export declare function getCommitInfo(): Promise<{
     hash: string;

package/dist/git.server.js

@@ -127,6 +127,28 @@ export async function checkForUpdatesCached() {
         cache: checkForUpdatesCache,
     });
 }
+async function runNpmInstallWithRetry(cwd, maxRetries = 3, baseDelayMs = 1000) {
+    for (let attempt = 1; attempt <= maxRetries; attempt++) {
+        try {
+            await execaCommand('npm install', { cwd, stdio: 'inherit' });
+            return;
+        }
+        catch (error) {
+            const isEbusy = error instanceof Error &&
+                (error.message.includes('EBUSY') ||
+                    error.code === 'EBUSY');
+            if (isEbusy && attempt < maxRetries) {
+                const delay = baseDelayMs * Math.pow(2, attempt - 1);
+                console.log(`⚠️  File busy error (attempt ${attempt}/${maxRetries}). ` +
+                    `Retrying in ${delay / 1000}s...`);
+                await new Promise((resolve) => setTimeout(resolve, delay));
+            }
+            else {
+                throw error;
+            }
+        }
+    }
+}
 export async function updateLocalRepo() {
     const ENV = getEnv();
     if (ENV.EPICSHOP_DEPLOYED) {
@@ -157,7 +179,23 @@ export async function updateLocalRepo() {
             await execaCommand('git stash pop', { cwd });
         }
         console.log('📦 Re-installing dependencies...');
-        await execaCommand('npm install', { cwd, stdio: 'inherit' });
+        try {
+            await runNpmInstallWithRetry(cwd);
+        }
+        catch (error) {
+            const isEbusy = error instanceof Error &&
+                (error.message.includes('EBUSY') ||
+                    error.code === 'EBUSY');
+            if (isEbusy) {
+                return {
+                    status: 'error',
+                    message: 'npm install failed: files are locked. ' +
+                        'Please close any editors or terminals using this directory, ' +
+                        'then run: npm install',
+                };
+            }
+            throw error;
+        }
         await cleanupEmptyExerciseDirectories(cwd);
         const postUpdateScript = getWorkshopConfig().scripts?.postupdate;
         if (postUpdateScript) {

package/dist/workshops.server.d.ts

@@ -3,12 +3,6 @@ export declare const PACKAGE_MANAGERS: readonly ["npm", "pnpm", "yarn", "bun"];
 export type PackageManager = (typeof PACKAGE_MANAGERS)[number];
 declare const ConfigSchema: z.ZodObject<{
     reposDirectory: z.ZodOptional<z.ZodString>;
-    packageManager: z.ZodOptional<z.ZodEnum<{
-        npm: "npm";
-        pnpm: "pnpm";
-        yarn: "yarn";
-        bun: "bun";
-    }>>;
 }, z.core.$strip>;
 export type Workshop = {
     name: string;
@@ -25,10 +19,6 @@ export declare function getReposDirectory(): Promise<string>;
 export declare function isReposDirectoryConfigured(): Promise<boolean>;
 export declare function getDefaultReposDir(): string;
 export declare function setReposDirectory(directory: string): Promise<void>;
-export declare function getPackageManager(): Promise<PackageManager>;
-export declare function isPackageManagerConfigured(): Promise<boolean>;
-export declare function setPackageManager(packageManager: PackageManager): Promise<void>;
-export declare function clearPackageManager(): Promise<void>;
 export type ReposDirectoryStatus = {
     accessible: true;
 } | {

package/dist/workshops.server.js

@@ -20,11 +20,9 @@ const EpicshopConfigSchema = z.object({
         .optional(),
 });
 export const PACKAGE_MANAGERS = ['npm', 'pnpm', 'yarn', 'bun'];
-const PackageManagerSchema = z.enum(PACKAGE_MANAGERS);
 // Schema for workshop configuration (stored settings only)
 const ConfigSchema = z.object({
     reposDirectory: z.string().optional(),
-    packageManager: PackageManagerSchema.optional(),
 });
 function getDefaultReposDirectory() {
     return path.join(os.homedir(), 'epic-workshops');
@@ -89,24 +87,6 @@ export async function setReposDirectory(directory) {
     config.reposDirectory = path.resolve(directory);
     await saveConfig(config);
 }
-export async function getPackageManager() {
-    const config = await loadConfig();
-    return config.packageManager ?? 'npm';
-}
-export async function isPackageManagerConfigured() {
-    const config = await loadConfig();
-    return Boolean(config.packageManager);
-}
-export async function setPackageManager(packageManager) {
-    const config = await loadConfig();
-    config.packageManager = packageManager;
-    await saveConfig(config);
-}
-export async function clearPackageManager() {
-    const config = await loadConfig();
-    delete config.packageManager;
-    await saveConfig(config);
-}
 /**
  * Verify that the configured repos directory exists and is accessible.
  * If the directory doesn't exist, attempts to create it.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epic-web/workshop-utils",
-  "version": "6.68.0",
+  "version": "6.69.1",
   "publishConfig": {
     "access": "public"
   },
@@ -221,6 +221,7 @@
     "mdx-bundler": "^10.1.1",
     "p-queue": "^9.1.0",
     "parse-git-diff": "^0.0.19",
+    "pkgmgr": "^1.0.0",
     "react": "^19.2.3",
     "react-dom": "^19.2.3",
     "react-router": "^7.12.0",