Merge pull request microsoft#4039 from iclanton/fix-rush-sdk-loading-…

…issue [rush] Fix an issue where rush-sdk sometimes fails to load if the globally installed Rush package is too old
spring6225 · Mar 30, 2023 · 19ce65c · 19ce65c
2 parents 6ac6247 + aa88666
commit 19ce65c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/common/changes/@microsoft/rush/fix-rush-sdk-loading-issue_2023-03-30-19-19.json b/common/changes/@microsoft/rush/fix-rush-sdk-loading-issue_2023-03-30-19-19.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Fix an issue where rush-sdk sometimes failed to load if the globally installed Rush version was older than rushVersion in rush.json (GitHub #4039)",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}
diff --git a/libraries/rush-lib/src/utilities/SetRushLibPath.ts b/libraries/rush-lib/src/utilities/SetRushLibPath.ts
@@ -2,11 +2,9 @@ import { PackageJsonLookup } from '@rushstack/node-core-library';
 
 import { EnvironmentVariableNames } from '../api/EnvironmentConfiguration';
 
-if (!process.env[EnvironmentVariableNames.RUSH_LIB_PATH]) {
-  const rootDir: string | undefined = PackageJsonLookup.instance.tryGetPackageFolderFor(__dirname);
-  if (rootDir) {
-    // Route to the 'main' field of package.json
-    const rushLibIndex: string = require.resolve(rootDir, { paths: [] });
-    process.env[EnvironmentVariableNames.RUSH_LIB_PATH] = rushLibIndex;
-  }
+const rootDir: string | undefined = PackageJsonLookup.instance.tryGetPackageFolderFor(__dirname);
+if (rootDir) {
+  // Route to the 'main' field of package.json
+  const rushLibIndex: string = require.resolve(rootDir, { paths: [] });
+  process.env[EnvironmentVariableNames.RUSH_LIB_PATH] = rushLibIndex;
 }