Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@microsoft/rush",
"comment": "Rename the subspace pnpmfileSettings file to globalPnpmfileSettings.json to avoid overwriting the original pnpmfileSettings.json",
"type": "none"
}
],
"packageName": "@microsoft/rush"
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function init(context: IPnpmfileContext | any): IPnpmfileContext {
if (!settings) {
// Initialize the settings from file
if (!context.splitWorkspacePnpmfileShimSettings) {
context.splitWorkspacePnpmfileShimSettings = __non_webpack_require__('./pnpmfileSettings.json');
context.splitWorkspacePnpmfileShimSettings = __non_webpack_require__('./globalPnpmfileSettings.json');
}
settings = context.splitWorkspacePnpmfileShimSettings!;
} else if (!context.splitWorkspacePnpmfileShimSettings) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class SubspacePnpmfileConfiguration {
// Write the settings file used by the shim
await JsonFile.saveAsync(
subspaceGlobalPnpmfileShimSettings,
path.join(targetDir, 'pnpmfileSettings.json'),
path.join(targetDir, 'globalPnpmfileSettings.json'),
{
ensureFolderExists: true
}
Expand Down