Skip to content

Commit af9adce

Browse files
committed
Rename subspace pnpmfileSettings file to globalPnpmfileSettings.json from pnpmfileSettings.json
1 parent 224e157 commit af9adce

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@microsoft/rush",
5+
"comment": "Rename the subspace pnpmfileSettings file to globalPnpmfileSettings.json to avoid overwriting the original pnpmfileSettings.json",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@microsoft/rush"
10+
}

Diff for: libraries/rush-lib/src/logic/pnpm/SubspaceGlobalPnpmfileShim.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function init(context: IPnpmfileContext | any): IPnpmfileContext {
4444
if (!settings) {
4545
// Initialize the settings from file
4646
if (!context.splitWorkspacePnpmfileShimSettings) {
47-
context.splitWorkspacePnpmfileShimSettings = __non_webpack_require__('./pnpmfileSettings.json');
47+
context.splitWorkspacePnpmfileShimSettings = __non_webpack_require__('./globalPnpmfileSettings.json');
4848
}
4949
settings = context.splitWorkspacePnpmfileShimSettings!;
5050
} else if (!context.splitWorkspacePnpmfileShimSettings) {

Diff for: libraries/rush-lib/src/logic/pnpm/SubspacePnpmfileConfiguration.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export class SubspacePnpmfileConfiguration {
4949
// Write the settings file used by the shim
5050
await JsonFile.saveAsync(
5151
subspaceGlobalPnpmfileShimSettings,
52-
path.join(targetDir, 'pnpmfileSettings.json'),
52+
path.join(targetDir, 'globalPnpmfileSettings.json'),
5353
{
5454
ensureFolderExists: true
5555
}

0 commit comments

Comments
 (0)