epicshop 6.76.0 → 6.76.2

package/README.md

@@ -48,7 +48,7 @@ epicshop start <workshop>
 - `epicshop update`: pull the latest workshop changes
 - `epicshop warm`: warm caches for faster workshop startup
 - `epicshop cleanup`: select what to delete (workshops, caches, offline videos,
-  prefs, auth)
+  prefs, auth, config)
 - `epicshop exercises`: list exercises with progress (context-aware)
 - `epicshop playground`: view, set, or restore saved playgrounds (context-aware)
 - `epicshop progress`: view or update your progress (context-aware)

package/dist/cli.js

@@ -544,8 +544,14 @@ const cli = yargs(args)
         .option('targets', {
         alias: 't',
         type: 'array',
-        choices: ['caches', 'offline-videos', 'preferences', 'auth'],
-        description: 'Cleanup targets (repeatable): caches, offline-videos, preferences, auth',
+        choices: [
+            'caches',
+            'offline-videos',
+            'preferences',
+            'auth',
+            'config',
+        ],
+        description: 'Cleanup targets (repeatable): caches, offline-videos, preferences, auth, config',
     })
         .option('workshops', {
         type: 'array',

package/dist/commands/cleanup.d.ts

@@ -1,5 +1,5 @@
 import '@epic-web/workshop-utils/init-env';
-export type CleanupTarget = 'workshops' | 'caches' | 'offline-videos' | 'preferences' | 'auth';
+export type CleanupTarget = 'workshops' | 'caches' | 'offline-videos' | 'preferences' | 'auth' | 'config';
 export type WorkshopCleanupTarget = 'files' | 'caches' | 'offline-videos';
 export type CleanupResult = {
     success: boolean;
@@ -16,6 +16,7 @@ type CleanupPaths = {
     legacyCacheDir: string;
     dataPaths: string[];
     offlineVideosDir: string;
+    configPath: string;
 };
 export type CleanupOptions = {
     silent?: boolean;

package/dist/commands/cleanup.js

@@ -4,7 +4,7 @@ import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import { resolveCacheDir, resolveFallbackPath, resolvePrimaryDir, resolvePrimaryPath, } from '@epic-web/workshop-utils/data-storage.server';
-import { deleteWorkshop, getReposDirectory, getUnpushedChanges, } from '@epic-web/workshop-utils/workshops.server';
+import { deleteWorkshop, getConfigPath, getReposDirectory, getUnpushedChanges, } from '@epic-web/workshop-utils/workshops.server';
 import chalk from 'chalk';
 import ora from 'ora';
 import { assertCanPrompt } from "../utils/cli-runtime.js";
@@ -29,6 +29,11 @@ const CLEANUP_TARGETS = [
         name: 'Preferences',
         description: 'Clear stored preferences and local settings',
     },
+    {
+        value: 'config',
+        name: 'CLI config',
+        description: 'Remove saved CLI config (workshops directory setting)',
+    },
     {
         value: 'auth',
         name: 'Auth data',
@@ -86,7 +91,15 @@ async function resolveCleanupPaths(paths = {}) {
         resolveFallbackPath(),
     ];
     const offlineVideosDir = paths.offlineVideosDir ?? path.join(resolvePrimaryDir(), 'offline-videos');
-    return { reposDir, cacheDir, legacyCacheDir, dataPaths, offlineVideosDir };
+    const configPath = paths.configPath ?? getConfigPath();
+    return {
+        reposDir,
+        cacheDir,
+        legacyCacheDir,
+        dataPaths,
+        offlineVideosDir,
+        configPath,
+    };
 }
 async function pathExists(targetPath) {
     try {
@@ -542,6 +555,7 @@ export async function cleanup({ silent = false, force = false, targets, workshop
         let legacyCacheDir = '';
         let dataPaths = [];
         let offlineVideosDir = '';
+        let configPath = '';
         let workshopSummaries = [];
         let workshopBytes = 0;
         let legacyCacheBytes = 0;
@@ -549,10 +563,17 @@ export async function cleanup({ silent = false, force = false, targets, workshop
         let offlineVideosBytes = 0;
         let preferencesBytes = 0;
         let authBytes = 0;
+        let configBytes = 0;
         try {
             updateSpinner(analysisSpinner, 'Resolving cleanup locations...');
-            ({ reposDir, cacheDir, legacyCacheDir, dataPaths, offlineVideosDir } =
-                await resolveCleanupPaths(paths));
+            ({
+                reposDir,
+                cacheDir,
+                legacyCacheDir,
+                dataPaths,
+                offlineVideosDir,
+                configPath,
+            } = await resolveCleanupPaths(paths));
             updateSpinner(analysisSpinner, 'Finding installed workshops...');
             const allWorkshops = await listWorkshopsInDirectory(reposDir);
             updateSpinner(analysisSpinner, 'Calculating workshop sizes...');
@@ -570,6 +591,8 @@ export async function cleanup({ silent = false, force = false, targets, workshop
             cacheBytes = cacheDirBytes + legacyCacheBytes;
             updateSpinner(analysisSpinner, 'Calculating offline video sizes...');
             offlineVideosBytes = await getPathSize(offlineVideosDir);
+            updateSpinner(analysisSpinner, 'Calculating CLI config size...');
+            configBytes = await getPathSize(configPath);
             updateSpinner(analysisSpinner, 'Scanning preferences and auth data...');
             ({ preferencesBytes, authBytes } =
                 await getDataCleanupSizeSummary(dataPaths));
@@ -584,6 +607,7 @@ export async function cleanup({ silent = false, force = false, targets, workshop
                 'offline-videos': offlineVideosBytes,
                 preferences: preferencesBytes,
                 auth: authBytes,
+                config: configBytes,
             };
             return {
                 ...target,
@@ -709,6 +733,9 @@ export async function cleanup({ silent = false, force = false, targets, workshop
             if (selectedTargets.includes('preferences')) {
                 console.log(chalk.yellow(`- Preferences: ${formatBytes(preferencesBytes)} (${dataPaths.join(', ')})`));
             }
+            if (selectedTargets.includes('config')) {
+                console.log(chalk.yellow(`- CLI config: ${formatBytes(configBytes)} (${configPath})`));
+            }
             if (selectedTargets.includes('auth')) {
                 console.log(chalk.yellow(`- Auth data: ${formatBytes(authBytes)} (${dataPaths.join(', ')})`));
             }
@@ -744,6 +771,8 @@ export async function cleanup({ silent = false, force = false, targets, workshop
                     switch (target) {
                         case 'offline-videos':
                             return 'Offline videos';
+                        case 'config':
+                            return 'CLI config';
                         default:
                             return target.charAt(0).toUpperCase() + target.slice(1);
                     }
@@ -837,6 +866,9 @@ export async function cleanup({ silent = false, force = false, targets, workshop
                 failures,
             });
         }
+        if (selectedTargets.includes('config')) {
+            await removePath(configPath, removedPaths, skippedPaths, failures);
+        }
         if (failures.length > 0) {
             const message = `Failed to clean up ${failures.length} path(s).`;
             if (!silent) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epicshop",
-  "version": "6.76.0",
+  "version": "6.76.2",
   "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.76.0",
+    "@epic-web/workshop-utils": "6.76.2",
     "@inquirer/prompts": "^8.2.0",
     "@sentry/node": "^10.36.0",
     "chalk": "^5.6.2",