Merge branch 'main' into fix/942

Brooooooklyn · web-flow · commit ec463917e936 · 2026-03-21T00:51:42.000-07:00
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
@@ -42,3 +42,9 @@ jobs:
             - If the issue is unclear, ask for more context
             - If fixable, provide a concrete implementation plan with specific steps
             - Any potential concerns or blockers
+
+      - name: Unassign boshen
+        if: always()
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: gh issue edit ${{ github.event.issue.number }} --remove-assignee boshen
diff --git a/packages/cli/snap-tests-global/command-staged-with-config/steps.json b/packages/cli/snap-tests-global/command-staged-with-config/steps.json
@@ -1,5 +1,5 @@
 {
-  "ignoredPlatforms": ["win32"],
+  "ignoredPlatforms": ["win32", "darwin"],
   "commands": [
     { "command": "git init", "ignoreOutput": true },
     { "command": "git add -A && git commit -m 'init'", "ignoreOutput": true },
diff --git a/packages/cli/snap-tests-global/migration-merge-vite-config-ts/package.json b/packages/cli/snap-tests-global/migration-merge-vite-config-ts/package.json
@@ -17,6 +17,7 @@
   },
   "devDependencies": {
     "@vitejs/plugin-react": "^4.2.0",
+    "@vitest/browser-playwright": "^4.0.0",
     "oxfmt": "1",
     "oxlint": "1",
     "vite": "^7.0.0",
diff --git a/packages/cli/snap-tests-global/migration-monorepo-pnpm-overrides-dependency-selector/package.json b/packages/cli/snap-tests-global/migration-monorepo-pnpm-overrides-dependency-selector/package.json
@@ -5,6 +5,7 @@
     "dev": "vite"
   },
   "devDependencies": {
+    "@vitejs/plugin-react": "catalog:",
     "vite": "catalog:"
   },
   "packageManager": "pnpm@10.20.0+sha512.cf9998222162dd85864d0a8102e7892e7ba4ceadebbf5a31f9c2fce48dfce317a9c53b9f6464d1ef9042cba2e02ae02a9f7c143a2b438cd93c91840f0192b9dd",
diff --git a/packages/cli/snap-tests-global/migration-monorepo-pnpm-overrides-dependency-selector/snap.txt b/packages/cli/snap-tests-global/migration-monorepo-pnpm-overrides-dependency-selector/snap.txt
@@ -26,6 +26,7 @@ export default defineConfig({
     "prepare": "vp config"
   },
   "devDependencies": {
+    "@vitejs/plugin-react": "catalog:",
     "vite": "catalog:",
     "vite-plus": "catalog:"
   },
diff --git a/packages/cli/snap-tests-global/migration-monorepo-pnpm/package.json b/packages/cli/snap-tests-global/migration-monorepo-pnpm/package.json
@@ -16,6 +16,7 @@
     "testnpm2": "1.0.0"
   },
   "devDependencies": {
+    "@vitejs/plugin-react": "catalog:",
     "oxfmt": "catalog:",
     "oxlint": "catalog:",
     "vite": "catalog:",
diff --git a/packages/cli/snap-tests-global/migration-monorepo-pnpm/snap.txt b/packages/cli/snap-tests-global/migration-monorepo-pnpm/snap.txt
@@ -62,6 +62,7 @@ cat: .oxfmtrc.json: No such file or directory
     "testnpm2": "1.0.0"
   },
   "devDependencies": {
+    "@vitejs/plugin-react": "catalog:",
     "vite": "catalog:",
     "vitest": "catalog:",
     "vite-plus": "catalog:"
diff --git a/packages/cli/snap-tests-global/migration-monorepo-yarn4/package.json b/packages/cli/snap-tests-global/migration-monorepo-yarn4/package.json
@@ -19,6 +19,7 @@
     "testnpm2": "1.0.0"
   },
   "devDependencies": {
+    "@vitejs/plugin-react": "catalog:",
     "oxfmt": "catalog:",
     "oxlint": "catalog:",
     "vite": "catalog:",
diff --git a/packages/cli/snap-tests-global/migration-monorepo-yarn4/snap.txt b/packages/cli/snap-tests-global/migration-monorepo-yarn4/snap.txt
@@ -53,6 +53,7 @@ cat: .oxlintrc.json: No such file or directory
     "testnpm2": "1.0.0"
   },
   "devDependencies": {
+    "@vitejs/plugin-react": "catalog:",
     "vite": "catalog:",
     "vitest": "catalog:",
     "vite-plus": "catalog:"
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -1,8 +1,8 @@
 import { type Plugin as VitestPlugin } from '@voidzero-dev/vite-plus-test/config';
+import type { OxfmtConfig } from 'oxfmt';
 import type { OxlintConfig } from 'oxlint';
 
 import { defineConfig } from './define-config.js';
-import type { FormatOptions } from './oxfmt-config';
 import type { PackUserConfig } from './pack';
 import type { RunConfig } from './run-config';
 import type { StagedConfig } from './staged-config';
@@ -14,7 +14,7 @@ declare module '@voidzero-dev/vite-plus-core' {
      */
     lint?: OxlintConfig;
 
-    fmt?: FormatOptions;
+    fmt?: OxfmtConfig;
 
     pack?: PackUserConfig | PackUserConfig[];
 
diff --git a/packages/cli/src/migration/__tests__/compat.spec.ts b/packages/cli/src/migration/__tests__/compat.spec.ts
@@ -0,0 +1,50 @@
+import { describe, expect, it } from 'vitest';
+
+import { checkManualChunksCompat } from '../compat.js';
+import { createMigrationReport } from '../report.js';
+
+describe('checkManualChunksCompat', () => {
+  it('should warn when manualChunks is an object', () => {
+    const report = createMigrationReport();
+    checkManualChunksCompat({ manualChunks: { react: ['react', 'react-dom'] } }, report);
+    expect(report.warnings).toHaveLength(1);
+    expect(report.warnings[0]).toContain('Object-form');
+    expect(report.warnings[0]).toContain('codeSplitting');
+  });
+
+  it('should not warn when manualChunks is a function', () => {
+    const report = createMigrationReport();
+    checkManualChunksCompat({ manualChunks: () => undefined }, report);
+    expect(report.warnings).toHaveLength(0);
+  });
+
+  it('should not warn when manualChunks is not set', () => {
+    const report = createMigrationReport();
+    checkManualChunksCompat({}, report);
+    expect(report.warnings).toHaveLength(0);
+  });
+
+  it('should not warn when output is undefined', () => {
+    const report = createMigrationReport();
+    checkManualChunksCompat(undefined, report);
+    expect(report.warnings).toHaveLength(0);
+  });
+
+  it('should handle array of outputs', () => {
+    const report = createMigrationReport();
+    checkManualChunksCompat(
+      [{ manualChunks: () => undefined }, { manualChunks: { vendor: ['lodash'] } }],
+      report,
+    );
+    expect(report.warnings).toHaveLength(1);
+  });
+
+  it('should only add one warning for multiple object-form outputs', () => {
+    const report = createMigrationReport();
+    checkManualChunksCompat(
+      [{ manualChunks: { react: ['react'] } }, { manualChunks: { lodash: ['lodash'] } }],
+      report,
+    );
+    expect(report.warnings).toHaveLength(1);
+  });
+});
diff --git a/packages/cli/src/migration/bin.ts b/packages/cli/src/migration/bin.ts
@@ -540,6 +540,22 @@ function showMigrationSummary(options: {
   }
 }
 
+async function checkRolldownCompatibility(rootDir: string, report: MigrationReport): Promise<void> {
+  try {
+    const { resolveConfig } = await import('../index.js');
+    const { checkManualChunksCompat } = await import('./compat.js');
+    // Use 'runner' configLoader to avoid Rolldown bundling the config file,
+    // which prints UNRESOLVED_IMPORT warnings that cannot be suppressed via logLevel.
+    const config = await resolveConfig(
+      { root: rootDir, logLevel: 'silent', configLoader: 'runner' },
+      'build',
+    );
+    checkManualChunksCompat(config.build?.rollupOptions?.output, report);
+  } catch {
+    // Config resolution may fail — skip compatibility check silently
+  }
+}
+
 async function executeMigrationPlan(
   workspaceInfoOptional: WorkspaceInfoOptional,
   plan: MigrationPlan,
@@ -637,7 +653,16 @@ async function executeMigrationPlan(
     cancelAndExit('Vite+ cannot automatically migrate this project yet.', 1);
   }
 
-  // 5. ESLint → Oxlint migration (before main rewrite so .oxlintrc.json gets picked up)
+  // 5. Check for Rolldown-incompatible config patterns (root + workspace packages)
+  updateMigrationProgress('Checking config compatibility');
+  await checkRolldownCompatibility(workspaceInfo.rootDir, report);
+  if (workspaceInfo.packages) {
+    for (const pkg of workspaceInfo.packages) {
+      await checkRolldownCompatibility(path.join(workspaceInfo.rootDir, pkg.path), report);
+    }
+  }
+
+  // 6. ESLint → Oxlint migration (before main rewrite so .oxlintrc.json gets picked up)
   if (plan.migrateEslint) {
     updateMigrationProgress('Migrating ESLint');
     const eslintOk = await migrateEslintToOxlint(
@@ -725,6 +750,7 @@ async function executeMigrationPlan(
     installArgs,
     { silent: true },
   );
+
   clearMigrationProgress();
   return {
     installDurationMs: initialInstallSummary.durationMs + finalInstallSummary.durationMs,
@@ -825,7 +851,18 @@ async function main() {
       }
     }
 
-    if (didMigrate) {
+    // Check for Rolldown-incompatible config patterns (root + workspace packages)
+    await checkRolldownCompatibility(workspaceInfoOptional.rootDir, report);
+    if (workspaceInfoOptional.packages) {
+      for (const pkg of workspaceInfoOptional.packages) {
+        await checkRolldownCompatibility(
+          path.join(workspaceInfoOptional.rootDir, pkg.path),
+          report,
+        );
+      }
+    }
+
+    if (didMigrate || report.warnings.length > 0) {
       clearMigrationProgress();
       showMigrationSummary({
         projectRoot: workspaceInfoOptional.rootDir,
diff --git a/packages/cli/src/migration/compat.ts b/packages/cli/src/migration/compat.ts
@@ -0,0 +1,19 @@
+import { addMigrationWarning, type MigrationReport } from './report.js';
+
+/**
+ * Check for Rolldown-incompatible manualChunks config patterns.
+ */
+export function checkManualChunksCompat(output: unknown, report: MigrationReport): void {
+  const outputs = Array.isArray(output) ? output : output ? [output] : [];
+  for (const out of outputs) {
+    if (out.manualChunks != null && typeof out.manualChunks !== 'function') {
+      addMigrationWarning(
+        report,
+        'Object-form `build.rollupOptions.output.manualChunks` is not supported by Rolldown. ' +
+          'Convert it to function form or use `build.rolldownOptions.output.codeSplitting`. ' +
+          'See: https://rolldown.rs/options/output#manualchunks and https://rolldown.rs/in-depth/manual-code-splitting',
+      );
+      break;
+    }
+  }
+}
diff --git a/packages/cli/src/oxfmt-config.ts b/packages/cli/src/oxfmt-config.ts
diff --git a/packages/cli/templates/monorepo/tsconfig.json b/packages/cli/templates/monorepo/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "noEmit": true,
-    "module": "nodenext",
-    "moduleResolution": "nodenext",
+    "module": "preserve",
+    "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
     "esModuleInterop": true
   }
diff --git a/packages/tools/src/snap-test.ts b/packages/tools/src/snap-test.ts
@@ -245,6 +245,9 @@ async function runTestCase(name: string, tempTmpDir: string, casesDir: string, b
     // Indicate CLI is running in test mode, so that it prints more detailed outputs.
     // Also disables tips for stable snapshots.
     VITE_PLUS_CLI_TEST: '1',
+    // Suppress Node.js runtime warnings (e.g. MODULE_TYPELESS_PACKAGE_JSON)
+    // to keep snap outputs stable across Node.js versions.
+    NODE_NO_WARNINGS: '1',
     NO_COLOR: 'true',
     // set CI=true make sure snap-tests are stable on GitHub Actions
     CI: 'true',

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "ignoredPlatforms": ["win32"],`
	`2`	`+ "ignoredPlatforms": ["win32", "darwin"],`
`3`	`3`	`"commands": [`
`4`	`4`	`{ "command": "git init", "ignoreOutput": true },`
`5`	`5`	`{ "command": "git add -A && git commit -m 'init'", "ignoreOutput": true },`