npm - @rstest/browser - Versions diffs - 0.10.2 → 0.10.3 - Mend

@rstest/browser 0.10.2 → 0.10.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/dist/{323.js → 626.js} +1 -3
package/dist/browser-container/container-static/js/{188.480c3c49b5.js → 27.099feaf1da.js} +2772 -2779
package/dist/browser-container/container-static/js/27.099feaf1da.js.LICENSE.txt +1 -0
package/dist/browser-container/container-static/js/{index.29fc60be33.js → index.be8c8d2626.js} +408 -405
package/dist/browser-container/index.html +1 -1
package/dist/browser.js +2 -2
package/dist/index.js +41 -6
package/dist/providers/index.d.ts +3 -0
package/dist/rslib-runtime.js +9 -5
package/package.json +6 -6
package/src/providers/index.ts +3 -0
package/src/providers/playwright/runtime.ts +104 -4
package/dist/browser-container/container-static/js/188.480c3c49b5.js.LICENSE.txt +0 -1

package/dist/browser-container/index.html CHANGED Viewed

@@ -12,7 +12,7 @@
     <script>
       window.__RSTEST_BROWSER_OPTIONS__ = __RSTEST_OPTIONS_PLACEHOLDER__;
     </script>
-  <script defer src="/container-static/js/lib-react.5ae9b90ee5.js"></script><script defer src="/container-static/js/188.480c3c49b5.js"></script><script defer src="/container-static/js/index.29fc60be33.js"></script><link href="/container-static/css/index.5c72297783.css" rel="stylesheet"></head>
+  <script defer src="/container-static/js/lib-react.5ae9b90ee5.js"></script><script defer src="/container-static/js/27.099feaf1da.js"></script><script defer src="/container-static/js/index.be8c8d2626.js"></script><link href="/container-static/css/index.5c72297783.css" rel="stylesheet"></head>
   <body>
     <div id="root"></div>
   </body>

package/dist/browser.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { DISPATCH_RESPONSE_TYPE, DISPATCH_METHOD_RPC, DISPATCH_RPC_REQUEST_TYPE, DISPATCH_MESSAGE_TYPE, DISPATCH_NAMESPACE_BROWSER } from "./323.js";
+import { DISPATCH_RESPONSE_TYPE, DISPATCH_RPC_REQUEST_TYPE, DISPATCH_MESSAGE_TYPE, DISPATCH_NAMESPACE_BROWSER } from "./626.js";
 const DEFAULT_RPC_TIMEOUT_MS = 30000;
 const getRpcTimeout = ()=>window.__RSTEST_BROWSER_OPTIONS__?.rpcTimeout ?? DEFAULT_RPC_TIMEOUT_MS;
 const pendingRequests = new Map();
