Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

fix(release): preserve repurposed changesets (#10376)

Cindy Zhanga9a7284aeb4f
diff --git a/scripts/release/active-release.mjs b/scripts/release/active-release.mjs
index 1ad166bfb5..7eae88e71b 100644
--- a/scripts/release/active-release.mjs
+++ b/scripts/release/active-release.mjs
@@ -934,14 +934,15 @@ function validateReleaseMergeBack({
for (const [file, digest] of planned) {
const baseDigest = baseChangesets.get(file);
- if (baseDigest !== undefined && baseDigest !== digest)
- errors.push(
- `release merge-back cannot verify frozen Changeset on current main: ${file}`,
- );
- if (headChangesets.has(file))
- errors.push(
- `release merge-back did not delete frozen Changeset: ${file}`,
- );
+ const headDigest = headChangesets.get(file);
+ if (baseDigest === digest) {
+ if (headDigest !== undefined)
+ errors.push(
+ `release merge-back did not delete frozen Changeset: ${file}`,
+ );
+ } else if (headDigest !== baseDigest) {
+ errors.push(`release merge-back changed post-cut Changeset: ${file}`);
+ }
}
for (const [file, digest] of baseChangesets) {
if (planned.has(file)) continue;
diff --git a/scripts/release/active-release.test.mjs b/scripts/release/active-release.test.mjs
index 5b5b1d4d7c..cc60bedcc5 100644
--- a/scripts/release/active-release.test.mjs
+++ b/scripts/release/active-release.test.mjs
@@ -694,7 +694,25 @@ describe('published release merge-back (FR50)', () => {
).toEqual([]);
});
- it('rejects changed post-cut Changesets and missing frozen bytes', () => {
+ it('preserves a changed frozen path as post-cut work', () => {
+ expect(
+ mergeBack({
+ base: mainAt('0.7.0'),
+ head: mainAt('0.7.0'),
+ entries: ['M\tpackages/core/CHANGELOG.md'],
+ baseChangesets: new Map([
+ ['.changeset/frozen.md', digest('z')],
+ ['.changeset/post-cut.md', digest('c')],
+ ]),
+ headChangesets: new Map([
+ ['.changeset/frozen.md', digest('z')],
+ ['.changeset/post-cut.md', digest('c')],
+ ]),
+ }),
+ ).toEqual([]);
+ });
+
+ it('rejects changed post-cut Changesets', () => {
expect(
mergeBack({
base: mainAt('0.7.0'),
@@ -709,7 +727,7 @@ describe('published release merge-back (FR50)', () => {
).toEqual(
expect.arrayContaining([
'release merge-back may only delete frozen Changesets: .changeset/post-cut.md',
- 'release merge-back cannot verify frozen Changeset on current main: .changeset/frozen.md',
+ 'release merge-back changed post-cut Changeset: .changeset/frozen.md',
'release merge-back changed post-cut Changeset: .changeset/post-cut.md',
]),
);