Skip to content

Commit 4e905a1

Browse files
authored
fix(coverage): v8 to ignore more Vite's CJS import helpers (#11981)
1 parent efba8cb commit 4e905a1

2 files changed

Lines changed: 39 additions & 10 deletions

File tree

‎packages/coverage-v8/src/provider.ts‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -308,16 +308,22 @@ export class V8CoverageProvider extends BaseCoverageProvider implements Coverage
308308

309309
// CJS imports as ternaries - e.g.
310310
// const React = __vite__cjsImport0_react.__esModule ? __vite__cjsImport0_react.default : __vite__cjsImport0_react;
311-
if (
312-
type === 'branch' &&
313-
node.type === 'ConditionalExpression' &&
314-
node.test.type === 'MemberExpression' &&
315-
node.test.object.type === 'Identifier' &&
316-
node.test.object.name.startsWith('__vite__cjsImport') &&
317-
node.test.property.type === 'Identifier' &&
318-
node.test.property.name === '__esModule'
319-
) {
320-
return true
311+
// const React = !__vite__cjsImport0_react.__esModule ? __vite__cjsImport0_react : __vite__cjsImport0_react.default;
312+
if (type === 'branch' && node.type === 'ConditionalExpression') {
313+
const test =
314+
node.test.type === 'UnaryExpression' && node.test.operator === '!'
315+
? node.test.argument
316+
: node.test
317+
318+
if (
319+
test.type === 'MemberExpression' &&
320+
test.object.type === 'Identifier' &&
321+
test.object.name.startsWith('__vite__cjsImport') &&
322+
test.property.type === 'Identifier' &&
323+
test.property.name === '__esModule'
324+
) {
325+
return true
326+
}
321327
}
322328

323329
// CJS namespace imports wrapped in interop helper - e.g.

‎test/coverage-test/test/cjs-dependency.test.ts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,26 @@ test('excludes Vite transforms done for namespace import of CJS dependency', asy
5555
expect(Object.keys(fileCoverage.b)).toHaveLength(0)
5656
expect(Object.keys(fileCoverage.branchMap)).toHaveLength(0)
5757
})
58+
59+
test('excludes Vite transforms done for CJS dependency with legacy.inconsistentCjsInterop', async () => {
60+
await runVitest(
61+
{
62+
include: ['fixtures/test/cjs-dependency.test.ts'],
63+
coverage: {
64+
reporter: 'json',
65+
},
66+
},
67+
undefined,
68+
{
69+
cacheDir: fileURLToPath(new URL('./node_modules/.vite', import.meta.url)),
70+
optimizeDeps: { include: ['@vitest/cjs-lib'] },
71+
legacy: { inconsistentCjsInterop: true },
72+
},
73+
)
74+
const coverageMap = await readCoverageMap()
75+
const fileCoverage = coverageMap.fileCoverageFor('<process-cwd>/fixtures/src/cjs-dependency.ts')
76+
77+
// There should be 0 branches (#11980)
78+
expect(Object.keys(fileCoverage.b)).toHaveLength(0)
79+
expect(Object.keys(fileCoverage.branchMap)).toHaveLength(0)
80+
})

0 commit comments

Comments
 (0)