From 2975b7988ff943bb20753f1726df49c166845923 Mon Sep 17 00:00:00 2001
From: Dmitry Gozman <dgozman@gmail.com>
Date: Fri, 3 Jul 2026 13:24:52 +0100
Subject: [PATCH 1/5] devops: update actions/checkout and actions/setup-node
 (#41610)

---
 .github/actions/run-test/action.yml           |  2 +-
 .github/workflows/tests_secondary.yml         |  2 +-
 .github/workflows/tests_webview_simulator.yml |  2 +-
 docs/src/ci-intro.md                          | 10 +++----
 docs/src/ci.md                                | 28 +++++++++----------
 docs/src/test-sharding-js.md                  |  8 +++---
 .../.github/workflows/copilot-setup-steps.yml |  4 +--
 package-lock.json                             | 10 -------
 packages/playwright-cli-stub/package.json     |  8 ------
 .../playwright-cli-stub.js                    | 23 ---------------
 .../src/agents/copilot-setup-steps.yml        |  4 +--
 11 files changed, 30 insertions(+), 71 deletions(-)
 delete mode 100644 packages/playwright-cli-stub/package.json
 delete mode 100755 packages/playwright-cli-stub/playwright-cli-stub.js

diff --git a/.github/actions/run-test/action.yml b/.github/actions/run-test/action.yml
index 247a49ba3919e..624a3c2a29c93 100644
--- a/.github/actions/run-test/action.yml
+++ b/.github/actions/run-test/action.yml
@@ -39,7 +39,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: ${{ inputs.node-version }}
     - run: |
diff --git a/.github/workflows/tests_secondary.yml b/.github/workflows/tests_secondary.yml
index 5578693a677e3..7e04617c61066 100644
--- a/.github/workflows/tests_secondary.yml
+++ b/.github/workflows/tests_secondary.yml
@@ -197,7 +197,7 @@ jobs:
         echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
         sudo udevadm control --reload-rules
         sudo udevadm trigger --name-match=kvm
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: 22
     - name: Create Android Emulator
diff --git a/.github/workflows/tests_webview_simulator.yml b/.github/workflows/tests_webview_simulator.yml
index 610ef3f755289..3f484c8ce67bb 100644
--- a/.github/workflows/tests_webview_simulator.yml
+++ b/.github/workflows/tests_webview_simulator.yml
@@ -26,7 +26,7 @@ jobs:
         shard: [1, 2, 3, 4]
     steps:
       - uses: actions/checkout@v6
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 20
 
diff --git a/docs/src/ci-intro.md b/docs/src/ci-intro.md
index b17c5948622b6..f39f11bef5ab4 100644
--- a/docs/src/ci-intro.md
+++ b/docs/src/ci-intro.md
@@ -48,8 +48,8 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
-    - uses: actions/setup-node@v5
+    - uses: actions/checkout@v6
+    - uses: actions/setup-node@v6
       with:
         node-version: lts/*
     - name: Install dependencies
@@ -94,7 +94,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
@@ -126,7 +126,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
@@ -151,7 +151,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Setup dotnet
       uses: actions/setup-dotnet@v5
       with:
diff --git a/docs/src/ci.md b/docs/src/ci.md
index 5b319041a6d1e..9c2c2cac03cd3 100644
--- a/docs/src/ci.md
+++ b/docs/src/ci.md
@@ -82,7 +82,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-node@v6
       with:
         node-version: lts/*
@@ -117,7 +117,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
@@ -149,7 +149,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
@@ -174,7 +174,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Setup dotnet
       uses: actions/setup-dotnet@v5
       with:
@@ -211,7 +211,7 @@ jobs:
       image: mcr.microsoft.com/playwright:v%%VERSION%%-noble
       options: --user 1001
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-node@v6
         with:
           node-version: lts/*
@@ -236,7 +236,7 @@ jobs:
       image: mcr.microsoft.com/playwright/python:v%%VERSION%%-noble
       options: --user 1001
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -265,7 +265,7 @@ jobs:
       image: mcr.microsoft.com/playwright/java:v%%VERSION%%-noble
       options: --user 1001
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
@@ -291,7 +291,7 @@ jobs:
       image: mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-noble
       options: --user 1001
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup dotnet
         uses: actions/setup-dotnet@v5
         with:
@@ -316,7 +316,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.deployment_status.state == 'success'
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-node@v6
       with:
         node-version: lts/*
@@ -340,7 +340,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.deployment_status.state == 'success'
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       uses: actions/setup-python@v6
       with:
         python-version: '3.13'
@@ -367,7 +367,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.deployment_status.state == 'success'
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
@@ -393,7 +393,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.deployment_status.state == 'success'
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Setup dotnet
       uses: actions/setup-dotnet@v5
       with:
@@ -427,7 +427,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         # Force a non-shallow checkout, so that we can reference $GITHUB_BASE_REF.
         # See https://github.com/actions/checkout for more details.
@@ -971,7 +971,7 @@ To run Playwright tests on Google Cloud Build, use our public Docker image ([see
 ```yml
 steps:
 - name: mcr.microsoft.com/playwright:v%%VERSION%%-noble
-  script: 
+  script:
   ...
   env:
   - 'CI=true'
diff --git a/docs/src/test-sharding-js.md b/docs/src/test-sharding-js.md
index 2db0e4cb5520b..a83df1b1abda1 100644
--- a/docs/src/test-sharding-js.md
+++ b/docs/src/test-sharding-js.md
@@ -101,8 +101,8 @@ jobs:
         shardIndex: [1, 2, 3, 4]
         shardTotal: [4]
     steps:
-    - uses: actions/checkout@v5
-    - uses: actions/setup-node@v5
+    - uses: actions/checkout@v6
+    - uses: actions/setup-node@v6
       with:
         node-version: lts/*
     - name: Install dependencies
@@ -134,8 +134,8 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
-    - uses: actions/setup-node@v5
+    - uses: actions/checkout@v6
+    - uses: actions/setup-node@v6
       with:
         node-version: lts/*
     - name: Install dependencies
diff --git a/examples/todomvc/.github/workflows/copilot-setup-steps.yml b/examples/todomvc/.github/workflows/copilot-setup-steps.yml
index d9b5b711e6173..7e76a9d2a4dd4 100644
--- a/examples/todomvc/.github/workflows/copilot-setup-steps.yml
+++ b/examples/todomvc/.github/workflows/copilot-setup-steps.yml
@@ -17,9 +17,9 @@ jobs:
       contents: read
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: lts/*
 
diff --git a/package-lock.json b/package-lock.json
index 83a3bc510ab85..fe35404b9f42c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8160,10 +8160,6 @@
       "resolved": "packages/playwright-chromium",
       "link": true
     },
-    "node_modules/playwright-cli-stub": {
-      "resolved": "packages/playwright-cli-stub",
-      "link": true
-    },
     "node_modules/playwright-core": {
       "resolved": "packages/playwright-core",
       "link": true
@@ -10232,12 +10228,6 @@
         "node": ">=20"
       }
     },
-    "packages/playwright-cli-stub": {
-      "version": "0.0.0",
-      "bin": {
-        "playwright-cli": "playwright-cli-stub.js"
-      }
-    },
     "packages/playwright-client": {
       "name": "@playwright/client",
       "version": "0.0.0",
diff --git a/packages/playwright-cli-stub/package.json b/packages/playwright-cli-stub/package.json
deleted file mode 100644
index a56ea13e2a5b6..0000000000000
--- a/packages/playwright-cli-stub/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "playwright-cli-stub",
-  "version": "0.0.0",
-  "private": true,
-  "bin": {
-    "playwright-cli": "playwright-cli-stub.js"
-  }
-}
diff --git a/packages/playwright-cli-stub/playwright-cli-stub.js b/packages/playwright-cli-stub/playwright-cli-stub.js
deleted file mode 100755
index 59772a7ce80f8..0000000000000
--- a/packages/playwright-cli-stub/playwright-cli-stub.js
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env node
-/**
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-const { program } = require('playwright-core/lib/tools/cli-client/program');
-
-program().catch(e => {
-  console.error(e.message);
-  process.exit(1);
-});
diff --git a/packages/playwright/src/agents/copilot-setup-steps.yml b/packages/playwright/src/agents/copilot-setup-steps.yml
index d9b5b711e6173..7e76a9d2a4dd4 100644
--- a/packages/playwright/src/agents/copilot-setup-steps.yml
+++ b/packages/playwright/src/agents/copilot-setup-steps.yml
@@ -17,9 +17,9 @@ jobs:
       contents: read
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
         node-version: lts/*
 

From 9c899cd73e6cc3370e28ae24c894d060033b9a28 Mon Sep 17 00:00:00 2001
From: Dmitry Gozman <dgozman@gmail.com>
Date: Fri, 3 Jul 2026 14:12:25 +0100
Subject: [PATCH 2/5] chore(locator): reimplement waitForFunction via
 _callOnElementOnceMatches (#41611)

---
 .../playwright-core/src/client/locator.ts     |  1 -
 .../src/server/dispatchers/frameDispatcher.ts |  4 +-
 packages/playwright-core/src/server/frames.ts | 94 ++++++++++---------
 3 files changed, 53 insertions(+), 46 deletions(-)

diff --git a/packages/playwright-core/src/client/locator.ts b/packages/playwright-core/src/client/locator.ts
index 52c20c4269063..99244f2295842 100644
--- a/packages/playwright-core/src/client/locator.ts
+++ b/packages/playwright-core/src/client/locator.ts
@@ -400,7 +400,6 @@ export class Locator implements api.Locator {
       isFunction: typeof pageFunction === 'function',
       arg: serializeArgument(arg),
       timeout: this._frame._timeout(options),
-      pollingInterval: 100,
     }, options?.signal);
   }
 
diff --git a/packages/playwright-core/src/server/dispatchers/frameDispatcher.ts b/packages/playwright-core/src/server/dispatchers/frameDispatcher.ts
index d0225e66d5c51..12aea64c8e2fd 100644
--- a/packages/playwright-core/src/server/dispatchers/frameDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/frameDispatcher.ts
@@ -255,11 +255,11 @@ export class FrameDispatcher extends Dispatcher<Frame, channels.FrameChannel, Br
   }
 
   async waitForFunction(params: channels.FrameWaitForFunctionParams, progress: Progress): Promise<channels.FrameWaitForFunctionResult> {
-    const handle = await this._frame.waitForFunctionExpression(progress, params.expression, params.isFunction, parseArgument(params.arg), params);
     if (params.selector !== undefined) {
-      handle.dispose();
+      await this._frame.waitForFunctionExpressionOnElement(progress, params.selector, params.expression, params.isFunction, parseArgument(params.arg), { strict: params.strict });
       return {};
     }
+    const handle = await this._frame.waitForFunctionExpression(progress, params.expression, params.isFunction, parseArgument(params.arg), params);
     return { handle: ElementHandleDispatcher.fromJSOrElementHandle(this, handle) };
   }
 
diff --git a/packages/playwright-core/src/server/frames.ts b/packages/playwright-core/src/server/frames.ts
index 1cb22c816183c..4aa8178c5816a 100644
--- a/packages/playwright-core/src/server/frames.ts
+++ b/packages/playwright-core/src/server/frames.ts
@@ -899,8 +899,9 @@ export class Frame extends SdkObject<FrameEventMap> {
   }
 
   async dispatchEvent(progress: Progress, selector: string, type: string, eventInit: Object = {}, options: types.QueryOnSelectorOptions, scope?: dom.ElementHandle): Promise<void> {
-    await this._callOnElementOnceMatches(progress, selector, (injectedScript, element, data) => {
+    await this._waitForFunctionOnSelector(progress, selector, (injectedScript, element, data) => {
       injectedScript.dispatchEvent(element, data.type, data.eventInit);
+      return { result: undefined };
     }, { type, eventInit }, { mainWorld: true, ...options }, scope);
   }
 
@@ -1354,32 +1355,37 @@ export class Frame extends SdkObject<FrameEventMap> {
   }
 
   async textContent(progress: Progress, selector: string, options: types.QueryOnSelectorOptions, scope?: dom.ElementHandle): Promise<string | null> {
-    return this._callOnElementOnceMatches(progress, selector, (injected, element) => element.textContent, undefined, options, scope);
+    const { result } = await this._waitForFunctionOnSelector(progress, selector, (injected, element) => ({ result: element.textContent }), undefined, options, scope);
+    return result;
   }
 
   async innerText(progress: Progress, selector: string, options: types.QueryOnSelectorOptions, scope?: dom.ElementHandle): Promise<string> {
-    return this._callOnElementOnceMatches(progress, selector, (injectedScript, element) => {
+    const { result } = await this._waitForFunctionOnSelector(progress, selector, (injectedScript, element) => {
       if (element.namespaceURI !== 'http://www.w3.org/1999/xhtml')
         throw injectedScript.createStacklessError('Node is not an HTMLElement');
-      return (element as HTMLElement).innerText;
+      return { result: (element as HTMLElement).innerText };
     }, undefined, options, scope);
+    return result;
   }
 
   async innerHTML(progress: Progress, selector: string, options: types.QueryOnSelectorOptions, scope?: dom.ElementHandle): Promise<string> {
-    return this._callOnElementOnceMatches(progress, selector, (injected, element) => element.innerHTML, undefined, options, scope);
+    const { result } = await this._waitForFunctionOnSelector(progress, selector, (injected, element) => ({ result: element.innerHTML }), undefined, options, scope);
+    return result;
   }
 
   async getAttribute(progress: Progress, selector: string, name: string, options: types.QueryOnSelectorOptions, scope?: dom.ElementHandle): Promise<string | null> {
-    return this._callOnElementOnceMatches(progress, selector, (injected, element, data) => element.getAttribute(data.name), { name }, options, scope);
+    const { result } = await this._waitForFunctionOnSelector(progress, selector, (injected, element, data) => ({ result: element.getAttribute(data.name) }), { name }, options, scope);
+    return result;
   }
 
   async inputValue(progress: Progress, selector: string, options: types.StrictOptions, scope?: dom.ElementHandle): Promise<string> {
-    return this._callOnElementOnceMatches(progress, selector, (injectedScript, node) => {
+    const { result } = await this._waitForFunctionOnSelector(progress, selector, (injectedScript, node) => {
       const element = injectedScript.retarget(node, 'follow-label');
       if (!element || (element.nodeName !== 'INPUT' && element.nodeName !== 'TEXTAREA' && element.nodeName !== 'SELECT'))
         throw injectedScript.createStacklessError('Node is not an <input>, <textarea> or <select> element');
-      return (element as any).value;
+      return { result: (element as any).value };
     }, undefined, options, scope);
+    return result;
   }
 
   async addHighlight(progress: Progress, selector: string, style?: string) {
@@ -1411,8 +1417,8 @@ export class Frame extends SdkObject<FrameEventMap> {
   }
 
   private async _elementState(progress: Progress, selector: string, state: ElementStateWithoutStable, options: types.QueryOnSelectorOptions, scope?: dom.ElementHandle): Promise<boolean> {
-    const result = await this._callOnElementOnceMatches(progress, selector, (injected, element, data) => {
-      return injected.elementState(element, data.state);
+    const { result } = await this._waitForFunctionOnSelector(progress, selector, (injected, element, data) => {
+      return { result: injected.elementState(element, data.state) };
     }, { state }, options, scope);
     if (result.received === 'error:notconnected')
       dom.throwElementIsNotAttached();
@@ -1616,49 +1622,30 @@ export class Frame extends SdkObject<FrameEventMap> {
     return { matches, received };
   }
 
-  async waitForFunctionExpression<R>(progress: Progress, expression: string, isFunction: boolean | undefined, arg: any, options: { pollingInterval?: number, selector?: string, strict?: boolean }, world: types.World = 'main'): Promise<js.SmartHandle<R>> {
+  async waitForFunctionExpression<R>(progress: Progress, expression: string, isFunction: boolean | undefined, arg: any, options: { pollingInterval?: number }, world: types.World = 'main'): Promise<js.SmartHandle<R>> {
     if (typeof options.pollingInterval === 'number')
       assert(options.pollingInterval > 0, 'Cannot poll with non-positive interval: ' + options.pollingInterval);
     expression = js.normalizeEvaluationExpression(expression, isFunction);
-    if (options.selector !== undefined)
-      progress.log(`waiting for ${this._asLocator(options.selector)}`);
-    return this.retryWithProgressAndBackoff(progress, async (progress, continuePolling) => {
-      let injectedScript: js.JSHandle<InjectedScript>;
-      let info: SelectorInfo | undefined;
-      if (options.selector !== undefined) {
-        const resolved = await progress.race(this.selectors.resolveInjectedForSelector(options.selector, { strict: options.strict, mainWorld: true }));
-        if (!resolved)
-          return continuePolling;
-        injectedScript = resolved.injected;
-        info = resolved.info;
-      } else {
-        const context = world === 'main' ? await progress.race(this.mainContext()) : await progress.race(this.utilityContext());
-        injectedScript = await progress.race(context.injectedScript());
-      }
-      const handle = await progress.race(injectedScript.evaluateHandle((injected, { info, expression, isFunction, polling, arg }) => {
+    return this.retryWithProgressAndTimeouts(progress, [100], async () => {
+      const context = world === 'main' ? await progress.race(this.mainContext()) : await progress.race(this.utilityContext());
+      const injectedScript = await progress.race(context.injectedScript());
+      const handle = await progress.race(injectedScript.evaluateHandle((injected, { expression, isFunction, polling, arg }) => {
         let evaledExpression: any;
         const predicate = (): R => {
-          const args = [arg];
-          if (info) {
-            const element = injected.querySelector(info.parsed, document, info.strict);
-            if (!element)
-              return undefined as any;
-            args.unshift(element);
-          }
           // NOTE: make sure to use `globalThis.eval` instead of `self.eval` due to a bug with sandbox isolation
           // in firefox.
           // See https://bugzilla.mozilla.org/show_bug.cgi?id=1814898
           let result = evaledExpression ?? globalThis.eval(expression);
           if (isFunction === true) {
             evaledExpression = result;
-            result = result(...args);
+            result = result(arg);
           } else if (isFunction === false) {
             result = result;
           } else {
             // auto detect.
             if (typeof result === 'function') {
               evaledExpression = result;
-              result = result(...args);
+              result = result(arg);
             }
           }
           return result;
@@ -1689,14 +1676,12 @@ export class Frame extends SdkObject<FrameEventMap> {
 
         next();
         return { result, abort: () => aborted = true };
-      }, { info, expression, isFunction, polling: options.pollingInterval, arg }));
+      }, { expression, isFunction, polling: options.pollingInterval, arg }));
       try {
         return await progress.race(handle.evaluateHandle(h => h.result));
       } catch (error) {
         // Note: it is important to await "abort()" to prevent any side effects
-        // after this method returns. We intentionally do not race against progress
-        // here - it is already resolved/aborted, and the abort must run to completion.
-        // eslint-disable-next-line progress/await-must-use-progress
+        // after this method returns.
         await handle.evaluate(h => h.abort()).catch(() => {});
         throw error;
       } finally {
@@ -1705,6 +1690,26 @@ export class Frame extends SdkObject<FrameEventMap> {
     });
   }
 
+  async waitForFunctionExpressionOnElement(progress: Progress, selector: string, expression: string, isFunction: boolean | undefined, arg: any, options: types.StrictOptions): Promise<void> {
+    expression = js.normalizeEvaluationExpression(expression, isFunction);
+    await this._waitForFunctionOnSelector(progress, selector, (injected, element, data) => {
+      // NOTE: make sure to use `globalThis.eval` instead of `self.eval` due to a bug with sandbox isolation
+      // in firefox.
+      // See https://bugzilla.mozilla.org/show_bug.cgi?id=1814898
+      let result = globalThis.eval(data.expression);
+      if (data.isFunction === true) {
+        result = result(element, data.arg);
+      } else if (data.isFunction === false) {
+        result = result;
+      } else {
+        // auto detect.
+        if (typeof result === 'function')
+          result = result(element, data.arg);
+      }
+      return result;
+    }, { expression, isFunction, arg }, { ...options, mainWorld: true });
+  }
+
   async waitForFunctionValueInUtility<R>(progress: Progress, pageFunction: js.Func1<any, R>) {
     const expression = `() => {
       const result = (${pageFunction})();
@@ -1765,7 +1770,7 @@ export class Frame extends SdkObject<FrameEventMap> {
     this._parentFrame = null;
   }
 
-  private async _callOnElementOnceMatches<T, R>(progress: Progress, selector: string, body: ElementCallback<T, R>, taskData: T, options: types.StrictOptions & { mainWorld?: boolean }, scope?: dom.ElementHandle): Promise<R> {
+  private async _waitForFunctionOnSelector<T, R>(progress: Progress, selector: string, body: ElementCallback<T, R>, taskData: T, options: types.StrictOptions & { mainWorld?: boolean }, scope?: dom.ElementHandle): Promise<R> {
     const callbackText = body.toString();
     progress.log(`waiting for ${this._asLocator(selector)}`);
     const promise = this.retryWithProgressAndBackoff(progress, async (progress, continuePolling) => {
@@ -1777,9 +1782,12 @@ export class Frame extends SdkObject<FrameEventMap> {
         const element = injected.querySelector(info.parsed, root || document, info.strict);
         if (!element)
           return { success: false };
-        const log = `  locator resolved to ${injected.previewNode(element)}`;
         injected.markTargetElements(new Set([element]));
-        return { log, success: true, value: callback(injected, element, taskData as T) };
+        const value = callback(injected, element, taskData as T);
+        if (!value)
+          return { success: false };
+        const log = `  locator resolved to ${injected.previewNode(element)}`;
+        return { log, success: true, value };
       }, { info: resolved.info, callbackText, taskData, root: resolved.frame === this ? scope : undefined }));
       if (log)
         progress.log(log);

From bc92bfe1882037ae254c3a00e41d4a44febae191 Mon Sep 17 00:00:00 2001
From: Dmitry Gozman <dgozman@gmail.com>
Date: Fri, 3 Jul 2026 16:15:52 +0100
Subject: [PATCH 3/5] chore(protocol): move protocol runtime into
 packages/protocol (#41612)

---
 eslint.config.mjs                                             | 2 +-
 packages/playwright-core/src/DEPS.list                        | 2 +-
 packages/playwright-core/src/browserServerImpl.ts             | 2 +-
 packages/playwright-core/src/client/DEPS.list                 | 2 +-
 packages/playwright-core/src/client/channelOwner.ts           | 4 ++--
 packages/playwright-core/src/client/connection.ts             | 4 ++--
 packages/playwright-core/src/client/errors.ts                 | 2 +-
 packages/playwright-core/src/client/jsHandle.ts               | 2 +-
 packages/playwright-core/src/protocol/DEPS.list               | 1 -
 packages/playwright-core/src/server/DEPS.list                 | 2 +-
 packages/playwright-core/src/server/dispatchers/DEPS.list     | 2 +-
 packages/playwright-core/src/server/dispatchers/dispatcher.ts | 4 ++--
 .../src/server/dispatchers/jsHandleDispatcher.ts              | 2 +-
 packages/playwright-core/src/server/errors.ts                 | 2 +-
 packages/playwright-core/src/server/socksInterceptor.ts       | 4 ++--
 .../src/protocol => protocol/src}/serializers.ts              | 0
 .../src/protocol => protocol/src}/validator.ts                | 0
 .../src/protocol => protocol/src}/validatorPrimitives.ts      | 0
 utils/build/build.js                                          | 4 +++-
 utils/check_deps.js                                           | 1 +
 utils/generate_channels.js                                    | 2 +-
 21 files changed, 23 insertions(+), 21 deletions(-)
 delete mode 100644 packages/playwright-core/src/protocol/DEPS.list
 rename packages/{playwright-core/src/protocol => protocol/src}/serializers.ts (100%)
 rename packages/{playwright-core/src/protocol => protocol/src}/validator.ts (100%)
 rename packages/{playwright-core/src/protocol => protocol/src}/validatorPrimitives.ts (100%)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index 8a852e3f0e13f..3d04768e11e90 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -460,7 +460,7 @@ export default [
   {
     files: [
       "packages/playwright-core/src/client/**/*.ts",
-      "packages/playwright-core/src/protocol/**/*.ts",
+      "packages/protocol/src/**/*.ts",
     ],
     languageOptions: languageOptionsWithTsConfig,
     rules: {
diff --git a/packages/playwright-core/src/DEPS.list b/packages/playwright-core/src/DEPS.list
index a780ae6ddf06f..264d291549e24 100644
--- a/packages/playwright-core/src/DEPS.list
+++ b/packages/playwright-core/src/DEPS.list
@@ -3,7 +3,7 @@ remote/
 server/
 @utils/**
 @isomorphic/**
-protocol/validatorPrimitives.ts
+@protocol/**
 
 [androidServerImpl.ts]
 remote/
diff --git a/packages/playwright-core/src/browserServerImpl.ts b/packages/playwright-core/src/browserServerImpl.ts
index 7144ac3f25ba9..6efd617b4519c 100644
--- a/packages/playwright-core/src/browserServerImpl.ts
+++ b/packages/playwright-core/src/browserServerImpl.ts
@@ -20,10 +20,10 @@ import { createGuid } from '@utils/crypto';
 import { isUnderTest } from '@utils/debug';
 import { rewriteErrorMessage } from '@utils/stackTrace';
 import { DEFAULT_PLAYWRIGHT_LAUNCH_TIMEOUT } from '@isomorphic/time';
+import * as validatorPrimitives from '@protocol/validatorPrimitives';
 import { PlaywrightServer } from './remote/playwrightServer';
 import { helper } from './server/helper';
 import { createPlaywright } from './server/playwright';
-import * as validatorPrimitives from './protocol/validatorPrimitives';
 import { ProgressController } from './server/progress';
 
 import type { BrowserServer, BrowserServerLauncher } from './client/browserType';
diff --git a/packages/playwright-core/src/client/DEPS.list b/packages/playwright-core/src/client/DEPS.list
index 6fd9f02f26fdc..368fa1a84722f 100644
--- a/packages/playwright-core/src/client/DEPS.list
+++ b/packages/playwright-core/src/client/DEPS.list
@@ -1,6 +1,6 @@
 [*]
-../protocol/
 @isomorphic/**
+@protocol/**
 @utils/crypto.ts
 @utils/debug.ts
 @utils/debugLogger.ts
diff --git a/packages/playwright-core/src/client/channelOwner.ts b/packages/playwright-core/src/client/channelOwner.ts
index 66571bd35b3e6..18d1e7ddc793c 100644
--- a/packages/playwright-core/src/client/channelOwner.ts
+++ b/packages/playwright-core/src/client/channelOwner.ts
@@ -19,14 +19,14 @@ import { showInternalStackFrames, stringifyStackFrames } from '@utils/stackTrace
 import { isUnderTest } from '@utils/debug';
 import { debugLogger } from '@utils/debugLogger';
 import { currentZone } from '@utils/zones';
+import { ValidationError, maybeFindValidator } from '@protocol/validator';
 import { EventEmitter } from './eventEmitter';
-import { ValidationError, maybeFindValidator  } from '../protocol/validator';
 import { captureLibraryStackTrace } from './clientStackTrace';
 
 import type { ClientInstrumentation } from './clientInstrumentation';
 import type { Connection } from './connection';
 import type { Logger } from './types';
-import type { ValidatorContext } from '../protocol/validator';
+import type { ValidatorContext } from '@protocol/validator';
 import type * as channels from './channels';
 
 type Listener = (...args: any[]) => void;
diff --git a/packages/playwright-core/src/client/connection.ts b/packages/playwright-core/src/client/connection.ts
index 2e3c1a33a0b27..db9de249a081c 100644
--- a/packages/playwright-core/src/client/connection.ts
+++ b/packages/playwright-core/src/client/connection.ts
@@ -19,6 +19,7 @@ import { rewriteErrorMessage } from '@utils/stackTrace';
 import { isUnderTest } from '@utils/debug';
 import { debugLogger } from '@utils/debugLogger';
 import { emptyZone } from '@utils/zones';
+import { ValidationError, findValidator, maybeFindValidator } from '@protocol/validator';
 import { EventEmitter } from './eventEmitter';
 import { Android, AndroidDevice, AndroidSocket } from './android';
 import { Artifact } from './artifact';
@@ -46,10 +47,9 @@ import { Stream } from './stream';
 import { Tracing } from './tracing';
 import { Worker } from './worker';
 import { WritableStream } from './writableStream';
-import { ValidationError, findValidator, maybeFindValidator } from '../protocol/validator';
 import type { ClientInstrumentation } from './clientInstrumentation';
 import type { HeadersArray } from './types';
-import type { ValidatorContext } from '../protocol/validator';
+import type { ValidatorContext } from '@protocol/validator';
 import type * as channels from './channels';
 
 class Root extends ChannelOwner<channels.RootChannel> {
diff --git a/packages/playwright-core/src/client/errors.ts b/packages/playwright-core/src/client/errors.ts
index 0ef84ee489dda..7e377025142ed 100644
--- a/packages/playwright-core/src/client/errors.ts
+++ b/packages/playwright-core/src/client/errors.ts
@@ -15,7 +15,7 @@
  */
 
 import { isError } from '@isomorphic/rtti';
-import { parseSerializedValue, serializeValue } from '../protocol/serializers';
+import { parseSerializedValue, serializeValue } from '@protocol/serializers';
 
 import type { SerializedError } from './channels';
 
diff --git a/packages/playwright-core/src/client/jsHandle.ts b/packages/playwright-core/src/client/jsHandle.ts
index e0bed9425a88d..2df73dd2d9e2d 100644
--- a/packages/playwright-core/src/client/jsHandle.ts
+++ b/packages/playwright-core/src/client/jsHandle.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+import { parseSerializedValue, serializeValue } from '@protocol/serializers';
 import { ChannelOwner } from './channelOwner';
 import { isTargetClosedError } from './errors';
-import { parseSerializedValue, serializeValue } from '../protocol/serializers';
 
 import type * as structs from '../../types/structs';
 import type * as api from '../../types/types';
diff --git a/packages/playwright-core/src/protocol/DEPS.list b/packages/playwright-core/src/protocol/DEPS.list
deleted file mode 100644
index e43dcb5d9f30b..0000000000000
--- a/packages/playwright-core/src/protocol/DEPS.list
+++ /dev/null
@@ -1 +0,0 @@
-[*]
diff --git a/packages/playwright-core/src/server/DEPS.list b/packages/playwright-core/src/server/DEPS.list
index d0741477416db..b212c0c3f3988 100644
--- a/packages/playwright-core/src/server/DEPS.list
+++ b/packages/playwright-core/src/server/DEPS.list
@@ -1,9 +1,9 @@
 [*]
 @isomorphic/**
+@protocol/**
 @utils/**
 ../generated/
 ../package.ts
-../protocol/
 ./
 ./har/
 ./recorder/
diff --git a/packages/playwright-core/src/server/dispatchers/DEPS.list b/packages/playwright-core/src/server/dispatchers/DEPS.list
index 1015a3e35ab90..28d0edf39434d 100644
--- a/packages/playwright-core/src/server/dispatchers/DEPS.list
+++ b/packages/playwright-core/src/server/dispatchers/DEPS.list
@@ -1,7 +1,7 @@
 [*]
 ../../generated/
-../../protocol/
 @utils/**
 @isomorphic/**
+@protocol/**
 ../**
 node_modules/yaml
diff --git a/packages/playwright-core/src/server/dispatchers/dispatcher.ts b/packages/playwright-core/src/server/dispatchers/dispatcher.ts
index ba14ed9c14b70..6a0c8a872877d 100644
--- a/packages/playwright-core/src/server/dispatchers/dispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/dispatcher.ts
@@ -22,7 +22,7 @@ import { isUnderTest } from '@utils/debug';
 import { assert } from '@isomorphic/assert';
 import { monotonicTime } from '@isomorphic/time';
 import { rewriteErrorMessage } from '@utils/stackTrace';
-import { ValidationError, createMetadataValidator, createWaitInfoValidator, findValidator, maybeFindValidator } from '../../protocol/validator';
+import { ValidationError, createMetadataValidator, createWaitInfoValidator, findValidator, maybeFindValidator } from '@protocol/validator';
 import { AbortError, TargetClosedError, isTargetClosedError, serializeError } from '../errors';
 import { createRootSdkObject, SdkObject } from '../instrumentation';
 import { isProtocolError } from '../protocolError';
@@ -32,7 +32,7 @@ import { Progress, ProgressController } from '../progress';
 import type { CallMetadata } from '../instrumentation';
 import type { PlaywrightDispatcher } from './playwrightDispatcher';
 import type { RegisteredListener } from '@utils/eventsHelper';
-import type { ValidatorContext } from '../../protocol/validator';
+import type { ValidatorContext } from '@protocol/validator';
 import type * as channels from '../channels';
 
 const metadataValidator = createMetadataValidator();
diff --git a/packages/playwright-core/src/server/dispatchers/jsHandleDispatcher.ts b/packages/playwright-core/src/server/dispatchers/jsHandleDispatcher.ts
index c2da3199ba6d3..d3ecc88c1b7be 100644
--- a/packages/playwright-core/src/server/dispatchers/jsHandleDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/jsHandleDispatcher.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+import { parseSerializedValue, serializeValue } from '@protocol/serializers';
 import { Dispatcher } from './dispatcher';
 import { ElementHandleDispatcher } from './elementHandlerDispatcher';
-import { parseSerializedValue, serializeValue } from '../../protocol/serializers';
 
 import type * as js from '../javascript';
 import type { ElectronApplicationDispatcher } from './electronDispatcher';
diff --git a/packages/playwright-core/src/server/errors.ts b/packages/playwright-core/src/server/errors.ts
index 03392de60577a..6d18b4ddcb018 100644
--- a/packages/playwright-core/src/server/errors.ts
+++ b/packages/playwright-core/src/server/errors.ts
@@ -15,7 +15,7 @@
  */
 
 import { isError } from '@isomorphic/rtti';
-import { parseSerializedValue, serializeValue } from '../protocol/serializers';
+import { parseSerializedValue, serializeValue } from '@protocol/serializers';
 
 import type { SerializedError } from './channels';
 
diff --git a/packages/playwright-core/src/server/socksInterceptor.ts b/packages/playwright-core/src/server/socksInterceptor.ts
index 72200bab03ebc..d964068c50d53 100644
--- a/packages/playwright-core/src/server/socksInterceptor.ts
+++ b/packages/playwright-core/src/server/socksInterceptor.ts
@@ -18,10 +18,10 @@ import EventEmitter from 'events';
 
 import * as socks from '@utils/socksProxy';
 import { isUnderTest } from '@utils/debug';
-import { ValidationError, findValidator } from '../protocol/validator';
+import { ValidationError, findValidator } from '@protocol/validator';
 
 import type { WebSocketTransport } from './transport';
-import type { ValidatorContext } from '../protocol/validator';
+import type { ValidatorContext } from '@protocol/validator';
 import type * as channels from '../client/channels'; // this file lives in server/, but since it runs via localUtils, client channels is still correct.
 
 export class SocksInterceptor {
diff --git a/packages/playwright-core/src/protocol/serializers.ts b/packages/protocol/src/serializers.ts
similarity index 100%
rename from packages/playwright-core/src/protocol/serializers.ts
rename to packages/protocol/src/serializers.ts
diff --git a/packages/playwright-core/src/protocol/validator.ts b/packages/protocol/src/validator.ts
similarity index 100%
rename from packages/playwright-core/src/protocol/validator.ts
rename to packages/protocol/src/validator.ts
diff --git a/packages/playwright-core/src/protocol/validatorPrimitives.ts b/packages/protocol/src/validatorPrimitives.ts
similarity index 100%
rename from packages/playwright-core/src/protocol/validatorPrimitives.ts
rename to packages/protocol/src/validatorPrimitives.ts
diff --git a/utils/build/build.js b/utils/build/build.js
index 2c0fbf6502b93..8790ade4230b3 100644
--- a/utils/build/build.js
+++ b/utils/build/build.js
@@ -590,6 +590,8 @@ for (const pkg of workspace.packages()) {
     filePath('packages/playwright-client/src'),
     filePath('packages/playwright-core/src/client'),
     filePath('packages/isomorphic'),
+    filePath('packages/utils'),
+    filePath('packages/protocol/src'),
   ]));
 }
 
