fix(migrate): allow pkg.pr.new pnpm subdependencies

Author: fengmk2

.github/scripts/test-pkg-pr-new-migrate.sh

@@ -109,6 +109,11 @@ export VP_OVERRIDE_PACKAGES="$(printf \
   "$vite_plus_core_spec" \
   "$vitest_version")"
 export VP_FORCE_MIGRATE=1
+# pkg.pr.new packages depend on URL-resolved platform binaries. pnpm blocks
+# those transitive URL dependencies when blockExoticSubdeps is enabled. The
+# migration persists the corresponding workspace setting, while this temporary
+# override also lets its pre-rewrite install recover a partially migrated tree.
+export PNPM_CONFIG_BLOCK_EXOTIC_SUBDEPS=false
 hash -r
 
 echo

packages/cli/snap-tests-global/migration-upgrade-pkg-pr-new-pnpm/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "migration-upgrade-pkg-pr-new-pnpm",
+  "devDependencies": {
+    "@vitest/coverage-v8": "4.1.6",
+    "vite": "npm:@voidzero-dev/vite-plus-core@^0.1.20",
+    "vite-plus": "^0.1.20",
+    "vitest": "npm:@voidzero-dev/vite-plus-test@^0.1.20"
+  },
+  "packageManager": "pnpm@10.33.2"
+}

packages/cli/snap-tests-global/migration-upgrade-pkg-pr-new-pnpm/pnpm-workspace.yaml

@@ -0,0 +1,21 @@
+packages:
+  - .
+
+blockExoticSubdeps: true
+
+catalog:
+  vite: npm:@voidzero-dev/vite-plus-core@^0.1.20
+  vite-plus: ^0.1.20
+  vitest: npm:@voidzero-dev/vite-plus-test@^0.1.20
+
+overrides:
+  vite: 'catalog:'
+  vitest: 'catalog:'
+
+peerDependencyRules:
+  allowAny:
+    - vite
+    - vitest
+  allowedVersions:
+    vite: '*'
+    vitest: '*'

packages/cli/snap-tests-global/migration-upgrade-pkg-pr-new-pnpm/snap.txt

@@ -0,0 +1,57 @@
+> vp migrate --no-interactive # pkg.pr.new pnpm migration allows URL-resolved subdependencies
+◇ Migrated . to Vite+
+• Node <semver>  pnpm <semver>
+• 2 config updates applied
+
+> cat package.json # direct dependencies use catalogs aligned to the pkg.pr.new build
+{
+  "name": "migration-upgrade-pkg-pr-new-pnpm",
+  "devDependencies": {
+    "@vitest/coverage-v8": "4.1.9",
+    "vite": "catalog:",
+    "vite-plus": "catalog:",
+    "vitest": "catalog:"
+  },
+  "packageManager": "pnpm@<semver>",
+  "pnpm": {
+    "overrides": {
+      "vite": "https://pkg.pr.new/voidzero-dev/vite-plus/@voidzero-dev/vite-plus-core@1891",
+      "vitest": "<semver>",
+      "vite-plus": "https://pkg.pr.new/voidzero-dev/vite-plus@1891"
+    }
+  },
+  "scripts": {
+    "prepare": "vp config"
+  }
+}
+
+> cat pnpm-workspace.yaml # pkg.pr.new URLs are pinned and exotic subdependencies are allowed
+packages:
+  - .
+
+blockExoticSubdeps: false
+
+catalog:
+  vite: https://pkg.pr.new/voidzero-dev/vite-plus/@voidzero-dev/vite-plus-core@1891
+  vite-plus: https://pkg.pr.new/voidzero-dev/vite-plus@1891
+  vitest: <semver>
+
+overrides:
+  vite: 'catalog:'
+  vitest: 'catalog:'
+
+peerDependencyRules:
+  allowAny:
+    - vite
+    - vitest
+  allowedVersions:
+    vite: '*'
+    vitest: '*'
+
+> node -e "const fs = require('node:fs'); const y = fs.readFileSync('pnpm-workspace.yaml', 'utf8'); if (!y.includes('blockExoticSubdeps: false') || !y.includes('https://pkg.pr.new/voidzero-dev/vite-plus@1891') || !y.includes('https://pkg.pr.new/voidzero-dev/vite-plus/@voidzero-dev/vite-plus-core@1891')) process.exit(1)" # pnpm policy and PR targets are persisted
+> node -e "const fs = require('node:fs'); fs.copyFileSync('package.json', 'package.after-first-migration.json'); fs.copyFileSync('pnpm-workspace.yaml', 'workspace.after-first-migration.yaml')" # capture first migration result
+> vp migrate --no-interactive # pkg.pr.new pnpm migration is idempotent
+◇ Migrated . to Vite+
+• Node <semver>  pnpm <semver>
+
+> node -e "const fs = require('node:fs'); if (fs.readFileSync('package.json', 'utf8') !== fs.readFileSync('package.after-first-migration.json', 'utf8') || fs.readFileSync('pnpm-workspace.yaml', 'utf8') !== fs.readFileSync('workspace.after-first-migration.yaml', 'utf8')) process.exit(1)" # rerun leaves manifests unchanged

