Skip to content

[rush] Fix an issue that rush-pnpm patch-commit can not generate correct pnpm-config.json file in subspace case #4838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 19, 2024
Merged

[rush] Fix an issue that rush-pnpm patch-commit can not generate correct pnpm-config.json file in subspace case #4838

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8a59872
fix: rush-pnpm patch-commit
g-chao Jul 17, 2024
fb45e6a
chore: rush change
g-chao Jul 17, 2024
512fa92
chore: address PR comments
g-chao Jul 17, 2024
975a108
fix: handle case where the pnpm-config.json not exists
g-chao Jul 17, 2024
b0dadb0
chore: add comments
g-chao Jul 18, 2024
2a6dba1
Improve error message wording
octogonz Jul 19, 2024
b6783cd
Prepare to publish a PATCH release
octogonz Jul 19, 2024
2f621cf
Merge remote-tracking branch 'remotes/origin/main' into chao/fix-rush…
octogonz Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions common/changes/@microsoft/rush/chao-fix-rush-pnpm-patch_2024-07-17-20-42.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@microsoft/rush",
"comment": "Fix an issue that `rush-pnpm patch-commit` can not generate correct pnpm-config.json file in subspace case",
"type": "none"
}
],
"packageName": "@microsoft/rush"
}
8 changes: 4 additions & 4 deletions libraries/rush-lib/src/cli/RushPnpmCommandLineParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,11 +452,11 @@ export class RushPnpmCommandLineParser {
const newGlobalPatchedDependencies: Record<string, string> | undefined =
commonPackageJson?.pnpm?.patchedDependencies;
const currentGlobalPatchedDependencies: Record<string, string> | undefined =
this._rushConfiguration.pnpmOptions.globalPatchedDependencies;
this._subspace.getPnpmOptions()?.globalPatchedDependencies;

if (!objectsAreDeepEqual(currentGlobalPatchedDependencies, newGlobalPatchedDependencies)) {
const commonTempPnpmPatchesFolder: string = `${subspaceTempFolder}/${RushConstants.pnpmPatchesFolderName}`;
const rushPnpmPatchesFolder: string = `${this._rushConfiguration.commonFolder}/${RushConstants.pnpmPatchesCommonFolderName}`;
const rushPnpmPatchesFolder: string = `${subspaceTempFolder}/${RushConstants.pnpmPatchesCommonFolderName}`;
// Copy (or delete) common\temp\patches\ --> common\pnpm-patches\
if (FileSystem.exists(commonTempPnpmPatchesFolder)) {
FileSystem.ensureEmptyFolder(rushPnpmPatchesFolder);
Expand All @@ -477,14 +477,14 @@ export class RushPnpmCommandLineParser {
}

// Update patchedDependencies to pnpm configuration file
this._rushConfiguration.pnpmOptions.updateGlobalPatchedDependencies(newGlobalPatchedDependencies);
this._subspace.getPnpmOptions()?.updateGlobalPatchedDependencies(newGlobalPatchedDependencies);

// Rerun installation to update
await this._doRushUpdateAsync();

this._terminal.writeWarningLine(
`Rush refreshed the ${RushConstants.pnpmConfigFilename}, shrinkwrap file and patch files under the ` +
`"${RushConstants.commonFolderName}/${RushConstants.pnpmPatchesCommonFolderName}" folder.\n` +
`"${commonTempPnpmPatchesFolder}" folder.\n` +
' Please commit this change to Git.'
);
}
Expand Down
Loading