diff --git a/packages/vitest/src/node/plugins/envReplacer.ts b/packages/vitest/src/node/plugins/envReplacer.ts index 29a4b1b22a3e..0078f78e7984 100644 --- a/packages/vitest/src/node/plugins/envReplacer.ts +++ b/packages/vitest/src/node/plugins/envReplacer.ts @@ -27,7 +27,12 @@ export const EnvReplacerPlugin = (): Plugin => { if (s) { return { code: s.toString(), - map: s.generateMap({ hires: true, source: id }), + map: s.generateMap({ + hires: true, + + // Remove possible query parameters, e.g. vue's "?vue&type=script&src=true&lang.ts" + source: id.split('?')[0], + }), } } }, diff --git a/test/coverage-test/coverage-report-tests/__snapshots__/c8.report.test.ts.snap b/test/coverage-test/coverage-report-tests/__snapshots__/c8.report.test.ts.snap index 52f3cb922d85..07f8eb6edfcf 100644 --- a/test/coverage-test/coverage-report-tests/__snapshots__/c8.report.test.ts.snap +++ b/test/coverage-test/coverage-report-tests/__snapshots__/c8.report.test.ts.snap @@ -4,18 +4,203 @@ exports[`c8 json report 1`] = ` { "/src/Counter/Counter.component.ts": { "all": false, - "b": {}, - "branchMap": {}, - "f": {}, - "fnMap": {}, + "b": { + "0": [ + 1, + ], + "1": [ + 2, + ], + }, + "branchMap": { + "0": { + "line": 6, + "loc": { + "end": { + "column": 4, + "line": 9, + }, + "start": { + "column": 2, + "line": 6, + }, + }, + "locations": [ + { + "end": { + "column": 4, + "line": 9, + }, + "start": { + "column": 2, + "line": 6, + }, + }, + ], + "type": "branch", + }, + "1": { + "line": 16, + "loc": { + "end": { + "column": 6, + "line": 18, + }, + "start": { + "column": 4, + "line": 16, + }, + }, + "locations": [ + { + "end": { + "column": 6, + "line": 18, + }, + "start": { + "column": 4, + "line": 16, + }, + }, + ], + "type": "branch", + }, + }, + "f": { + "0": 1, + "1": 0, + "2": 2, + "3": 0, + }, + "fnMap": { + "0": { + "decl": { + "end": { + "column": 4, + "line": 9, + }, + "start": { + "column": 2, + "line": 6, + }, + }, + "line": 6, + "loc": { + "end": { + "column": 4, + "line": 9, + }, + "start": { + "column": 2, + "line": 6, + }, + }, + "name": "setup", + }, + "1": { + "decl": { + "end": { + "column": 6, + "line": 14, + }, + "start": { + "column": 4, + "line": 12, + }, + }, + "line": 12, + "loc": { + "end": { + "column": 6, + "line": 14, + }, + "start": { + "column": 4, + "line": 12, + }, + }, + "name": "uncoveredMethod", + }, + "2": { + "decl": { + "end": { + "column": 6, + "line": 18, + }, + "start": { + "column": 4, + "line": 16, + }, + }, + "line": 16, + "loc": { + "end": { + "column": 6, + "line": 18, + }, + "start": { + "column": 4, + "line": 16, + }, + }, + "name": "coveredMethod", + }, + "3": { + "decl": { + "end": { + "column": 6, + "line": 22, + }, + "start": { + "column": 4, + "line": 20, + }, + }, + "line": 20, + "loc": { + "end": { + "column": 6, + "line": 22, + }, + "start": { + "column": 4, + "line": 20, + }, + }, + "name": "uncoveredMethodUsingImportMeta", + }, + }, "path": "/src/Counter/Counter.component.ts", "s": { "0": 1, + "1": 1, + "10": 1, + "11": 1, + "12": 0, + "13": 0, + "14": 1, + "15": 1, + "16": 2, + "17": 2, + "18": 1, + "19": 1, + "2": 1, + "20": 0, + "21": 0, + "22": 1, + "23": 1, + "3": 1, + "4": 1, + "5": 1, + "6": 1, + "7": 1, + "8": 1, + "9": 1, }, "statementMap": { "0": { "end": { - "column": 0, + "column": 42, "line": 1, }, "start": { @@ -23,6 +208,236 @@ exports[`c8 json report 1`] = ` "line": 1, }, }, + "1": { + "end": { + "column": 0, + "line": 2, + }, + "start": { + "column": 0, + "line": 2, + }, + }, + "10": { + "end": { + "column": 12, + "line": 11, + }, + "start": { + "column": 0, + "line": 11, + }, + }, + "11": { + "end": { + "column": 23, + "line": 12, + }, + "start": { + "column": 0, + "line": 12, + }, + }, + "12": { + "end": { + "column": 46, + "line": 13, + }, + "start": { + "column": 0, + "line": 13, + }, + }, + "13": { + "end": { + "column": 6, + "line": 14, + }, + "start": { + "column": 0, + "line": 14, + }, + }, + "14": { + "end": { + "column": 0, + "line": 15, + }, + "start": { + "column": 0, + "line": 15, + }, + }, + "15": { + "end": { + "column": 21, + "line": 16, + }, + "start": { + "column": 0, + "line": 16, + }, + }, + "16": { + "end": { + "column": 42, + "line": 17, + }, + "start": { + "column": 0, + "line": 17, + }, + }, + "17": { + "end": { + "column": 6, + "line": 18, + }, + "start": { + "column": 0, + "line": 18, + }, + }, + "18": { + "end": { + "column": 0, + "line": 19, + }, + "start": { + "column": 0, + "line": 19, + }, + }, + "19": { + "end": { + "column": 38, + "line": 20, + }, + "start": { + "column": 0, + "line": 20, + }, + }, + "2": { + "end": { + "column": 32, + "line": 3, + }, + "start": { + "column": 0, + "line": 3, + }, + }, + "20": { + "end": { + "column": 94, + "line": 21, + }, + "start": { + "column": 0, + "line": 21, + }, + }, + "21": { + "end": { + "column": 6, + "line": 22, + }, + "start": { + "column": 0, + "line": 22, + }, + }, + "22": { + "end": { + "column": 4, + "line": 23, + }, + "start": { + "column": 0, + "line": 23, + }, + }, + "23": { + "end": { + "column": 2, + "line": 24, + }, + "start": { + "column": 0, + "line": 24, + }, + }, + "3": { + "end": { + "column": 18, + "line": 4, + }, + "start": { + "column": 0, + "line": 4, + }, + }, + "4": { + "end": { + "column": 0, + "line": 5, + }, + "start": { + "column": 0, + "line": 5, + }, + }, + "5": { + "end": { + "column": 11, + "line": 6, + }, + "start": { + "column": 0, + "line": 6, + }, + }, + "6": { + "end": { + "column": 24, + "line": 7, + }, + "start": { + "column": 0, + "line": 7, + }, + }, + "7": { + "end": { + "column": 20, + "line": 8, + }, + "start": { + "column": 0, + "line": 8, + }, + }, + "8": { + "end": { + "column": 4, + "line": 9, + }, + "start": { + "column": 0, + "line": 9, + }, + }, + "9": { + "end": { + "column": 0, + "line": 10, + }, + "start": { + "column": 0, + "line": 10, + }, + }, }, }, "/src/Counter/Counter.vue": {