Skip to content

revert(migrate): stop merging Oxc configs in existing projects #2696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fengmk2 merged 1 commit into from
Sep 14, 2026
Merged

revert(migrate): stop merging Oxc configs in existing projects #2696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions ...p_cli_snapshots/tests/cli_snapshots/fixtures/migration_existing_oxc_configs/.oxfmtrc.json
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions ...vp_cli_snapshots/tests/cli_snapshots/fixtures/migration_existing_oxc_configs/package.json
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions ..._cli_snapshots/tests/cli_snapshots/fixtures/migration_existing_oxc_configs/snapshots.toml
View file
Open in desktop

This file was deleted.

91 changes: 0 additions & 91 deletions ...ures/migration_existing_oxc_configs/snapshots/migration_existing_oxc_configs.md
View file
Open in desktop

This file was deleted.

84 changes: 0 additions & 84 deletions ...ion_existing_oxc_configs/snapshots/migration_existing_oxc_configs_inline_fmt.md
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...vp_cli_snapshots/tests/cli_snapshots/fixtures/migration_existing_oxc_configs/src/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ..._cli_snapshots/tests/cli_snapshots/fixtures/migration_existing_oxc_configs/vite.config.ts
View file
Open in desktop

This file was deleted.

128 changes: 0 additions & 128 deletions packages/cli/src/migration/__tests__/migrator.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8796,7 +8796,6 @@ describe('existing Vite+ core migration finalization', () => {
scripts: true,
tsconfigTypes: true,
imports: true,
oxcConfigs: false,
tsdownConfig: false,
});

Expand Down Expand Up @@ -8828,96 +8827,6 @@ describe('existing Vite+ core migration finalization', () => {
});
});

it.each(['.oxfmtrc.json', '.oxfmtrc.jsonc'])(
'finishes a leftover %s config and remains idempotent',
(configFile) => {
fs.writeFileSync(
path.join(tmpDir, 'package.json'),
JSON.stringify({ name: 'test', devDependencies: { 'vite-plus': 'latest' } }),
);
fs.writeFileSync(path.join(tmpDir, 'vite.config.ts'), 'export default {};\n');
fs.writeFileSync(path.join(tmpDir, configFile), '{"singleQuote":true,"semi":false}\n');
const workspaceInfo = makeWorkspaceInfo(tmpDir, PackageManager.npm);
const report = createMigrationReport();

expect(finalizeCoreMigrationForExistingVitePlus(workspaceInfo, true, report).oxcConfigs).toBe(
true,
);
const config = fs.readFileSync(path.join(tmpDir, 'vite.config.ts'), 'utf8');
expect(config).toContain('fmt:');
expect(config).toContain('"singleQuote":true');
expect(config).toContain('"semi":false');
expect(fs.existsSync(path.join(tmpDir, configFile))).toBe(false);
expect(report.mergedConfigCount).toBe(1);
expect(finalizeCoreMigrationForExistingVitePlus(workspaceInfo, true).oxcConfigs).toBe(false);
expect(fs.readFileSync(path.join(tmpDir, 'vite.config.ts'), 'utf8')).toBe(config);
},
);

it('finishes leftover lint and format configs in workspace packages', () => {
const appDir = path.join(tmpDir, 'packages', 'app');
fs.mkdirSync(appDir, { recursive: true });
fs.writeFileSync(
path.join(tmpDir, 'package.json'),
JSON.stringify({ name: 'root', devDependencies: { 'vite-plus': 'latest' } }),
);
fs.writeFileSync(path.join(appDir, 'package.json'), JSON.stringify({ name: 'app' }));
fs.writeFileSync(path.join(appDir, '.oxfmtrc.json'), '{"singleQuote":true}\n');
fs.writeFileSync(path.join(appDir, '.oxlintrc.json'), '{"rules":{"no-console":"error"}}\n');
const workspaceInfo = {
...makeWorkspaceInfo(tmpDir, PackageManager.pnpm),
isMonorepo: true,
packages: [{ name: 'app', path: 'packages/app' }],
};

expect(finalizeCoreMigrationForExistingVitePlus(workspaceInfo, true).oxcConfigs).toBe(true);
const config = fs.readFileSync(path.join(appDir, 'vite.config.ts'), 'utf8');
expect(config).toContain('fmt:');
expect(config).toContain('lint:');
expect(config).toMatch(/"no-console":\s*"error"/);
expect(fs.existsSync(path.join(appDir, '.oxfmtrc.json'))).toBe(false);
expect(fs.existsSync(path.join(appDir, '.oxlintrc.json'))).toBe(false);
expect(finalizeCoreMigrationForExistingVitePlus(workspaceInfo, true).oxcConfigs).toBe(false);
});

