Skip to content

Commit 2778497

Browse files
authored
Merge branch 'master' into fei-experimental-flags
2 parents 19cda6a + 00e768e commit 2778497

9 files changed

Lines changed: 123 additions & 18 deletions

File tree

‎.changeset/large-rings-invite.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@changesets/assemble-release-plan": patch
3+
---
4+
5+
Fix a bug where packages that shouldn't get released get patch releases when the pre mode is exit
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# We just want a file in here so git collects it
2+
3+
For this we have deliberately not included a config file, as we want to test the defaults
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"private": true,
3+
"name": "simple-project",
4+
"description": "three projects, each depending on one other",
5+
"version": "1.0.0",
6+
"bolt": {
7+
"workspaces": [
8+
"packages/*"
9+
]
10+
}
11+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "pkg-a",
3+
"version": "1.0.0",
4+
"dependencies": {
5+
"pkg-b": "^1.0.0"
6+
}
7+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "pkg-b",
3+
"version": "1.0.0"
4+
}

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,27 @@ describe("assemble-release-plan", () => {
348348
expect(releases[1].name).toEqual("pkg-b");
349349
expect(releases[1].newVersion).toEqual("2.0.0");
350350
});
351+
describe("pre mode exit", () => {
352+
it("should not generate a release for package that has no changesets and is not a dependent of any packages being released", () => {
353+
const { releases } = assembleReleasePlan(
354+
setup.changesets,
355+
setup.packages,
356+
{
357+
...defaultConfig
358+
},
359+
{
360+
changesets: [],
361+
tag: "next",
362+
initialVersions: {},
363+
mode: "exit"
364+
}
365+
);
366+
367+
expect(releases.length).toEqual(1);
368+
expect(releases[0].name).toEqual("pkg-a");
369+
expect(releases[0].newVersion).toEqual("1.0.1");
370+
});
371+
});
351372
});
352373

353374
describe("version update thoroughness", () => {

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

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -88,27 +88,29 @@ function assembleReleasePlan(
8888
changesets = changesets.filter(
8989
changeset => !usedChangesetIds.has(changeset.id)
9090
);
91-
for (let pkg of packages.packages) {
92-
preVersions.set(
93-
pkg.packageJson.name,
94-
getPreVersion(pkg.packageJson.version)
91+
}
92+
93+
// Populate preVersion
94+
// preVersion is the map between package name and its next pre version number.
95+
for (let pkg of packages.packages) {
96+
preVersions.set(
97+
pkg.packageJson.name,
98+
getPreVersion(pkg.packageJson.version)
99+
);
100+
}
101+
for (let linkedGroup of config.linked) {
102+
let highestPreVersion = 0;
103+
for (let linkedPackage of linkedGroup) {
104+
highestPreVersion = Math.max(
105+
getPreVersion(packagesByName.get(linkedPackage)!.packageJson.version),
106+
highestPreVersion
95107
);
96108
}
97-
for (let linkedGroup of config.linked) {
98-
let highestPreVersion = 0;
99-
for (let linkedPackage of linkedGroup) {
100-
highestPreVersion = Math.max(
101-
getPreVersion(
102-
packagesByName.get(linkedPackage)!.packageJson.version
103-
),
104-
highestPreVersion
105-
);
106-
}
107-
for (let linkedPackage of linkedGroup) {
108-
preVersions.set(linkedPackage, highestPreVersion);
109-
}
109+
for (let linkedPackage of linkedGroup) {
110+
preVersions.set(linkedPackage, highestPreVersion);
110111
}
111112
}
113+
112114
for (let pkg of packages.packages) {
113115
packagesByName.set(pkg.packageJson.name, {
114116
...pkg,
@@ -128,7 +130,10 @@ function assembleReleasePlan(
128130
if (updatedPreState !== undefined) {
129131
if (updatedPreState.mode === "exit") {
130132
for (let pkg of packages.packages) {
131-
if (preVersions.get(pkg.packageJson.name) !== -1) {
133+
// If a package had a prerelease, but didn't trigger a version bump in the regular release,
134+
// we want to give it a patch release.
135+
// Detailed explaination at https://github.com/atlassian/changesets/pull/382#discussion_r434434182
136+
if (preVersions.get(pkg.packageJson.name) !== 0) {
132137
if (!releases.has(pkg.packageJson.name)) {
133138
releases.set(pkg.packageJson.name, {
134139
type: "patch",

‎packages/cli/src/commands/version/version.test.ts‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,54 @@ describe("running version in a simple project", () => {
200200
});
201201
});
202202

203+
describe("running version in a simple project with caret dependencies", () => {
204+
it("should bump patch version for packages that had prereleases, but dependencies are still in range", async () => {
205+
let cwd = f.copy("simple-project-caret-dep");
206+
await pre(cwd, { command: "enter", tag: "next" });
207+
await writeChangeset(
208+
{
209+
releases: [{ name: "pkg-b", type: "patch" }],
210+
summary: "a very useful summary for the first change"
211+
},
212+
cwd
213+
);
214+
await version(cwd, defaultOptions, modifiedDefaultConfig);
215+
216+
let packages = (await getPackages(cwd))!;
217+
expect(packages.packages.map(x => x.packageJson)).toEqual([
218+
{
219+
dependencies: {
220+
"pkg-b": "^1.0.1-next.0"
221+
},
222+
name: "pkg-a",
223+
version: "1.0.1-next.0"
224+
},
225+
{
226+
name: "pkg-b",
227+
version: "1.0.1-next.0"
228+
}
229+
]);
230+
231+
await pre(cwd, { command: "exit" });
232+
await version(cwd, defaultOptions, modifiedDefaultConfig);
233+
234+
packages = (await getPackages(cwd))!;
235+
expect(packages.packages.map(x => x.packageJson)).toEqual([
236+
{
237+
dependencies: {
238+
"pkg-b": "^1.0.1"
239+
},
240+
name: "pkg-a",
241+
version: "1.0.1"
242+
},
243+
{
244+
name: "pkg-b",
245+
version: "1.0.1"
246+
}
247+
]);
248+
});
249+
});
250+
203251
describe("running version in a simple project with workspace range", () => {
204252
temporarilySilenceLogs();
205253
let cwd: string;

0 commit comments

Comments
 (0)