Skip to content

Commit 9c8e308

Browse files
authoredJul 28, 2023
fix: port the latest defineConfig type from vite (#3804)
1 parent b7ce195 commit 9c8e308

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed
 

‎packages/vitest/src/config.ts

+8-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,19 @@ export { configDefaults, defaultInclude, defaultExclude, coverageConfigDefaults
1010
export { mergeConfig } from 'vite'
1111

1212
export type { ConfigEnv, ViteUserConfig as UserConfig }
13+
export type UserConfigFnObject = (env: ConfigEnv) => ViteUserConfig
14+
export type UserConfigFnPromise = (env: ConfigEnv) => Promise<ViteUserConfig>
1315
export type UserConfigFn = (env: ConfigEnv) => ViteUserConfig | Promise<ViteUserConfig>
14-
export type UserConfigExport = ViteUserConfig | Promise<ViteUserConfig> | UserConfigFn
16+
export type UserConfigExport = ViteUserConfig | Promise<ViteUserConfig> | UserConfigFnObject | UserConfigFnPromise | UserConfigFn
1517

1618
export type UserProjectConfigFn = (env: ConfigEnv) => UserWorkspaceConfig | Promise<UserWorkspaceConfig>
1719
export type UserProjectConfigExport = UserWorkspaceConfig | Promise<UserWorkspaceConfig> | UserProjectConfigFn
1820

19-
export function defineConfig(config: UserConfigExport) {
21+
export function defineConfig(config: ViteUserConfig): ViteUserConfig
22+
export function defineConfig(config: Promise<ViteUserConfig>): Promise<ViteUserConfig>
23+
export function defineConfig(config: UserConfigFnObject): UserConfigFnObject
24+
export function defineConfig(config: UserConfigExport): UserConfigExport
25+
export function defineConfig(config: UserConfigExport): UserConfigExport {
2026
return config
2127
}
2228

0 commit comments

Comments
 (0)
Please sign in to comment.