it('preserves existing inline config when removing a redundant standalone config', () => {
fs.writeFileSync(
path.join(tmpDir, 'package.json'),
JSON.stringify({ name: 'test', devDependencies: { 'vite-plus': 'latest' } }),
);
const config = 'export default { fmt: { singleQuote: false } };\n';
fs.writeFileSync(path.join(tmpDir, 'vite.config.ts'), config);
fs.writeFileSync(path.join(tmpDir, '.oxfmtrc.json'), '{"singleQuote":true}\n');
const workspaceInfo = makeWorkspaceInfo(tmpDir, PackageManager.npm);

expect(finalizeCoreMigrationForExistingVitePlus(workspaceInfo, true).oxcConfigs).toBe(true);
expect(fs.readFileSync(path.join(tmpDir, 'vite.config.ts'), 'utf8')).toBe(config);
expect(fs.existsSync(path.join(tmpDir, '.oxfmtrc.json'))).toBe(false);
expect(finalizeCoreMigrationForExistingVitePlus(workspaceInfo, true).oxcConfigs).toBe(false);
});

it('keeps an unmergeable config and reports the incomplete migration', () => {
fs.writeFileSync(
path.join(tmpDir, 'package.json'),
JSON.stringify({ name: 'test', devDependencies: { 'vite-plus': 'latest' } }),
);
fs.writeFileSync(
path.join(tmpDir, 'vite.config.ts'),
'const config = {}; export default config;\n',
);
fs.writeFileSync(path.join(tmpDir, '.oxfmtrc.json'), '{"singleQuote":true}\n');
const report = createMigrationReport();

const result = finalizeCoreMigrationForExistingVitePlus(
makeWorkspaceInfo(tmpDir, PackageManager.npm),
true,
report,
);
expect(result.oxcConfigs).toBe(false);
expect(fs.existsSync(path.join(tmpDir, '.oxfmtrc.json'))).toBe(true);
expect(report.warnings.some((warning) => warning.includes('Failed to merge'))).toBe(true);
});

it('detects package-level legacy signals in workspaces', () => {
const appDir = path.join(tmpDir, 'packages', 'app');
fs.mkdirSync(appDir, { recursive: true });
Expand All @@ -8943,40 +8852,6 @@ describe('existing Vite+ core migration finalization', () => {
expect(appPkg.scripts.dev).toBe('vp dev');
});

it('finishes leftover Oxc and tsdown configs together and remains idempotent', () => {
fs.writeFileSync(
path.join(tmpDir, 'package.json'),
JSON.stringify({ name: 'test', devDependencies: { 'vite-plus': 'latest' } }),
);
fs.writeFileSync(path.join(tmpDir, 'vite.config.ts'), 'export default {};\n');
fs.writeFileSync(path.join(tmpDir, '.oxfmtrc.json'), '{"singleQuote":true,"semi":false}\n');
fs.writeFileSync(
path.join(tmpDir, 'tsdown.config.ts'),
"import { defineConfig } from 'tsdown'; export default defineConfig({ entry: 'src/index.ts' });\n",
);
const workspaceInfo = makeWorkspaceInfo(tmpDir, PackageManager.pnpm);

const result = finalizeCoreMigrationForExistingVitePlus(workspaceInfo, true);
expect(result.oxcConfigs).toBe(true);
expect(result.tsdownConfig).toBe(true);
const config = fs.readFileSync(path.join(tmpDir, 'vite.config.ts'), 'utf8');
expect(config).toContain('pack: tsdownConfig');
expect(config).toContain('"singleQuote":true');
expect(config).toContain('"semi":false');
expect(fs.existsSync(path.join(tmpDir, '.oxfmtrc.json'))).toBe(false);
expect(fs.readFileSync(path.join(tmpDir, 'tsdown.config.ts'), 'utf8')).toContain(
"from 'vite-plus/pack'",
);
expect(finalizeCoreMigrationForExistingVitePlus(workspaceInfo, true)).toEqual({
scripts: false,
tsconfigTypes: false,
imports: false,
oxcConfigs: false,
tsdownConfig: false,
});
expect(fs.readFileSync(path.join(tmpDir, 'vite.config.ts'), 'utf8')).toBe(config);
});

it('makes a leftover tsdown config discoverable in an existing Vite+ project', () => {
fs.writeFileSync(
path.join(tmpDir, 'package.json'),
Expand All @@ -8998,7 +8873,6 @@ export default defineConfig({
tsconfigTypes: false,
imports: true,
tsdownConfig: true,
oxcConfigs: false,
});
expect(fs.readFileSync(path.join(tmpDir, 'vite.config.ts'), 'utf8')).toContain(
"import tsdownConfig from './tsdown.config.js';",
Expand All @@ -9015,7 +8889,6 @@ export default defineConfig({
tsconfigTypes: false,
imports: false,
tsdownConfig: false,
oxcConfigs: false,
});
});

Expand Down Expand Up @@ -9052,7 +8925,6 @@ export default defineConfig({ entry: 'src/index.ts' });
tsconfigTypes: false,
imports: true,
tsdownConfig: false,
oxcConfigs: false,
});
expect(fs.readFileSync(path.join(tmpDir, 'vite.config.ts'), 'utf8')).toBe(originalViteConfig);
expect(report.tsdownImportCount).toBe(0);
Expand Down
Loading
Loading