Repository navigation
[rush] Make version consistency checks aware of PNPM catalogs - #6140
Merged
Bharat Middha (bmiddha) merged 1 commit intoNov 10, 2026
Merged
Conversation
Bharat Middha (bmiddha)
force-pushed
the
bmiddha-catalog-aware-version-checks
branch
from
October 14, 2026 20:54
664d3de to
eff340a
Compare
Bharat Middha (bmiddha)
force-pushed
the
bmiddha-catalog-aware-version-checks
branch
2 times, most recently
from
October 20, 2026 21:13
f2519b0 to
cb746ea
Compare
Bharat Middha (bmiddha)
force-pushed
the
bmiddha-catalog-aware-version-checks
branch
from
October 28, 2026 04:45
cb746ea to
209c8e5
Compare
Bharat Middha (bmiddha)
force-pushed
the
bmiddha-catalog-aware-version-checks
branch
from
October 30, 2026 21:06
209c8e5 to
354f91f
Compare
Bharat Middha (bmiddha)
marked this pull request as ready for review
October 30, 2026 23:02
Bharat Middha (bmiddha)
force-pushed
the
bmiddha-catalog-aware-version-checks
branch
from
November 8, 2026 01:13
354f91f to
13bb763
Compare
Bharat Middha (bmiddha)
force-pushed
the
bmiddha-catalog-aware-version-checks
branch
from
November 8, 2026 02:00
13bb763 to
a9fbd99
Compare
Sean Larkin (TheLarkInn)
approved these changes
Nov 9, 2026
Bharat Middha (bmiddha)
force-pushed
the
bmiddha-catalog-aware-version-checks
branch
2 times, most recently
from
November 9, 2026 21:34
40f186e to
49d41e2
Compare
Base automatically changed from
bmiddha-catalog-aware-preferred-versions
to
main
November 10, 2026 01:02
Version checks compared raw specifiers, so "catalog:" was reported as inconsistent with the same version elsewhere, which fails ensureConsistentVersions once a repo adopts PNPM catalogs. Compare catalog references by their resolved version, and keep --make-consistent from replacing them with literal versions. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Bharat Middha (bmiddha)
force-pushed
the
bmiddha-catalog-aware-version-checks
branch
from
November 10, 2026 01:02
49d41e2 to
f1bf275
Compare
Bharat Middha (bmiddha)
deleted the
bmiddha-catalog-aware-version-checks
branch
November 10, 2026 01:50
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Version consistency checks compared raw specifiers, so
"typescript": "catalog:"was reported as inconsistent with"~5.8.2", with the same version inpreferredVersions, and even with"catalog:default". WithensureConsistentVersions, that failsrush install,rush update, andrush checkas soon as a repo adopts PNPM catalogs.Catalog references are now compared by the version that they resolve to in the subspace's catalogs, and
--make-consistentno longer replaces other projects' catalog references with literal versions.Details
catalog:orcatalog:<name>, instead of failing or being ignored.allowedAlternativeVersionsmatches either the resolved version or the raw reference, such ascatalog:react17.rush checkannotates catalog versions, for example~5.8.2 (catalog:). Inrush check --json,versionis the resolved version, which is what PNPM installs, and an optionalcatalogReferencesfield lists the projects that used a catalog. Existing fields are unchanged.--make-consistent(rush add,rush upgrade-interactive) skips projects that reference the package through a catalog, and warns if the catalog version differs. It still overwrites a catalog reference in the target project itself; that is not addressed here.ProjectChangeAnalyzernow trims catalog names the way PNPM does, socatalog: toolsis treated astools.How it was tested
Unit tests cover catalog references compared with literals,
catalog:default, andpreferredVersions; named catalogs withallowedAlternativeVersions; per-subspace catalogs; unresolved references; therush checktext and JSON output; and--make-consistentleaving catalog references in place. The consistency check still finds no mismatches in this repo.