@@ -663,7 +665,7 @@ steps.push(new EsbuildStep({
     setup: build => build.onResolve({ filter: /utilsBundle/ },
         () => ({ path: './utilsBundle', external: true })),
   }, dynamicImportToRequirePlugin],
-}, [playwrightCoreSrc]));
+}, [playwrightCoreSrc, filePath('packages/protocol/src')]));
 
 function assertCoreBundleHasNoNodeModules() {
   const bundlePath = filePath('packages/playwright-core/lib/coreBundle.js');
diff --git a/utils/check_deps.js b/utils/check_deps.js
index 01754c95eb559..edc5b4b737007 100644
--- a/utils/check_deps.js
+++ b/utils/check_deps.js
@@ -29,6 +29,7 @@ const packages = new Map();
 packages.set('web', packagesDir + '/web/src/');
 packages.set('injected', packagesDir + '/injected/src/');
 packages.set('isomorphic', packagesDir + '/isomorphic/');
+packages.set('protocol', packagesDir + '/protocol/src/');
 packages.set('utils', packagesDir + '/utils/');
 packages.set('testIsomorphic', packagesDir + '/playwright/src/isomorphic/');
 
diff --git a/utils/generate_channels.js b/utils/generate_channels.js
index d18da74789df8..8b3d08e3ad2d6 100755
--- a/utils/generate_channels.js
+++ b/utils/generate_channels.js
@@ -464,5 +464,5 @@ writeFile(path.join(__dirname, '..', 'packages', 'protocol', 'src', 'structs.d.t
 writeFile(path.join(__dirname, '..', 'packages', 'playwright-core', 'src', 'client', 'channels.d.ts'), client_channels_ts.join('\n') + '\n');
 writeFile(path.join(__dirname, '..', 'packages', 'playwright-core', 'src', 'server', 'channels.d.ts'), server_channels_ts.join('\n') + '\n');
 writeFile(path.join(__dirname, '..', 'packages', 'isomorphic', 'protocolMetainfo.ts'), metainfoContent);
-writeFile(path.join(__dirname, '..', 'packages', 'playwright-core', 'src', 'protocol', 'validator.ts'), validatorContent);
+writeFile(path.join(__dirname, '..', 'packages', 'protocol', 'src', 'validator.ts'), validatorContent);
 process.exit(hasChanges ? 1 : 0);

From 5e02792eb1f000e397e125c7a62828ff734b3941 Mon Sep 17 00:00:00 2001
From: Dmitry Gozman <dgozman@gmail.com>
Date: Fri, 3 Jul 2026 16:16:15 +0100
Subject: [PATCH 4/5] chore: rework screenshot masking to be compatible with
 frame piercing (#41613)

---
 packages/injected/src/highlight.ts            |  6 ++--
 packages/injected/src/injectedScript.ts       | 17 ++---------
 packages/playwright-core/src/server/frames.ts | 17 ++---------
 .../src/server/screenshotter.ts               | 28 ++++++++-----------
 4 files changed, 22 insertions(+), 46 deletions(-)

diff --git a/packages/injected/src/highlight.ts b/packages/injected/src/highlight.ts
index fbd012c4bcd31..8513a52742fee 100644
--- a/packages/injected/src/highlight.ts
+++ b/packages/injected/src/highlight.ts
@@ -318,8 +318,10 @@ export class Highlight {
     this._renderedEntries = [];
   }
 
-  maskElements(elements: Element[], color: string) {
-    this.updateHighlight(elements.map(element => ({ element, color })));
+  addMaskedElements(elements: Element[], color: string) {
+    const existingEntries = this._renderedEntries.map(e => ({ element: e.targetElement, color: e.color }));
+    const newEntries = elements.map(element => ({ element, color }));
+    this.updateHighlight([...existingEntries, ...newEntries]);
   }
 
   updateHighlight(entries: HighlightEntry[]) {
diff --git a/packages/injected/src/injectedScript.ts b/packages/injected/src/injectedScript.ts
index cddf13cfebaee..bb72c31e4afed 100644
--- a/packages/injected/src/injectedScript.ts
+++ b/packages/injected/src/injectedScript.ts
@@ -1303,20 +1303,9 @@ export class InjectedScript {
     return new Highlight(this);
   }
 
-  maskSelectors(selectors: ParsedSelector[], color: string) {
-    const highlight = this._createHighlight();
-    const elements = [];
-    for (const selector of selectors)
-      elements.push(this.querySelectorAll(selector, this.document.documentElement));
-    highlight.maskElements(elements.flat(), color);
-  }
-
-  private _createHighlight() {
-    if (this._highlight)
-      this.hideHighlight();
-    this._highlight = new Highlight(this);
-    this._highlight.install();
-    return this._highlight;
+  addMaskedElements(elements: Element[], color: string) {
+    const highlight = this._ensureHighlight();
+    highlight.addMaskedElements(elements, color);
   }
 
   private _ensureHighlight() {
diff --git a/packages/playwright-core/src/server/frames.ts b/packages/playwright-core/src/server/frames.ts
index 4aa8178c5816a..1a61ede8acbd6 100644
--- a/packages/playwright-core/src/server/frames.ts
+++ b/packages/playwright-core/src/server/frames.ts
@@ -47,7 +47,6 @@ import type { ElementStateWithoutStable, FrameExpectParams, InjectedScript } fro
 import type { Progress } from './progress';
 import type { ScreenshotOptions } from './screenshotter';
 import type { RegisteredListener } from '@utils/eventsHelper';
-import type { ParsedSelector } from '@isomorphic/selectorParser';
 import type * as channels from './channels';
 
 type ContextData = {
@@ -929,14 +928,6 @@ export class Frame extends SdkObject<FrameEventMap> {
     return result;
   }
 
-  async maskSelectors(selectors: ParsedSelector[], color: string): Promise<void> {
-    const context = await this.utilityContext();
-    const injectedScript = await context.injectedScript();
-    await injectedScript.evaluate((injected, { parsed, color }) => {
-      injected.maskSelectors(parsed, color);
-    }, { parsed: selectors, color: color });
-  }
-
   async querySelectorAll(progress: Progress, selector: string): Promise<dom.ElementHandle<Element>[]> {
     return progress.race(this.selectors.queryAll(selector));
   }
@@ -1408,11 +1399,9 @@ export class Frame extends SdkObject<FrameEventMap> {
 
   async hideHighlight() {
     return this.raceAgainstEvaluationStallingEvents(async () => {
-      const context = await this.utilityContext();
-      const injectedScript = await context.injectedScript();
-      return await injectedScript.evaluate(injected => {
-        return injected.hideHighlight();
-      });
+      const context = this._contextData.get('utility')?.context;
+      const injectedScript = await context?.injectedScript();
+      await injectedScript?.evaluate(injected => injected.hideHighlight());
     });
   }
 
diff --git a/packages/playwright-core/src/server/screenshotter.ts b/packages/playwright-core/src/server/screenshotter.ts
index 41acde79345fd..7fbaa73fd72d4 100644
--- a/packages/playwright-core/src/server/screenshotter.ts
+++ b/packages/playwright-core/src/server/screenshotter.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { MultiMap } from '@isomorphic/multimap';
 import { assert } from '@isomorphic/assert';
 import { helper } from './helper';
 
@@ -25,7 +24,6 @@ import type { Page } from './page';
 import type { Progress } from './progress';
 import type * as types from './types';
 import type { Rect } from '@isomorphic/types';
-import type { ParsedSelector } from '@isomorphic/selectorParser';
 
 
 declare global {
@@ -275,21 +273,19 @@ export class Screenshotter {
     if (!options.mask || !options.mask.length)
       return () => Promise.resolve();
 
-    const framesToParsedSelectors: MultiMap<Frame, ParsedSelector> = new MultiMap();
-    await progress.race(Promise.all((options.mask || []).map(async ({ frame, selector }) => {
-      const pair = await frame.selectors.resolveFrameForSelector(selector);
-      if (pair)
-        framesToParsedSelectors.set(pair.frame, pair.info.parsed);
-    })));
-
-    const frames = [...framesToParsedSelectors.keys()];
-    const cleanup = async () => {
-      await Promise.all(frames.map(frame => frame.hideHighlight()));
-    };
-
+    const cleanup = () => this._page.hideHighlight();
     try {
-      const promises = frames.map(frame => frame.maskSelectors(framesToParsedSelectors.get(frame), options.maskColor || '#F0F'));
-      await progress.race(Promise.all(promises));
+      await progress.race(this._page.hideHighlight());
+      await progress.race(Promise.all((options.mask || []).map(async ({ frame, selector }) => {
+        const resolved = await frame.selectors.resolveInjectedForSelector(selector, { strict: false });
+        if (!resolved)
+          return;
+        await resolved.injected.evaluate((injected, { info, color }) => {
+          const elements = injected.querySelectorAll(info.parsed, injected.document.documentElement);
+          if (elements.length)
+            injected.addMaskedElements(elements, color);
+        }, { info: resolved.info, color: options.maskColor || '#F0F' });
+      })));
       return cleanup;
     } catch (error) {
       cleanup().catch(() => {});

From e9a206539527957abd177749dd893939d3c6c85c Mon Sep 17 00:00:00 2001
From: Dmitry Gozman <dgozman@gmail.com>
Date: Fri, 3 Jul 2026 18:04:09 +0100
Subject: [PATCH 5/5] chore(build): generate third-party license notices
 without license-checker (#41615)

---
 package-lock.json            | 518 -----------------------------------
 package.json                 |   1 -
 utils/build/bundle_report.js | 124 ++++++---
 3 files changed, 87 insertions(+), 556 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fe35404b9f42c..971041d56b81c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -98,7 +98,6 @@
         "jest-message-util": "30.4.1",
         "jpeg-js": "0.4.4",
         "json5": "2.2.3",
-        "license-checker": "25.0.1",
         "mime": "4.1.0",
         "minimatch": "10.2.5",
         "open": "11.0.0",
@@ -3446,13 +3445,6 @@
         "node": ">=16.5.0"
       }
     },
-    "node_modules/abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/accepts": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
@@ -3646,16 +3638,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/array-includes": {
       "version": "3.1.9",
       "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz",
@@ -4413,17 +4395,6 @@
         }
       }
     },
-    "node_modules/debuglog": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
-      "integrity": "sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -5701,13 +5672,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
@@ -5873,28 +5837,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/glob-parent": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -5908,37 +5850,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/glob/node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/glob/node_modules/brace-expansion": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
-      "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/glob/node_modules/minimatch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
-      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/globals": {
       "version": "14.0.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
@@ -6119,13 +6030,6 @@
         "node": ">=16.9.0"
       }
     },
-    "node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/html-reporter": {
       "resolved": "packages/html-reporter",
       "link": true
@@ -6220,18 +6124,6 @@
         "node": ">=0.8.19"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@@ -6970,13 +6862,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -7058,126 +6943,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/license-checker": {
-      "version": "25.0.1",
-      "resolved": "https://registry.npmjs.org/license-checker/-/license-checker-25.0.1.tgz",
-      "integrity": "sha512-mET5AIwl7MR2IAKYYoVBBpV0OnkKQ1xGj2IMMeEFIs42QAkEVjRtFZGWmQ28WeU7MP779iAgOaOy93Mn44mn6g==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "debug": "^3.1.0",
-        "mkdirp": "^0.5.1",
-        "nopt": "^4.0.1",
-        "read-installed": "~4.0.3",
-        "semver": "^5.5.0",
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-satisfies": "^4.0.0",
-        "treeify": "^1.1.0"
-      },
-      "bin": {
-        "license-checker": "bin/license-checker"
-      }
-    },
-    "node_modules/license-checker/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/license-checker/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/license-checker/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/license-checker/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/license-checker/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/license-checker/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/license-checker/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/license-checker/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/license-checker/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/lightningcss": {
       "version": "1.32.0",
       "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz",
@@ -7606,19 +7371,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -7690,65 +7442,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/nopt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
-      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "abbrev": "1",
-        "osenv": "^0.1.4"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      }
-    },
-    "node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/resolve": {
-      "version": "1.22.12",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz",
-      "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "is-core-module": "^2.16.1",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -7759,13 +7452,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/npm-normalize-package-bin": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
-      "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -7951,38 +7637,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/osenv": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "deprecated": "This package is no longer supported.",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
     "node_modules/own-keys": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
@@ -8079,16 +7733,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -8439,63 +8083,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/read-installed": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz",
-      "integrity": "sha512-O03wg/IYuV/VtnK2h/KXEt9VIbMUFbk3ERG0Iu4FhLZw0EP0T9znqrYDGn6ncbEsXUFaUjiVAWXHzxwt3lhRPQ==",
-      "deprecated": "This package is no longer supported.",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "debuglog": "^1.0.1",
-        "read-package-json": "^2.0.0",
-        "readdir-scoped-modules": "^1.0.0",
-        "semver": "2 || 3 || 4 || 5",
-        "slide": "~1.1.3",
-        "util-extend": "^1.0.1"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.2"
-      }
-    },
-    "node_modules/read-installed/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/read-package-json": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz",
-      "integrity": "sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==",
-      "deprecated": "This package is no longer supported. Please use @npmcli/package-json instead.",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "normalize-package-data": "^2.0.0",
-        "npm-normalize-package-bin": "^1.0.0"
-      }
-    },
-    "node_modules/readdir-scoped-modules": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
-      "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
-      "deprecated": "This functionality has been moved to @npmcli/fs",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "debuglog": "^1.0.1",
-        "dezalgo": "^1.0.0",
-        "graceful-fs": "^4.1.2",
-        "once": "^1.3.0"
-      }
-    },
     "node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -9001,16 +8588,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/slide": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
