@wpmoo/toolkit 0.9.16 → 0.9.17

package/dist/cli.js

@@ -856,7 +856,7 @@ async function removeModuleOptionsFromPrompts(showIntro = true, cancelAction = '
         message: menuPromptMessage('Delete module files too?', cancelAction),
         active: 'Y',
         inactive: 'n',
-        initialValue: false,
+        initialValue: cancelAction === 'back',
     });
     handleCancel(deleteFiles, cancelAction);
     return {
@@ -1234,7 +1234,7 @@ async function runSelectedModuleAction(action, module, cwd) {
             message: menuPromptMessage('Delete module files too?', 'back'),
             active: 'Y',
             inactive: 'n',
-            initialValue: false,
+            initialValue: true,
         });
         handleCancel(deleteFiles, 'back');
         const removeCommand = cockpitCommands.find((entry) => entry.id === 'remove-module');

package/dist/module-actions.js

@@ -355,7 +355,7 @@ async function assertModuleCleanBeforeDelete(target, sourceType, repoPath, modul
     const repoRoot = sourceRepoPath(target, sourceType, repoPath);
     try {
         const result = await git.run(repoRoot, ['status', '--short', '--', moduleName]);
-        if (result.stdout.trim()) {
+        if (result.stdout.trim() && (await moduleHasCommittedFiles(repoRoot, moduleName, git))) {
             throw new Error(`Refusing to delete module ${moduleName} because it has dirty git changes in source repo ${repoPath}.`);
         }
     }
@@ -365,6 +365,15 @@ async function assertModuleCleanBeforeDelete(target, sourceType, repoPath, modul
         }
     }
 }
+async function moduleHasCommittedFiles(repoRoot, moduleName, git) {
+    try {
+        const result = await git.run(repoRoot, ['ls-tree', '-r', '--name-only', 'HEAD', '--', moduleName]);
+        return Boolean(result.stdout.trim());
+    }
+    catch {
+        return false;
+    }
+}
 export async function addModuleToSourceRepo(options, git = realGit) {
     const repoPath = validateRepoPath(options.repoPath);
     const moduleName = validateModuleName(options.moduleName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wpmoo/toolkit",
-  "version": "0.9.16",
+  "version": "0.9.17",
   "description": "WPMoo Toolkit for development, staging, and production lifecycle workflows.",
   "type": "module",
   "repository": {