Skip to content
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.

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

fix(browser): support coverage.reportsDirectory with multiple directories #5056

Merged
merged 1 commit into from Feb 2, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 45 additions & 1 deletion packages/browser/src/node/index.ts
@@ -1,9 +1,10 @@
import { fileURLToPath } from 'node:url'

import { resolve } from 'node:path'
import { basename, resolve } from 'pathe'
import sirv from 'sirv'
import type { Plugin } from 'vite'
import type { WorkspaceProject } from 'vitest/node'
import { coverageConfigDefaults } from 'vitest/config'
import { injectVitestModule } from './esmInjector'

export default (project: WorkspaceProject, base = '/'): Plugin[] => {
Expand Down Expand Up @@ -36,6 +37,19 @@ export default (project: WorkspaceProject, base = '/'): Plugin[] => {
},
}),
)

const coverageFolder = resolveCoverageFolder(project)
const coveragePath = coverageFolder ? coverageFolder[1] : undefined
if (coveragePath && base === coveragePath)
throw new Error(`The ui base path and the coverage path cannot be the same: ${base}, change coverage.reportsDirectory`)

coverageFolder && server.middlewares.use(coveragePath!, sirv(coverageFolder[0], {
single: true,
dev: true,
setHeaders: (res) => {
res.setHeader('Cache-Control', 'public,max-age=0,must-revalidate')
},
}))
},
},
{
Expand Down Expand Up @@ -114,3 +128,33 @@ export default (project: WorkspaceProject, base = '/'): Plugin[] => {
},
]
}

function resolveCoverageFolder(project: WorkspaceProject) {
const options = project.ctx.config
const htmlReporter = options.coverage?.enabled
? options.coverage.reporter.find((reporter) => {
if (typeof reporter === 'string')
return reporter === 'html'

return reporter[0] === 'html'
})
: undefined

if (!htmlReporter)
return undefined

// reportsDirectory not resolved yet
const root = resolve(
options.root || options.root || process.cwd(),
options.coverage.reportsDirectory || coverageConfigDefaults.reportsDirectory,
)

const subdir = (Array.isArray(htmlReporter) && htmlReporter.length > 1 && 'subdir' in htmlReporter[1])
? htmlReporter[1].subdir
: undefined

if (!subdir || typeof subdir !== 'string')
return [root, `/${basename(root)}/`]

return [resolve(root, subdir), `/${basename(root)}/${subdir}/`]
}