-      "integrity": "sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/smart-buffer": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
@@ -9082,73 +8659,6 @@
         "source-map": "^0.6.0"
       }
     },
-    "node_modules/spdx-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-compare/-/spdx-compare-1.0.0.tgz",
-      "integrity": "sha512-C1mDZOX0hnu0ep9dfmuoi03+eOdDoz2yvK79RxbcrVEG1NO1Ph35yW102DHWKN4pk80nwCgeMmSY5L25VE4D9A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "array-find-index": "^1.0.2",
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-ranges": "^2.0.0"
-      }
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
-      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
-      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
-      "dev": true,
-      "license": "CC-BY-3.0"
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.23.tgz",
-      "integrity": "sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw==",
-      "dev": true,
-      "license": "CC0-1.0"
-    },
-    "node_modules/spdx-ranges": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-ranges/-/spdx-ranges-2.1.1.tgz",
-      "integrity": "sha512-mcdpQFV7UDAgLpXEE/jOMqvK4LBoO0uTQg0uvXUewmEFhpiZx5yJSZITHB8w1ZahKdhfZqP5GPEOKLyEq5p8XA==",
-      "dev": true,
-      "license": "(MIT AND CC-BY-3.0)"
-    },
-    "node_modules/spdx-satisfies": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-satisfies/-/spdx-satisfies-4.0.1.tgz",
-      "integrity": "sha512-WVzZ/cXAzoNmjCWiEluEA3BjHp5tiUmmhn9MK+X0tBbR9sOqtC6UQwmgCNrAIZvNlMuBUYAaHYfb2oqlF9SwKA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "spdx-compare": "^1.0.0",
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-ranges": "^2.0.0"
-      }
-    },
     "node_modules/ssim.js": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/ssim.js/-/ssim.js-3.5.0.tgz",
