fix: update shrinkwrap when globalOverrides has change (microsoft#4898)

discordjs · Aug 22, 2024 · de9aa4a · de9aa4a
1 parent 4cd9b54
commit de9aa4a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/common/changes/@microsoft/rush/kenrick-overrides-check_2024-08-22-06-49.json b/common/changes/@microsoft/rush/kenrick-overrides-check_2024-08-22-06-49.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Always update shrinkwrap when globalOverrides has been changed",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}
diff --git a/libraries/rush-lib/src/logic/installManager/WorkspaceInstallManager.ts b/libraries/rush-lib/src/logic/installManager/WorkspaceInstallManager.ts
@@ -367,6 +367,17 @@ export class WorkspaceInstallManager extends BaseInstallManager {
       shrinkwrapIsUpToDate = false;
     }
 
+    // Check if overrides and globalOverrides are the same
+    const overridesAreEqual: boolean = objectsAreDeepEqual<Record<string, string>>(
+      this.rushConfiguration.pnpmOptions.globalOverrides ?? {},
+      shrinkwrapFile?.overrides ? Object.fromEntries(shrinkwrapFile?.overrides) : {}
+    );
+
+    if (!overridesAreEqual) {
+      shrinkwrapWarnings.push("The overrides settings doesn't match the current shrinkwrap.");
+      shrinkwrapIsUpToDate = false;
+    }
+
     // Write the common package.json
     InstallHelpers.generateCommonPackageJson(this.rushConfiguration, subspace, undefined);