Skip to content

refactor(cli): share Vite config file order #2409

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
Aug 11, 2026
+15 −35
Merged

refactor(cli): share Vite config file order #2409

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
11 changes: 1 addition & 10 deletions packages/cli/src/init-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { hasConfigKey, mergeJsonConfig } from '../binding/index.js';
import { createDefaultVitePlusLintConfig } from './oxlint-plugin-config.ts';
import { fmt as resolveFmt } from './resolve-fmt.ts';
import { runCommandSilently } from './utils/command.ts';
import { BASEURL_TSCONFIG_WARNING, VITE_PLUS_NAME } from './utils/constants.ts';
import { BASEURL_TSCONFIG_WARNING, VITE_CONFIG_FILES, VITE_PLUS_NAME } from './utils/constants.ts';
import { warnMsg } from './utils/terminal.ts';
import { fixBaseUrlInTsconfig, hasBaseUrlInTsconfig } from './utils/tsconfig.ts';

Expand All @@ -32,15 +32,6 @@ function normalizeInitCommand(command: string | undefined): string | undefined {
return command === 'format' ? 'fmt' : command;
}

const VITE_CONFIG_FILES = [
'vite.config.ts',
'vite.config.mts',
'vite.config.cts',
'vite.config.js',
'vite.config.mjs',
'vite.config.cjs',
] as const;

export interface InitCommandInspection {
handled: boolean;
configKey?: 'lint' | 'fmt';
Expand Down
14 changes: 3 additions & 11 deletions packages/cli/src/migration/detector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import fs from 'node:fs';
import path from 'node:path';

import { VITE_CONFIG_FILES } from '../utils/constants.ts';

export interface ConfigFiles {
viteConfig?: string;
vitestConfig?: string;
Expand Down Expand Up @@ -44,17 +46,7 @@ export const PRETTIER_CONFIG_FILES = [
export function detectConfigs(projectPath: string): ConfigFiles {
const configs: ConfigFiles = {};

// Check for vite.config.*
// https://vite.dev/config/
const viteConfigs = [
'vite.config.ts',
'vite.config.mts',
'vite.config.cts',
'vite.config.js',
'vite.config.mjs',
'vite.config.cjs',
];
for (const config of viteConfigs) {
for (const config of VITE_CONFIG_FILES) {
if (fs.existsSync(path.join(projectPath, config))) {
configs.viteConfig = config;
break;
Expand Down
15 changes: 1 addition & 14 deletions packages/cli/src/resolve-vite-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,7 @@ import fs from 'node:fs';
import path from 'node:path';

import { withConfigMetadataResolution } from './define-config.ts';

// Mirrors Vite's own DEFAULT_CONFIG_FILES order so finders here pick the same
// file Vite loads when a directory contains more than one config (e.g. a
// `vite.config.js` next to a stray `vite.config.ts`). Readers evaluate via
// Vite's loader, so a different order would make read and write target
// different files.
const VITE_CONFIG_FILES = [
'vite.config.js',
'vite.config.mjs',
'vite.config.ts',
'vite.config.cjs',
'vite.config.mts',
'vite.config.cts',
];
import { VITE_CONFIG_FILES } from './utils/constants.ts';

/**
* Find a vite config file by walking up from `startDir` to `stopDir`.
Expand Down
10 changes: 10 additions & 0 deletions packages/cli/src/utils/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ import cliPkg from '../../package.json' with { type: 'json' };
export const VITE_PLUS_NAME = 'vite-plus';
export const VITE_PLUS_VERSION = process.env.VP_VERSION || cliPkg.version;

// Mirrors Vite's DEFAULT_CONFIG_FILES order so readers and writers target the same file.
export const VITE_CONFIG_FILES = [
'vite.config.js',
'vite.config.mjs',
'vite.config.ts',
'vite.config.cjs',
'vite.config.mts',
'vite.config.cts',
] as const;

export const VITEST_VERSION = '4.1.10';

export const VITE_PLUS_OVERRIDE_PACKAGES: Record<string, string> = process.env.VP_OVERRIDE_PACKAGES
Expand Down
Loading