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

microsoft · Dec 12, 2024 · 38758c0 · 38758c0
1 parent a4add6e
commit 38758c0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 25 deletions.
diff --git a/packages/playwright-core/browsers.json b/packages/playwright-core/browsers.json
@@ -7,24 +7,12 @@
       "installByDefault": true,
       "browserVersion": "132.0.6834.46"
     },
-    {
-      "name": "chromium-headless-shell",
-      "revision": "1152",
-      "installByDefault": true,
-      "browserVersion": "132.0.6834.46"
-    },
     {
       "name": "chromium-tip-of-tree",
       "revision": "1285",
       "installByDefault": false,
       "browserVersion": "133.0.6887.0"
     },
-    {
-      "name": "chromium-tip-of-tree-headless-shell",
-      "revision": "1285",
-      "installByDefault": false,
-      "browserVersion": "133.0.6887.0"
-    },
     {
       "name": "firefox",
       "revision": "1466",

diff --git a/packages/playwright-core/src/server/registry/index.ts b/packages/playwright-core/src/server/registry/index.ts
@@ -415,7 +415,14 @@ type 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 revisionOverride = (obj.revisionOverrides || {})[hostPlatform];
     const revision = revisionOverride || obj.revision;

diff --git a/utils/roll_browser.js b/utils/roll_browser.js
@@ -94,18 +94,6 @@ 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');
   }