github/puppeteer
0
0
Fork 0
mirror of https://github.com/puppeteer/puppeteer synced 2024-06-14 14:02:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove deferred from addStyleTag (#12166)

Browse Source
This commit is contained in:
Alex Rudenko 2024-03-27 19:30:20 +01:00 committed by GitHub
parent 957cb8ee6c
commit b1d30a6158
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/puppeteer-core/src/api/Frame.ts
View File

@ -18,7 +18,6 @@ import type {PuppeteerLifeCycleEvent} from '../cdp/LifecycleWatcher.js';
import {EventEmitter, type EventType} from '../common/EventEmitter.js'; import {EventEmitter, type EventType} from '../common/EventEmitter.js';
import {getQueryHandlerAndSelector} from '../common/GetQueryHandler.js'; import {getQueryHandlerAndSelector} from '../common/GetQueryHandler.js';
import {transposeIterableHandle} from '../common/HandleIterator.js'; import {transposeIterableHandle} from '../common/HandleIterator.js';
import {LazyArg} from '../common/LazyArg.js';
import type { import type {
Awaitable, Awaitable,
EvaluateFunc, EvaluateFunc,
@ -921,9 +920,9 @@ export abstract class Frame extends EventEmitter<FrameEvents> {
} }
return await this.mainRealm().transferHandle( return await this.mainRealm().transferHandle(
await this.isolatedRealm().evaluateHandle( await this.isolatedRealm().evaluateHandle(async ({url, content}) => {
async ({Deferred}, {url, content}) => { return await new Promise<HTMLStyleElement | HTMLLinkElement>(
const deferred = Deferred.create<void>(); (resolve, reject) => {
let element: HTMLStyleElement | HTMLLinkElement; let element: HTMLStyleElement | HTMLLinkElement;
if (!url) { if (!url) {
element = document.createElement('style'); element = document.createElement('style');
@ -937,14 +936,14 @@ export abstract class Frame extends EventEmitter<FrameEvents> {
element.addEventListener( element.addEventListener(
'load', 'load',
() => { () => {
deferred.resolve(); resolve(element);
}, },
{once: true} {once: true}
); );
element.addEventListener( element.addEventListener(
'error', 'error',
event => { event => {
deferred.reject( reject(
new Error( new Error(
(event as ErrorEvent).message ?? 'Could not load style' (event as ErrorEvent).message ?? 'Could not load style'
) )
@ -953,14 +952,10 @@ export abstract class Frame extends EventEmitter<FrameEvents> {
{once: true} {once: true}
); );
document.head.appendChild(element); document.head.appendChild(element);
await deferred.valueOrThrow();
return element; return element;
}, }
LazyArg.create(context => { );
return context.puppeteerUtil; }, options)
}),
options
)
); );
} }