Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chore: tidy up headless-shell hacks (#33967)

Browse source
This commit is contained in:
Max Schmitt 2024-12-12 12:23:03 -08:00 committed by GitHub
parent a4add6ebaf
commit 38758c0596
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
packages/playwright-core/browsers.json
View file

@ -7,24 +7,12 @@
"installByDefault": true, "installByDefault": true,
"browserVersion": "132.0.6834.46" "browserVersion": "132.0.6834.46"
}, },
{
"name": "chromium-headless-shell",
"revision": "1152",
"installByDefault": true,
"browserVersion": "132.0.6834.46"
},
{ {
"name": "chromium-tip-of-tree", "name": "chromium-tip-of-tree",
"revision": "1285", "revision": "1285",
"installByDefault": false, "installByDefault": false,
"browserVersion": "133.0.6887.0" "browserVersion": "133.0.6887.0"
}, },
{
"name": "chromium-tip-of-tree-headless-shell",
"revision": "1285",
"installByDefault": false,
"browserVersion": "133.0.6887.0"
},
{ {
"name": "firefox", "name": "firefox",
"revision": "1466", "revision": "1466",

9
packages/playwright-core/src/server/registry/index.ts
View file

@ -415,7 +415,14 @@ type BrowsersJSONDescriptor = {
}; };
function readDescriptors(browsersJSON: BrowsersJSON): BrowsersJSONDescriptor[] { function readDescriptors(browsersJSON: BrowsersJSON): BrowsersJSONDescriptor[] {
return (browsersJSON['browsers']).map(obj => { const headlessShells: BrowsersJSON['browsers'] = [];
for (const browserName of ['chromium', 'chromium-tip-of-tree']) {
headlessShells.push({
...browsersJSON.browsers.find(browser => browser.name === browserName)!,
name: `${browserName}-headless-shell`,
});
}
return [...browsersJSON.browsers, ...headlessShells].map(obj => {
const name = obj.name; const name = obj.name;
const revisionOverride = (obj.revisionOverrides || {})[hostPlatform]; const revisionOverride = (obj.revisionOverrides || {})[hostPlatform];
const revision = revisionOverride || obj.revision; const revision = revisionOverride || obj.revision;

12
utils/roll_browser.js
View file

@ -94,18 +94,6 @@ Example:
console.log('\nUpdating browser version in browsers.json...'); console.log('\nUpdating browser version in browsers.json...');
for (const descriptor of descriptors) for (const descriptor of descriptors)
descriptor.browserVersion = browserVersion; descriptor.browserVersion = browserVersion;
// 4.1 chromium-headless-shell is equal to chromium version.
if (browserName === 'chromium') {
const headlessShellBrowser = await browsersJSON.browsers.find(b => b.name === 'chromium-headless-shell');
headlessShellBrowser.revision = revision;
headlessShellBrowser.browserVersion = browserVersion;
} else if (browserName === 'chromium-tip-of-tree') {
const tipOfTreeBrowser = await browsersJSON.browsers.find(b => b.name === 'chromium-tip-of-tree-headless-shell');
tipOfTreeBrowser.revision = revision;
tipOfTreeBrowser.browserVersion = browserVersion;
}
fs.writeFileSync(path.join(CORE_PATH, 'browsers.json'), JSON.stringify(browsersJSON, null, 2) + '\n'); fs.writeFileSync(path.join(CORE_PATH, 'browsers.json'), JSON.stringify(browsersJSON, null, 2) + '\n');
} }