Skip to content

fix(sync): hold the lockfile at main's versions - #229

Merged
catinspace-au merged 1 commit into
mainfrom
fix/sync-lockfile-guard
Nov 16, 2026
Merged

catinspace-au merged 1 commit into
mainfrom
fix/sync-lockfile-guard

Conversation

@catinspace-au

Copy link
Copy Markdown
Contributor

The 2.45 sync took upstream's lockfile whole and skipped the yarn up -R step. #228 put back the packages behind alerts. This restores the other downgraded packages and fails future syncs if package versions fall below the base branch.

  • 16 packages go back inside their declared ranges: the @babel/* copies, @jridgewell/sourcemap-codec, @types/semver, axios, is-core-module, isexe, regenerate, resolve, smol-toml
  • The package fixes change yarn.lock alone. package.json is untouched.
  • scripts/lockfile-floor.py names every package that resolves below the base branch, and prints the yarn up -R line that fixes it
  • upstream-sync.yml runs yarn up -R after yarn install, then fails the gate if any package version is still below the base branch
  • fork-surface.yml checks every PR for package versions below the base branch, covering hand-merged syncs
  • security/lockfile-floor-allow.txt allows downgrades listed one per line with a reason

One yarn up -R command fixes all 122 package regressions in the 2.45 merge's lockfile. osv-scanner reports no issues before and after.

The 2.45 sync took upstream's whole lockfile and skipped step 5 of the cycle. This downgraded packages main had moved past upstream. #228 restored those behind alerts. This restores the other downgraded packages and stops sync downgrades.

The 16 restored packages are the @babel/* copies, @jridgewell/sourcemap-codec, @types/semver, axios, is-core-module, isexe, regenerate, resolve and smol-toml. The restored versions are within their declared ranges, resolved by yarn up -R. package.json is unchanged. osv-scanner reports no issues before and after.

scripts/lockfile-floor.py compares yarn.lock with the base branch and names every package that resolves lower, by descriptor and by major line. The sync workflow runs yarn up -R on those names, then fails if any is still below. fork-surface.yml runs the same check on every PR. Intentional downgrades go in security/lockfile-floor-allow.txt with a reason.
@catinspace-au
catinspace-au merged commit 36cd8cc into main Nov 16, 2026
34 checks passed
@catinspace-au
catinspace-au deleted the fix/sync-lockfile-guard branch November 16, 2026 17:25
@github-actions

Copy link
Copy Markdown
Contributor

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant