Commit 656f538
authored
[rush] Consolidate pnpm options handling into InstallHelpers.resolvePnpmSettings (#5880)
* More cleanup.
* [rush] Consolidate pnpm options handling into InstallHelpers.resolvePnpmSettings
Read the pnpm options in a single place that derives both the common package.json "pnpm" field and a populated PnpmWorkspaceFile, removing the duplicated pnpm-version gating between generateCommonPackageJsonAsync and WorkspaceInstallManager.prepareCommonTempAsync.
* Create a pnpmWorkspaceFileName constant.
* Get rid of some path.joins
* [rush] Add PnpmWorkspaceFile.loadAsync to read pnpm-workspace.yaml once
Replace the per-field loadPatchedDependenciesAsync/loadAllowBuildsAsync helpers with a single loadAsync that parses the file once and returns a populated PnpmWorkspaceFile, and use it from the rush-pnpm patch-commit and approve-builds commands.
* Add rush change file
* Rush change.1 parent f29d18d commit 656f538
10 files changed
Lines changed: 400 additions & 308 deletions
File tree
- common
- changes/@microsoft/rush
- reviews/api
- libraries/rush-lib/src
- cli
- logic
- installManager
- pnpm
- test
- test
Lines changed: 11 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1578 | 1578 | | |
1579 | 1579 | | |
1580 | 1580 | | |
| 1581 | + | |
1581 | 1582 | | |
1582 | 1583 | | |
1583 | 1584 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
166 | 166 | | |
167 | 167 | | |
168 | 168 | | |
169 | | - | |
| 169 | + | |
170 | 170 | | |
171 | 171 | | |
172 | 172 | | |
| |||
545 | 545 | | |
546 | 546 | | |
547 | 547 | | |
548 | | - | |
549 | | - | |
| 548 | + | |
| 549 | + | |
550 | 550 | | |
| 551 | + | |
551 | 552 | | |
552 | 553 | | |
553 | 554 | | |
| |||
612 | 613 | | |
613 | 614 | | |
614 | 615 | | |
615 | | - | |
616 | | - | |
617 | | - | |
618 | | - | |
619 | | - | |
620 | | - | |
621 | | - | |
| 616 | + | |
| 617 | + | |
| 618 | + | |
| 619 | + | |
622 | 620 | | |
623 | 621 | | |
624 | 622 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
369 | 369 | | |
370 | 370 | | |
371 | 371 | | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
372 | 377 | | |
0 commit comments