Skip to content

Commit e3ebba5

Browse files
authored
chore: cleanup code that is not used by cli anymore (#5005)
1 parent 7ff86a8 commit e3ebba5

File tree

9 files changed

+2
-144
lines changed

9 files changed

+2
-144
lines changed

src/client/frame.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -464,12 +464,6 @@ export class Frame extends ChannelOwner<channels.FrameChannel, channels.FrameIni
464464
return (await this._channel.title()).value;
465465
});
466466
}
467-
468-
// TODO: remove once playwright-cli does not use this one anymore.
469-
async _extendInjectedScript<Arg>(source: string, arg?: Arg): Promise<JSHandle> {
470-
const result = await this._channel.extendInjectedScript({ source, arg: serializeArgument(arg) });
471-
return JSHandle.from(result.handle);
472-
}
473467
}
474468

475469
export function verifyLoadState(name: string, waitUntil: LifecycleEvent): LifecycleEvent {

src/dispatchers/frameDispatcher.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,4 @@ export class FrameDispatcher extends Dispatcher<Frame, channels.FrameInitializer
233233
async title(): Promise<channels.FrameTitleResult> {
234234
return { value: await this._frame.title() };
235235
}
236-
237-
async extendInjectedScript(params: channels.FrameExtendInjectedScriptParams): Promise<channels.FrameExtendInjectedScriptResult> {
238-
return { handle: createHandle(this._scope, await this._frame.extendInjectedScript(params.source, parseArgument(params.arg))) };
239-
}
240236
}

src/protocol/channels.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1209,7 +1209,6 @@ export interface FrameChannel extends Channel {
12091209
uncheck(params: FrameUncheckParams, metadata?: Metadata): Promise<FrameUncheckResult>;
12101210
waitForFunction(params: FrameWaitForFunctionParams, metadata?: Metadata): Promise<FrameWaitForFunctionResult>;
12111211
waitForSelector(params: FrameWaitForSelectorParams, metadata?: Metadata): Promise<FrameWaitForSelectorResult>;
1212-
extendInjectedScript(params: FrameExtendInjectedScriptParams, metadata?: Metadata): Promise<FrameExtendInjectedScriptResult>;
12131212
}
12141213
export type FrameLoadstateEvent = {
12151214
add?: 'load' | 'domcontentloaded' | 'networkidle',
@@ -1669,16 +1668,6 @@ export type FrameWaitForSelectorOptions = {
16691668
export type FrameWaitForSelectorResult = {
16701669
element?: ElementHandleChannel,
16711670
};
1672-
export type FrameExtendInjectedScriptParams = {
1673-
source: string,
1674-
arg: SerializedArgument,
1675-
};
1676-
export type FrameExtendInjectedScriptOptions = {
1677-
1678-
};
1679-
export type FrameExtendInjectedScriptResult = {
1680-
handle: JSHandleChannel,
1681-
};
16821671

16831672
// ----------- Worker -----------
16841673
export type WorkerInitializer = {

src/protocol/protocol.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,14 +1396,6 @@ Frame:
13961396
returns:
13971397
element: ElementHandle?
13981398

1399-
extendInjectedScript:
1400-
experimental: True
1401-
parameters:
1402-
source: string
1403-
arg: SerializedArgument
1404-
returns:
1405-
handle: JSHandle
1406-
14071399
events:
14081400

14091401
loadstate:

src/protocol/validator.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -679,10 +679,6 @@ export function createScheme(tChannel: (name: string) => Validator): Scheme {
679679
timeout: tOptional(tNumber),
680680
state: tOptional(tEnum(['attached', 'detached', 'visible', 'hidden'])),
681681
});
682-
scheme.FrameExtendInjectedScriptParams = tObject({
683-
source: tString,
684-
arg: tType('SerializedArgument'),
685-
});
686682
scheme.WorkerEvaluateExpressionParams = tObject({
687683
expression: tString,
688684
isFunction: tBoolean,

src/utils/binaryPaths.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,11 @@ export function ffmpegExecutable(): string | undefined {
3434
}
3535

3636
function pathToExecutable(relative: string[]): string | undefined {
37-
const defaultPath = path.join(__dirname, '..', '..', ...relative);
38-
const localPath = path.join(path.dirname(process.argv[0]), relative[relative.length - 1]);
3937
try {
38+
const defaultPath = path.join(__dirname, '..', '..', ...relative);
4039
if (fs.existsSync(defaultPath))
4140
return defaultPath;
4241
} catch (e) {
4342
}
44-
45-
try {
46-
if (fs.existsSync(localPath))
47-
return localPath;
48-
} catch (e) {
49-
}
5043
}
5144

test/trace.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
import { it, expect } from './fixtures';
18-
import type * as trace from '../types/trace';
18+
import type * as trace from '../src/trace/traceTypes';
1919
import * as path from 'path';
2020
import * as fs from 'fs';
2121

types/trace.d.ts

Lines changed: 0 additions & 101 deletions
This file was deleted.

utils/generate_types/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ let hadChanges = false;
3636
if (!fs.existsSync(typesDir))
3737
fs.mkdirSync(typesDir)
3838
writeFile(path.join(typesDir, 'protocol.d.ts'), fs.readFileSync(path.join(PROJECT_DIR, 'src', 'server', 'chromium', 'protocol.ts'), 'utf8'));
39-
writeFile(path.join(typesDir, 'trace.d.ts'), fs.readFileSync(path.join(PROJECT_DIR, 'src', 'trace', 'traceTypes.ts'), 'utf8'));
4039
documentation = parseApi(path.join(PROJECT_DIR, 'docs', 'src', 'api'));
4140
documentation.filterForLanguage('js');
4241
documentation.copyDocsFromSuperclasses([]);

0 commit comments

Comments
 (0)