Skip to content

Commit

Permalink
fix: remove duplicate type (#3303)
Browse files Browse the repository at this point in the history
  • Loading branch information
sheremet-va committed May 4, 2023
1 parent a93be56 commit 5382e8b
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions packages/vitest/src/config.ts
@@ -1,21 +1,17 @@
import type { ConfigEnv, UserConfig as ViteUserConfig } from 'vite'
import type { ProjectConfig } from './types'

export interface UserConfig extends ViteUserConfig {
test?: ViteUserConfig['test'] | undefined
}

export interface UserWorkspaceConfig extends ViteUserConfig {
test?: ProjectConfig | undefined
test?: ProjectConfig
}

// will import vitest declare test in module 'vite'
export { configDefaults, defaultInclude, defaultExclude, coverageConfigDefaults } from './defaults'
export { mergeConfig } from 'vite'

export type { ConfigEnv }
export type UserConfigFn = (env: ConfigEnv) => UserConfig | Promise<UserConfig>
export type UserConfigExport = UserConfig | Promise<UserConfig> | UserConfigFn
export type { ConfigEnv, ViteUserConfig as UserConfig }
export type UserConfigFn = (env: ConfigEnv) => ViteUserConfig | Promise<ViteUserConfig>
export type UserConfigExport = ViteUserConfig | Promise<ViteUserConfig> | UserConfigFn

export type UserProjectConfigFn = (env: ConfigEnv) => UserWorkspaceConfig | Promise<UserWorkspaceConfig>
export type UserProjectConfigExport = UserWorkspaceConfig | Promise<UserWorkspaceConfig> | UserProjectConfigFn
Expand Down

0 comments on commit 5382e8b

Please sign in to comment.