Skip to content

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

TypeScript

fix(release): accept already-consumed frozen changesets (#10358)

Cindy Zhang3c8a88335a6b
diff --git a/scripts/release/active-release.mjs b/scripts/release/active-release.mjs
index 8a4f6d6fad..1ad166bfb5 100644
--- a/scripts/release/active-release.mjs
+++ b/scripts/release/active-release.mjs
@@ -933,7 +933,8 @@ function validateReleaseMergeBack({
}
for (const [file, digest] of planned) {
- if (baseChangesets.get(file) !== digest)
+ const baseDigest = baseChangesets.get(file);
+ if (baseDigest !== undefined && baseDigest !== digest)
errors.push(
`release merge-back cannot verify frozen Changeset on current main: ${file}`,
);
diff --git a/scripts/release/active-release.test.mjs b/scripts/release/active-release.test.mjs
index f1cae32469..5b5b1d4d7c 100644
--- a/scripts/release/active-release.test.mjs
+++ b/scripts/release/active-release.test.mjs
@@ -682,6 +682,18 @@ describe('published release merge-back (FR50)', () => {
);
});
+ it('accepts a frozen Changeset already removed from current main', () => {
+ expect(
+ mergeBack({
+ base: mainAt('0.7.0'),
+ head: mainAt('0.7.0'),
+ entries: ['M\tpackages/core/CHANGELOG.md'],
+ baseChangesets: new Map([['.changeset/post-cut.md', digest('c')]]),
+ headChangesets: new Map([['.changeset/post-cut.md', digest('c')]]),
+ }),
+ ).toEqual([]);
+ });
+
it('rejects changed post-cut Changesets and missing frozen bytes', () => {
expect(
mergeBack({
@@ -847,7 +859,10 @@ describe('published release merge-back (FR50)', () => {
git(root, 'checkout', '-qb', 'invalid-merge-back', `${head}^`);
fs.rmSync(path.join(root, '.changeset/frozen.md'));
write('packages/core/CHANGELOG.md', '# Changelog\n\n## 0.7.8\n');
- write('packages/core/src/Unexpected.tsx', 'export const unexpected = true;\n');
+ write(
+ 'packages/core/src/Unexpected.tsx',
+ 'export const unexpected = true;\n',
+ );
git(root, 'add', '-A');
git(
root,