Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mxschmitt merged 1 commit into from
Feb 6, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions packages/playwright-core/browsers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,24 @@
"installByDefault": true,
"browserVersion": "133.0.6943.35"
},
{
"name": "chromium-headless-shell",
"revision": "1157",
"installByDefault": true,
"browserVersion": "133.0.6943.35"
},
{
"name": "chromium-tip-of-tree",
"revision": "1300",
"installByDefault": false,
"browserVersion": "134.0.6998.0"
},
{
"name": "chromium-tip-of-tree-headless-shell",
"revision": "1300",
"installByDefault": false,
"browserVersion": "134.0.6998.0"
},
{
"name": "firefox",
"revision": "1474",
Expand Down
9 changes: 1 addition & 8 deletions packages/playwright-core/src/server/registry/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,14 +445,7 @@ type BrowsersJSONDescriptor = {
};

function readDescriptors(browsersJSON: BrowsersJSON): BrowsersJSONDescriptor[] {
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 => {
return (browsersJSON['browsers']).map(obj => {
const name = obj.name;
const revisionOverride = (obj.revisionOverrides || {})[hostPlatform];
const revision = revisionOverride || obj.revision;
Expand Down
12 changes: 12 additions & 0 deletions utils/roll_browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,18 @@ Example:
console.log('\nUpdating browser version in browsers.json...');
for (const descriptor of descriptors)
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');
}

Expand Down
Loading