@bobfrankston/npmglobalize 1.0.152 → 1.0.153

package/README.md

@@ -350,6 +350,11 @@ Workspace mode is auto-detected when run from a root with `"private": true` and
 -asis           Skip ignore file checks (or set "asis": true in .globalize.json5)
 -fix-tags       Automatically fix version/tag mismatches
 -rebase         Automatically rebase if local is behind remote
+-clean-nested-modules, -clean-nested
+                Before npm pack, wipe node_modules/ inside each file: dep
+                target. Fixes arborist "Cannot read properties of null"
+                crashes caused by sibling file: deps with nested
+                node_modules. Suggested automatically when the error hits.
 -show           Show package.json dependency changes
 -package, -pkg  Update package.json scripts to use npmglobalize (see below)
 -h, -help       Show help

package/lib.js

@@ -1262,12 +1262,10 @@ function waitForNpmVersion(pkgName, version, maxWaitMs = 90000) {
     process.stdout.write(' timed out\n');
     return false;
 }
-/** Delete `node_modules/` inside each `file:` dep target.
- *  Works around arborist crashes during `npm pack` when sibling `file:` deps
- *  have their own populated `node_modules/`. Returns the names of cleaned deps. */
 function cleanNestedDepModules(pkg, cwd, verbose) {
-    const cleaned = [];
+    const stashed = [];
     const seen = new Set();
+    const suffix = `.npmglobalize-stash-${process.pid}`;
     for (const key of ['.dependencies', '.devDependencies', 'dependencies', 'devDependencies']) {
         const deps = pkg?.[key];
         if (!deps || typeof deps !== 'object')
@@ -1282,18 +1280,40 @@ function cleanNestedDepModules(pkg, cwd, verbose) {
             if (!fs.existsSync(nm))
                 continue;
             seen.add(name);
+            const backup = nm + suffix;
             try {
-                fs.rmSync(nm, { recursive: true, force: true });
-                cleaned.push(name);
+                if (fs.existsSync(backup))
+                    fs.rmSync(backup, { recursive: true, force: true });
+                fs.renameSync(nm, backup);
+                stashed.push({ name, nm, backup });
                 if (verbose)
-                    console.log(colors.dim(`  cleaned ${nm}`));
+                    console.log(colors.dim(`  stashed ${nm} -> ${path.basename(backup)}`));
             }
             catch (e) {
-                console.error(colors.yellow(`  warning: could not clean ${nm}: ${e.message}`));
+                console.error(colors.yellow(`  warning: could not stash ${nm}: ${e.message}`));
             }
         }
     }
-    return cleaned;
+    return stashed;
+}
+/** Restore `node_modules/` previously moved aside by `cleanNestedDepModules`.
+ *  Safe to call multiple times; missing backups are skipped. */
+function restoreNestedDepModules(stashed, verbose) {
+    for (const s of stashed) {
+        try {
+            if (!fs.existsSync(s.backup))
+                continue;
+            if (fs.existsSync(s.nm))
+                fs.rmSync(s.nm, { recursive: true, force: true });
+            fs.renameSync(s.backup, s.nm);
+            if (verbose)
+                console.log(colors.dim(`  restored ${s.nm}`));
+        }
+        catch (e) {
+            console.error(colors.yellow(`  warning: could not restore ${s.nm}: ${e.message}`));
+            console.error(colors.yellow(`    backup remains at ${s.backup} — restore manually`));
+        }
+    }
 }
 /** Run npm install -g with retries for registry propagation delay */
 function installGlobalWithRetry(pkgSpec, cwd, maxRetries = 3) {
@@ -4270,11 +4290,14 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
         if (verbose) {
             console.log(colors.green(`✓ Authenticated as ${authStatus.username}`));
         }
-        // Optionally clean nested node_modules in file: dep targets before pack
+        // Optionally stash nested node_modules in file: dep targets before pack
+        // (arborist crashes when sibling file: deps have populated node_modules).
+        // Restored immediately after pack so symlinked file: deps stay runnable.
+        let stashedDepModules = [];
         if (options.cleanNestedModules) {
-            const cleaned = cleanNestedDepModules(pkg, cwd, verbose);
-            if (cleaned.length > 0) {
-                console.log(colors.yellow(`  Cleaned node_modules in ${cleaned.length} file: dep target(s): ${cleaned.join(', ')}`));
+            stashedDepModules = cleanNestedDepModules(pkg, cwd, verbose);
+            if (stashedDepModules.length > 0) {
+                console.log(colors.yellow(`  Cleaned node_modules in ${stashedDepModules.length} file: dep target(s): ${stashedDepModules.map(s => s.name).join(', ')}`));
             }
             else if (verbose) {
                 console.log(colors.dim('  --clean-nested-modules: nothing to clean'));
@@ -4282,6 +4305,10 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
         }
         // Create tarball first
         const packResult = runCommand('npm', ['pack'], { cwd, silent: true });
+        // Restore stashed node_modules now that pack is done — must happen
+        // before any subsequent install -g symlinks to these dep targets.
+        if (stashedDepModules.length > 0)
+            restoreNestedDepModules(stashedDepModules, verbose);
         if (!packResult.success) {
             const d = diagnoseNpmPackFailure(cwd, packResult.output, packResult.stderr, pkg);
             console.error(colors.red(`ERROR: ${d.summary}`));

package/package.json

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