Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions packages/cli/src/migration/__tests__/migrator.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8487,6 +8487,32 @@ export default defineConfig({
expect(report.wrappedPluginConfigCount).toBe(1);
});

it('rewrites vite imports before wrapping plugins in direct monorepo project rewrites', () => {
fs.writeFileSync(
path.join(tmpDir, 'package.json'),
JSON.stringify({ name: 'web', devDependencies: { vite: '^7.0.0' } }),
);
fs.writeFileSync(
path.join(tmpDir, 'vite.config.ts'),
`import { defineConfig } from 'vite';

export default defineConfig({
plugins: [react()],
});
`,
);
const report = createMigrationReport();

rewriteMonorepoProject(tmpDir, PackageManager.pnpm, true, true, report);

const viteConfig = fs.readFileSync(path.join(tmpDir, 'vite.config.ts'), 'utf8');
expect(viteConfig).toContain("import { defineConfig, lazyPlugins } from 'vite-plus'");
expect(viteConfig).not.toContain("from 'vite'");
expect(viteConfig).toContain('plugins: lazyPlugins(() => [react()])');
expect(report.wrappedPluginConfigCount).toBe(1);
expect(report.rewrittenImportFileCount).toBe(1);
});

it('wraps package-level inline plugin arrays in monorepos', () => {
const appDir = path.join(tmpDir, 'apps', 'web');
fs.mkdirSync(appDir, { recursive: true });
Expand Down
10 changes: 10 additions & 0 deletions packages/cli/src/migration/migrator/orchestrators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,14 @@ export function rewriteMonorepoProject(
? findYarnWorkspaceHoisting(workspaceContext?.rootDir ?? projectPath)
: undefined;

// Capture Oxlint plugin owner directories before `rewritePackageJson` strips
// `oxlint` from the package manifest. The import rewriter needs these signals
// to preserve legitimate plugin imports.
const oxlintOwnerDirs = collectOxlintOwnerDirs(
workspaceContext?.rootDir ?? projectPath,
workspaceContext?.packages,
);

let extractedStagedConfig: Record<string, string | string[]> | null = null;
editJsonFile<{
devDependencies?: Record<string, string>;
Expand Down Expand Up @@ -639,6 +647,8 @@ export function rewriteMonorepoProject(
}

if (!deferLazyPluginWrapping) {
// rewrite imports in all TypeScript/JavaScript files before lazy plugin import merging
rewriteAllImports(projectPath, silent, report, true, oxlintOwnerDirs);
wrapLazyPluginsInViteConfig(projectPath, silent, report);
migrateTaskCacheConfigInViteConfig(projectPath, silent, report);
}
Expand Down
Loading