[rush] Clean up PNPM options saving#5874
Open
iclanton wants to merge 5 commits into
Open
Conversation
… objects - Restore workspaceFile.catalogs assignment in WorkspaceInstallManager that was lost during cleanup, so globalCatalogs are written to pnpm-workspace.yaml again - Pass through explicitly-set empty catalogs/allowBuilds objects rather than omitting them; only undefined is omitted - Update tests and snapshot to reflect the passthrough behavior
iclanton
requested review from
apostolisms,
bmiddha,
dmichon-msft,
jxanthony and
octogonz
as code owners
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.
Summary
Cleanup of the PNPM
common/temp/package.jsonandpnpm-workspace.yamlgeneration code, plus a bug fix uncovered during the cleanup.Changes
InstallHelpers: RefactoredgenerateCommonPackageJsoninto an asyncgenerateCommonPackageJsonAsync. Thepnpmsection of the commonpackage.jsonis now assembled once from a destructured set of options, relying onJsonFile.saveAsync({ ignoreUndefinedValues: true })to drop unset fields instead of conditionally assigning each property. Optional-chaining cleanups ingetPackageManagerEnvironment.BaseWorkspaceFile/PnpmWorkspaceFile:saveis nowsaveAsync, andserializeis nowserializeAsync. Thecatalogs,allowBuilds,minimumReleaseAge, andminimumReleaseAgeExcludesetters were replaced with public fields.js-yamlis now imported dynamically.WorkspaceInstallManager: Destructures the PNPM options up front and defers thejs-yamlimport.workspaceFile.catalogsassignment that was accidentally dropped during the cleanup, soglobalCatalogsare written topnpm-workspace.yamlagain.catalogs/allowBuildsobjects are now passed through to the generated file as-is; onlyundefinedvalues are omitted.Testing
PnpmWorkspaceFileandInstallHelpersunit tests updated for the async API and the empty-object passthrough behavior. All tests pass.