@@ -97,7 +97,7 @@ const getCurrentRunId = ()=>{
 const createBrowserDispatchRequest = (requestId, request)=>({
         requestId,
         namespace: DISPATCH_NAMESPACE_BROWSER,
-        method: DISPATCH_METHOD_RPC,
+        method: "rpc",
         args: request,
         target: {
             testFile: request.testPath

package/dist/index.js CHANGED Viewed

@@ -10,7 +10,7 @@ import { WebSocketServer } from "ws";
 import node_os from "node:os";
 import convert_source_map from "convert-source-map";
 import { __webpack_require__ } from "./rslib-runtime.js";
-import { DISPATCH_RPC_BRIDGE_NAME, DISPATCH_MESSAGE_TYPE, DISPATCH_NAMESPACE_RUNNER } from "./323.js";
+import { DISPATCH_RPC_BRIDGE_NAME, DISPATCH_MESSAGE_TYPE } from "./626.js";
 __webpack_require__.add({
     "../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/index.js" (module, __unused_rspack_exports, __webpack_require__) {
         const pico = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/picomatch.js");
@@ -2428,6 +2428,41 @@ async function dispatchPlaywrightBrowserRpc({ containerPage, runnerPage, request
     }
     throw new Error(`Unknown browser rpc kind: ${request.kind}`);
 }
+const patchedPages = new WeakSet();
+const patchedContexts = new WeakSet();
+const withAsyncDispose = (resource)=>{
+    if ('symbol' == typeof Symbol.asyncDispose) {
+        const existing = Object.getOwnPropertyDescriptor(resource, Symbol.asyncDispose);
+        if (!existing) Object.defineProperty(resource, Symbol.asyncDispose, {
+            configurable: true,
+            value: ()=>resource.close()
+        });
+    }
+    return resource;
+};
+const wrapPage = (page)=>{
+    if (patchedPages.has(page)) return withAsyncDispose(page);
+    patchedPages.add(page);
+    const originalOn = page.on.bind(page);
+    page.on = (event, listener)=>{
+        if ('popup' === event) return void originalOn(event, (popup)=>{
+            listener(wrapPage(popup));
+        });
+        originalOn(event, listener);
+    };
+    return withAsyncDispose(page);
+};
+const wrapContext = (context)=>{
+    if (patchedContexts.has(context)) return withAsyncDispose(context);
+    patchedContexts.add(context);
+    const originalNewPage = context.newPage.bind(context);
+    context.newPage = async ()=>wrapPage(await originalNewPage());
+    const originalOn = context.on.bind(context);
+    context.on = (event, listener)=>{
+        originalOn(event, (page)=>listener(wrapPage(page)));
+    };
+    return withAsyncDispose(context);
+};
 async function launchPlaywrightBrowser({ browserName, headless, providerOptions }) {
     const playwright = await import("playwright");
     const browserType = playwright[browserName];
@@ -2442,7 +2477,7 @@ async function launchPlaywrightBrowser({ browserName, headless, providerOptions
         headless,
         args: launchArgs
     });
-    const wrappedBrowser = {
+    const wrappedBrowser = withAsyncDispose({
         close: async ()=>browser.close(),
         newContext: async ({ providerOptions: contextProviderOptions, viewport })=>{
             const contextOptions = contextProviderOptions?.context;
@@ -2450,9 +2485,9 @@ async function launchPlaywrightBrowser({ browserName, headless, providerOptions
                 ...contextOptions,
                 viewport
             });
-            return context;
+            return wrapContext(context);
         }
-    };
+    });
     return {
         browser: wrappedBrowser
     };
@@ -4072,14 +4107,14 @@ const runBrowserController = async (context, options)=>{
         const dispatchRouter = createDispatchRouter({
             isRunTokenStale: (runToken)=>runLifecycle.isTokenStale(runToken),
             onStale: (request)=>{
-                if (request.namespace === DISPATCH_NAMESPACE_RUNNER) logger.debug(`[Headless] Dropped stale message "${request.method}" for ${request.target?.testFile ?? 'unknown'}`);
+                if ("runner" === request.namespace) logger.debug(`[Headless] Dropped stale message "${request.method}" for ${request.target?.testFile ?? 'unknown'}`);
             }
         });
         const dispatchRunnerMessage = async (run, file, sessionId, message)=>{
             const response = await dispatchRouter.dispatch({
                 requestId: nextDispatchRequestId('runner'),
                 runToken: run.token,
-                namespace: DISPATCH_NAMESPACE_RUNNER,
+                namespace: "runner",
                 method: message.type,
                 args: 'payload' in message ? message.payload : void 0,
                 target: {

package/dist/providers/index.d.ts CHANGED Viewed

@@ -39,16 +39,19 @@ export type BrowserProviderPage = {
         (event: 'console', listener: (message: BrowserConsoleMessage) => void): void;
     };
     close: () => Promise<void>;
+    [Symbol.asyncDispose]: () => Promise<void>;
 };
 /** Minimal browser context API surface required by hostController. */
 export type BrowserProviderContext = {
     newPage: () => Promise<BrowserProviderPage>;
     on: (event: 'page', listener: (page: BrowserProviderPage) => void) => void;
     close: () => Promise<void>;
+    [Symbol.asyncDispose]: () => Promise<void>;
 };
 /** Minimal browser API surface required by hostController. */
 export type BrowserProviderBrowser = {
     close: () => Promise<void>;
+    [Symbol.asyncDispose]: () => Promise<void>;
     newContext: (options: {
         viewport: {
             width: number;

package/dist/rslib-runtime.js CHANGED Viewed

@@ -20,11 +20,15 @@ __webpack_require__.m = __webpack_modules__;
     };
 })();
 (()=>{
-    __webpack_require__.d = (exports, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) Object.defineProperty(exports, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports, key)) Object.defineProperty(exports, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@rstest/browser",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "description": "Browser mode support for Rstest testing framework.",
   "keywords": [
     "rstest",
@@ -45,25 +45,25 @@
     "open-editor": "^6.0.0",
     "pathe": "^2.0.3",
     "sirv": "^3.0.2",
-    "ws": "^8.20.1"
+    "ws": "^8.21.0"
   },
   "devDependencies": {
     "@rslib/core": "0.21.5",
     "@types/convert-source-map": "^2.0.3",
     "@types/picomatch": "^4.0.3",
     "@types/ws": "^8.18.1",
-    "@typescript/native-preview": "7.0.0-dev.20260516.1",
+    "@typescript/native-preview": "7.0.0-dev.20260527.1",
     "@vitest/snapshot": "^3.2.4",
     "birpc": "^4.0.0",
     "picomatch": "^4.0.4",
     "playwright": "^1.60.0",
     "@rstest/browser-ui": "0.0.0",
-    "@rstest/tsconfig": "0.0.1",
-    "@rstest/core": "0.10.2"
+    "@rstest/core": "0.10.3",
+    "@rstest/tsconfig": "0.0.1"
   },
   "peerDependencies": {
     "playwright": "^1.49.1",
-    "@rstest/core": "^0.10.2"
+    "@rstest/core": "^0.10.3"
   },
   "peerDependenciesMeta": {
     "playwright": {

package/src/providers/index.ts CHANGED Viewed

@@ -44,6 +44,7 @@ export type BrowserProviderPage = {
     ): void;
   };
   close: () => Promise<void>;
+  [Symbol.asyncDispose]: () => Promise<void>;
 };
 /** Minimal browser context API surface required by hostController. */
@@ -51,11 +52,13 @@ export type BrowserProviderContext = {
   newPage: () => Promise<BrowserProviderPage>;
   on: (event: 'page', listener: (page: BrowserProviderPage) => void) => void;
   close: () => Promise<void>;
+  [Symbol.asyncDispose]: () => Promise<void>;
 };
 /** Minimal browser API surface required by hostController. */
 export type BrowserProviderBrowser = {
   close: () => Promise<void>;
+  [Symbol.asyncDispose]: () => Promise<void>;
   newContext: (options: {
     viewport: { width: number; height: number } | null;
     providerOptions?: Record<string, unknown>;

package/src/providers/playwright/runtime.ts CHANGED Viewed

@@ -1,4 +1,104 @@
-import type { BrowserProviderContext, BrowserProviderRuntime } from '../index';
+import type {
+  BrowserConsoleMessage,
+  BrowserProviderContext,
+  BrowserProviderPage,
+  BrowserProviderRuntime,
+} from '../index';
+type PlaywrightPageLike = Omit<
+  BrowserProviderPage,
+  'on' | typeof Symbol.asyncDispose
+> & {
+  on: {
+    (event: 'popup', listener: (page: PlaywrightPageLike) => void): void;
+    (
+      event: 'console',
+      listener: (message: BrowserConsoleMessage) => void,
+    ): void;
+  };
+};
+type PlaywrightContextLike = Omit<
+  BrowserProviderContext,
+  'newPage' | typeof Symbol.asyncDispose
+> & {
+  newPage: () => Promise<PlaywrightPageLike>;
+};
+type AsyncDisposableResource<T> = T & {
+  [Symbol.asyncDispose]: () => Promise<void>;
+};
+type PlaywrightBrowserLike = Omit<
+  BrowserProviderRuntime['browser'],
+  typeof Symbol.asyncDispose
+>;
+const patchedPages = new WeakSet<PlaywrightPageLike>();
+const patchedContexts = new WeakSet<PlaywrightContextLike>();
+const withAsyncDispose = <T extends { close: () => Promise<void> }>(
+  resource: T,
+): AsyncDisposableResource<T> => {
+  if (typeof Symbol.asyncDispose === 'symbol') {
+    const existing = Object.getOwnPropertyDescriptor(
+      resource,
+      Symbol.asyncDispose,
+    );
+    if (!existing) {
+      Object.defineProperty(resource, Symbol.asyncDispose, {
+        configurable: true,
+        value: () => resource.close(),
+      });
+    }
+  }
+  return resource as AsyncDisposableResource<T>;
+};
+const wrapPage = (page: PlaywrightPageLike): BrowserProviderPage => {
+  if (patchedPages.has(page)) {
+    return withAsyncDispose(page) as BrowserProviderPage;
+  }
+  patchedPages.add(page);
+  const originalOn = page.on.bind(page);
+  page.on = ((
+    event: 'popup' | 'console',
+    listener:
+      | ((page: BrowserProviderPage) => void)
+      | ((message: BrowserConsoleMessage) => void),
+  ) => {
+    if (event === 'popup') {
+      originalOn(event, (popup) => {
+        (listener as (page: BrowserProviderPage) => void)(wrapPage(popup));
+      });
+      return;
+    }
+    originalOn(event, listener as (message: BrowserConsoleMessage) => void);
+  }) as PlaywrightPageLike['on'];
+  return withAsyncDispose(page) as BrowserProviderPage;
+};
+const wrapContext = (
+  context: PlaywrightContextLike,
+): BrowserProviderContext => {
+  if (patchedContexts.has(context)) {
+    return withAsyncDispose(context) as BrowserProviderContext;
+  }
+  patchedContexts.add(context);
+  const originalNewPage = context.newPage.bind(context);
+  context.newPage = async () => wrapPage(await originalNewPage());
+  const originalOn = context.on.bind(context);
+  context.on = (event, listener) => {
+    originalOn(event, (page) => listener(wrapPage(page)));
+  };
+  return withAsyncDispose(context) as BrowserProviderContext;
+};
 export async function launchPlaywrightBrowser({
   browserName,
@@ -30,7 +130,7 @@ export async function launchPlaywrightBrowser({
     args: launchArgs,
   });
-  const wrappedBrowser: BrowserProviderRuntime['browser'] = {
+  const wrappedBrowser = withAsyncDispose({
     close: async () => browser.close(),
     newContext: async ({
       providerOptions: contextProviderOptions,
@@ -44,9 +144,9 @@ export async function launchPlaywrightBrowser({
         viewport,
       });
-      return context as unknown as BrowserProviderContext;
+      return wrapContext(context as unknown as PlaywrightContextLike);
     },
-  };
+  } satisfies PlaywrightBrowserLike) as BrowserProviderRuntime['browser'];
   return {
     browser: wrappedBrowser,

package/dist/browser-container/container-static/js/188.480c3c49b5.js.LICENSE.txt DELETED Viewed

	@@ -1 +0,0 @@
1	- /! LICENSE: 188.480c3c49b5.js.LICENSE.txt /