@vitest/browser 4.1.8 → 4.1.9

package/dist/client/.vite/manifest.json

@@ -4,7 +4,7 @@
     "name": "utils"
   },
   "orchestrator.html": {
-    "file": "__vitest_browser__/orchestrator-B-wB8WWP.js",
+    "file": "__vitest_browser__/orchestrator-KVYrTcFi.js",
     "name": "orchestrator",
     "src": "orchestrator.html",
     "isEntry": true,
@@ -13,7 +13,7 @@
     ]
   },
   "tester/tester.html": {
-    "file": "__vitest_browser__/tester-DQAp97S5.js",
+    "file": "__vitest_browser__/tester-BJtsJFpD.js",
     "name": "tester",
     "src": "tester/tester.html",
     "isEntry": true,

package/dist/client/__vitest_browser__/{orchestrator-B-wB8WWP.js → orchestrator-KVYrTcFi.js}

@@ -10,6 +10,8 @@ class IframeOrchestrator {
   cancelled = false;
   recreateNonIsolatedIframe = false;
   iframes = /* @__PURE__ */ new Map();
+  readyIframes = /* @__PURE__ */ new Set();
+  readyWaiters = /* @__PURE__ */ new Map();
   eventTarget = new EventTarget();
   traces;
   constructor() {
@@ -27,6 +29,9 @@ class IframeOrchestrator {
       "message",
       (e) => this.onGlobalChannelEvent(e)
     );
+    void client.waitForConnection().then(() => client.rpc.onOrchestratorReady()).catch((error) => {
+      debug("failed to notify orchestrator readiness", error);
+    });
   }
   async createTesters(options) {
     await this.traces.waitInit();
@@ -63,6 +68,8 @@ class IframeOrchestrator {
     }
     this.iframes.forEach((iframe) => iframe.remove());
     this.iframes.clear();
+    this.readyIframes.clear();
+    this.readyWaiters.clear();
     for (let i = 0; i < options.files.length; i++) {
       if (this.cancelled) {
         await endSpan();
@@ -104,8 +111,7 @@ class IframeOrchestrator {
   async runNonIsolatedTests(container, options, startTime, otelContext) {
     if (this.recreateNonIsolatedIframe) {
       this.recreateNonIsolatedIframe = false;
-      this.iframes.get(ID_ALL).remove();
-      this.iframes.delete(ID_ALL);
+      this.removeIframe(ID_ALL);
       debug("recreate non-isolated iframe");
     }
     if (!this.iframes.has(ID_ALL)) {
@@ -131,8 +137,7 @@ class IframeOrchestrator {
     const { width, height } = config.browser.viewport;
     const file = spec.filepath;
     if (this.iframes.has(file)) {
-      this.iframes.get(file).remove();
-      this.iframes.delete(file);
+      this.removeIframe(file);
     }
     const iframe = await this.prepareIframe(
       container,
@@ -181,12 +186,12 @@ Expected: ${iframe.src}`
           }
         } else {
           this.iframes.set(iframeId, iframe);
-          this.sendEventToIframe({
+          this.waitForReady(iframeId).then(() => this.sendEventToIframe({
             event: "prepare",
             iframeId,
             startTime,
             otelCarrier: this.traces.getContextCarrier(otelContext)
-          }).then(resolve, (error) => reject(this.dispatchIframeError(error)));
+          })).then(resolve, (error) => reject(this.dispatchIframeError(error)));
         }
       };
       iframe.onerror = (e) => {
@@ -201,6 +206,29 @@ Expected: ${iframe.src}`
     });
     return iframe;
   }
+  markReady(iframeId) {
+    this.readyIframes.add(iframeId);
+    const waiter = this.readyWaiters.get(iframeId);
+    if (waiter) {
+      this.readyWaiters.delete(iframeId);
+      waiter();
+    }
+  }
+  waitForReady(iframeId) {
+    if (this.readyIframes.has(iframeId)) {
+      return Promise.resolve();
+    }
+    return new Promise((resolve) => {
+      this.readyWaiters.set(iframeId, resolve);
+    });
+  }
+  removeIframe(iframeId) {
+    const iframe = this.iframes.get(iframeId);
+    this.iframes.delete(iframeId);
+    this.readyIframes.delete(iframeId);
+    this.readyWaiters.delete(iframeId);
+    iframe == null ? void 0 : iframe.remove();
+  }
   loggedIframe = /* @__PURE__ */ new WeakSet();
   createWarningMessage(iframeId, location) {
     return `The iframe${iframeId === ID_ALL ? "" : ` for "${iframeId}"`} was reloaded ${location}. This can lead to unexpected behavior during tests, duplicated test results or tests hanging.
@@ -257,6 +285,10 @@ If you are using a framework that manipulates browser history (like React Router
   async onIframeEvent(e) {
     debug("iframe event", JSON.stringify(e.data));
     switch (e.data.event) {
+      case "ready": {
+        this.markReady(e.data.iframeId);
+        break;
+      }
       case "viewport": {
         const { width, height, iframeId: id } = e.data;
         const iframe = this.iframes.get(id);

package/dist/client/__vitest_browser__/{tester-DQAp97S5.js → tester-BJtsJFpD.js}

@@ -2151,6 +2151,10 @@ const commands = new CommandsManager();
 getBrowserState().commands = commands;
 getBrowserState().activeTraceTaskIds = /* @__PURE__ */ new Set();
 getBrowserState().iframeId = iframeId;
+channel.postMessage({
+  event: "ready",
+  iframeId
+});
 let contextSwitched = false;
 async function prepareTestEnvironment(options) {
   debug == null ? void 0 : debug("trying to resolve the runner");

package/dist/client/orchestrator.html

@@ -26,7 +26,7 @@
     {__VITEST_INJECTOR__}
     {__VITEST_ERROR_CATCHER__}
     {__VITEST_SCRIPTS__}
-    <script type="module" crossorigin src="/__vitest_browser__/orchestrator-B-wB8WWP.js"></script>
+    <script type="module" crossorigin src="/__vitest_browser__/orchestrator-KVYrTcFi.js"></script>
     <link rel="modulepreload" crossorigin href="/__vitest_browser__/utils-BsFW67Gk.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-DQAp97S5.js"></script>
+    <script type="module" crossorigin src="/__vitest_browser__/tester-BJtsJFpD.js"></script>
     <link rel="modulepreload" crossorigin href="/__vitest_browser__/utils-BsFW67Gk.js">
   </head>
   <body>

package/dist/index.js

@@ -18,7 +18,7 @@ import { PNG } from 'pngjs';
 import { diff } from '@blazediff/core';
 import { WebSocketServer } from 'ws';
 
-var version = "4.1.8";
+var version = "4.1.9";
 
 const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
@@ -3024,7 +3024,8 @@ function setupBrowserRpc(globalServer, defaultMockerRegistry) {
 		}
 		if (type === "orchestrator") {
 			const session = sessions.getSession(sessionId);
-			// it's possible the session was already resolved by the preview provider
+			// it's possible the session was already resolved by the preview provider,
+			// but we still mark the websocket connection when the page reconnects
 			session?.connected();
 		}
 		const project = vitest.getProjectByName(projectName);
@@ -3033,7 +3034,7 @@ function setupBrowserRpc(globalServer, defaultMockerRegistry) {
 		}
 		wss.handleUpgrade(request, socket, head, (ws) => {
 			wss.emit("connection", ws, request);
-			const { rpc, offCancel } = setupClient(project, rpcId, ws);
+			const { rpc, offCancel } = setupClient(project, rpcId, ws, { sessionId });
 			const state = project.browser.state;
 			const clients = type === "tester" ? state.testers : state.orchestrators;
 			clients.set(rpcId, rpc);
@@ -3072,10 +3073,14 @@ function setupBrowserRpc(globalServer, defaultMockerRegistry) {
 			throw new Error(`Cannot use CDP because browser API write or exec operations are disabled. See https://vitest.dev/config/browser/api.`);
 		}
 	}
-	function setupClient(project, rpcId, ws) {
+	function setupClient(project, rpcId, ws, options) {
 		const mockResolver = new ServerMockResolver(globalServer.vite, { moduleDirectories: project.config?.deps?.moduleDirectories });
 		const mocker = project.browser?.provider.mocker;
 		const rpc = createBirpc({
+			onOrchestratorReady() {
+				const sessions = vitest._browserSessions;
+				sessions.getSession(options.sessionId)?.ready();
+			},
 			async onUnhandledError(error, type) {
 				if (error && typeof error === "object") {
 					const _error = error;

package/dist/types.d.ts

@@ -11,6 +11,7 @@ export interface WebSocketBrowserHandlers {
 	onTaskArtifactRecord: <Artifact extends TestArtifact>(testId: string, artifact: Artifact) => Promise<Artifact>;
 	onTaskUpdate: (method: TestExecutionMethod, packs: TaskResultPack[], events: TaskEventPack[]) => void;
 	onAfterSuiteRun: (meta: AfterSuiteRunMeta) => void;
+	onOrchestratorReady: () => void;
 	cancelCurrentRun: (reason: CancelReason) => void;
 	getCountOfFailedTests: () => number;
 	readSnapshotFile: (id: string) => Promise<string | null>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "4.1.8",
+  "version": "4.1.9",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -57,7 +57,7 @@
     "providers"
   ],
   "peerDependencies": {
-    "vitest": "4.1.8"
+    "vitest": "4.1.9"
   },
   "dependencies": {
     "@blazediff/core": "1.9.1",
@@ -66,8 +66,8 @@
     "sirv": "^3.0.2",
     "tinyrainbow": "^3.1.0",
     "ws": "^8.19.0",
-    "@vitest/mocker": "4.1.8",
-    "@vitest/utils": "4.1.8"
+    "@vitest/utils": "4.1.9",
+    "@vitest/mocker": "4.1.9"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.0",
@@ -79,8 +79,8 @@
     "ivya": "^1.8.0",
     "mime": "^4.1.0",
     "pathe": "^2.0.3",
-    "vitest": "4.1.8",
-    "@vitest/runner": "4.1.8"
+    "vitest": "4.1.9",
+    "@vitest/runner": "4.1.9"
   },
   "scripts": {
     "typecheck": "tsc -p ./src/client/tsconfig.json --noEmit",