From 180446d20f03ccf75865301eb6acb51a04c4c170 Mon Sep 17 00:00:00 2001 From: Joel Einbinder Date: Tue, 23 Feb 2021 20:29:10 -0800 Subject: [PATCH] fix(types): restore electron types (#5574) --- types/types.d.ts | 11 +++++++---- utils/generate_types/overrides.d.ts | 13 ++++++++----- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/types/types.d.ts b/types/types.d.ts index 3eaccaf8ef..661959f90b 100644 --- a/types/types.d.ts +++ b/types/types.d.ts @@ -7042,6 +7042,9 @@ type AccessibilityNode = { export const selectors: Selectors; export const devices: Devices & DeviceDescriptor[]; +//@ts-ignore this will be any if electron is not installed +type ElectronType = typeof import('electron'); + /** * Electron application representation. You can use * [electron.launch([options])](https://playwright.dev/docs/api/class-electron#electronlaunchoptions) to obtain the @@ -7095,8 +7098,8 @@ export interface ElectronApplication { * @param pageFunction Function to be evaluated in the worker context. * @param arg Optional argument to pass to `pageFunction`. */ - evaluate(pageFunction: PageFunctionOn, arg: Arg): Promise; - evaluate(pageFunction: PageFunctionOn, arg?: any): Promise; + evaluate(pageFunction: PageFunctionOn, arg: Arg): Promise; + evaluate(pageFunction: PageFunctionOn, arg?: any): Promise; /** * Returns the return value of `pageFunction` as a [JSHandle]. @@ -7117,8 +7120,8 @@ export interface ElectronApplication { * @param pageFunction Function to be evaluated in the worker context. * @param arg */ - evaluateHandle(pageFunction: PageFunctionOn, arg: Arg): Promise>; - evaluateHandle(pageFunction: PageFunctionOn, arg?: any): Promise>; + evaluateHandle(pageFunction: PageFunctionOn, arg: Arg): Promise>; + evaluateHandle(pageFunction: PageFunctionOn, arg?: any): Promise>; /** * This event is issued when the application closes. */ diff --git a/utils/generate_types/overrides.d.ts b/utils/generate_types/overrides.d.ts index f5468f14fa..a178ff1e7e 100644 --- a/utils/generate_types/overrides.d.ts +++ b/utils/generate_types/overrides.d.ts @@ -222,12 +222,15 @@ type AccessibilityNode = { export const selectors: Selectors; export const devices: Devices & DeviceDescriptor[]; -export interface ElectronApplication { - evaluate(pageFunction: PageFunctionOn, arg: Arg): Promise; - evaluate(pageFunction: PageFunctionOn, arg?: any): Promise; +//@ts-ignore this will be any if electron is not installed +type ElectronType = typeof import('electron'); - evaluateHandle(pageFunction: PageFunctionOn, arg: Arg): Promise>; - evaluateHandle(pageFunction: PageFunctionOn, arg?: any): Promise>; +export interface ElectronApplication { + evaluate(pageFunction: PageFunctionOn, arg: Arg): Promise; + evaluate(pageFunction: PageFunctionOn, arg?: any): Promise; + + evaluateHandle(pageFunction: PageFunctionOn, arg: Arg): Promise>; + evaluateHandle(pageFunction: PageFunctionOn, arg?: any): Promise>; } export type AndroidElementInfo = {