refactor(migration): deduplicate pnpm override cleanup logic

Extract cleanupPnpmOverridesForWorkspaceYaml() to share the non-force
override cleanup between rewriteStandaloneProject and
rewriteRootWorkspacePackageJson. Also eliminate a redundant
readJsonFile() call by moving the usePnpmWorkspaceYaml check inside
the editJsonFile callback.

Author: fengmk2

packages/cli/src/migration/migrator.ts

@@ -696,15 +696,10 @@ export function rewriteStandaloneProject(
   }
 
   const packageManager = workspaceInfo.packageManager;
-  // Respect the project's existing pnpm config location: if package.json already
-  // has a "pnpm" field, keep using package.json; otherwise use pnpm-workspace.yaml.
-  const existingPkg = readJsonFile(packageJsonPath);
-  const usePnpmWorkspaceYaml = packageManager === PackageManager.pnpm && !existingPkg.pnpm;
-  if (usePnpmWorkspaceYaml) {
-    rewritePnpmWorkspaceYaml(projectPath);
-  }
   let extractedStagedConfig: Record<string, string | string[]> | null = null;
   let remainingPnpmOverrides: Record<string, string> | undefined;
+  // Determined inside editJsonFile callback to avoid a redundant file read
+  let usePnpmWorkspaceYaml = false;
   editJsonFile<{
     overrides?: Record<string, string>;
     resolutions?: Record<string, string>;
@@ -730,9 +725,15 @@ export function rewriteStandaloneProject(
         ...VITE_PLUS_OVERRIDE_PACKAGES,
       };
     } else if (packageManager === PackageManager.pnpm) {
+      // If package.json already has a "pnpm" field, keep using it;
+      // otherwise use pnpm-workspace.yaml.
+      usePnpmWorkspaceYaml = !pkg.pnpm;
+      if (usePnpmWorkspaceYaml) {
+        rewritePnpmWorkspaceYaml(projectPath);
+      }
       const overrideKeys = Object.keys(VITE_PLUS_OVERRIDE_PACKAGES);
       if (!usePnpmWorkspaceYaml) {
-        // Project already has pnpm config in package.json — keep using it.
+        // Project already has pnpm config in package.json -- keep using it.
         pkg.pnpm = {
           ...pkg.pnpm,
           overrides: {
@@ -751,40 +752,9 @@ export function rewriteStandaloneProject(
           },
         };
       } else {
-        // Remove Vite-managed keys from pnpm.overrides
-        for (const key of [...overrideKeys, ...REMOVE_PACKAGES]) {
-          if (pkg.pnpm?.overrides?.[key]) {
-            delete pkg.pnpm.overrides[key];
-          }
-        }
-        // Remove dependency selectors targeting vite
-        for (const key in pkg.pnpm?.overrides) {
-          if (key.includes('>')) {
-            const splits = key.split('>');
-            if (splits[splits.length - 1].trim() === 'vite') {
-              delete pkg.pnpm.overrides[key];
-            }
-          }
-        }
-        // Move any remaining overrides to pnpm-workspace.yaml then delete all
-        // (pnpm ignores workspace-level overrides when pnpm.overrides exists in package.json)
-        if (pkg.pnpm?.overrides && Object.keys(pkg.pnpm.overrides).length > 0) {
-          remainingPnpmOverrides = { ...pkg.pnpm.overrides };
-        }
-        delete pkg.pnpm?.overrides;
-        // Only remove Vite-managed peerDependencyRules entries, preserve custom ones
-        cleanupPeerDependencyRules(pkg.pnpm?.peerDependencyRules, overrideKeys);
-        if (
-          pkg.pnpm?.peerDependencyRules &&
-          Object.keys(pkg.pnpm.peerDependencyRules).length === 0
-        ) {
-          delete pkg.pnpm.peerDependencyRules;
-        }
-        if (pkg.pnpm && Object.keys(pkg.pnpm).length === 0) {
-          delete pkg.pnpm;
-        }
+        remainingPnpmOverrides = cleanupPnpmOverridesForWorkspaceYaml(pkg, overrideKeys);
       }
-      // remove dependency selector from vite in force-override mode
+      // remove dependency selectors targeting vite (e.g. "vite-plugin-svgr>vite")
       for (const key in pkg.pnpm?.overrides) {
         if (key.includes('>')) {
           const splits = key.split('>');
@@ -1027,6 +997,53 @@ function rewritePnpmWorkspaceYaml(projectPath: string): void {
   });
 }
 
+/**
+ * Clean up pnpm.overrides and peerDependencyRules from package.json when migrating
+ * to pnpm-workspace.yaml. Returns any remaining non-Vite overrides that need to be
+ * moved to pnpm-workspace.yaml.
+ */
+function cleanupPnpmOverridesForWorkspaceYaml(
+  pkg: {
+    pnpm?: {
+      overrides?: Record<string, string>;
+      peerDependencyRules?: { allowAny?: string[]; allowedVersions?: Record<string, string> };
+    };
+  },
+  overrideKeys: string[],
+): Record<string, string> | undefined {
+  // Remove Vite-managed keys from pnpm.overrides
+  for (const key of [...overrideKeys, ...REMOVE_PACKAGES]) {
+    if (pkg.pnpm?.overrides?.[key]) {
+      delete pkg.pnpm.overrides[key];
+    }
+  }
+  // Remove dependency selectors targeting vite
+  for (const key in pkg.pnpm?.overrides) {
+    if (key.includes('>')) {
+      const splits = key.split('>');
+      if (splits[splits.length - 1].trim() === 'vite') {
+        delete pkg.pnpm.overrides[key];
+      }
+    }
+  }
+  // Collect remaining overrides to move to pnpm-workspace.yaml then delete all
+  // (pnpm ignores workspace-level overrides when pnpm.overrides exists in package.json)
+  let remaining: Record<string, string> | undefined;
+  if (pkg.pnpm?.overrides && Object.keys(pkg.pnpm.overrides).length > 0) {
+    remaining = { ...pkg.pnpm.overrides };
+  }
+  delete pkg.pnpm?.overrides;
+  // Only remove Vite-managed peerDependencyRules entries, preserve custom ones
+  cleanupPeerDependencyRules(pkg.pnpm?.peerDependencyRules, overrideKeys);
+  if (pkg.pnpm?.peerDependencyRules && Object.keys(pkg.pnpm.peerDependencyRules).length === 0) {
+    delete pkg.pnpm.peerDependencyRules;
+  }
+  if (pkg.pnpm && Object.keys(pkg.pnpm).length === 0) {
+    delete pkg.pnpm;
+  }
+  return remaining;
+}
+
 /**
  * Move remaining non-Vite pnpm.overrides from package.json to pnpm-workspace.yaml.
  * pnpm ignores workspace-level overrides when pnpm.overrides exists in package.json,
@@ -1220,43 +1237,14 @@ function rewriteRootWorkspacePackageJson(
           },
         };
       } else {
-        // Remove Vite-managed keys from pnpm.overrides
         for (const key of [...overrideKeys, ...REMOVE_PACKAGES]) {
-          if (pkg.pnpm?.overrides?.[key]) {
-            delete pkg.pnpm.overrides[key];
-          }
           if (pkg.resolutions?.[key]) {
             delete pkg.resolutions[key];
           }
         }
-        // Remove dependency selectors targeting vite
-        for (const key in pkg.pnpm?.overrides) {
-          if (key.includes('>')) {
-            const splits = key.split('>');
-            if (splits[splits.length - 1].trim() === 'vite') {
-              delete pkg.pnpm.overrides[key];
-            }
-          }
-        }
-        // Move any remaining overrides to pnpm-workspace.yaml then delete all
-        // (pnpm ignores workspace-level overrides when pnpm.overrides exists in package.json)
-        if (pkg.pnpm?.overrides && Object.keys(pkg.pnpm.overrides).length > 0) {
-          remainingPnpmOverrides = { ...pkg.pnpm.overrides };
-        }
-        delete pkg.pnpm?.overrides;
-        // Only remove Vite-managed peerDependencyRules entries, preserve custom ones
-        cleanupPeerDependencyRules(pkg.pnpm?.peerDependencyRules, overrideKeys);
-        if (
-          pkg.pnpm?.peerDependencyRules &&
-          Object.keys(pkg.pnpm.peerDependencyRules).length === 0
-        ) {
-          delete pkg.pnpm.peerDependencyRules;
-        }
-        if (pkg.pnpm && Object.keys(pkg.pnpm).length === 0) {
-          delete pkg.pnpm;
-        }
+        remainingPnpmOverrides = cleanupPnpmOverridesForWorkspaceYaml(pkg, overrideKeys);
       }
-      // remove dependency selector from vite in force-override mode
+      // remove dependency selectors targeting vite (e.g. "vite-plugin-svgr>vite")
       for (const key in pkg.pnpm?.overrides) {
         if (key.includes('>')) {
           const splits = key.split('>');