Merge pull request #4633 from g-chao/chao/upgrade-pnpm-sync

[rush-lib] Update dependency: pnpm-sync-lib@0.2.2
microsoft · Apr 10, 2024 · 91030d7 · 91030d7
2 parents c46bd9d + 246378c
commit 91030d7
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 6 deletions.
diff --git a/common/changes/@microsoft/rush/chao-upgrade-pnpm-sync_2024-04-10-18-15.json b/common/changes/@microsoft/rush/chao-upgrade-pnpm-sync_2024-04-10-18-15.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Update dependency: pnpm-sync-lib@0.2.2",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}
diff --git a/common/config/subspaces/default/pnpm-lock.yaml b/common/config/subspaces/default/pnpm-lock.yaml
diff --git a/common/config/subspaces/default/repo-state.json b/common/config/subspaces/default/repo-state.json
@@ -1,5 +1,5 @@
 // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
 {
-  "pnpmShrinkwrapHash": "f978fe75c5f4cc21dceba7d0dbfcce33e6909f2c",
+  "pnpmShrinkwrapHash": "adb944665d5d498cbf5efe14dfd31f1734266745",
   "preferredVersionsHash": "ce857ea0536b894ec8f346aaea08cfd85a5af648"
 }
diff --git a/libraries/rush-lib/package.json b/libraries/rush-lib/package.json
@@ -57,7 +57,7 @@
     "tar": "~6.1.11",
     "true-case-path": "~2.2.1",
     "uuid": "~8.3.2",
-    "pnpm-sync-lib": "0.2.0"
+    "pnpm-sync-lib": "0.2.2"
   },
   "devDependencies": {
     "@pnpm/logger": "4.0.0",

diff --git a/libraries/rush-lib/src/utilities/PnpmSyncUtilities.ts b/libraries/rush-lib/src/utilities/PnpmSyncUtilities.ts
@@ -42,6 +42,26 @@ export class PnpmSyncUtilities {
           terminal.writeVerboseLine(PnpmSyncUtilities._addLinePrefix(customMessage));
         }
         return;
+
+      case LogMessageIdentifier.PREPARE_REPLACING_FILE:
+        {
+          const customMessage: string =
+            `excepted .pnpm-sync.json version: ${details.expectedVersion}; ` +
+            `actual .pnpm-sync.json version: ${details.actualVersion}; `;
+
+          terminal.writeVerboseLine(PnpmSyncUtilities._addLinePrefix(message));
+          terminal.writeVerboseLine(PnpmSyncUtilities._addLinePrefix(customMessage));
+        }
+        return;
+
+      // don't return this error case, pass to default handler
+      case LogMessageIdentifier.COPY_ERROR_INCOMPATIBLE_SYNC_FILE: {
+        const customMessage: string =
+          `excepted .pnpm-sync.json version: ${details.expectedVersion}; ` +
+          `actual .pnpm-sync.json version: ${details.actualVersion}; `;
+
+        terminal.writeErrorLine(PnpmSyncUtilities._addLinePrefix(customMessage));
+      }
     }
 
     // Default handling for other messages