@@ -9420,16 +8930,6 @@
       "resolved": "packages/trace-viewer",
       "link": true
     },
-    "node_modules/treeify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/treeify/-/treeify-1.1.0.tgz",
-      "integrity": "sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
     "node_modules/ts-api-utils": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz",
@@ -9718,24 +9218,6 @@
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/util-extend": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz",
-      "integrity": "sha512-mLs5zAK+ctllYBj+iAQvlDCwoxU/WDOUaJkcFudeiAX6OajC6BKXJUa9a+tbtkC11dz2Ufb7h0lyvIOVn4LADA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
diff --git a/package.json b/package.json
index 4de7314e760ef..e7310d0ffd40c 100644
--- a/package.json
+++ b/package.json
@@ -140,7 +140,6 @@
     "jest-message-util": "30.4.1",
     "jpeg-js": "0.4.4",
     "json5": "2.2.3",
-    "license-checker": "25.0.1",
     "mime": "4.1.0",
     "minimatch": "10.2.5",
     "open": "11.0.0",
diff --git a/utils/build/bundle_report.js b/utils/build/bundle_report.js
index c989006c429bd..2b01307529f25 100644
--- a/utils/build/bundle_report.js
+++ b/utils/build/bundle_report.js
@@ -18,27 +18,78 @@
 
 const fs = require('fs');
 const path = require('path');
