fix(bootstrap): Omit local bundled dependencies (#1805)

Fixes #1775
lerna · Dec 6, 2018 · 8f5bdbb · 8f5bdbb
1 parent 25572af
commit 8f5bdbb
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/utils/npm-install/__tests__/npm-install.test.js b/utils/npm-install/__tests__/npm-install.test.js
@@ -121,11 +121,25 @@ describe("npm-install", () => {
             exact: "1.0.0", // will be removed
             "local-dev-dependency": "^1.0.0",
           },
+          optionalDependencies: {
+            "@scoped/others": "1.0.0", // will be removed
+            caret: "^1.0.0",
+            "local-dependency": "^1.0.0",
+          },
+          bundledDependencies: ["local-dependency", "@scoped/exact", "others"],
+          bundleDependencies: ["local-dependency", "@scoped/exact", "others"],
         },
         path.normalize("/test/npm-install-deps")
       );
       const backupManifest = `${pkg.manifestLocation}.lerna_backup`;
-      const dependencies = ["@scoped/caret@^2.0.0", "@scoped/exact@2.0.0", "caret@^1.0.0", "exact@1.0.0"];
+      const dependencies = [
+        "@scoped/caret@^2.0.0",
+        "@scoped/exact@2.0.0",
+        "caret@^1.0.0",
+        "exact@1.0.0",
+        "@scoped/others@1.0.0",
+        "others@1.0.0",
+      ];
 
       await npmInstall.dependencies(pkg, dependencies, {});
 
@@ -144,6 +158,14 @@ describe("npm-install", () => {
           caret: "^1.0.0",
           // removed local-dev-dependency
         },
+        optionalDependencies: {
+          "@scoped/others": "1.0.0",
+          // removed caret, local-dependency
+        },
+        bundledDependencies: [/* removed local-dependency */ "others"],
+        bundleDependencies: [
+          /* removed  */
+        ],
       });
       expect(ChildProcessUtilities.exec).toHaveBeenLastCalledWith("npm", ["install"], {
         cwd: pkg.location,

diff --git a/utils/npm-install/npm-install.js b/utils/npm-install/npm-install.js
@@ -126,6 +126,20 @@ function transformManifest(pkg, dependencies) {
     }
   });
 
+  ["bundledDependencies", "bundleDependencies"].forEach(depType => {
+    const collection = json[depType];
+    if (collection) {
+      const newCollection = [];
+      for (const depName of collection) {
+        if (depMap.has(depName)) {
+          newCollection.push(depName);
+          depMap.delete(depName);
+        }
+      }
+      json[depType] = newCollection;
+    }
+  });
+
   // add all leftovers (root hoisted)
   if (depMap.size) {
     if (!json.dependencies) {