packages/cli/snap-tests-global/migration-upgrade-pkg-pr-new-pnpm/steps.json

@@ -0,0 +1,17 @@
+{
+  "env": {
+    "PNPM_CONFIG_BLOCK_EXOTIC_SUBDEPS": "false",
+    "VP_FORCE_MIGRATE": "1",
+    "VP_OVERRIDE_PACKAGES": "{\"vite\":\"https://pkg.pr.new/voidzero-dev/vite-plus/@voidzero-dev/vite-plus-core@1891\",\"vitest\":\"4.1.9\"}",
+    "VP_VERSION": "https://pkg.pr.new/voidzero-dev/vite-plus@1891"
+  },
+  "commands": [
+    "vp migrate --no-interactive # pkg.pr.new pnpm migration allows URL-resolved subdependencies",
+    "cat package.json # direct dependencies use catalogs aligned to the pkg.pr.new build",
+    "cat pnpm-workspace.yaml # pkg.pr.new URLs are pinned and exotic subdependencies are allowed",
+    "node -e \"const fs = require('node:fs'); const y = fs.readFileSync('pnpm-workspace.yaml', 'utf8'); if (!y.includes('blockExoticSubdeps: false') || !y.includes('https://pkg.pr.new/voidzero-dev/vite-plus@1891') || !y.includes('https://pkg.pr.new/voidzero-dev/vite-plus/@voidzero-dev/vite-plus-core@1891')) process.exit(1)\" # pnpm policy and PR targets are persisted",
+    "node -e \"const fs = require('node:fs'); fs.copyFileSync('package.json', 'package.after-first-migration.json'); fs.copyFileSync('pnpm-workspace.yaml', 'workspace.after-first-migration.yaml')\" # capture first migration result",
+    "vp migrate --no-interactive # pkg.pr.new pnpm migration is idempotent",
+    "node -e \"const fs = require('node:fs'); if (fs.readFileSync('package.json', 'utf8') !== fs.readFileSync('package.after-first-migration.json', 'utf8') || fs.readFileSync('pnpm-workspace.yaml', 'utf8') !== fs.readFileSync('workspace.after-first-migration.yaml', 'utf8')) process.exit(1)\" # rerun leaves manifests unchanged"
+  ]
+}

packages/cli/src/migration/__tests__/migrator.spec.ts

@@ -1455,6 +1455,66 @@ describe('ensureVitePlusBootstrap', () => {
     expect(detectVitePlusBootstrapPending(tmpDir, PackageManager.pnpm)).toBe(false);
   });
 
