Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.
TypeScript automationchromechromiume2e-testingelectronend-to-end-testingfirefoxjavascriptplaywrighttesttest-automationtestingtesting-toolswebwebkit
chore: remove deprecated API options (#40196)
Dmitry Gozmanb6c0a186c7c7
diff --git a/docs/src/api/class-browsercontext.md b/docs/src/api/class-browsercontext.mdindex 403fb8e3d0..4b9f0b7fc7 100644--- a/docs/src/api/class-browsercontext.md+++ b/docs/src/api/class-browsercontext.md@@ -737,14 +737,6 @@ Name of the function on the window object.Callback function that will be called in the Playwright's context.-### option: BrowserContext.exposeBinding.handle-* since: v1.8-* deprecated: This option will be removed in the future.-- `handle` <[boolean]>--Whether to pass the argument as a handle, instead of passing by value. When passing a handle, only one argument is-supported. When passing by value, multiple arguments are supported.-## async method: BrowserContext.exposeFunction* since: v1.8- returns: <[Disposable]>diff --git a/docs/src/api/class-browsertype.md b/docs/src/api/class-browsertype.mdindex ee2af12c3e..bc7d51d865 100644--- a/docs/src/api/class-browsertype.md+++ b/docs/src/api/class-browsertype.md@@ -114,14 +114,6 @@ Additional HTTP headers to be sent with web socket connect request. Optional.Slows down Playwright operations by the specified amount of milliseconds. Useful so that youcan see what is going on. Defaults to 0.-### option: BrowserType.connect.logger-* since: v1.14-* langs: js-* deprecated: The logs received by the logger are incomplete. Please use tracing instead.-- `logger` <[Logger]>--Logger sink for Playwright logging. Optional.-### option: BrowserType.connect.timeout* since: v1.10- `timeout` <[float]>@@ -218,14 +210,6 @@ Additional HTTP headers to be sent with connect request. Optional.Tells Playwright that it runs on the same host as the CDP server. It will enable certain optimizations that rely uponthe file system being the same between Playwright and the Browser.-### option: BrowserType.connectOverCDP.logger-* since: v1.14-* langs: js-* deprecated: The logs received by the logger are incomplete. Please use tracing instead.-- `logger` <[Logger]>--Logger sink for Playwright logging. Optional.-### option: BrowserType.connectOverCDP.slowMo* since: v1.11- `slowMo` <[float]>diff --git a/docs/src/api/class-page.md b/docs/src/api/class-page.mdindex 9dc84351fd..01b4f4f2b7 100644--- a/docs/src/api/class-page.md+++ b/docs/src/api/class-page.md@@ -1833,14 +1833,6 @@ Name of the function on the window object.Callback function that will be called in the Playwright's context.-### option: Page.exposeBinding.handle-* since: v1.8-* deprecated: This option will be removed in the future.-- `handle` <[boolean]>--Whether to pass the argument as a handle, instead of passing by value. When passing a handle, only one argument is-supported. When passing by value, multiple arguments are supported.-## async method: Page.exposeFunction* since: v1.8- returns: <[Disposable]>diff --git a/docs/src/api/params.md b/docs/src/api/params.mdindex c278774acf..faef52e241 100644--- a/docs/src/api/params.md+++ b/docs/src/api/params.md@@ -751,18 +751,6 @@ Emulates `'prefers-contrast'` media feature, supported values are `'no-preferencLogger sink for Playwright logging.-## context-option-videospath-* langs: js-* deprecated: Use [`option: recordVideo`] instead.-- `videosPath` <[path]>--## context-option-videosize-* langs: js-* deprecated: Use [`option: recordVideo`] instead.-- `videoSize` <[Object]>- - `width` <[int]> Video frame width.- - `height` <[int]> Video frame height.-## context-option-recordhar* langs: js- `recordHar` <[Object]>@@ -1066,8 +1054,6 @@ between the same pixel in compared images, between zero (strict) and one (lax),- %%-context-option-contrast-%%- %%-context-option-contrast-csharp-python-%%- %%-context-option-logger-%%-- %%-context-option-videospath-%%-- %%-context-option-videosize-%%- %%-context-option-recordhar-%%- %%-context-option-recordhar-path-%%- %%-context-option-recordhar-omit-content-%%diff --git a/packages/injected/src/bindingsController.ts b/packages/injected/src/bindingsController.tsindex a9a8d42c7b..7f58b482a5 100644--- a/packages/injected/src/bindingsController.ts+++ b/packages/injected/src/bindingsController.ts@@ -21,13 +21,12 @@ import type { SerializedValue } from '@isomorphic/utilityScriptSerializers';export type BindingPayload = {name: string;seq: number;- serializedArgs?: SerializedValue[],+ serializedArgs: SerializedValue[],};type BindingData = {callbacks: Map<number, { resolve: (value: any) => void, reject: (error: Error) => void }>;lastSeq: number;- handles: Map<number, any>;removed: boolean;};@@ -41,34 +40,25 @@ export class BindingsController {this._globalBindingName = globalBindingName;}- addBinding(bindingName: string, needsHandle: boolean) {+ addBinding(bindingName: string) {const data: BindingData = {callbacks: new Map(),lastSeq: 0,- handles: new Map(),removed: false,};this._bindings.set(bindingName, data);(this._global as any)[bindingName] = (...args: any[]) => {if (data.removed)throw new Error(`binding "${bindingName}" has been removed`);- if (needsHandle && args.slice(1).some(arg => arg !== undefined))- throw new Error(`exposeBindingHandle supports a single argument, ${args.length} received`);const seq = ++data.lastSeq;const promise = new Promise((resolve, reject) => data.callbacks.set(seq, { resolve, reject }));- let payload: BindingPayload;- if (needsHandle) {- data.handles.set(seq, args[0]);- payload = { name: bindingName, seq };- } else {- const serializedArgs = [];- for (let i = 0; i < args.length; i++) {- serializedArgs[i] = serializeAsCallArgument(args[i], v => {- return { fallThrough: v };- });- }- payload = { name: bindingName, seq, serializedArgs };+ const serializedArgs = [];+ for (let i = 0; i < args.length; i++) {+ serializedArgs[i] = serializeAsCallArgument(args[i], v => {+ return { fallThrough: v };+ });}+ const payload: BindingPayload = { name: bindingName, seq, serializedArgs };(this._global as any)[this._globalBindingName](JSON.stringify(payload));return promise;};@@ -82,13 +72,6 @@ export class BindingsController {delete (this._global as any)[bindingName];}- takeBindingHandle(arg: { name: string, seq: number }) {- const handles = this._bindings.get(arg.name)!.handles;- const handle = handles.get(arg.seq);- handles.delete(arg.seq);- return handle;- }-deliverBindingResult(arg: { name: string, seq: number, result?: any, error?: any }) {const callbacks = this._bindings.get(arg.name)!.callbacks;if ('error' in arg)diff --git a/packages/playwright-client/types/types.d.ts b/packages/playwright-client/types/types.d.tsindex e1e1e00b15..713631848c 100644--- a/packages/playwright-client/types/types.d.ts+++ b/packages/playwright-client/types/types.d.ts@@ -884,64 +884,12 @@ export interface Page {* information about the caller: `{ browserContext: BrowserContext, page: Page, frame: Frame }`.** See- * [browserContext.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding)+ * [browserContext.exposeBinding(name, callback)](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding)* for the context-wide version.** **NOTE** Functions installed via- * [page.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-page#page-expose-binding)- * survive navigations.- *- * **Usage**- *- * An example of exposing page URL to all frames in a page:- *- * ```js- * const { webkit } = require('playwright'); // Or 'chromium' or 'firefox'.- *- * (async () => {- * const browser = await webkit.launch({ headless: false });- * const context = await browser.newContext();- * const page = await context.newPage();- * await page.exposeBinding('pageURL', ({ page }) => page.url());- * await page.setContent(`- * <script>- * async function onClick() {- * document.querySelector('div').textContent = await window.pageURL();- * }- * </script>- * <button onclick="onClick()">Click me</button>- * <div></div>- * `);- * await page.click('button');- * })();- * ```- *- * @param name Name of the function on the window object.- * @param callback Callback function that will be called in the Playwright's context.- * @param options- */- exposeBinding(name: string, playwrightBinding: (source: BindingSource, arg: JSHandle) => any, options: { handle: true }): Promise<Disposable>;- /**- * The method adds a function called- * [`name`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-name) on the `window` object of- * every frame in this page. When called, the function executes- * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) and returns a- * [Promise] which resolves to the return value of- * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback). If the- * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) returns a [Promise],- * it will be awaited.- *- * The first argument of the- * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) function contains- * information about the caller: `{ browserContext: BrowserContext, page: Page, frame: Frame }`.- *- * See- * [browserContext.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding)- * for the context-wide version.- *- * **NOTE** Functions installed via- * [page.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-page#page-expose-binding)- * survive navigations.+ * [page.exposeBinding(name, callback)](https://playwright.dev/docs/api/class-page#page-expose-binding) survive+ * navigations.** **Usage***@@ -970,9 +918,8 @@ export interface Page {** @param name Name of the function on the window object.* @param callback Callback function that will be called in the Playwright's context.- * @param options*/- exposeBinding(name: string, playwrightBinding: (source: BindingSource, ...args: any[]) => any, options?: { handle?: boolean }): Promise<Disposable>;+ exposeBinding(name: string, playwrightBinding: (source: BindingSource, ...args: any[]) => any): Promise<Disposable>;/*** Removes all the listeners of the given type (or all registered listeners if no type given). Allows to wait for@@ -8174,56 +8121,8 @@ export interface BrowserContext {* [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)* function contains information about the caller: `{ browserContext: BrowserContext, page: Page, frame: Frame }`.*- * See [page.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-page#page-expose-binding)- * for page-only version.- *- * **Usage**- *- * An example of exposing page URL to all frames in all pages in the context:- *- * ```js- * const { webkit } = require('playwright'); // Or 'chromium' or 'firefox'.- *- * (async () => {- * const browser = await webkit.launch({ headless: false });- * const context = await browser.newContext();- * await context.exposeBinding('pageURL', ({ page }) => page.url());- * const page = await context.newPage();- * await page.setContent(`- * <script>- * async function onClick() {- * document.querySelector('div').textContent = await window.pageURL();- * }- * </script>- * <button onclick="onClick()">Click me</button>- * <div></div>- * `);- * await page.getByRole('button').click();- * })();- * ```- *- * @param name Name of the function on the window object.- * @param callback Callback function that will be called in the Playwright's context.- * @param options- */- exposeBinding(name: string, playwrightBinding: (source: BindingSource, arg: JSHandle) => any, options: { handle: true }): Promise<Disposable>;- /**- * The method adds a function called- * [`name`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-name) on the- * `window` object of every frame in every page in the context. When called, the function executes- * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)- * and returns a [Promise] which resolves to the return value of- * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback).- * If the- * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)- * returns a [Promise], it will be awaited.- *- * The first argument of the- * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)- * function contains information about the caller: `{ browserContext: BrowserContext, page: Page, frame: Frame }`.- *- * See [page.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-page#page-expose-binding)- * for page-only version.+ * See [page.exposeBinding(name, callback)](https://playwright.dev/docs/api/class-page#page-expose-binding) for+ * page-only version.** **Usage***@@ -8252,9 +8151,8 @@ export interface BrowserContext {** @param name Name of the function on the window object.* @param callback Callback function that will be called in the Playwright's context.- * @param options*/- exposeBinding(name: string, playwrightBinding: (source: BindingSource, ...args: any[]) => any, options?: { handle?: boolean }): Promise<Disposable>;+ exposeBinding(name: string, playwrightBinding: (source: BindingSource, ...args: any[]) => any): Promise<Disposable>;/*** Adds a script which would be evaluated in one of the following scenarios:@@ -10352,26 +10250,6 @@ export interface Browser {*/userAgent?: string;- /**- * @deprecated Use [`recordVideo`](https://playwright.dev/docs/api/class-browser#browser-new-page-option-record-video) instead.- */- videoSize?: {- /**- * Video frame width.- */- width: number;-- /**- * Video frame height.- */- height: number;- };-- /**- * @deprecated Use [`recordVideo`](https://playwright.dev/docs/api/class-browser#browser-new-page-option-record-video) instead.- */- videosPath?: string;-/*** Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent* viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).@@ -15657,30 +15535,6 @@ export interface BrowserType<Unused = {}> {*/userAgent?: string;- /**- * @deprecated Use- * [`recordVideo`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-record-video)- * instead.- */- videoSize?: {- /**- * Video frame width.- */- width: number;-- /**- * Video frame height.- */- height: number;- };-- /**- * @deprecated Use- * [`recordVideo`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-record-video)- * instead.- */- videosPath?: string;-/*** Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent* viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).@@ -17611,30 +17465,6 @@ export interface AndroidDevice {*/userAgent?: string;- /**- * @deprecated Use- * [`recordVideo`](https://playwright.dev/docs/api/class-androiddevice#android-device-launch-browser-option-record-video)- * instead.- */- videoSize?: {- /**- * Video frame width.- */- width: number;-- /**- * Video frame height.- */- height: number;- };-- /**- * @deprecated Use- * [`recordVideo`](https://playwright.dev/docs/api/class-androiddevice#android-device-launch-browser-option-record-video)- * instead.- */- videosPath?: string;-/*** Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent* viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).@@ -22723,12 +22553,6 @@ export interface ConnectOverCDPOptions {*/isLocal?: boolean;- /**- * Logger sink for Playwright logging. Optional.- * @deprecated The logs received by the logger are incomplete. Please use tracing instead.- */- logger?: Logger;-/*** Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going* on. Defaults to 0.@@ -22765,12 +22589,6 @@ export interface ConnectOptions {*/headers?: { [key: string]: string; };- /**- * Logger sink for Playwright logging. Optional.- * @deprecated The logs received by the logger are incomplete. Please use tracing instead.- */- logger?: Logger;-/*** Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going* on. Defaults to 0.@@ -23297,26 +23115,6 @@ export interface BrowserContextOptions {*/userAgent?: string;- /**- * @deprecated Use [`recordVideo`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-record-video) instead.- */- videoSize?: {- /**- * Video frame width.- */- width: number;-- /**- * Video frame height.- */- height: number;- };-- /**- * @deprecated Use [`recordVideo`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-record-video) instead.- */- videosPath?: string;-/*** Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent* viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).diff --git a/packages/playwright-core/src/client/browserContext.ts b/packages/playwright-core/src/client/browserContext.tsindex ed74d8404d..4d593e83dd 100644--- a/packages/playwright-core/src/client/browserContext.ts+++ b/packages/playwright-core/src/client/browserContext.ts@@ -358,8 +358,8 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>return DisposableObject.from((await this._channel.addInitScript({ source })).disposable);}- async exposeBinding(name: string, callback: (source: structs.BindingSource, ...args: any[]) => any, options: { handle?: boolean } = {}): Promise<DisposableObject> {- const result = await this._channel.exposeBinding({ name, needsHandle: options.handle });+ async exposeBinding(name: string, callback: (source: structs.BindingSource, ...args: any[]) => any): Promise<DisposableObject> {+ const result = await this._channel.exposeBinding({ name });this._bindings.set(name, callback);return DisposableObject.from(result.disposable);}@@ -539,8 +539,6 @@ async function prepareStorageState(platform: Platform, storageState: string | Se}export async function prepareBrowserContextParams(platform: Platform, options: BrowserContextOptions): Promise<channels.BrowserNewContextParams> {- if (options.videoSize && !options.videosPath)- throw new Error(`"videoSize" option requires "videosPath" to be specified`);if (options.extraHTTPHeaders)network.validateHeaders(options.extraHTTPHeaders);const contextParams: channels.BrowserNewContextParams = {@@ -557,12 +555,6 @@ export async function prepareBrowserContextParams(platform: Platform, options: BacceptDownloads: toAcceptDownloadsProtocol(options.acceptDownloads),clientCertificates: await toClientCertificatesProtocol(platform, options.clientCertificates),};- if (!contextParams.recordVideo && options.videosPath) {- contextParams.recordVideo = {- dir: options.videosPath,- size: options.videoSize- };- }if (contextParams.recordVideo && contextParams.recordVideo.dir)contextParams.recordVideo.dir = platform.path().resolve(contextParams.recordVideo.dir);return contextParams;diff --git a/packages/playwright-core/src/client/browserType.ts b/packages/playwright-core/src/client/browserType.tsindex bdbe704829..0f06b4438d 100644--- a/packages/playwright-core/src/client/browserType.ts+++ b/packages/playwright-core/src/client/browserType.ts@@ -129,10 +129,9 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel> imple}async _connect(params: ConnectOptions): Promise<Browser> {- const logger = params.logger;return await this._wrapApiCall(async () => {const browser = await connectToBrowser(this._playwright, { browserName: this.name(), ...params });- browser._connectToBrowserType(this, {}, logger);+ browser._connectToBrowserType(this, {}, undefined);return browser;});}@@ -159,7 +158,7 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel> impleisLocal: params.isLocal,});const browser = Browser.from(result.browser);- browser._connectToBrowserType(this, {}, params.logger);+ browser._connectToBrowserType(this, {}, undefined);if (result.defaultContext)await this._instrumentation.runAfterCreateBrowserContext(BrowserContext.from(result.defaultContext));return browser;diff --git a/packages/playwright-core/src/client/page.ts b/packages/playwright-core/src/client/page.tsindex 817b8a3360..4ac5c7bc45 100644--- a/packages/playwright-core/src/client/page.ts+++ b/packages/playwright-core/src/client/page.ts@@ -34,7 +34,7 @@ import { FileChooser } from './fileChooser';import { Frame, verifyLoadState } from './frame';import { HarRouter } from './harRouter';import { Keyboard, Mouse, Touchscreen } from './input';-import { JSHandle, assertMaxArguments, parseResult, serializeArgument } from './jsHandle';+import { assertMaxArguments, parseResult, serializeArgument } from './jsHandle';import { Request, Response, Route, RouteHandler, WebSocket, WebSocketRoute, WebSocketRouteHandler, validateHeaders } from './network';import { Video } from './video';import { Screencast } from './screencast';@@ -348,8 +348,8 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Pagereturn DisposableObject.from(result.disposable);}- async exposeBinding(name: string, callback: (source: structs.BindingSource, ...args: any[]) => any, options: { handle?: boolean } = {}) {- const result = await this._channel.exposeBinding({ name, needsHandle: options.handle });+ async exposeBinding(name: string, callback: (source: structs.BindingSource, ...args: any[]) => any) {+ const result = await this._channel.exposeBinding({ name });this._bindings.set(name, callback);return DisposableObject.from(result.disposable);}@@ -884,11 +884,7 @@ export class BindingCall extends ChannelOwner<channels.BindingCallChannel> {page: frame._page!,frame};- let result: any;- if (this._initializer.handle)- result = await func(source, JSHandle.from(this._initializer.handle));- else- result = await func(source, ...this._initializer.args!.map(parseResult));+ const result = await func(source, ...this._initializer.args.map(parseResult));this._channel.resolve({ result: serializeArgument(result) }).catch(() => {});} catch (e) {this._channel.reject({ error: serializeError(e) }).catch(() => {});diff --git a/packages/playwright-core/src/client/types.ts b/packages/playwright-core/src/client/types.tsindex af99141f73..5977bb5da6 100644--- a/packages/playwright-core/src/client/types.ts+++ b/packages/playwright-core/src/client/types.ts@@ -62,8 +62,6 @@ export type BrowserContextOptions = Omit<channels.BrowserNewContextOptions, 'vieviewport?: Size | null;extraHTTPHeaders?: Headers;logger?: Logger;- videosPath?: string;- videoSize?: Size;storageState?: string | SetStorageState;har?: {path: string;@@ -102,7 +100,6 @@ export type ConnectOptions = {exposeNetwork?: string;slowMo?: number;timeout?: number;- logger?: Logger;};export type LaunchServerOptions = LaunchOptions & {host?: string,diff --git a/packages/playwright-core/src/protocol/validator.ts b/packages/playwright-core/src/protocol/validator.tsindex cd2c1fb828..49bda468d3 100644--- a/packages/playwright-core/src/protocol/validator.ts+++ b/packages/playwright-core/src/protocol/validator.ts@@ -1036,7 +1036,6 @@ scheme.BrowserContextCookiesResult = tObject({});scheme.BrowserContextExposeBindingParams = tObject({name: tString,- needsHandle: tOptional(tBoolean),});scheme.BrowserContextExposeBindingResult = tObject({disposable: tChannel(['Disposable']),@@ -1283,7 +1282,6 @@ scheme.PageEmulateMediaParams = tObject({scheme.PageEmulateMediaResult = tOptional(tObject({}));scheme.PageExposeBindingParams = tObject({name: tString,- needsHandle: tOptional(tBoolean),});scheme.PageExposeBindingResult = tObject({disposable: tChannel(['Disposable']),@@ -2525,8 +2523,7 @@ scheme.WebSocketCloseEvent = tOptional(tObject({}));scheme.BindingCallInitializer = tObject({frame: tChannel(['Frame']),name: tString,- args: tOptional(tArray(tType('SerializedValue'))),- handle: tOptional(tChannel(['ElementHandle', 'JSHandle'])),+ args: tArray(tType('SerializedValue')),});scheme.BindingCallRejectParams = tObject({error: tType('SerializedError'),diff --git a/packages/playwright-core/src/server/browserContext.ts b/packages/playwright-core/src/server/browserContext.tsindex 41163bd7e7..7173434c83 100644--- a/packages/playwright-core/src/server/browserContext.ts+++ b/packages/playwright-core/src/server/browserContext.ts@@ -354,7 +354,7 @@ export abstract class BrowserContext<EM extends EventMap = EventMap> extends Sdkreturn this._playwrightBindingExposed !== undefined;}- async exposeBinding(progress: Progress, name: string, needsHandle: boolean, playwrightBinding: frames.FunctionWithSource, forClient?: unknown): Promise<PageBinding> {+ async exposeBinding(progress: Progress, name: string, playwrightBinding: frames.FunctionWithSource, forClient?: unknown): Promise<PageBinding> {if (this._pageBindings.has(name))throw new Error(`Function "${name}" has been already registered`);for (const page of this.pages()) {@@ -362,7 +362,7 @@ export abstract class BrowserContext<EM extends EventMap = EventMap> extends Sdkthrow new Error(`Function "${name}" has been already registered in one of the pages`);}await progress.race(this.exposePlaywrightBindingIfNeeded());- const binding = new PageBinding(this, name, playwrightBinding, needsHandle);+ const binding = new PageBinding(this, name, playwrightBinding);binding.forClient = forClient;this._pageBindings.set(name, binding);try {diff --git a/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.ts b/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.tsindex 83ea86ab1f..69453cfacc 100644--- a/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.ts+++ b/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.ts@@ -232,13 +232,13 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel}async exposeBinding(params: channels.BrowserContextExposeBindingParams, progress: Progress): Promise<channels.BrowserContextExposeBindingResult> {- const binding = await this._context.exposeBinding(progress, params.name, !!params.needsHandle, (source, ...args) => {+ const binding = await this._context.exposeBinding(progress, params.name, (source, ...args) => {// When reusing the context, we might have some bindings called late enough,// after context and page dispatchers have been disposed.if (this._disposed)return;const pageDispatcher = PageDispatcher.from(this, source.page);- const binding = new BindingCallDispatcher(pageDispatcher, params.name, !!params.needsHandle, source, args);+ const binding = new BindingCallDispatcher(pageDispatcher, params.name, source, args);this._dispatchEvent('bindingCall', { binding });return binding.promise();});diff --git a/packages/playwright-core/src/server/dispatchers/pageDispatcher.ts b/packages/playwright-core/src/server/dispatchers/pageDispatcher.tsindex f02882170b..5426544fd7 100644--- a/packages/playwright-core/src/server/dispatchers/pageDispatcher.ts+++ b/packages/playwright-core/src/server/dispatchers/pageDispatcher.ts@@ -38,7 +38,6 @@ import type { BrowserContext } from '../browserContext';import type { CRCoverage } from '../chromium/crCoverage';import type { Download } from '../download';import type { FileChooser } from '../fileChooser';-import type { JSHandle } from '../javascript';import type { BrowserContextDispatcher } from './browserContextDispatcher';import type { Frame } from '../frames';import type { RouteHandler } from '../network';@@ -136,12 +135,12 @@ export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, Brows}async exposeBinding(params: channels.PageExposeBindingParams, progress: Progress): Promise<channels.PageExposeBindingResult> {- const binding = await this._page.exposeBinding(progress, params.name, !!params.needsHandle, (source, ...args) => {+ const binding = await this._page.exposeBinding(progress, params.name, (source, ...args) => {// When reusing the context, we might have some bindings called late enough,// after context and page dispatchers have been disposed.if (this._disposed)return;- const binding = new BindingCallDispatcher(this, params.name, !!params.needsHandle, source, args);+ const binding = new BindingCallDispatcher(this, params.name, source, args);this._dispatchEvent('bindingCall', { binding });return binding.promise();});@@ -543,13 +542,12 @@ export class BindingCallDispatcher extends Dispatcher<SdkObject, channels.Bindinprivate _reject: ((error: any) => void) | undefined;private _promise: Promise<any>;- constructor(scope: PageDispatcher, name: string, needsHandle: boolean, source: { context: BrowserContext, page: Page, frame: Frame }, args: any[]) {+ constructor(scope: PageDispatcher, name: string, source: { context: BrowserContext, page: Page, frame: Frame }, args: any[]) {const frameDispatcher = FrameDispatcher.from(scope.parentScope(), source.frame);super(scope, new SdkObject(scope._object, 'bindingCall'), 'BindingCall', {frame: frameDispatcher,name,- args: needsHandle ? undefined : args.map(serializeResult),- handle: needsHandle ? ElementHandleDispatcher.fromJSOrElementHandle(frameDispatcher, args[0] as JSHandle) : undefined,+ args: args.map(serializeResult),});this._promise = new Promise((resolve, reject) => {this._resolve = resolve;diff --git a/packages/playwright-core/src/server/dispatchers/webSocketRouteDispatcher.ts b/packages/playwright-core/src/server/dispatchers/webSocketRouteDispatcher.tsindex 32972ec8af..35f50af8ba 100644--- a/packages/playwright-core/src/server/dispatchers/webSocketRouteDispatcher.ts+++ b/packages/playwright-core/src/server/dispatchers/webSocketRouteDispatcher.ts@@ -66,7 +66,7 @@ export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.Webthrow new Error('Another client is already routing WebSockets');if (!data) {data = { counter: 0, connection, binding: null as any };- data.binding = await context.exposeBinding(progress, kBindingName, false, (source, payload: ws.BindingPayload) => {+ data.binding = await context.exposeBinding(progress, kBindingName, (source, payload: ws.BindingPayload) => {if (payload.type === 'onCreate') {const contextDispatcher = connection.existingDispatcher<BrowserContextDispatcher>(context);const pageDispatcher = contextDispatcher ? PageDispatcher.fromNullable(contextDispatcher, source.page) : undefined;diff --git a/packages/playwright-core/src/server/launchApp.ts b/packages/playwright-core/src/server/launchApp.tsindex 40a999d47e..355af0ff4b 100644--- a/packages/playwright-core/src/server/launchApp.ts+++ b/packages/playwright-core/src/server/launchApp.ts@@ -105,7 +105,7 @@ export async function syncLocalStorageWithSettings(page: Page, appName: string)const controller = new ProgressController();await controller.run(async progress => {- await page.exposeBinding(progress, '_saveSerializedSettings', false, (_, settings) => {+ await page.exposeBinding(progress, '_saveSerializedSettings', (_, settings) => {fs.mkdirSync(path.dirname(settingsFile), { recursive: true });fs.writeFileSync(settingsFile, settings);});diff --git a/packages/playwright-core/src/server/page.ts b/packages/playwright-core/src/server/page.tsindex f6f6ce37af..257b657ba3 100644--- a/packages/playwright-core/src/server/page.ts+++ b/packages/playwright-core/src/server/page.ts@@ -334,13 +334,13 @@ export class Page extends SdkObject<PageEventMap> {return this.frameManager.frames();}- async exposeBinding(progress: Progress, name: string, needsHandle: boolean, playwrightBinding: frames.FunctionWithSource): Promise<PageBinding> {+ async exposeBinding(progress: Progress, name: string, playwrightBinding: frames.FunctionWithSource): Promise<PageBinding> {if (this._pageBindings.has(name))throw new Error(`Function "${name}" has been already registered`);if (this.browserContext._pageBindings.has(name))throw new Error(`Function "${name}" has been already registered in the browser context`);await progress.race(this.browserContext.exposePlaywrightBindingIfNeeded());- const binding = new PageBinding(this, name, playwrightBinding, needsHandle);+ const binding = new PageBinding(this, name, playwrightBinding);this._pageBindings.set(name, binding);try {await progress.race(this.delegate.addInitScript(binding.initScript));@@ -1013,16 +1013,14 @@ export class PageBinding extends DisposableObject {readonly name: string;readonly playwrightFunction: frames.FunctionWithSource;readonly initScript: InitScript;- readonly needsHandle: boolean;readonly cleanupScript: string;forClient?: unknown;- constructor(parent: BrowserContext | Page, name: string, playwrightFunction: frames.FunctionWithSource, needsHandle: boolean) {+ constructor(parent: BrowserContext | Page, name: string, playwrightFunction: frames.FunctionWithSource) {super(parent);this.name = name;this.playwrightFunction = playwrightFunction;- this.initScript = new InitScript(parent, `globalThis['${PageBinding.kController}'].addBinding(${JSON.stringify(name)}, ${needsHandle})`);- this.needsHandle = needsHandle;+ this.initScript = new InitScript(parent, `globalThis['${PageBinding.kController}'].addBinding(${JSON.stringify(name)})`);this.cleanupScript = `globalThis['${PageBinding.kController}'].removeBinding(${JSON.stringify(name)})`;}@@ -1033,16 +1031,10 @@ export class PageBinding extends DisposableObject {const binding = page.getBinding(name);if (!binding)throw new Error(`Function "${name}" is not exposed`);- let result: any;- if (binding.needsHandle) {- const handle = await context.evaluateExpressionHandle(`arg => globalThis['${PageBinding.kController}'].takeBindingHandle(arg)`, { isFunction: true }, { name, seq }).catch(e => null);- result = await binding.playwrightFunction({ frame: context.frame, page, context: page.browserContext }, handle);- } else {- if (!Array.isArray(serializedArgs))- throw new Error(`serializedArgs is not an array. This can happen when Array.prototype.toJSON is defined incorrectly`);- const args = serializedArgs!.map(a => parseEvaluationResultValue(a));- result = await binding.playwrightFunction({ frame: context.frame, page, context: page.browserContext }, ...args);- }+ if (!Array.isArray(serializedArgs))+ throw new Error(`serializedArgs is not an array. This can happen when Array.prototype.toJSON is defined incorrectly`);+ const args = serializedArgs.map(a => parseEvaluationResultValue(a));+ const result = await binding.playwrightFunction({ frame: context.frame, page, context: page.browserContext }, ...args);context.evaluateExpressionHandle(`arg => globalThis['${PageBinding.kController}'].deliverBindingResult(arg)`, { isFunction: true }, { name, seq, result }).catch(e => debugLogger.log('error', e));} catch (error) {context.evaluateExpressionHandle(`arg => globalThis['${PageBinding.kController}'].deliverBindingResult(arg)`, { isFunction: true }, { name, seq, error }).catch(e => debugLogger.log('error', e));diff --git a/packages/playwright-core/src/server/recorder.ts b/packages/playwright-core/src/server/recorder.tsindex 4f506e8506..c0a8c6dd9c 100644--- a/packages/playwright-core/src/server/recorder.ts+++ b/packages/playwright-core/src/server/recorder.ts@@ -167,7 +167,7 @@ export class Recorder extends EventEmitter<RecorderEventMap> implements Instrumeconst controller = new ProgressController();await controller.run(async progress => {- await this._context.exposeBinding(progress, '__pw_recorderState', false, async source => {+ await this._context.exposeBinding(progress, '__pw_recorderState', async source => {let actionSelector: string | undefined;let actionPoint: Point | undefined;const hasActiveScreenshotCommand = [...this._currentCallsMetadata.keys()].some(isScreenshotCommand);@@ -195,24 +195,24 @@ export class Recorder extends EventEmitter<RecorderEventMap> implements Instrumereturn uiState;});- await this._context.exposeBinding(progress, '__pw_recorderElementPicked', false, async ({ frame }, elementInfo: ElementInfo) => {+ await this._context.exposeBinding(progress, '__pw_recorderElementPicked', async ({ frame }, elementInfo: ElementInfo) => {const selectorChain = await generateFrameSelector(progress, frame);this.emit(RecorderEvent.ElementPicked, { selector: buildFullSelector(selectorChain, elementInfo.selector), ariaSnapshot: elementInfo.ariaSnapshot }, true);});- await this._context.exposeBinding(progress, '__pw_recorderSetMode', false, async ({ frame }, mode: Mode) => {+ await this._context.exposeBinding(progress, '__pw_recorderSetMode', async ({ frame }, mode: Mode) => {if (frame.parentFrame())return;await this.setMode(mode);});- await this._context.exposeBinding(progress, '__pw_recorderSetOverlayState', false, async ({ frame }, state: OverlayState) => {+ await this._context.exposeBinding(progress, '__pw_recorderSetOverlayState', async ({ frame }, state: OverlayState) => {if (frame.parentFrame())return;this._overlayState = state;});- await this._context.exposeBinding(progress, '__pw_resume', false, () => {+ await this._context.exposeBinding(progress, '__pw_resume', () => {this._debugger.resume();});@@ -227,11 +227,11 @@ export class Recorder extends EventEmitter<RecorderEventMap> implements Instrume// Input actions that potentially lead to navigation are intercepted on the page and are// performed by the Playwright.- await this._context.exposeBinding(progress, '__pw_recorderPerformAction', false,+ await this._context.exposeBinding(progress, '__pw_recorderPerformAction',(source: BindingSource, action: actions.PerformOnRecordAction) => this._performAction(progress, source.frame, action));// Other non-essential actions are simply being recorded.- await this._context.exposeBinding(progress, '__pw_recorderRecordAction', false,+ await this._context.exposeBinding(progress, '__pw_recorderRecordAction',(source: BindingSource, action: actions.Action) => this._recordAction(progress, source.frame, action));await progress.race(this._context.extendInjectedScript(rawRecorderSource.source, { recorderMode: this._recorderMode, hideToolbar: !!this._params.hideToolbar }));diff --git a/packages/playwright-core/src/server/recorder/recorderApp.ts b/packages/playwright-core/src/server/recorder/recorderApp.tsindex 06d504dc8d..f85f695741 100644--- a/packages/playwright-core/src/server/recorder/recorderApp.ts+++ b/packages/playwright-core/src/server/recorder/recorderApp.ts@@ -170,7 +170,7 @@ export class RecorderApp {},};- await this._page.exposeBinding(progress, 'sendCommand', false, async (_, data: any) => {+ await this._page.exposeBinding(progress, 'sendCommand', async (_, data: any) => {const { method, params } = data as { method: string; params: any };return await (dispatcher as any)[method].call(dispatcher, params);});diff --git a/packages/playwright-core/types/types.d.ts b/packages/playwright-core/types/types.d.tsindex e1e1e00b15..713631848c 100644--- a/packages/playwright-core/types/types.d.ts+++ b/packages/playwright-core/types/types.d.ts@@ -884,64 +884,12 @@ export interface Page {* information about the caller: `{ browserContext: BrowserContext, page: Page, frame: Frame }`.** See- * [browserContext.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding)+ * [browserContext.exposeBinding(name, callback)](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding)* for the context-wide version.** **NOTE** Functions installed via- * [page.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-page#page-expose-binding)- * survive navigations.- *- * **Usage**- *- * An example of exposing page URL to all frames in a page:- *- * ```js- * const { webkit } = require('playwright'); // Or 'chromium' or 'firefox'.- *- * (async () => {- * const browser = await webkit.launch({ headless: false });- * const context = await browser.newContext();- * const page = await context.newPage();- * await page.exposeBinding('pageURL', ({ page }) => page.url());- * await page.setContent(`- * <script>- * async function onClick() {- * document.querySelector('div').textContent = await window.pageURL();- * }- * </script>- * <button onclick="onClick()">Click me</button>- * <div></div>- * `);- * await page.click('button');- * })();- * ```- *- * @param name Name of the function on the window object.- * @param callback Callback function that will be called in the Playwright's context.- * @param options- */- exposeBinding(name: string, playwrightBinding: (source: BindingSource, arg: JSHandle) => any, options: { handle: true }): Promise<Disposable>;- /**- * The method adds a function called- * [`name`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-name) on the `window` object of- * every frame in this page. When called, the function executes- * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) and returns a- * [Promise] which resolves to the return value of- * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback). If the- * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) returns a [Promise],- * it will be awaited.- *- * The first argument of the- * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) function contains- * information about the caller: `{ browserContext: BrowserContext, page: Page, frame: Frame }`.- *- * See- * [browserContext.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding)- * for the context-wide version.- *- * **NOTE** Functions installed via- * [page.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-page#page-expose-binding)- * survive navigations.+ * [page.exposeBinding(name, callback)](https://playwright.dev/docs/api/class-page#page-expose-binding) survive+ * navigations.** **Usage***@@ -970,9 +918,8 @@ export interface Page {** @param name Name of the function on the window object.* @param callback Callback function that will be called in the Playwright's context.- * @param options*/- exposeBinding(name: string, playwrightBinding: (source: BindingSource, ...args: any[]) => any, options?: { handle?: boolean }): Promise<Disposable>;+ exposeBinding(name: string, playwrightBinding: (source: BindingSource, ...args: any[]) => any): Promise<Disposable>;/*** Removes all the listeners of the given type (or all registered listeners if no type given). Allows to wait for@@ -8174,56 +8121,8 @@ export interface BrowserContext {* [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)* function contains information about the caller: `{ browserContext: BrowserContext, page: Page, frame: Frame }`.*- * See [page.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-page#page-expose-binding)- * for page-only version.- *- * **Usage**- *- * An example of exposing page URL to all frames in all pages in the context:- *- * ```js- * const { webkit } = require('playwright'); // Or 'chromium' or 'firefox'.- *- * (async () => {- * const browser = await webkit.launch({ headless: false });- * const context = await browser.newContext();- * await context.exposeBinding('pageURL', ({ page }) => page.url());- * const page = await context.newPage();- * await page.setContent(`- * <script>- * async function onClick() {- * document.querySelector('div').textContent = await window.pageURL();- * }- * </script>- * <button onclick="onClick()">Click me</button>- * <div></div>- * `);- * await page.getByRole('button').click();- * })();- * ```- *- * @param name Name of the function on the window object.- * @param callback Callback function that will be called in the Playwright's context.- * @param options- */- exposeBinding(name: string, playwrightBinding: (source: BindingSource, arg: JSHandle) => any, options: { handle: true }): Promise<Disposable>;- /**- * The method adds a function called- * [`name`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-name) on the- * `window` object of every frame in every page in the context. When called, the function executes- * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)- * and returns a [Promise] which resolves to the return value of- * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback).- * If the- * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)- * returns a [Promise], it will be awaited.- *- * The first argument of the- * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)- * function contains information about the caller: `{ browserContext: BrowserContext, page: Page, frame: Frame }`.- *- * See [page.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-page#page-expose-binding)- * for page-only version.+ * See [page.exposeBinding(name, callback)](https://playwright.dev/docs/api/class-page#page-expose-binding) for+ * page-only version.** **Usage***@@ -8252,9 +8151,8 @@ export interface BrowserContext {** @param name Name of the function on the window object.* @param callback Callback function that will be called in the Playwright's context.- * @param options*/- exposeBinding(name: string, playwrightBinding: (source: BindingSource, ...args: any[]) => any, options?: { handle?: boolean }): Promise<Disposable>;+ exposeBinding(name: string, playwrightBinding: (source: BindingSource, ...args: any[]) => any): Promise<Disposable>;/*** Adds a script which would be evaluated in one of the following scenarios:@@ -10352,26 +10250,6 @@ export interface Browser {*/userAgent?: string;- /**- * @deprecated Use [`recordVideo`](https://playwright.dev/docs/api/class-browser#browser-new-page-option-record-video) instead.- */- videoSize?: {- /**- * Video frame width.- */- width: number;-- /**- * Video frame height.- */- height: number;- };-- /**- * @deprecated Use [`recordVideo`](https://playwright.dev/docs/api/class-browser#browser-new-page-option-record-video) instead.- */- videosPath?: string;-/*** Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent* viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).@@ -15657,30 +15535,6 @@ export interface BrowserType<Unused = {}> {*/userAgent?: string;- /**- * @deprecated Use- * [`recordVideo`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-record-video)- * instead.- */- videoSize?: {- /**- * Video frame width.- */- width: number;-- /**- * Video frame height.- */- height: number;- };-- /**- * @deprecated Use- * [`recordVideo`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-record-video)- * instead.- */- videosPath?: string;-/*** Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent* viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).@@ -17611,30 +17465,6 @@ export interface AndroidDevice {*/userAgent?: string;- /**- * @deprecated Use- * [`recordVideo`](https://playwright.dev/docs/api/class-androiddevice#android-device-launch-browser-option-record-video)- * instead.- */- videoSize?: {- /**- * Video frame width.- */- width: number;-- /**- * Video frame height.- */- height: number;- };-- /**- * @deprecated Use- * [`recordVideo`](https://playwright.dev/docs/api/class-androiddevice#android-device-launch-browser-option-record-video)- * instead.- */- videosPath?: string;-/*** Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent* viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).@@ -22723,12 +22553,6 @@ export interface ConnectOverCDPOptions {*/isLocal?: boolean;- /**- * Logger sink for Playwright logging. Optional.- * @deprecated The logs received by the logger are incomplete. Please use tracing instead.- */- logger?: Logger;-/*** Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going* on. Defaults to 0.@@ -22765,12 +22589,6 @@ export interface ConnectOptions {*/headers?: { [key: string]: string; };- /**- * Logger sink for Playwright logging. Optional.- * @deprecated The logs received by the logger are incomplete. Please use tracing instead.- */- logger?: Logger;-/*** Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going* on. Defaults to 0.@@ -23297,26 +23115,6 @@ export interface BrowserContextOptions {*/userAgent?: string;- /**- * @deprecated Use [`recordVideo`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-record-video) instead.- */- videoSize?: {- /**- * Video frame width.- */- width: number;-- /**- * Video frame height.- */- height: number;- };-- /**- * @deprecated Use [`recordVideo`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-record-video) instead.- */- videosPath?: string;-/*** Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent* viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).diff --git a/packages/protocol/src/channels.d.ts b/packages/protocol/src/channels.d.tsindex 570a5f6df4..30824236fd 100644--- a/packages/protocol/src/channels.d.ts+++ b/packages/protocol/src/channels.d.ts@@ -1819,10 +1819,9 @@ export type BrowserContextCookiesResult = {};export type BrowserContextExposeBindingParams = {name: string,- needsHandle?: boolean,};export type BrowserContextExposeBindingOptions = {- needsHandle?: boolean,+};export type BrowserContextExposeBindingResult = {disposable: DisposableChannel,@@ -2273,10 +2272,9 @@ export type PageEmulateMediaOptions = {export type PageEmulateMediaResult = void;export type PageExposeBindingParams = {name: string,- needsHandle?: boolean,};export type PageExposeBindingOptions = {- needsHandle?: boolean,+};export type PageExposeBindingResult = {disposable: DisposableChannel,@@ -4354,8 +4352,7 @@ export interface WebSocketEvents {export type BindingCallInitializer = {frame: FrameChannel,name: string,- args?: SerializedValue[],- handle?: JSHandleChannel,+ args: SerializedValue[],};export interface BindingCallEventTarget {}diff --git a/packages/protocol/src/protocol.yml b/packages/protocol/src/protocol.ymlindex 4d5b81c41a..afec91adad 100644--- a/packages/protocol/src/protocol.yml+++ b/packages/protocol/src/protocol.yml@@ -1281,7 +1281,6 @@ BrowserContext:group: configurationparameters:name: string- needsHandle: boolean?returns:disposable: Disposable@@ -1679,7 +1678,6 @@ Page:group: configurationparameters:name: string- needsHandle: boolean?returns:disposable: Disposable@@ -3874,9 +3872,8 @@ BindingCall:frame: Framename: stringargs:- type: array?+ type: arrayitems: SerializedValue- handle: JSHandle?commands:diff --git a/tests/bidi/expectations/bidi-chromium-page.txt b/tests/bidi/expectations/bidi-chromium-page.txtindex c358d13006..3fae49615c 100644--- a/tests/bidi/expectations/bidi-chromium-page.txt+++ b/tests/bidi/expectations/bidi-chromium-page.txt@@ -128,7 +128,6 @@ page/page-event-request.spec.ts › should not expose preflight OPTIONS requestpage/page-event-request.spec.ts › should report navigation requests and responses handled by service worker with routing [fail]page/page-event-request.spec.ts › should report requests and responses handled by service worker [fail]page/page-event-request.spec.ts › should report requests and responses handled by service worker with routing [timeout]-page/page-expose-function.spec.ts › exposeBinding(handle) should work with element handles [timeout]page/page-expose-function.spec.ts › should be callable from-inside addInitScript [timeout]page/page-expose-function.spec.ts › should not result in unhandled rejection [timeout]page/page-expose-function.spec.ts › should work on frames [flaky]diff --git a/tests/library/browsercontext-expose-function.spec.ts b/tests/library/browsercontext-expose-function.spec.tsindex c485dce08b..ab1acc37ab 100644--- a/tests/library/browsercontext-expose-function.spec.ts+++ b/tests/library/browsercontext-expose-function.spec.ts@@ -16,7 +16,6 @@*/import { contextTest as it, expect } from '../config/browserTest';-import type { JSHandle } from '@playwright/test';it('expose binding should work', async ({ context }) => {let bindingSource: any;@@ -90,20 +89,6 @@ it('should be callable from-inside addInitScript', async ({ context, server }) =await expect.poll(() => args).toEqual(['context', 'page']);});-it('exposeBindingHandle should work', async ({ context }) => {- let target!: JSHandle<any>;- await context.exposeBinding('logme', (source, t) => {- target = t;- return 17;- }, { handle: true });- const page = await context.newPage();- const result = await page.evaluate(async function() {- return (window as any)['logme']({ foo: 42 });- });- expect(await target.evaluate(x => x.foo)).toBe(42);- expect(result).toEqual(17);-});-it('should work with CSP', async ({ page, context, server }) => {server.setCSP('/empty.html', 'default-src "self"');await page.goto(server.EMPTY_PAGE);diff --git a/tests/library/chromium/connect-over-cdp.spec.ts b/tests/library/chromium/connect-over-cdp.spec.tsindex 72a84499af..2becc9d0fd 100644--- a/tests/library/chromium/connect-over-cdp.spec.ts+++ b/tests/library/chromium/connect-over-cdp.spec.ts@@ -43,33 +43,6 @@ test('should connect to an existing cdp session', async ({ browserType, mode },}});-test('should use logger in default context', async ({ browserType }, testInfo) => {- test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/28813' });- const port = 9339 + testInfo.workerIndex;- const browserServer = await browserType.launch({- args: ['--remote-debugging-port=' + port]- });- try {- const log = [];- const browser = await browserType.connectOverCDP({- endpointURL: `http://127.0.0.1:${port}/`,- logger: {- log: (name, severity, message) => log.push({ name, severity, message }),- isEnabled: (name, severity) => severity !== 'verbose'- }- });- const page = await browser.contexts()[0].newPage();- await page.setContent('<button>Button</button>');- await page.click('button');- await browser.close();- expect(log.length > 0).toBeTruthy();- expect(log.filter(item => item.message.includes('page.setContent')).length > 0).toBeTruthy();- expect(log.filter(item => item.message.includes('page.click')).length > 0).toBeTruthy();- } finally {- await browserServer.close();- }-});-test('should cleanup artifacts dir after connectOverCDP disconnects due to ws close', async ({ browserType, toImpl, mode }, testInfo) => {const port = 9339 + testInfo.workerIndex;const browserServer = await browserType.launch({diff --git a/tests/library/video.spec.ts b/tests/library/video.spec.tsindex a0c97146f3..0bdd999cbf 100644--- a/tests/library/video.spec.ts+++ b/tests/library/video.spec.ts@@ -106,11 +106,6 @@ it.describe('screencast', () => {expect(page.video()).toBeNull();});- it('videoSize should require videosPath', async ({ browser }) => {- const error = await browser.newContext({ videoSize: { width: 100, height: 100 } }).catch(e => e);- expect(error.message).toContain('"videoSize" option requires "videosPath" to be specified');- });-it('should not throw without recordVideo.dir', async ({ browser }) => {await browser.newContext({ recordVideo: {} });});diff --git a/tests/page/page-expose-function.spec.ts b/tests/page/page-expose-function.spec.tsindex 8e92215ff3..79c354791c 100644--- a/tests/page/page-expose-function.spec.ts+++ b/tests/page/page-expose-function.spec.ts@@ -16,7 +16,6 @@*/import { test as it, expect } from './pageTest';-import type { ElementHandle } from 'playwright-core';it('exposeBinding should work @smoke', async ({ page }) => {let bindingSource;@@ -184,76 +183,12 @@ it('should work with complex objects', async ({ page, server }) => {expect(result.x).toBe(7);});-it('exposeBindingHandle should work', async ({ page }) => {- let target;- await page.exposeBinding('logme', (source, t) => {- target = t;- return 17;- }, { handle: true });- const result = await page.evaluate(async function() {- return window['logme']({ foo: 42 });- });- expect(await target.evaluate(x => x.foo)).toBe(42);- expect(result).toEqual(17);-});--it('exposeBindingHandle should not throw during navigation', async ({ page, server }) => {- await page.exposeBinding('logme', (source, t) => {- return 17;- }, { handle: true });- await page.goto(server.EMPTY_PAGE);- await Promise.all([- page.evaluate(async url => {- window['logme']({ foo: 42 });- window.location.href = url;- }, server.PREFIX + '/one-style.html'),- page.waitForNavigation({ waitUntil: 'load' }),- ]);-});-it('should throw for duplicate registrations', async ({ page }) => {await page.exposeFunction('foo', () => {});const error = await page.exposeFunction('foo', () => {}).catch(e => e);expect(error.message).toContain('page.exposeFunction: Function "foo" has been already registered');});-it('exposeBindingHandle should throw for multiple arguments', async ({ page }) => {- await page.exposeBinding('logme', (source, t) => {- return 17;- }, { handle: true });- expect(await page.evaluate(async function() {- return window['logme']({ foo: 42 });- })).toBe(17);- expect(await page.evaluate(async function() {- return window['logme']({ foo: 42 }, undefined, undefined);- })).toBe(17);- expect(await page.evaluate(async function() {- return window['logme'](undefined, undefined, undefined);- })).toBe(17);-- const error = await page.evaluate(async function() {- return window['logme'](1, 2);- }).catch(e => e);- expect(error.message).toContain('exposeBindingHandle supports a single argument, 2 received');-});--it('exposeBinding(handle) should work with element handles', async ({ page }) => {- let cb;- const promise = new Promise(f => cb = f);- await page.exposeBinding('clicked', async (source, element: ElementHandle) => {- cb(await element.innerText().catch(e => e));- }, { handle: true });- await page.goto('about:blank');- await page.setContent(`- <script>- document.addEventListener('click', event => window.clicked(event.target));- </script>- <div id="a1">Click me</div>- `);- await page.click('#a1');- expect(await promise).toBe('Click me');-});-it('should work with setContent', async ({ page, server }) => {await page.exposeFunction('compute', function(a, b) {return Promise.resolve(a * b);diff --git a/utils/generate_types/overrides.d.ts b/utils/generate_types/overrides.d.tsindex 7d86dd472f..5a1b224213 100644--- a/utils/generate_types/overrides.d.ts+++ b/utils/generate_types/overrides.d.ts@@ -70,8 +70,7 @@ export interface Page {waitForSelector<K extends keyof HTMLElementTagNameMap>(selector: K, options: PageWaitForSelectorOptions): Promise<ElementHandleForTag<K> | null>;waitForSelector(selector: string, options: PageWaitForSelectorOptions): Promise<null|ElementHandle<SVGElement | HTMLElement>>;- exposeBinding(name: string, playwrightBinding: (source: BindingSource, arg: JSHandle) => any, options: { handle: true }): Promise<Disposable>;- exposeBinding(name: string, playwrightBinding: (source: BindingSource, ...args: any[]) => any, options?: { handle?: boolean }): Promise<Disposable>;+ exposeBinding(name: string, playwrightBinding: (source: BindingSource, ...args: any[]) => any): Promise<Disposable>;removeAllListeners(type?: string): this;removeAllListeners(type: string | undefined, options: {@@ -118,8 +117,7 @@ export interface Frame {}export interface BrowserContext {- exposeBinding(name: string, playwrightBinding: (source: BindingSource, arg: JSHandle) => any, options: { handle: true }): Promise<Disposable>;- exposeBinding(name: string, playwrightBinding: (source: BindingSource, ...args: any[]) => any, options?: { handle?: boolean }): Promise<Disposable>;+ exposeBinding(name: string, playwrightBinding: (source: BindingSource, ...args: any[]) => any): Promise<Disposable>;addInitScript<Arg>(script: PageFunction<Arg, any> | { path?: string, content?: string }, arg?: Arg): Promise<Disposable>;diff --git a/utils/generate_types/test/test.ts b/utils/generate_types/test/test.tsindex aba7594597..ff7b28a520 100644--- a/utils/generate_types/test/test.ts+++ b/utils/generate_types/test/test.ts@@ -122,11 +122,6 @@ playwright.chromium.launch().then(async browser => {console.log(content);});- await page.exposeBinding('clicked', async (source, handle) => {- await handle.asElement()!.textContent();- await source.page.goto('http://example.com');- }, { handle: true });-await page.emulateMedia({media: 'screen'});await page.pdf({ path: 'page.pdf' });