Merge pull request #4696 from william2958/will/pnpmfile-reset

[rush] Add a reset function to the pnpmfile to allow for clearing state

common/changes/@microsoft/rush/will-pnpmfile-reset_2024-05-10-19-46.json

@@ -0,0 +1,10 @@
+{
+ "changes": [
+ {
+ "packageName": "@microsoft/rush",
+ "comment": "Fix an issue where installing multiple subspaces consecutively can cause unexpected cross-contamination between pnpmfiles.",
+ "type": "none"
+ }
+ ],
+ "packageName": "@microsoft/rush"
+}

libraries/rush-lib/src/logic/pnpm/PnpmfileConfiguration.ts

@@ -22,6 +22,7 @@ export class PnpmfileConfiguration {
  private _context: IPnpmfileContext | undefined;
 
  private constructor(context: IPnpmfileContext) {
+ pnpmfile.reset();
  this._context = context;
  }
 

libraries/rush-lib/src/logic/pnpm/PnpmfileShim.ts

@@ -14,12 +14,21 @@ import type { IPackageJson } from '@rushstack/node-core-library';
 import type { IPnpmShrinkwrapYaml } from './PnpmShrinkwrapFile';
 import type { IPnpmfile, IPnpmfileShimSettings, IPnpmfileContext, IPnpmfileHooks } from './IPnpmfile';
 
-let settings: IPnpmfileShimSettings;
-let allPreferredVersions: Map<string, string>;
+let settings: IPnpmfileShimSettings | undefined;
+let allPreferredVersions: Map<string, string> | undefined;
 let allowedAlternativeVersions: Map<string, Set<string>> | undefined;
 let userPnpmfile: IPnpmfile | undefined;
 let semver: typeof TSemver | undefined;
 
+// Resets the internal state of the pnpmfile
+export function reset(): void {
+ settings = undefined;
+ allPreferredVersions = undefined;
+ allowedAlternativeVersions = undefined;
+ userPnpmfile = undefined;
+ semver = undefined;
+}
+
 // Initialize all external aspects of the pnpmfile shim. When using the shim, settings
 // are always expected to be available. Init must be called before running any hook that
 // depends on a resource obtained from or related to the settings, and will require modules
@@ -40,7 +49,7 @@ function init(context: IPnpmfileContext | any): IPnpmfileContext {
  if (!context.pnpmfileShimSettings) {
  context.pnpmfileShimSettings = __non_webpack_require__('./pnpmfileSettings.json');
  }
- settings = context.pnpmfileShimSettings!;
+ settings = context.pnpmfileShimSettings as IPnpmfileShimSettings;
  } else if (!context.pnpmfileShimSettings) {
  // Reuse the already initialized settings
  context.pnpmfileShimSettings = settings;