fix: Respect durable hoist configuration

fixes #1325
lerna · Mar 19, 2018 · 2081640 · 2081640
1 parent f15b224
commit 2081640
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/commands/bootstrap/__tests__/bootstrap-command.test.js b/commands/bootstrap/__tests__/bootstrap-command.test.js
@@ -17,6 +17,7 @@ const createSymlink = require("@lerna/create-symlink");
 // helpers
 const initFixture = require("@lerna-test/init-fixture")(__dirname);
 const normalizeRelativeDir = require("@lerna-test/normalize-relative-dir");
+const updateLernaConfig = require("@lerna-test/update-lerna-config");
 
 // file under test
 const lernaBootstrap = require("@lerna-test/command-runner")(require("../command"));
@@ -282,7 +283,10 @@ describe("BootstrapCommand", () => {
     it("hoists appropriately", async () => {
       const testDir = await initFixture("cold");
 
-      await lernaBootstrap(testDir)("--hoist");
+      await updateLernaConfig(testDir, {
+        hoist: true,
+      });
+      await lernaBootstrap(testDir)();
 
       expect(installedPackagesInDirectories(testDir)).toMatchSnapshot();
       expect(symlinkedDirectories(testDir)).toMatchSnapshot();
@@ -301,7 +305,15 @@ describe("BootstrapCommand", () => {
     it("hoists appropriately", async () => {
       const testDir = await initFixture("warm");
 
-      await lernaBootstrap(testDir)("--hoist");
+      await updateLernaConfig(testDir, {
+        command: {
+          // "commands" also supported
+          bootstrap: {
+            hoist: true,
+          },
+        },
+      });
+      await lernaBootstrap(testDir)();
 
       expect(installedPackagesInDirectories(testDir)).toMatchSnapshot();
       expect(symlinkedDirectories(testDir)).toMatchSnapshot();

diff --git a/commands/bootstrap/index.js b/commands/bootstrap/index.js
@@ -212,7 +212,19 @@ class BootstrapCommand extends Command {
     let hoisting;
 
     if (hoist) {
-      hoisting = [].concat(hoist, nohoist || []);
+      if (hoist === true) {
+        // lerna.json `hoist: true`
+        hoisting = ["**"];
+      } else {
+        // `--hoist ...` or lerna.json `hoist: [...]`
+        hoisting = [].concat(hoist);
+      }
+
+      if (nohoist) {
+        // `--nohoist ...` or lerna.json `nohoist: [...]`
+        hoisting = hoisting.concat(nohoist);
+      }
+
       tracker.verbose("hoist", "using globs %j", hoisting);
     }