-const checker = require('license-checker');
 
 const ROOT = path.join(__dirname, '..', '..');
 const BUILTIN_SET = new Set(require('module').builtinModules);
 
-/** @type {Record<string, { licenseText?: string, repository?: string, licenses?: string }> | null} */
-let _licenseMap = null;
-
-/** Memoized license map keyed by "name@version". Lazily populated on
- *  first call; shared across all bundles in a single build run. */
-async function getLicenseMap() {
-  if (_licenseMap)
-    return _licenseMap;
-  _licenseMap = await new Promise((resolve, reject) => {
-    checker.init({
-      start: ROOT,
-      production: false,
-      customPath: { licenseText: '' },
-    }, (err, packages) => err ? reject(err) : resolve(packages));
-  });
-  return _licenseMap;
+/** @type {Map<string, { license: string, repository?: string }>} */
+const _licenseCache = new Map();
+
+/**
+ * @param {*} pkg
+ * @returns {string}
+ */
+function normalizeRepositoryUrlToGitHub(pkg) {
+  let url = typeof pkg.repository === 'object' ? pkg.repository.url : pkg.repository;
+  if (typeof url !== 'string')
+    throw new Error(`Malformed repository for ${pkg.name}@${pkg.version}: ${JSON.stringify(pkg.repository)}`);
+  url = url.replace(/^git@github\.com:/, 'https://github.com/');
+  url = url.replace(/^git:\/\/git@github\.com/, 'https://github.com');
+  url = url.replace(/^git\+ssh:\/\/git@github\.com/, 'https://github.com');
+  url = url.replace(/^git\+https:\/\//, 'https://');
+  url = url.replace(/^http:\/\//, 'https://');
+  url = url.replace(/^git:\/\//, 'https://');
+  url = url.replace(/^github:/, 'https://github.com/');
+  url = url.replace(/\.git$/, '');
+  if (url.match(/^[\w-.]+\/[\w-.]+$/))
+    url = 'https://github.com/' + url;
+  if (!url.match(/^https:\/\/github\.com\/([\w-.]+\/)+[\w-.]+$/))
+    throw new Error(`Malformed repository for ${pkg.name}@${pkg.version}: ${JSON.stringify(pkg.repository)}`);
+  return url;
+}
+
+/**
+ * @param {string} dir
+ * @returns {string | undefined}
+ */
+function readLicenseText(dir) {
+  const files = fs.readdirSync(dir, { withFileTypes: true });
+  const patterns = [/^LICENSE$/i, /^LICENSE-\w+$/i];
+  for (const pattern of patterns) {
+    for (const file of files) {
+      if (!file.isFile())
+        continue;
+      if (pattern.test(path.basename(file.name, path.extname(file.name))))
+        return fs.readFileSync(path.join(dir, file.name), 'utf8').trim();
+    }
+  }
+  // Note: this list ensures we do not accidentally miss a license for some package.
+  const knownPackagesWithoutLicense = ['proxy-agent-negotiate'];
+  if (!knownPackagesWithoutLicense.some(pkg => dir.endsWith(path.sep + pkg)))
+    throw new Error(`Cannot locate license file for ${dir}`);
+}
+
+/**
+ * @param {string} dir
+ * @returns {{ license: string, repository?: string }}
+ */
+function licenseInfoForDir(dir) {
+  let info = _licenseCache.get(dir);
+  if (!info) {
+    const pkg = JSON.parse(fs.readFileSync(path.join(dir, 'package.json'), 'utf8'));
+    let license = readLicenseText(dir);
+    if (!license) {
+      if (!pkg.license)
+        throw new Error(`Cannot determine license for ${pkg.name}@${pkg.version} at ${dir}`);
+      license = `(no license text found; declared licenses: ${pkg.license})`;
+    }
+    info = {
+      repository: normalizeRepositoryUrlToGitHub(pkg),
+      license,
+    };
+    _licenseCache.set(dir, info);
+  }
+  return info;
 }
 
 /** Extract the owning npm package directory from an input path like
@@ -72,10 +123,10 @@ function packageKeyForDir(pkgDir) {
   }
 }
 
-/** Given one bundle's metafile output, return the deduped sorted list of
- *  "name@version" strings for every inlined npm package. */
+/** Given one bundle's metafile output, return the deduped sorted list of inlined
+ *  npm packages as { key: "name@version", dir } entries. */
 function inlinedPackages(outInfo) {
-  const keys = new Set();
+  const byKey = new Map();
   for (const inputPath of Object.keys(outInfo.inputs)) {
     if (inputPath.startsWith('(disabled):'))
       continue;
@@ -83,10 +134,10 @@ function inlinedPackages(outInfo) {
     if (!dir)
       continue;
     const key = packageKeyForDir(dir);
-    if (key)
-      keys.add(key);
+    if (key && !byKey.has(key))
+      byKey.set(key, dir);
   }
-  return [...keys].sort();
+  return [...byKey.keys()].sort().map(key => ({ key, dir: byKey.get(key) }));
 }
 
 function fmtKB(bytes) {
@@ -138,12 +189,11 @@ function writeBundleReport(result, outFile, outInfo) {
 
 /** Write the .js.LICENSE sidecar. No-op for bundles with no inlined
  *  third-party packages. */
-async function writeBundleLicenses(outFile, outInfo) {
-  const keys = inlinedPackages(outInfo);
-  if (keys.length === 0)
+function writeBundleLicenses(outFile, outInfo) {
+  const packages = inlinedPackages(outInfo);
+  if (packages.length === 0)
     return 0;
 
-  const licenseMap = await getLicenseMap();
   const lines = [];
   lines.push(`${path.relative(ROOT, outFile)}`);
   lines.push('');
@@ -151,39 +201,39 @@ async function writeBundleLicenses(outFile, outInfo) {
   lines.push('');
   lines.push('The following npm packages are inlined into this bundle.');
   lines.push('');
-  for (const key of keys) {
-    const info = licenseMap[key];
-    const repo = info && info.repository ? info.repository : '';
+  for (const { key, dir } of packages) {
+    const info = licenseInfoForDir(dir);
+    const repo = info.repository ? info.repository : '';
     lines.push(`- ${key}${repo ? ` (${repo})` : ''}`);
   }
-  for (const key of keys) {
-    const info = licenseMap[key];
+  for (const { key, dir } of packages) {
+    const info = licenseInfoForDir(dir);
     lines.push('');
     lines.push(`%% ${key} NOTICES AND INFORMATION BEGIN HERE`);
     lines.push('=========================================');
-    lines.push((info && info.licenseText) || `(no license text found; declared licenses: ${(info && info.licenses) || 'unknown'})`);
+    lines.push(info.license);
     lines.push('=========================================');
     lines.push(`END OF ${key} NOTICES AND INFORMATION`);
   }
   lines.push('');
   lines.push('SUMMARY');
   lines.push('=========================================');
-  lines.push(`Total Packages: ${keys.length}`);
+  lines.push(`Total Packages: ${packages.length}`);
   lines.push('=========================================');
 
   fs.writeFileSync(outFile + '.LICENSE', lines.join('\n'));
-  return keys.length;
+  return packages.length;
 }
 
 /** Top-level entry called by EsbuildStep after each bundled build. */
-async function writeReports(result) {
+function writeReports(result) {
   if (!result.metafile)
     return;
   for (const [outFile, outInfo] of Object.entries(result.metafile.outputs)) {
     if (outFile.endsWith('.map'))
       continue;
     const { inputCount, externalCount } = writeBundleReport(result, outFile, outInfo);
-    const licCount = await writeBundleLicenses(outFile, outInfo);
+    const licCount = writeBundleLicenses(outFile, outInfo);
     const rel = path.relative(ROOT, outFile);
     const licFragment = licCount ? `, ${licCount} licenses` : '';
     console.log(`     bundle: ${rel}  (${inputCount} files, ${externalCount} external${licFragment}, ${fmtKB(outInfo.bytes)})`);