@bobfrankston/npmglobalize 1.0.130 → 1.0.132

package/lib.js

@@ -3451,6 +3451,19 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
             console.log('  Pulled latest from remote');
         }
     }
+    // Ensure clean working tree before version bump (catch stray changes from pull/rebase/watchers)
+    if (!dryRun) {
+        const preVersionStatus = spawnSafe('git', ['status', '--porcelain'], {
+            encoding: 'utf-8', stdio: 'pipe', shell: true
+        });
+        if (preVersionStatus.status === 0 && preVersionStatus.stdout.trim()) {
+            if (verbose) {
+                console.log('Committing stray changes before version bump...');
+            }
+            runCommand('git', ['add', '-A'], { cwd, silent: true });
+            gitCommit('Pre-version cleanup', cwd);
+        }
+    }
     // Version bump (skip if republishing a version that's already bumped locally)
     if (skipVersionBump) {
         console.log(`Skipping version bump — ${pkg.version} already set locally.`);
@@ -3826,7 +3839,12 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
                         console.error('  Just run npmglobalize again (it will bump to next version)');
                         console.error('');
                         if (transformResult.transformed) {
-                            console.log('Run --cleanup to restore file: dependencies');
+                            console.log('Restoring file: dependencies...');
+                            const failPkg = readPackageJson(cwd);
+                            restoreDeps(failPkg, verbose);
+                            writePackageJson(cwd, failPkg);
+                            runCommand('git', ['add', 'package.json'], { cwd, silent: true });
+                            gitCommit('Restore file: dependencies', cwd);
                         }
                         return false;
                     }
@@ -3838,7 +3856,12 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
                     console.error('  3. Scope (@username) requires authentication');
                     console.error('');
                     if (transformResult.transformed) {
-                        console.log('Run --cleanup to restore file: dependencies');
+                        console.log('Restoring file: dependencies...');
+                        const failPkg = readPackageJson(cwd);
+                        restoreDeps(failPkg, verbose);
+                        writePackageJson(cwd, failPkg);
+                        runCommand('git', ['add', 'package.json'], { cwd, silent: true });
+                        gitCommit('Restore file: dependencies', cwd);
                     }
                     return false;
                 }
@@ -3857,7 +3880,12 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
                 console.error('');
             }
             if (transformResult.transformed) {
-                console.log('Run --cleanup to restore file: dependencies');
+                console.log('Restoring file: dependencies...');
+                const failPkg = readPackageJson(cwd);
+                restoreDeps(failPkg, verbose);
+                writePackageJson(cwd, failPkg);
+                runCommand('git', ['add', 'package.json'], { cwd, silent: true });
+                gitCommit('Restore file: dependencies', cwd);
             }
             return false;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/npmglobalize",
-  "version": "1.0.130",
+  "version": "1.0.132",
   "description": "Transform file: dependencies to npm versions for publishing",
   "main": "index.js",
   "type": "module",