@msw/playwright 0.6.3 → 0.6.5

package/build/{index.js → index.mjs}

@@ -1,7 +1,6 @@
 import { invariant } from "outvariant";
 import { RequestHandler, SetupApi, WebSocketHandler, handleRequest, isCommonAssetRequest } from "msw";
 import { CancelableCloseEvent, CancelableMessageEvent } from "@mswjs/interceptors/WebSocket";
-
 //#region src/fixture.ts
 function defineNetworkFixture(options) {
 	return new SetupPlaywrightApi({
@@ -37,7 +36,7 @@ var SetupPlaywrightApi = class extends SetupApi {
 			* requests through the matching logic below.
 			* @see https://github.com/mswjs/playwright/issues/13
 			*/
-			if (this.options.skipAssetRequests && isCommonAssetRequest(fetchRequest)) return route.fallback();
+			if (this.options.skipAssetRequests && isCommonAssetRequest(fetchRequest)) return this.safelyHandleRoute(() => route.fallback());
 			const handlers = this.handlersController.currentHandlers().filter((handler) => {
 				return handler instanceof RequestHandler;
 			});
@@ -51,14 +50,16 @@ var SetupPlaywrightApi = class extends SetupApi {
 				baseUrl
 			} });
 			if (response) {
-				if (response.status === 0) return route.abort();
-				return route.fulfill({
-					status: response.status,
-					headers: Object.fromEntries(response.headers),
-					body: response.body ? Buffer.from(await response.arrayBuffer()) : void 0
+				if (response.status === 0) return this.safelyHandleRoute(() => route.abort());
+				return this.safelyHandleRoute(async () => {
+					return route.fulfill({
+						status: response.status,
+						headers: Object.fromEntries(response.headers),
+						body: response.body ? Buffer.from(await response.arrayBuffer()) : void 0
+					});
 				});
 			}
-			return route.fallback();
+			return this.safelyHandleRoute(() => route.fallback());
 		});
 		await context.routeWebSocket(INTERNAL_MATCH_ALL_REG_EXP, async (route) => {
 			const allWebSocketHandlers = this.handlersController.currentHandlers().filter((handler) => {
@@ -90,6 +91,21 @@ var SetupPlaywrightApi = class extends SetupApi {
 		if (url === "about:blank") return;
 		return decodeURI(new URL(encodeURI(url)).origin);
 	}
+	async safelyHandleRoute(callback) {
+		try {
+			await callback();
+		} catch (error) {
+			/**
+			* @note Ignore "Route is already handled!" errors.
+			* Playwright has a bug where requests terminated due to navigation
+			* cause your in-flight route handlers to throw. There's no means to
+			* detect that scenario as both "route.handled" and "route._handlingPromise" are internal.
+			* @see https://github.com/mswjs/playwright/issues/35
+			*/
+			if (error instanceof Error && /route is already handled/i.test(error.message)) return;
+			throw error;
+		}
+	}
 };
 var PlaywrightWebSocketClientConnection = class {
 	id;
@@ -142,13 +158,12 @@ var PlaywrightWebSocketClientConnection = class {
 		*/
 		const target = {};
 		switch (type) {
-			case "message": {
+			case "message":
 				this.ws.onMessage((data) => {
 					listener.call(target, new CancelableMessageEvent("message", { data }));
 				});
 				break;
-			}
-			case "close": {
+			case "close":
 				this.ws.onClose((code, reason) => {
 					listener.call(target, new CancelableCloseEvent("close", {
 						code,
@@ -156,7 +171,6 @@ var PlaywrightWebSocketClientConnection = class {
 					}));
 				});
 				break;
-			}
 		}
 	}
 	removeEventListener(event, listener, options) {
@@ -209,13 +223,12 @@ var PlaywrightWebSocketServerConnection = class {
 		}
 		const target = {};
 		switch (type) {
-			case "message": {
+			case "message":
 				this.#server.onMessage((data) => {
 					listener.call(target, new CancelableMessageEvent("message", { data }));
 				});
 				break;
-			}
-			case "close": {
+			case "close":
 				this.#server.onClose((code, reason) => {
 					listener.call(target, new CancelableCloseEvent("close", {
 						code,
@@ -223,7 +236,6 @@ var PlaywrightWebSocketServerConnection = class {
 					}));
 				});
 				break;
-			}
 		}
 	}
 	removeEventListener(type, listener, options) {
@@ -241,6 +253,5 @@ async function unrouteWebSocket(target, url, handler) {
 		if (route.url === url && (handler != null ? route.handler === handler : true)) target._webSocketRoutes.splice(i, 1);
 	}
 }
-
 //#endregion
-export { defineNetworkFixture };
+export { defineNetworkFixture };

package/package.json

@@ -1,10 +1,16 @@
 {
   "type": "module",
   "name": "@msw/playwright",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "description": "Mock Service Worker binding for Playwright",
-  "main": "./build/index.js",
-  "types": "./build/index.d.ts",
+  "main": "./build/index.mjs",
+  "types": "./build/index.d.mts",
+  "exports": {
+    ".": {
+      "types": "./build/index.d.mts",
+      "default": "./build/index.mjs"
+    }
+  },
   "files": [
     "./src",
     "./build"
@@ -38,17 +44,17 @@
   "devDependencies": {
     "@epic-web/test-server": "^0.1.6",
     "@ossjs/release": "^0.10.1",
-    "@playwright/test": "^1.58.1",
+    "@playwright/test": "^1.58.2",
     "@types/node": "^22.15.29",
     "@types/sinon": "^21.0.0",
     "msw": "^2.12.10",
-    "sinon": "^21.0.1",
-    "tsdown": "^0.12.7",
+    "sinon": "^21.0.2",
+    "tsdown": "^0.21.0",
     "typescript": "^5.9.3",
     "vite": "^7.3.1"
   },
   "dependencies": {
-    "@mswjs/interceptors": "^0.41.2",
+    "@mswjs/interceptors": "^0.41.3",
     "outvariant": "^1.4.3"
   },
   "scripts": {

package/src/fixture.ts

@@ -99,7 +99,7 @@ class SetupPlaywrightApi extends SetupApi<LifeCycleEventsMap> {
           this.options.skipAssetRequests &&
           isCommonAssetRequest(fetchRequest)
         ) {
-          return route.fallback()
+          return this.safelyHandleRoute(() => route.fallback())
         }
 
         const handlers = this.handlersController
@@ -134,19 +134,21 @@ class SetupPlaywrightApi extends SetupApi<LifeCycleEventsMap> {
 
         if (response) {
           if (response.status === 0) {
-            return route.abort()
+            return this.safelyHandleRoute(() => route.abort())
           }
 
-          return route.fulfill({
-            status: response.status,
-            headers: Object.fromEntries(response.headers),
-            body: response.body
-              ? Buffer.from(await response.arrayBuffer())
-              : undefined,
+          return this.safelyHandleRoute(async () => {
+            return route.fulfill({
+              status: response.status,
+              headers: Object.fromEntries(response.headers),
+              body: response.body
+                ? Buffer.from(await response.arrayBuffer())
+                : undefined,
+            })
           })
         }
 
-        return route.fallback()
+        return this.safelyHandleRoute(() => route.fallback())
       },
     )
 
@@ -201,6 +203,30 @@ class SetupPlaywrightApi extends SetupApi<LifeCycleEventsMap> {
     // Encode/decode to preserve escape characters.
     return decodeURI(new URL(encodeURI(url)).origin)
   }
+
+  private async safelyHandleRoute(
+    callback: () => Promise<void>,
+  ): Promise<void> {
+    try {
+      await callback()
+    } catch (error) {
+      /**
+       * @note Ignore "Route is already handled!" errors.
+       * Playwright has a bug where requests terminated due to navigation
+       * cause your in-flight route handlers to throw. There's no means to
+       * detect that scenario as both "route.handled" and "route._handlingPromise" are internal.
+       * @see https://github.com/mswjs/playwright/issues/35
+       */
+      if (
+        error instanceof Error &&
+        /route is already handled/i.test(error.message)
+      ) {
+        return
+      }
+
+      throw error
+    }
+  }
 }
 
 class PlaywrightWebSocketClientConnection implements WebSocketClientConnectionProtocol {

package/build/index.d.ts

@@ -1,30 +0,0 @@
-import { AnyHandler, LifeCycleEventsMap, SetupApi, UnhandledRequestStrategy } from "msw";
-import { BrowserContext } from "@playwright/test";
-
-//#region src/fixture.d.ts
-interface NetworkFixtureOptions {
-  context: BrowserContext;
-  handlers?: Array<AnyHandler>;
-  onUnhandledRequest?: UnhandledRequestStrategy;
-  /**
-   * Skip common asset requests (e.g. `*.html`, `*.css`, `*.js`, etc).
-   * This improves performance for certian projects.
-   * @default true
-   *
-   * @see https://mswjs.io/docs/api/is-common-asset-request
-   */
-  skipAssetRequests?: boolean;
-}
-type NetworkFixture = Omit<SetupApi<LifeCycleEventsMap>, 'dispose'> & {
-  enable: () => Promise<void>;
-  disable: () => Promise<void>;
-};
-declare function defineNetworkFixture(options: NetworkFixtureOptions): NetworkFixture;
-/**
- * @note Use a match-all RegExp with an optional group as the predicate
- * for the `page.route()`/`page.unroute()` calls. Playwright treats given RegExp
- * as the handler ID, which allows us to remove only those handlers introduces by us
- * without carrying the reference to the handler function around.
- */
-//#endregion
-export { NetworkFixture, NetworkFixtureOptions, defineNetworkFixture };