@vitest/coverage-istanbul 2.1.0-beta.4 → 2.1.0-beta.6

package/dist/provider.js

@@ -108,6 +108,8 @@ const isAbsolute = function(p) {
   return _IS_ABSOLUTE_RE.test(p);
 };
 
+var version = "2.1.0-beta.6";
+
 const DEFAULT_PROJECT = Symbol.for("default-project");
 const debug = createDebug("vitest:coverage");
 let uniqueId = 0;
@@ -122,6 +124,15 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
   pendingPromises = [];
   initialize(ctx) {
     const config = ctx.config.coverage;
+    if (ctx.version !== version) {
+      ctx.logger.warn(
+        c.yellow(
+          `Loaded ${c.inverse(c.yellow(` vitest@${ctx.version} `))} and ${c.inverse(c.yellow(` @vitest/coverage-istanbul@${version} `))}.
+Running mixed versions is not supported and may lead into bugs
+Update your dependencies and make sure the versions match.`
+        )
+      );
+    }
     this.ctx = ctx;
     this.options = {
       ...coverageConfigDefaults,
@@ -207,12 +218,12 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
     if (!coverage) {
       return;
     }
-    if (transformMode !== "web" && transformMode !== "ssr") {
+    if (transformMode !== "web" && transformMode !== "ssr" && transformMode !== "browser") {
       throw new Error(`Invalid transform mode: ${transformMode}`);
     }
     let entry = this.coverageFiles.get(projectName || DEFAULT_PROJECT);
     if (!entry) {
-      entry = { web: [], ssr: [] };
+      entry = { web: [], ssr: [], browser: [] };
       this.coverageFiles.set(projectName || DEFAULT_PROJECT, entry);
     }
     const filename = resolve(
@@ -251,7 +262,8 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
     for (const coveragePerProject of this.coverageFiles.values()) {
       for (const filenames of [
         coveragePerProject.ssr,
-        coveragePerProject.web
+        coveragePerProject.web,
+        coveragePerProject.browser
       ]) {
         const coverageMapByTransformMode = libCoverage.createCoverageMap({});
         for (const chunk of this.toSlices(
@@ -283,6 +295,9 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
       );
       coverageMap.merge(await transformCoverage(uncoveredCoverage));
     }
+    if (this.options.excludeAfterRemap) {
+      coverageMap.filter((filename) => this.testExclude.shouldInstrument(filename));
+    }
     return coverageMap;
   }
   async reportCoverage(coverageMap, { allTestsRun }) {
@@ -372,9 +387,10 @@ class IstanbulCoverageProvider extends BaseCoverageProvider {
     const uncoveredFiles = includedFiles.filter((file) => !coveredFiles.includes(file)).sort();
     const cacheKey = (/* @__PURE__ */ new Date()).getTime();
     const coverageMap = libCoverage.createCoverageMap({});
+    const transform = this.createUncoveredFileTransformer(this.ctx);
     for (const [index, filename] of uncoveredFiles.entries()) {
       debug("Uncovered file %s %d/%d", filename, index, uncoveredFiles.length);
-      await this.ctx.vitenode.transformRequest(`${filename}?v=${cacheKey}`);
+      await transform(`${filename}?v=${cacheKey}`);
       const lastCoverage = this.instrumenter.lastFileCoverage();
       coverageMap.addFileCoverage(lastCoverage);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/coverage-istanbul",
   "type": "module",
-  "version": "2.1.0-beta.4",
+  "version": "2.1.0-beta.6",
   "description": "Istanbul coverage provider for Vitest",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "vitest": "2.1.0-beta.4"
+    "vitest": "2.1.0-beta.6"
   },
   "dependencies": {
     "@istanbuljs/schema": "^0.1.3",
@@ -59,7 +59,7 @@
     "@types/istanbul-lib-source-maps": "^4.0.4",
     "@types/istanbul-reports": "^3.0.4",
     "pathe": "^1.1.2",
-    "vitest": "2.1.0-beta.4"
+    "vitest": "2.1.0-beta.6"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",