From 13100ad1c60c6f38ec053b73a3d58e245e8a8a11 Mon Sep 17 00:00:00 2001 From: Daniel Lu Date: Mon, 6 Jul 2026 11:56:11 -0700 Subject: [PATCH 1/3] chore: fix weekly differ so it doesnt error after a patch release --- scripts/buildBranchAPI.js | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/scripts/buildBranchAPI.js b/scripts/buildBranchAPI.js index 94e19be481a..e0fd782aa95 100644 --- a/scripts/buildBranchAPI.js +++ b/scripts/buildBranchAPI.js @@ -180,6 +180,34 @@ async function build() { .filter(Boolean) ); + // similar to above, dev/* packages may contain pinned dependency versions (e.g. codemods pins to specific S2 versions) + // problem that arises is if we do a patch release since our weekly tsdiffer looks for the last MINOR instead + // this causes a miss match in the versions since the dev/* package gets copied over and might still have the updated S2 patch + // version whereas the workspace (aka the last minor baseline we checked out) has the last S2 minor version + // handle this by deleting the pinned versions so we resolve to the workspace's version + let devPackageJsons = glob.sync('dev/**/package.json', { + cwd: path.join(dir, 'packages'), + ignore: ['**/node_modules/**'] + }); + for (let p of devPackageJsons) { + let fullPath = path.join(dir, 'packages', p); + let json = JSON.parse(fs.readFileSync(fullPath, 'utf8')); + let changed = false; + for (let depField of ['dependencies', 'devDependencies']) { + if (json[depField]) { + for (let dep of Object.keys(json[depField])) { + if (workspacePackageNames.has(dep)) { + delete json[depField][dep]; + changed = true; + } + } + } + } + if (changed) { + fs.writeFileSync(fullPath, JSON.stringify(json, false, 2)); + } + } + let excludeList = ['@react-spectrum/story-utils']; // Copy packages over to temp dir console.log('copying over'); From e9bb254cb99d2bd7b8bc53ac02a90c18e5580749 Mon Sep 17 00:00:00 2001 From: Daniel Lu Date: Mon, 6 Jul 2026 11:58:58 -0700 Subject: [PATCH 2/3] test on test channel --- .github/workflows/weekly-api-diff.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/weekly-api-diff.yml b/.github/workflows/weekly-api-diff.yml index 4c6a4f0e2ed..5e1683b6ec5 100644 --- a/.github/workflows/weekly-api-diff.yml +++ b/.github/workflows/weekly-api-diff.yml @@ -148,7 +148,7 @@ jobs: raise SystemExit(f"Missing required environment variables: {', '.join(missing)}") today = os.environ['TODAY'] - channel = os.environ['SLACK_CHANNEL_ID'] + channel = os.environ['TEST_SLACK_ID'] snapshots_repo = os.environ['SNAPSHOTS_REPO'] slack_token = os.environ['SLACK_TSDIFF_CHROMATIC_BOT_TOKEN'] github_token = os.environ['GITHUB_TOKEN'] From ee8dd5132b4f8bb293f719365d4df26e43921fe6 Mon Sep 17 00:00:00 2001 From: Daniel Lu Date: Mon, 6 Jul 2026 12:35:29 -0700 Subject: [PATCH 3/3] Revert "test on test channel" This reverts commit e9bb254cb99d2bd7b8bc53ac02a90c18e5580749. --- .github/workflows/weekly-api-diff.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/weekly-api-diff.yml b/.github/workflows/weekly-api-diff.yml index 5e1683b6ec5..4c6a4f0e2ed 100644 --- a/.github/workflows/weekly-api-diff.yml +++ b/.github/workflows/weekly-api-diff.yml @@ -148,7 +148,7 @@ jobs: raise SystemExit(f"Missing required environment variables: {', '.join(missing)}") today = os.environ['TODAY'] - channel = os.environ['TEST_SLACK_ID'] + channel = os.environ['SLACK_CHANNEL_ID'] snapshots_repo = os.environ['SNAPSHOTS_REPO'] slack_token = os.environ['SLACK_TSDIFF_CHROMATIC_BOT_TOKEN'] github_token = os.environ['GITHUB_TOKEN']