Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions packages/coverage-v8/src/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,20 @@ export class V8CoverageProvider extends BaseCoverageProvider<ResolvedCoverageOpt
return true
}

// CJS imports as ternaries - e.g.
// const React = __vite__cjsImport0_react.__esModule ? __vite__cjsImport0_react.default : __vite__cjsImport0_react;
if (
type === 'branch'
&& node.type === 'ConditionalExpression'
&& node.test.type === 'MemberExpression'
&& node.test.object.type === 'Identifier'
&& node.test.object.name.startsWith('__vite__cjsImport')
&& node.test.property.type === 'Identifier'
&& node.test.property.name === '__esModule'
) {
return true
}

// in-source test with "if (import.meta.vitest)"
if (
(type === 'branch' || type === 'statement')
Expand Down
8 changes: 8 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions test/coverage-test/fixtures/src/cjs-dependency.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// @ts-expect-error -- types not picked up for some reason
import cjsDefault from '@vitest/cjs-lib'

export default function getA() {
return cjsDefault.a
}
6 changes: 6 additions & 0 deletions test/coverage-test/fixtures/test/cjs-dependency.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { test } from "vitest";
import cjsDependency from "../src/cjs-dependency";

test("cjs dependency vite transforms", () => {
cjsDependency()
})
1 change: 1 addition & 0 deletions test/coverage-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"@types/istanbul-lib-report": "catalog:",
"@vitejs/plugin-vue": "latest",
"@vitest/browser-playwright": "workspace:*",
"@vitest/cjs-lib": "file:../browser/cjs-lib",
"@vitest/coverage-istanbul": "workspace:*",
"@vitest/coverage-v8": "workspace:*",
"@vitest/web-worker": "workspace:*",
Expand Down
25 changes: 25 additions & 0 deletions test/coverage-test/test/cjs-dependency.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { expect } from 'vitest'
import { readCoverageMap, runVitest, test } from '../utils'

test('excludes Vite transforms done for CJS dependency', async () => {
await runVitest({
include: ['fixtures/test/cjs-dependency.test.ts'],
coverage: {
reporter: 'json',
},
})
const coverageMap = await readCoverageMap()
const files = coverageMap.files()

expect(files).toMatchInlineSnapshot(`
[
"<process-cwd>/fixtures/src/cjs-dependency.ts",
]
`)

const fileCoverage = coverageMap.fileCoverageFor('<process-cwd>/fixtures/src/cjs-dependency.ts')

// There should be 0 branches (#8717)
expect(Object.keys(fileCoverage.b)).toHaveLength(0)
expect(Object.keys(fileCoverage.branchMap)).toHaveLength(0)
})
2 changes: 2 additions & 0 deletions test/coverage-test/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ export default defineConfig({
'**/vue.test.ts',
'**/in-source.test.ts',
'**/query-param-transforms.test.ts',
'**/test/cjs-dependency.test.ts',
],
},
},
Expand Down Expand Up @@ -115,6 +116,7 @@ export default defineConfig({
'**/vue.test.ts',
'**/in-source.test.ts',
'**/query-param-transforms.test.ts',
'**/test/cjs-dependency.test.ts',
],
},
},
Expand Down
Loading