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 addScriptTag (#12165)

Browse Source
This commit is contained in:
Alex Rudenko 2024-03-27 17:23:51 +01:00 committed by GitHub
parent c9ad6b48c4
commit 957cb8ee6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -841,42 +841,37 @@ 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 ({Deferred}, {url, id, type, content}) => { async ({url, id, type, content}) => {
const deferred = Deferred.create<void>(); return await new Promise<HTMLScriptElement>((resolve, reject) => {
const script = document.createElement('script'); const script = document.createElement('script');
script.type = type; script.type = type;
script.text = content; script.text = content;
if (url) {
script.src = url;
script.addEventListener(
'load',
() => {
return deferred.resolve();
},
{once: true}
);
script.addEventListener( script.addEventListener(
'error', 'error',
event => { event => {
deferred.reject( reject(new Error(event.message ?? 'Could not load script'));
new Error(event.message ?? 'Could not load script')
);
}, },
{once: true} {once: true}
); );
} else { if (id) {
deferred.resolve(); script.id = id;
} }
if (id) { if (url) {
script.id = id; script.src = url;
} script.addEventListener(
document.head.appendChild(script); 'load',
await deferred.valueOrThrow(); () => {
return script; resolve(script);
},
{once: true}
);
document.head.appendChild(script);
} else {
document.head.appendChild(script);
resolve(script);
}
});
}, },
LazyArg.create(context => {
return context.puppeteerUtil;
}),
{...options, type, content} {...options, type, content}
) )
); );

4
test/TestExpectations.json
View File

@ -649,7 +649,7 @@
"platforms": ["darwin", "linux", "win32"], "platforms": ["darwin", "linux", "win32"],
"parameters": ["webDriverBiDi"], "parameters": ["webDriverBiDi"],
"expectations": ["FAIL"], "expectations": ["FAIL"],
"comment": "TODO: add a comment explaining why this expectation is required (include links to issues)" "comment": "See https://github.com/puppeteer/puppeteer/issues/4840"
}, },
{ {
"testIdPattern": "[page.spec] Page Page.addStyleTag should throw when added with content to the CSP page", "testIdPattern": "[page.spec] Page Page.addStyleTag should throw when added with content to the CSP page",
@ -3010,7 +3010,7 @@
"platforms": ["darwin", "linux", "win32"], "platforms": ["darwin", "linux", "win32"],
"parameters": ["cdp", "chrome"], "parameters": ["cdp", "chrome"],
"expectations": ["SKIP"], "expectations": ["SKIP"],
"comment": "TODO: add a comment explaining why this expectation is required (include links to issues)" "comment": "See https://github.com/puppeteer/puppeteer/issues/4840"
}, },
{ {
"testIdPattern": "[page.spec] Page Page.addScriptTag should throw when added with content to the CSP page", "testIdPattern": "[page.spec] Page Page.addScriptTag should throw when added with content to the CSP page",