+  it('allows pkg.pr.new transitive URLs in pnpm workspace config and is idempotent', () => {
+    const savedForceMigrate = process.env.VP_FORCE_MIGRATE;
+    const savedViteOverride = VITE_PLUS_OVERRIDE_PACKAGES.vite;
+    const viteOverride =
+      'https://pkg.pr.new/voidzero-dev/vite-plus/@voidzero-dev/vite-plus-core@1891';
+    process.env.VP_FORCE_MIGRATE = '1';
+    VITE_PLUS_OVERRIDE_PACKAGES.vite = viteOverride;
+    try {
+      fs.writeFileSync(
+        path.join(tmpDir, 'package.json'),
+        JSON.stringify({
+          name: 'test',
+          devDependencies: { 'vite-plus': 'catalog:' },
+          devEngines: {
+            packageManager: { name: 'pnpm', version: '10.33.0', onFail: 'download' },
+          },
+        }),
+      );
+      fs.writeFileSync(
+        path.join(tmpDir, 'pnpm-workspace.yaml'),
+        [
+          'blockExoticSubdeps: true',
+          'catalog:',
+          `  vite: '${viteOverride}'`,
+          '  vite-plus: latest',
+          'overrides:',
+          "  vite: 'catalog:'",
+          'peerDependencyRules:',
+          '  allowAny:',
+          '    - vite',
+          '  allowedVersions:',
+          "    vite: '*'",
+        ].join('\n'),
+      );
+
+      expect(detectVitePlusBootstrapPending(tmpDir, PackageManager.pnpm)).toBe(true);
+      const first = ensureVitePlusBootstrap(makeWorkspaceInfo(tmpDir, PackageManager.pnpm));
+
+      expect(first.packageManagerConfig).toBe(true);
+      expect(
+        (
+          readYamlObject(path.join(tmpDir, 'pnpm-workspace.yaml')) as {
+            blockExoticSubdeps: boolean;
+          }
+        ).blockExoticSubdeps,
+      ).toBe(false);
+      expect(detectVitePlusBootstrapPending(tmpDir, PackageManager.pnpm)).toBe(false);
+      expect(ensureVitePlusBootstrap(makeWorkspaceInfo(tmpDir, PackageManager.pnpm)).changed).toBe(
+        false,
+      );
+    } finally {
+      VITE_PLUS_OVERRIDE_PACKAGES.vite = savedViteOverride;
+      if (savedForceMigrate === undefined) {
+        delete process.env.VP_FORCE_MIGRATE;
+      } else {
+        process.env.VP_FORCE_MIGRATE = savedForceMigrate;
+      }
+    }
+  });
+
   it('detects missing pnpm workspace catalog entry for vite-plus', () => {
     fs.writeFileSync(
       path.join(tmpDir, 'package.json'),

packages/cli/src/migration/migrator.ts

@@ -1924,6 +1924,10 @@ export function rewriteStandaloneProject(
     });
   }
 
+  if (packageManager === PackageManager.pnpm) {
+    ensurePnpmWorkspaceExoticSubdepsSetting(projectPath);
+  }
+
   if (packageManager === PackageManager.yarn) {
     rewriteYarnrcYml(projectPath, usesVitest);
   } else if (packageManager === PackageManager.bun) {
@@ -2188,6 +2192,8 @@ function rewritePnpmWorkspaceYaml(
   const managed = managedOverridePackages(usesVitest);
 
   editYamlFile(pnpmWorkspaceYamlPath, (doc) => {
+    ensurePnpmExoticSubdepsSetting(doc);
+
     // catalog
     rewriteCatalog(doc, usesVitest);
     if (pnpmMajorVersion !== undefined) {
@@ -3802,6 +3808,50 @@ function readPnpmWorkspacePeerDependencyRules(
   return doc?.peerDependencyRules;
 }
 
+function forceOverrideUsesExoticPnpmSpec(): boolean {
+  if (!isForceOverrideMode()) {
+    return false;
+  }
+  return [VITE_PLUS_VERSION, ...Object.values(VITE_PLUS_OVERRIDE_PACKAGES)].some((spec) =>
+    /^(?:file|https?):/.test(spec),
+  );
+}
+
+function pnpmWorkspaceExoticSubdepsSettingSatisfied(projectPath: string): boolean {
+  if (!forceOverrideUsesExoticPnpmSpec()) {
+    return true;
+  }
+  const pnpmWorkspaceYamlPath = path.join(projectPath, 'pnpm-workspace.yaml');
+  if (!fs.existsSync(pnpmWorkspaceYamlPath)) {
+    return false;
+  }
+  const doc = readYamlFile(pnpmWorkspaceYamlPath) as { blockExoticSubdeps?: boolean } | null;
+  return doc?.blockExoticSubdeps === false;
+}
+
+function ensurePnpmExoticSubdepsSetting(doc: YamlDocument): boolean {
+  if (!forceOverrideUsesExoticPnpmSpec() || doc.get('blockExoticSubdeps') === false) {
+    return false;
+  }
+  doc.set('blockExoticSubdeps', false);
+  return true;
+}
+
+function ensurePnpmWorkspaceExoticSubdepsSetting(projectPath: string): boolean {
+  if (!forceOverrideUsesExoticPnpmSpec()) {
+    return false;
+  }
+  const pnpmWorkspaceYamlPath = path.join(projectPath, 'pnpm-workspace.yaml');
+  if (!fs.existsSync(pnpmWorkspaceYamlPath)) {
+    fs.writeFileSync(pnpmWorkspaceYamlPath, '');
+  }
+  let changed = false;
+  editYamlFile(pnpmWorkspaceYamlPath, (doc) => {
+    changed = ensurePnpmExoticSubdepsSetting(doc);
+  });
+  return changed;
+}
+
 function yarnrcSatisfiesVitePlus(projectPath: string, usesVitest: boolean): boolean {
   const yarnrcYmlPath = path.join(projectPath, '.yarnrc.yml');
   if (!fs.existsSync(yarnrcYmlPath)) {
@@ -4120,6 +4170,9 @@ export function detectVitePlusBootstrapPending(
     );
   }
   if (packageManager === PackageManager.pnpm) {
+    if (!pnpmWorkspaceExoticSubdepsSettingSatisfied(projectPath)) {
+      return true;
+    }
     if (pnpmConfigLivesInPackageJson(pkg, projectPath)) {
       return (
         vitePlusDependencyNeedsConcreteVersion(pkg) ||
@@ -4390,6 +4443,7 @@ export function ensureVitePlusBootstrap(
       const catalogDependencyResolver = readPnpmWorkspaceCatalogDependencyResolver(projectPath);
       if (
         result.packageJson ||
+        !pnpmWorkspaceExoticSubdepsSettingSatisfied(projectPath) ||
         defaultCatalogVitePlusDependencyPending(pkg, catalogDependencyResolver) ||
         !overridesSatisfyVitePlus(
           readPnpmWorkspaceOverrides(projectPath),
@@ -4415,6 +4469,9 @@ export function ensureVitePlusBootstrap(
         ? fs.readFileSync(pnpmWorkspaceYamlPath, 'utf-8')
         : undefined;
       result.packageManagerConfig = before !== after;
+    } else if (ensurePnpmWorkspaceExoticSubdepsSetting(projectPath)) {
+      ensurePnpmWorkspacePackages(projectPath, workspaceInfo.workspacePatterns);
+      result.packageManagerConfig = true;
     }
   } else if (workspaceInfo.packageManager === PackageManager.yarn) {
     const yarnrcYmlPath = path.join(projectPath, '.yarnrc.yml');