@bobfrankston/npmglobalize 1.0.121 → 1.0.122

package/lib.js

@@ -814,6 +814,18 @@ export function restoreDeps(pkg, verbose = false) {
             }
         }
     }
+    // Remove bundledDependencies added for workspace hoisting
+    if (pkg['.bundledDependencies']) {
+        if (pkg['.bundledDependencies'].length === 0) {
+            delete pkg.bundledDependencies;
+            delete pkg.bundleDependencies;
+        }
+        else {
+            pkg.bundledDependencies = pkg['.bundledDependencies'];
+        }
+        delete pkg['.bundledDependencies'];
+        restored = true;
+    }
     return restored;
 }
 /** Check if .dependencies exist (already transformed) */
@@ -2998,16 +3010,18 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
         console.log('  No file: dependencies found.');
     }
     // Hoist workspace sub-package deps into root for publishing/global install.
-    // npm install -g only installs root-level dependencies, so sub-package deps
-    // like express must be present in the root package.json.
-    // These are added temporarily — restoreDeps removes them via .dependencies backup.
+    // npm install -g only installs root-level dependencies and doesn't process
+    // the workspaces field, so:
+    //   1. Third-party deps (express, ws, etc.) must be in root dependencies
+    //   2. Sibling workspace packages must be in bundledDependencies so npm
+    //      includes them in the tarball's node_modules/
+    // All changes are temporary — restoreDeps removes them via .dependencies backup.
     if (pkg.workspaces) {
         const wsPatterns = Array.isArray(pkg.workspaces) ? pkg.workspaces : pkg.workspaces.packages || [];
         // Collect all workspace sub-package dirs
         const wsDirs = [];
         for (const pattern of wsPatterns) {
             if (pattern.includes('*')) {
-                // Glob pattern like "packages/*" — enumerate subdirectories
                 const baseDir = path.resolve(cwd, pattern.replace(/\/?\*$/, ''));
                 if (!fs.existsSync(baseDir))
                     continue;
@@ -3017,14 +3031,13 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
                 }
             }
             else {
-                // Direct directory like "client"
                 const dir = path.resolve(cwd, pattern);
                 if (fs.existsSync(dir))
                     wsDirs.push(dir);
             }
         }
-        // Collect all workspace package names (siblings to skip)
-        const wsNames = new Set();
+        // Collect workspace package names and their relative paths
+        const wsPackages = new Map(); // name -> relative dir
         for (const dir of wsDirs) {
             const pkgJsonPath = path.join(dir, 'package.json');
             if (!fs.existsSync(pkgJsonPath))
@@ -3032,11 +3045,11 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
             try {
                 const subPkg = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf-8'));
                 if (subPkg.name)
-                    wsNames.add(subPkg.name);
+                    wsPackages.set(subPkg.name, path.relative(cwd, dir).replace(/\\/g, '/'));
             }
             catch { /* skip */ }
         }
-        // Find deps in sub-packages not present in root
+        // Find third-party deps in sub-packages not present in root
         const rootDeps = { ...pkg.dependencies, ...pkg.devDependencies };
         const hoisted = [];
         for (const dir of wsDirs) {
@@ -3052,8 +3065,8 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
             }
             const deps = subPkg.dependencies || {};
             for (const [dep, ver] of Object.entries(deps)) {
-                if (wsNames.has(dep))
-                    continue; // sibling workspace — bundled
+                if (wsPackages.has(dep))
+                    continue; // sibling workspace — handled via bundledDependencies
                 if (dep in rootDeps)
                     continue; // already in root
                 if (hoisted.some(m => m.dep === dep))
@@ -3061,7 +3074,8 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
                 hoisted.push({ dep, version: ver, from: subPkg.name || path.basename(dir) });
             }
         }
-        if (hoisted.length > 0) {
+        const needsUpdate = hoisted.length > 0 || wsPackages.size > 0;
+        if (needsUpdate) {
             // Ensure .dependencies backup exists so restoreDeps will remove hoisted deps
             if (!pkg['.dependencies']) {
                 pkg['.dependencies'] = { ...(pkg.dependencies || {}) };
@@ -3069,6 +3083,7 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
             }
             if (!pkg.dependencies)
                 pkg.dependencies = {};
+            // Hoist third-party deps
             for (const m of hoisted) {
                 let version = m.version;
                 if (typeof version === 'string' && version.startsWith('file:')) {
@@ -3084,6 +3099,22 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
                 pkg.dependencies[m.dep] = version;
                 console.log(colors.green(`  + hoisted ${m.dep}: ${version} (from ${m.from})`));
             }
+            // Add workspace sibling packages to dependencies + bundledDependencies
+            // so npm includes them in the tarball's node_modules/
+            // Save original bundledDependencies for restore
+            const origBundled = pkg.bundledDependencies || pkg.bundleDependencies || [];
+            pkg['.bundledDependencies'] = [...origBundled];
+            const bundled = [...origBundled];
+            for (const [name, relDir] of wsPackages) {
+                if (!(name in pkg.dependencies)) {
+                    pkg.dependencies[name] = 'file:./' + relDir;
+                }
+                if (!bundled.includes(name)) {
+                    bundled.push(name);
+                }
+                console.log(colors.green(`  + bundled workspace ${name} (./${relDir})`));
+            }
+            pkg.bundledDependencies = bundled;
             if (!dryRun) {
                 writePackageJson(cwd, pkg);
             }

package/package.json

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