@bobfrankston/npmglobalize 1.0.108 → 1.0.110

package/cli.js

@@ -40,6 +40,8 @@ Install Options:
   -link          Global install via symlink (npm install -g .)
   -local         Local install only — skip transform/publish, just npm install -g .
   -wsl           Also install globally in WSL
+  -freeze        Freeze node_modules (replace symlinks with real copies for network shares)
+  -nofreeze      Disable freeze
   -once          Don't persist flags to .globalize.json5
 
 Mode Options:
@@ -283,6 +285,14 @@ function parseArgs(args) {
             case '-pkg':
                 options.package = true;
                 break;
+            case '-freeze':
+                options.freeze = true;
+                options.explicitKeys.add('freeze');
+                break;
+            case '-nofreeze':
+                options.freeze = false;
+                options.explicitKeys.add('freeze');
+                break;
             case '-once':
                 options.once = true;
                 break;

package/ignorepatterns.json5

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

package/lib.d.ts

@@ -74,6 +74,8 @@ export interface GlobalizeOptions {
     once?: boolean;
     /** Local install only — skip transform/publish, just npm install -g . */
     local?: boolean;
+    /** Freeze node_modules: replace symlinks/junctions with real copies for network share use */
+    freeze?: boolean;
     /** Internal: signals this call is from workspace orchestrator */
     _fromWorkspace?: boolean;
     /** Internal: signals this call is from CLI (version already printed) */

package/lib.js

@@ -13,6 +13,7 @@ import fs from 'fs';
 import path from 'path';
 import { execSync, spawnSync } from 'child_process';
 import { readConfig as readUserConfig, writeConfig as writeUserConfig, configDir } from '@bobfrankston/userconfig';
+import { freezeDependencies } from '@bobfrankston/freezepak';
 /** Wrapper for spawnSync that avoids DEP0190 (args + shell: true).
  *  When shell is true, joins cmd+args into a single command string. */
 function spawnSafe(cmd, args, options = {}) {
@@ -198,7 +199,8 @@ export function writeConfig(dir, config, explicitKeys) {
         install: false,
         wsl: false,
         force: false,
-        verbose: false
+        verbose: false,
+        freeze: false
     };
     // Read existing config to preserve values
     const existing = readConfig(dir);
@@ -257,6 +259,8 @@ export function writeConfig(dir, config, explicitKeys) {
                 comment = '  // Local install only (skip transform/publish)';
             else if (key === 'noPublish')
                 comment = '  // Transform but don\'t publish';
+            else if (key === 'freeze')
+                comment = '  // Freeze node_modules (replace symlinks with real copies)';
             lines.push(`  "${key}": ${jsonValue}${comma}${comment}`);
         });
         lines.push('');
@@ -276,6 +280,7 @@ export function writeConfig(dir, config, explicitKeys) {
     lines.push('  // "fix": false                 // Auto-run npm audit fix');
     lines.push('  // "local": false              // Local install only (skip transform/publish)');
     lines.push('  // "noPublish": false          // Transform but don\'t publish');
+    lines.push('  // "freeze": false              // Freeze node_modules (replace symlinks with real copies)');
     lines.push('}');
     fs.writeFileSync(configPath, lines.join('\n') + '\n');
 }
@@ -1870,7 +1875,7 @@ async function doLocalInstall(cwd, options) {
 }
 export async function globalize(cwd, options = {}, configOptions = {}) {
     const { bump = 'patch', noPublish = false, cleanup = false, install = false, link = false, wsl = false, force = false, files = true, dryRun = false, quiet = true, verbose = false, init = false, gitVisibility = 'private', npmVisibility = 'private', message, conform = false, asis = false, updateDeps = false, updateMajor = false, publishDeps = true, // Default to publishing deps for safety
-    forcePublish = false, fix = false, fixTags = false, rebase = false, show = false, local = false } = options;
+    forcePublish = false, fix = false, fixTags = false, rebase = false, show = false, local = false, freeze = false } = options;
     // Show tool version only for recursive dep calls (CLI already prints it at startup)
     const toolVersion = getToolVersion();
     if (!options._fromWorkspace && !options._fromCli) {
@@ -1927,6 +1932,8 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
             settings.push('--show');
         if (configOptions.local)
             settings.push('-local');
+        if (configOptions.freeze)
+            settings.push('-freeze');
         if (settings.length > 0) {
             console.log(colors.dim(`Settings from .globalize.json5: ${settings.join(', ')}`));
         }
@@ -2687,6 +2694,16 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
     }
     if (noPublish) {
         console.log('Transform complete (--nopublish mode).');
+        if (freeze && !dryRun) {
+            console.log('Freezing node_modules (replacing symlinks with real copies)...');
+            try {
+                freezeDependencies(cwd);
+                console.log(colors.green('✓ node_modules frozen'));
+            }
+            catch (error) {
+                console.error(colors.red(`✗ Freeze failed: ${error.message}`));
+            }
+        }
         if (files && transformResult.transformed) {
             console.log('Restoring file: dependencies...');
             const finalPkg = readPackageJson(cwd);
@@ -2705,6 +2722,16 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
     // Skip if private
     if (pkg.private) {
         console.log('Package is private - skipping npm publish.');
+        if (freeze && !dryRun) {
+            console.log('Freezing node_modules (replacing symlinks with real copies)...');
+            try {
+                freezeDependencies(cwd);
+                console.log(colors.green('✓ node_modules frozen'));
+            }
+            catch (error) {
+                console.error(colors.red(`✗ Freeze failed: ${error.message}`));
+            }
+        }
         if (files && transformResult.transformed) {
             console.log('Restoring file: dependencies...');
             const finalPkg = readPackageJson(cwd);
@@ -2870,6 +2897,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 +2955,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 +2974,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 +3084,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 {
@@ -3302,6 +3370,20 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
             }
         }
     }
+    // Freeze node_modules: replace symlinks/junctions with real copies
+    if (freeze && !dryRun) {
+        console.log('Freezing node_modules (replacing symlinks with real copies)...');
+        try {
+            freezeDependencies(cwd);
+            console.log(colors.green('✓ node_modules frozen'));
+        }
+        catch (error) {
+            console.error(colors.red(`✗ Freeze failed: ${error.message}`));
+        }
+    }
+    else if (freeze && dryRun) {
+        console.log('  [dry-run] Would freeze node_modules');
+    }
     // Finalize - restore file: paths if --files mode (default)
     if (files && transformResult.transformed) {
         console.log('Restoring file: dependencies (--files mode)...');
@@ -3350,6 +3432,9 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
     if (wsl) {
         console.log(`  Installed in WSL: ${colors.green('✓')}`);
     }
+    if (freeze) {
+        console.log(`  Frozen node_modules: ${colors.green('✓')}`);
+    }
     if (files && transformResult.transformed) {
         console.log(`  Restored file: deps: ${colors.green('✓')}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/npmglobalize",
-  "version": "1.0.108",
+  "version": "1.0.110",
   "description": "Transform file: dependencies to npm versions for publishing",
   "main": "index.js",
   "type": "module",
@@ -31,6 +31,7 @@
     "url": "https://github.com/BobFrankston/npmglobalize.git"
   },
   "dependencies": {
+    "@bobfrankston/freezepak": "^0.1.4",
     "@bobfrankston/userconfig": "^1.0.4",
     "@npmcli/package-json": "^7.0.4",
     "json5": "^2.2.3",
@@ -43,6 +44,7 @@
     "access": "public"
   },
   ".dependencies": {
+    "@bobfrankston/freezepak": "file:../freezepak",
     "@bobfrankston/userconfig": "file:../userconfig",
     "@npmcli/package-json": "^7.0.4",
     "json5": "^2.2.3",