Skip to content

Commit

Permalink
fix: throw error if c8 is used with browser via poolMatchGlobs
Browse files Browse the repository at this point in the history
  • Loading branch information
AriPerkkio committed Mar 26, 2023
1 parent 752fcd2 commit ae63ed0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
9 changes: 8 additions & 1 deletion packages/vitest/src/node/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export function resolveConfig(
}
}

if (resolved.coverage.enabled && resolved.coverage.provider === 'c8' && resolved.browser.enabled)
if (resolved.coverage.provider === 'c8' && resolved.coverage.enabled && isBrowserEnabled(resolved))
throw new Error('@vitest/coverage-c8 does not work with --browser. Use @vitest/coverage-istanbul instead')

resolved.deps = resolved.deps || {}
Expand Down Expand Up @@ -265,3 +265,10 @@ export function resolveConfig(

return resolved
}

export function isBrowserEnabled(config: ResolvedConfig) {
if (config.browser.enabled)
return true

return config.poolMatchGlobs?.length && config.poolMatchGlobs.some(([, pool]) => pool === 'browser')
}
6 changes: 2 additions & 4 deletions packages/vitest/src/node/core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { createPool } from './pool'
import type { ProcessPool } from './pool'
import { createBenchmarkReporters, createReporters } from './reporters/utils'
import { StateManager } from './state'
import { resolveConfig } from './config'
import { isBrowserEnabled, resolveConfig } from './config'
import { Logger } from './logger'
import { VitestCache } from './cache'
import { VitestServer } from './server'
Expand Down Expand Up @@ -719,9 +719,7 @@ export class Vitest {
}

isBrowserEnabled() {
if (this.config.browser.enabled)
return true
return this.config.poolMatchGlobs?.length && this.config.poolMatchGlobs.some(([, pool]) => pool === 'browser')
return isBrowserEnabled(this.config)
}

// The server needs to be running for communication
Expand Down

0 comments on commit ae63ed0

Please sign in to comment.