@vitest/browser 3.2.0-beta.3 → 3.2.1

package/dist/client/__vitest_browser__/{tester-BV-CSJ5v.js → tester-B_w3in1j.js}

@@ -14,12 +14,22 @@ const seen = {};
 const __vitePreload = function preload(baseModule, deps, importerUrl) {
   let promise = Promise.resolve();
   if (deps && deps.length > 0) {
+    let allSettled2 = function(promises2) {
+      return Promise.all(
+        promises2.map(
+          (p2) => Promise.resolve(p2).then(
+            (value) => ({ status: "fulfilled", value }),
+            (reason) => ({ status: "rejected", reason })
+          )
+        )
+      );
+    };
     document.getElementsByTagName("link");
     const cspNonceMeta = document.querySelector(
       "meta[property=csp-nonce]"
     );
     const cspNonce = (cspNonceMeta == null ? void 0 : cspNonceMeta.nonce) || (cspNonceMeta == null ? void 0 : cspNonceMeta.getAttribute("nonce"));
-    promise = Promise.allSettled(
+    promise = allSettled2(
       deps.map((dep) => {
         dep = assetsURL(dep);
         if (dep in seen) return;
@@ -1589,6 +1599,31 @@ function createBrowserRunner(runnerClass, mocker, state, coverageModule) {
         }
         return rpc$2().onCollected(this.method, files);
       });
+      __publicField(this, "onTestAnnotate", (test, annotation) => {
+        if (annotation.location) {
+          const map = this.sourceMapCache.get(annotation.location.file);
+          if (!map) {
+            return rpc$2().onTaskAnnotate(test.id, annotation);
+          }
+          const traceMap = new TraceMap(map);
+          const { line, column, source } = originalPositionFor(traceMap, annotation.location);
+          if (line != null && column != null && source != null) {
+            let file = annotation.location.file;
+            if (source) {
+              const fileUrl = annotation.location.file.startsWith("file://") ? annotation.location.file : `file://${annotation.location.file}`;
+              const sourceRootUrl = map.sourceRoot ? new URL(map.sourceRoot, fileUrl) : fileUrl;
+              file = new URL(source, sourceRootUrl).pathname;
+            }
+            annotation.location = {
+              line,
+              column: column + 1,
+              // if the file path is on windows, we need to remove the starting slash
+              file: file.match(/\/\w:\//) ? file.slice(1) : file
+            };
+          }
+        }
+        return rpc$2().onTaskAnnotate(test.id, annotation);
+      });
       __publicField(this, "onTaskUpdate", (task, events) => {
         return rpc$2().onTaskUpdate(this.method, task, events);
       });
@@ -1655,14 +1690,23 @@ async function initiateRunner(state, mocker, config) {
   };
   return runner;
 }
+async function getTraceMap(file, sourceMaps) {
+  const result = sourceMaps.get(file) || await rpc$2().getBrowserFileSourceMap(file).then((map) => {
+    sourceMaps.set(file, map);
+    return map;
+  });
+  if (!result) {
+    return null;
+  }
+  return new TraceMap(result);
+}
 async function updateTestFilesLocations(files, sourceMaps) {
   const promises2 = files.map(async (file) => {
-    const result = sourceMaps.get(file.filepath) || await rpc$2().getBrowserFileSourceMap(file.filepath);
-    if (!result) {
+    const traceMap = await getTraceMap(file.filepath, sourceMaps);
+    if (!traceMap) {
       return null;
     }
-    const traceMap = new TraceMap(result);
-    function updateLocation(task) {
+    const updateLocation = (task) => {
       if (task.location) {
         const { line, column } = originalPositionFor(traceMap, task.location);
         if (line != null && column != null) {
@@ -1672,7 +1716,7 @@ async function updateTestFilesLocations(files, sourceMaps) {
       if ("tasks" in task) {
         task.tasks.forEach(updateLocation);
       }
-    }
+    };
     file.tasks.forEach(updateLocation);
     return null;
   });
@@ -3502,6 +3546,9 @@ async function cleanup() {
     }
   }
   await userEvent.cleanup().catch((error) => unhandledError(error, "Cleanup Error"));
+  await Promise.all(
+    getBrowserState().cleanups.map((fn) => fn())
+  ).catch((error) => unhandledError(error, "Cleanup Error"));
   if (contextSwitched) {
     await rpc2.wdioSwitchContext("parent").catch((error) => unhandledError(error, "Cleanup Error"));
   }

package/dist/client/esm-client-injector.js

@@ -20,6 +20,7 @@
     wrapModule,
     wrapDynamicImport: wrapModule,
     moduleCache,
+    cleanups: [],
     config: { __VITEST_CONFIG__ },
     viteConfig: { __VITEST_VITE_CONFIG__ },
     type: { __VITEST_TYPE__ },

package/dist/client/orchestrator.html

@@ -26,7 +26,7 @@
     {__VITEST_INJECTOR__}
     {__VITEST_ERROR_CATCHER__}
     {__VITEST_SCRIPTS__}
-    <script type="module" crossorigin src="/__vitest_browser__/orchestrator-Bsc_nLaw.js"></script>
+    <script type="module" crossorigin src="/__vitest_browser__/orchestrator-R-D9fwJI.js"></script>
     <link rel="modulepreload" crossorigin href="/__vitest_browser__/utils-Owv5OOOf.js">
   </head>
   <body>

package/dist/client/tester/tester.html

@@ -5,7 +5,7 @@
     <link rel="icon" href="{__VITEST_FAVICON__}" type="image/svg+xml">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vitest Browser Tester</title>
-    <script type="module" crossorigin src="/__vitest_browser__/tester-BV-CSJ5v.js"></script>
+    <script type="module" crossorigin src="/__vitest_browser__/tester-B_w3in1j.js"></script>
     <link rel="modulepreload" crossorigin href="/__vitest_browser__/utils-Owv5OOOf.js">
   </head>
   <body>

package/dist/client.js

@@ -273,7 +273,7 @@ const PORT = location.port;
 const HOST = [location.hostname, PORT].filter(Boolean).join(":");
 const RPC_ID = PAGE_TYPE === "orchestrator" ? getBrowserState().sessionId : getBrowserState().testerId;
 const METHOD = getBrowserState().method;
-const ENTRY_URL = `${location.protocol === "https:" ? "wss:" : "ws:"}//${HOST}/__vitest_browser_api__?type=${PAGE_TYPE}&rpcId=${RPC_ID}&sessionId=${getBrowserState().sessionId}&projectName=${getBrowserState().config.name || ""}&method=${METHOD}&token=${window.VITEST_API_TOKEN}`;
+const ENTRY_URL = `${location.protocol === "https:" ? "wss:" : "ws:"}//${HOST}/__vitest_browser_api__?type=${PAGE_TYPE}&rpcId=${RPC_ID}&sessionId=${getBrowserState().sessionId}&projectName=${getBrowserState().config.name || ""}&method=${METHOD}&token=${window.VITEST_API_TOKEN || "0"}`;
 let setCancel = (_) => {};
 const onCancel = new Promise((resolve) => {
 	setCancel = resolve;

package/dist/index.d.ts

@@ -5,7 +5,7 @@ import { ViteDevServer, HtmlTagDescriptor } from 'vite';
 import { CancelReason, BrowserTesterOptions, TestExecutionMethod, RunnerTestFile, AfterSuiteRunMeta, UserConsoleLog, SnapshotResult, SerializedConfig, ErrorWithDiff, ParsedStack } from 'vitest';
 import { MockedModuleSerialized } from '@vitest/mocker';
 import { ServerIdResolution, ServerMockResolution } from '@vitest/mocker/node';
-import { TaskResultPack, TaskEventPack } from '@vitest/runner';
+import { TestAnnotation, TaskResultPack, TaskEventPack } from '@vitest/runner';
 
 type ArgumentsType<T> = T extends (...args: infer A) => any ? A : never;
 type ReturnType<T> = T extends (...args: any) => infer R ? R : never;
@@ -29,6 +29,7 @@ interface WebSocketBrowserHandlers {
 	onUnhandledError: (error: unknown, type: string) => Promise<void>;
 	onQueued: (method: TestExecutionMethod, file: RunnerTestFile) => void;
 	onCollected: (method: TestExecutionMethod, files: RunnerTestFile[]) => Promise<void>;
+	onTaskAnnotate: (testId: string, annotation: TestAnnotation) => Promise<TestAnnotation>;
 	onTaskUpdate: (method: TestExecutionMethod, packs: TaskResultPack[], events: TaskEventPack[]) => void;
 	onAfterSuiteRun: (meta: AfterSuiteRunMeta) => void;
 	cancelCurrentRun: (reason: CancelReason) => void;

package/dist/index.js

@@ -18,7 +18,7 @@ import { resolve as resolve$1, basename as basename$1, dirname as dirname$1, nor
 import { WebSocketServer } from 'ws';
 import * as nodeos from 'node:os';
 
-var version = "3.2.0-beta.3";
+var version = "3.2.1";
 
 const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
@@ -3079,6 +3079,9 @@ function setupBrowserRpc(globalServer, defaultMockerRegistry) {
 					await vitest._testRun.collected(project, files);
 				}
 			},
+			async onTaskAnnotate(id, annotation) {
+				return vitest._testRun.annotate(id, annotation);
+			},
 			async onTaskUpdate(method, packs, events) {
 				if (method === "collect") {
 					vitest.state.updateTasks(packs);
@@ -3564,6 +3567,7 @@ async function createBrowserServer(project, configFile, prePlugins = [], postPlu
 			hmr: false,
 			watch: null
 		},
+		cacheDir: project.vite.config.cacheDir,
 		plugins: [
 			...prePlugins,
 			...project.options?.plugins || [],

package/dist/state.js

@@ -33,6 +33,7 @@
   			throw new Error("Not called in the browser");
   		}
   	},
+  	onCleanup: (fn) => getBrowserState().cleanups.push(fn),
   	moduleCache: getBrowserState().moduleCache,
   	rpc: null,
   	durations: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "3.2.0-beta.3",
+  "version": "3.2.1",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -66,7 +66,7 @@
   "peerDependencies": {
     "playwright": "*",
     "webdriverio": "^7.0.0 || ^8.0.0 || ^9.0.0",
-    "vitest": "3.2.0-beta.3"
+    "vitest": "3.2.1"
   },
   "peerDependenciesMeta": {
     "playwright": {
@@ -86,13 +86,13 @@
     "sirv": "^3.0.1",
     "tinyrainbow": "^2.0.0",
     "ws": "^8.18.2",
-    "@vitest/mocker": "3.2.0-beta.3",
-    "@vitest/utils": "3.2.0-beta.3"
+    "@vitest/mocker": "3.2.1",
+    "@vitest/utils": "3.2.1"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",
-    "@wdio/protocols": "^9.14.0",
-    "@wdio/types": "^9.14.0",
+    "@wdio/protocols": "^9.15.0",
+    "@wdio/types": "^9.15.0",
     "birpc": "2.3.0",
     "flatted": "^3.3.3",
     "ivya": "^1.6.0",
@@ -102,11 +102,11 @@
     "playwright": "^1.52.0",
     "playwright-core": "^1.52.0",
     "safaridriver": "^1.0.0",
-    "webdriverio": "^9.14.0",
-    "@vitest/runner": "3.2.0-beta.3",
-    "@vitest/ws-client": "3.2.0-beta.3",
-    "@vitest/ui": "3.2.0-beta.3",
-    "vitest": "3.2.0-beta.3"
+    "webdriverio": "^9.15.0",
+    "@vitest/runner": "3.2.1",
+    "vitest": "3.2.1",
+    "@vitest/ui": "3.2.1",
+    "@vitest/ws-client": "3.2.1"
   },
   "scripts": {
     "build": "rimraf dist && pnpm build:node && pnpm build:client",