archive-gh-me/vitest
1
0
Fork 0
mirror of https://github.com/vitest-dev/vitest.git synced 2026-02-01 17:36:51 +00:00
Code Issues Projects Releases Wiki Activity

chore: cleanup

Browse Source
This commit is contained in:
Anthony Fu 2022-01-27 07:58:30 +08:00
parent 9cff755a86
commit 5887fb7aca
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/vitest/src/node/config.ts
View File

@ -1,5 +1,5 @@
import { resolve } from 'pathe'
import type { ResolvedConfig as ResolvedViteConfig, UserConfig as ViteUserConfig } from 'vite'
import type { ResolvedConfig as ResolvedViteConfig } from 'vite'
import type { ApiConfig, ResolvedConfig, UserConfig } from '../types'
import { defaultExclude, defaultInclude, defaultPort } from '../constants'
@ -8,7 +8,6 @@ import { toArray } from '../utils'
export function resolveApiConfig<Options extends ApiConfig & UserConfig>(
options: Options,
viteOverrides?: ViteUserConfig,
): ApiConfig | undefined {
let api: ApiConfig | undefined
@ -23,10 +22,8 @@ export function resolveApiConfig<Options extends ApiConfig & UserConfig>(
if (api) {
if (options.api.port)
api.port = options.api.port
if (options.api.strictPort)
api.strictPort = options.api.strictPort
if (options.api.host)
api.host = options.api.host
}
@ -38,9 +35,6 @@ export function resolveApiConfig<Options extends ApiConfig & UserConfig>(
if (api) {
if (!api.port)
api.port = defaultPort
if (viteOverrides)
viteOverrides.server = Object.assign(viteOverrides.server || {}, api)
}
return api

6
packages/vitest/src/node/plugins/index.ts
View File

@ -1,4 +1,4 @@
import type { Plugin as VitePlugin, UserConfig as ViteUserConfig } from 'vite'
import type { Plugin as VitePlugin } from 'vite'
import type { UserConfig } from '../../types'
import { deepMerge, ensurePackageInstalled, notNullish } from '../../utils'
import { resolveApiConfig } from '../config'
@ -6,7 +6,7 @@ import { Vitest } from '../core'
import { GlobalSetupPlugin } from './globalSetup'
import { MocksPlugin } from './mock'
export async function VitestPlugin(options: UserConfig = {}, viteOverrides: ViteUserConfig = {}, ctx = new Vitest()): Promise<VitePlugin[]> {
export async function VitestPlugin(options: UserConfig = {}, ctx = new Vitest()): Promise<VitePlugin[]> {
let haveStarted = false
async function UIPlugin() {
@ -20,7 +20,7 @@ export async function VitestPlugin(options: UserConfig = {}, viteOverrides: Vite
enforce: 'pre',
config(viteConfig: any) {
options = deepMerge(options, viteConfig.test || {})
options.api = resolveApiConfig(options, viteOverrides)
options.api = resolveApiConfig(options)
return {
clearScreen: false,
resolve: {