fix(bootstrap): reject-cycles when using workspaces (#3168)

commands/bootstrap/__tests__/__fixtures__/yarn-workspaces-cyclic/.yarnrc

@@ -0,0 +1 @@
+workspaces-experimental true

commands/bootstrap/__tests__/__fixtures__/yarn-workspaces-cyclic/lerna.json

@@ -0,0 +1,5 @@
+{
+  "version": "1.0.0",
+  "npmClient": "yarn",
+  "useWorkspaces": true
+}

commands/bootstrap/__tests__/__fixtures__/yarn-workspaces-cyclic/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "root",
+  "private": true,
+  "workspaces": [
+    "workspaces/*"
+  ]
+}

commands/bootstrap/__tests__/__fixtures__/yarn-workspaces-cyclic/workspaces/package-1/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "package-1",
+  "version": "1.0.0",
+  "dependencies": {
+    "foo": "^1.0.0"
+  }
+}

commands/bootstrap/__tests__/__fixtures__/yarn-workspaces-cyclic/workspaces/package-2/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "package-2",
+  "version": "1.0.0",
+  "dependencies": {
+    "package-2": "^1.0.0"
+  }
+}

commands/bootstrap/__tests__/bootstrap-command.test.js

@@ -654,6 +654,12 @@ describe("BootstrapCommand", () => {
       const testDir = await initFixture("toposort");
       const command = lernaBootstrap(testDir)("--reject-cycles");
 
+      await expect(command).rejects.toThrow("Dependency cycles detected, you should fix these!");
+    });
+    it("should throw an error with --reject-cycles when using yarn-workspaces", async () => {
+      const testDir = await initFixture("yarn-workspaces-cyclic");
+      const command = lernaBootstrap(testDir)("--reject-cycles");
+
       await expect(command).rejects.toThrow("Dependency cycles detected, you should fix these!");
     });
   });

commands/bootstrap/index.js

@@ -185,6 +185,9 @@ class BootstrapCommand extends Command {
 
   execute() {
     if (this.options.useWorkspaces || this.rootHasLocalFileDependencies()) {
+      if (this.options.rejectCycles) {
+        this.packageGraph.collapseCycles({ rejectCycles: this.options.rejectCycles });
+      }
       return this.installRootPackageOnly();
     }