Merge pull request #4504 from iclanton/fix-update

[rush] Fix an issue with pnpm-lock.yaml not getting synced back.
microsoft · Jan 31, 2024 · 2af9641 · 2af9641
2 parents dce97ab + cfa7cb2
commit 2af9641
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/common/changes/@microsoft/rush/main_2024-01-31-21-44.json b/common/changes/@microsoft/rush/main_2024-01-31-21-44.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Fix an issue where `rush update` would sometimes not correctly sync the `pnpm-lock.yaml` file back to `common/config/rush/` after a project's `package.json` has been updated.",
+      "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
@@ -303,10 +303,11 @@ export class WorkspaceInstallManager extends BaseInstallManager {
       }
 
       // Now, we compare these two objects to see if they are equal or not
-      shrinkwrapIsUpToDate = objectsAreDeepEqual(
-        packagePathToDependenciesMetaInPackageJson,
-        packagePathToDependenciesMetaInShrinkwrapFile
-      );
+      shrinkwrapIsUpToDate =
+        objectsAreDeepEqual(
+          packagePathToDependenciesMetaInPackageJson,
+          packagePathToDependenciesMetaInShrinkwrapFile
+        ) && shrinkwrapIsUpToDate;
     }
 
     // Write the common package.json