fix: bump dependent when both a dev dep and a prod dep are released (#…

…344)

.changeset/lovely-papayas-promise.md

@@ -0,0 +1,5 @@
+---
+"@changesets/assemble-release-plan": patch
+---
+
+When both a dev dep and a prod dep of a dependent package are published, the version of the dependent package should be bumped. This fixes a regression introduced by #313.

__fixtures__/dev-and-prod-dep/.changeset/README.md

@@ -0,0 +1,3 @@
+# We just want a file in here so git collects it
+
+For this we have deliberately not included a config file, as we want to test the defaults

__fixtures__/dev-and-prod-dep/.changeset/config.json

@@ -0,0 +1 @@
+{}

__fixtures__/dev-and-prod-dep/package.json

@@ -0,0 +1,11 @@
+{
+  "private": true,
+  "name": "simple-project",
+  "description": "three projects, each depending on one other",
+  "version": "1.0.0",
+  "bolt": {
+    "workspaces": [
+      "packages/*"
+    ]
+  }
+}

__fixtures__/dev-and-prod-dep/packages/pkg-a/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "pkg-a",
+  "version": "1.0.0",
+  "dependencies": {
+    "pkg-b": "1.0.0"
+  },
+  "devDependencies": {
+    "pkg-c": "1.0.0"
+  }
+}

__fixtures__/dev-and-prod-dep/packages/pkg-b/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "pkg-b",
+  "version": "1.0.0"
+}

__fixtures__/dev-and-prod-dep/packages/pkg-c/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "pkg-c",
+  "version": "1.0.0"
+}

packages/assemble-release-plan/src/determine-dependents.ts

@@ -67,7 +67,8 @@ export default function getDependents(
         } else {
           if (
             // TODO validate this - I don't think it's right anymore
-            !releases.has(dependent) &&
+            (!releases.has(dependent) ||
+              releases.get(dependent)!.type === "none") &&
             !semver.satisfies(
               incrementVersion(nextRelease, preInfo),
               versionRange
@@ -85,6 +86,9 @@ export default function getDependents(
             }
           }
         }
+        if (releases.has(dependent) && releases.get(dependent)!.type === type) {
+          type = undefined;
+        }
         return { name: dependent, type, pkgJSON: dependentPackage.packageJson };
       })
       .filter(({ type }) => type)

packages/assemble-release-plan/src/index.test.ts

@@ -115,6 +115,33 @@ describe("assemble-release-plan", () => {
     expect(releases[1].name).toEqual("pkg-b");
     expect(releases[1].newVersion).toEqual("1.0.0");
   });
+  it("should assemble release plan with dependent when the dependent has both a changed prod and dev dependency", () => {
+    setup.updateDevDependency("pkg-b", "pkg-a", "^1.0.0");
+    setup.updateDependency("pkg-b", "pkg-c", "^1.0.0");
+    setup.addChangeset({
+      id: "big-cats-delight",
+      releases: [
+        { name: "pkg-a", type: "major" },
+        { name: "pkg-c", type: "major" }
+      ]
+    });
+
+    let { releases } = assembleReleasePlan(
+      setup.changesets,
+      setup.packages,
+      defaultConfig,
+      undefined
+    );
+
+    expect(releases.length).toEqual(3);
+    expect(releases[0].name).toEqual("pkg-a");
+    expect(releases[0].newVersion).toEqual("2.0.0");
+    expect(releases[1].name).toEqual("pkg-c");
+    expect(releases[1].newVersion).toEqual("2.0.0");
+    expect(releases[2].name).toEqual("pkg-b");
+    expect(releases[2].oldVersion).toEqual("1.0.0");
+    expect(releases[2].newVersion).toEqual("1.0.1");
+  });
   it("should assemble release plan without dependent through the link protocol", () => {
     setup.updateDevDependency("pkg-b", "pkg-a", "link:../pkg-a");
     setup.addChangeset({