fix: load Yarn catalogs from .yarnrc.yml (#148)#149
Merged
Conversation
Yarn (>=4.10) stores catalog definitions in .yarnrc.yml under the catalog/catalogs keys, the same shape pnpm uses in pnpm-workspace.yaml. Catalog loading only read pnpm-workspace.yaml and package.json, so Yarn workspaces always got an empty catalog map. Add a catalogYamlFile(pm) helper (pnpm -> pnpm-workspace.yaml, yarn -> .yarnrc.yml) and use it in both loadCatalogs and check's catalog-diff, and include .yarnrc.yml in CATALOG_FILES.
|
The changes in this PR will be included in the next version bump.
|
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
1 participant
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.
Fixes #148.
Problem
Yarn (>=4.10) defines catalogs in
.yarnrc.ymlunder thecatalog/catalogskeys, withpackage.jsononly referencing them via thecatalog:protocol. Catalog loading only readpnpm-workspace.yaml(pnpm) andpackage.json(bun/npm), so in a Yarn workspace the catalog map always came back empty — breakingcatalog:protocol resolution at publish time and catalog-driven change detection.Fix
Yarn's
.yarnrc.ymluses the exact samecatalog/catalogsshape as pnpm'spnpm-workspace.yaml, so no new parsing is needed — the loader just has to read the right file for the detected package manager.catalogYamlFile(pm)helper:pnpm→pnpm-workspace.yaml,yarn→.yarnrc.yml, npm/bun → none (they usepackage.json).loadCatalogsand thecheckcommand's catalog diff now consult that file instead of hardcoding pnpm..yarnrc.ymltoCATALOG_FILESsobumpy checkdetects catalog changes in Yarn repos.parseCatalogs's first parampnpmWorkspaceYaml→workspaceYaml(it's format-agnostic).Because every downstream consumer (dependency propagation,
catalog:resolution during publish) reads the resultingCatalogMap, fixing the load path fixes the whole flow.Tests
Added coverage in
package-manager.test.ts: parsing Yarn's.yarnrc.ymlshape, thecatalogYamlFilehelper, and an integration test thatdetectWorkspacesloads catalogs from.yarnrc.ymlfor a Yarn repo (and ignores a stray.yarnrc.ymlin a pnpm repo).Full suite passes (318 tests), plus
tscand lint are clean.