Undo rename a const

sachinjoseph · sachinjoseph · commit 62ba1f10e8f0 · 2019-10-08T19:05:47.000-07:00
diff --git a/apps/rush-lib/src/api/packageManager/PnpmPackageManager.ts b/apps/rush-lib/src/api/packageManager/PnpmPackageManager.ts
@@ -22,25 +22,25 @@ export class PnpmPackageManager extends PackageManager {
   public constructor(version: string) {
     super(version, 'pnpm');
 
-    const pnpmVersion: semver.SemVer = new semver.SemVer(version);
+    const parsedVersion: semver.SemVer = new semver.SemVer(version);
 
     this.supportsResolutionStrategy = false;
 
-    if (pnpmVersion.major >= 3) {
+    if (parsedVersion.major >= 3) {
       this._shrinkwrapFilename = RushConstants.pnpmV3ShrinkwrapFilename;
 
-      if (pnpmVersion.minor >= 1) {
+      if (parsedVersion.minor >= 1) {
         // Introduced in version 3.1.0-0
         this.supportsResolutionStrategy = true;
       }
     } else {
       this._shrinkwrapFilename = RushConstants.pnpmV1ShrinkwrapFilename;
     }
 
-    if (pnpmVersion.major <= 2) {
+    if (parsedVersion.major <= 2) {
       // node_modules/.shrinkwrap.yaml
       this.internalShrinkwrapRelativePath = path.join('node_modules', '.shrinkwrap.yaml');
-    } else if (pnpmVersion.major <= 3) {
+    } else if (parsedVersion.major <= 3) {
       // node_modules/.pnpm-lock.yaml
       this.internalShrinkwrapRelativePath = path.join('node_modules', '.pnpm-lock.yaml');
     } else {
diff --git a/apps/rush-lib/src/logic/InstallManager.ts b/apps/rush-lib/src/logic/InstallManager.ts
@@ -1150,7 +1150,7 @@ export class InstallManager {
         args.push('--verbose');
       }
     } else if (this._rushConfiguration.packageManager === 'pnpm') {
-      // args.push('--store', this._rushConfiguration.pnpmStoreFolder);
+      args.push('--store', this._rushConfiguration.pnpmStoreFolder);
 
       // we are using the --no-lock flag for now, which unfortunately prints a warning, but should be OK
       // since rush already has its own install lock file which will invalidate the cache for us.

Original file line number	Diff line number	Diff line change
`@@ -1150,7 +1150,7 @@ export class InstallManager {`
`1150`	`1150`	`args.push('--verbose');`
`1151`	`1151`	`}`
`1152`	`1152`	`} else if (this._rushConfiguration.packageManager === 'pnpm') {`
`1153`		`- // args.push('--store', this._rushConfiguration.pnpmStoreFolder);`
	`1153`	`+ args.push('--store', this._rushConfiguration.pnpmStoreFolder);`
`1154`	`1154`
`1155`	`1155`	`// we are using the --no-lock flag for now, which unfortunately prints a warning, but should be OK`
`1156`	`1156`	`// since rush already has its own install lock file which will invalidate the cache for us.`