@bobfrankston/npmglobalize 1.0.108 → 1.0.109

package/ignorepatterns.json5

@@ -20,7 +20,6 @@
         recommended: [
             "node_modules/",
             ".globalize.json5",
-            ".globalize.jsonc",
             "*.log",
             ".DS_Store",
             "Thumbs.db"

package/lib.js

@@ -2870,6 +2870,19 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
             console.log('  [dry-run] Would commit changes');
         }
     }
+    // Pull latest from remote before version bump to avoid push rejection
+    if (currentGitStatus.hasRemote && !dryRun) {
+        const pullResult = runCommand('git', ['pull', '--rebase'], { cwd, silent: true });
+        if (!pullResult.success) {
+            console.error(colors.yellow('Warning: git pull --rebase failed before version bump'));
+            if (verbose) {
+                console.error('  ' + pullResult.stderr);
+            }
+        }
+        else if (verbose) {
+            console.log('  Pulled latest from remote');
+        }
+    }
     // Version bump
     console.log(`Bumping version (${bump})...`);
     if (!dryRun) {
@@ -2915,6 +2928,7 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
             console.log(colors.green(`Version bumped to ${newVersion}`));
         }
         catch (error) {
+            let autoFixed = false;
             console.error(colors.red('ERROR: Version bump failed:'), error.message);
             // Show additional error details if available
             if (error.stderr || error.stdout || error.code) {
@@ -2933,16 +2947,41 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
             const stderrLower = (error.stderr || '').toLowerCase();
             const stdoutLower = (error.stdout || '').toLowerCase();
             const combinedOutput = stderrLower + ' ' + stdoutLower;
-            if (combinedOutput.includes('non-fast-forward') || combinedOutput.includes('rejected') && combinedOutput.includes('behind')) {
-                console.error(colors.yellow('\nYour local branch is behind the remote.'));
-                console.error(colors.yellow('This usually means changes were pushed from another location.'));
-                console.error(colors.yellow('\nTo fix this:'));
-                console.error('  1. Pull remote changes: git pull --rebase');
-                console.error('  2. Then run npmglobalize again');
-                console.error(colors.yellow('\nOr to force push (use with caution):'));
-                console.error('  git push --force-with-lease');
-                if (!force) {
-                    return false;
+            if (combinedOutput.includes('non-fast-forward') || (combinedOutput.includes('rejected') && combinedOutput.includes('behind'))) {
+                // Version bump + tag succeeded locally; only the push failed.
+                // Auto-pull --rebase and retry the push.
+                console.log(colors.yellow('\nLocal branch is behind remote — pulling with rebase...'));
+                const pullResult = runCommand('git', ['pull', '--rebase'], { cwd });
+                if (pullResult.success) {
+                    console.log(colors.green('  ✓ Rebased onto remote'));
+                    const pushResult = runCommand('git', ['push'], { cwd });
+                    if (pushResult.success) {
+                        const tagPush = runCommand('git', ['push', '--tags'], { cwd, silent: true });
+                        if (tagPush.success) {
+                            console.log(colors.green('  ✓ Pushed with tags'));
+                        }
+                        else {
+                            console.log(colors.green('  ✓ Pushed (tags may need manual push)'));
+                        }
+                        // Re-read version after successful rebase+push
+                        const rebased = readPackageJson(cwd);
+                        console.log(colors.green(`Version bumped to ${rebased.version}`));
+                        autoFixed = true;
+                    }
+                    else {
+                        console.error(colors.red('Push still failed after rebase.'));
+                        console.error('  Try: git push --force-with-lease');
+                        if (!force) {
+                            return false;
+                        }
+                    }
+                }
+                else {
+                    console.error(colors.red('Auto-rebase failed (likely merge conflict).'));
+                    console.error('  Resolve conflicts, then: git rebase --continue && git push');
+                    if (!force) {
+                        return false;
+                    }
                 }
             }
             else if (stderrLower.includes('tag') && stderrLower.includes('already exists')) {
@@ -3018,10 +3057,12 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
                 console.error('  • Disk space or permissions issues');
                 console.error(colors.yellow('\nTry running with --verbose or check git status manually'));
             }
-            if (!force) {
-                return false;
+            if (!autoFixed) {
+                if (!force) {
+                    return false;
+                }
+                console.log(colors.yellow('Continuing with --force...'));
             }
-            console.log(colors.yellow('Continuing with --force...'));
         }
     }
     else {

package/package.json

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