feat: roll to Chrome 123.0.6312.58 (r1262506) (#12110)

Co-authored-by: Alex Rudenko <alexrudenko@chromium.org>
puppeteer · Mar 20, 2024 · 6f5b3bc · 6f5b3bc
1 parent e6e861c
commit 6f5b3bc
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 34 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/puppeteer-core/package.json b/packages/puppeteer-core/package.json
@@ -122,7 +122,7 @@
     "@puppeteer/browsers": "2.2.0",
     "chromium-bidi": "0.5.13",
     "debug": "4.3.4",
-    "devtools-protocol": "0.0.1249869",
+    "devtools-protocol": "0.0.1262051",
     "ws": "8.16.0"
   },
   "devDependencies": {

diff --git a/packages/puppeteer-core/src/revisions.ts b/packages/puppeteer-core/src/revisions.ts
@@ -8,7 +8,7 @@
  * @internal
  */
 export const PUPPETEER_REVISIONS = Object.freeze({
-  chrome: '122.0.6261.128',
-  'chrome-headless-shell': '122.0.6261.128',
+  chrome: '123.0.6312.58',
+  'chrome-headless-shell': '123.0.6312.58',
   firefox: 'latest',
 });
diff --git a/packages/puppeteer/package.json b/packages/puppeteer/package.json
@@ -125,7 +125,8 @@
   "dependencies": {
     "cosmiconfig": "9.0.0",
     "puppeteer-core": "22.5.0",
-    "@puppeteer/browsers": "2.2.0"
+    "@puppeteer/browsers": "2.2.0",
+    "devtools-protocol": "0.0.1262051"
   },
   "devDependencies": {
     "@types/node": "18.17.15"

diff --git a/test/TestExpectations.json b/test/TestExpectations.json
@@ -223,20 +223,6 @@
     "expectations": ["SKIP"],
     "comment": "TODO: add a comment explaining why this expectation is required (include links to issues)"
   },
-  {
-    "testIdPattern": "[ariaqueryhandler.spec] AriaQueryHandler queryOne (Chromium web test) should find by role \"button\"",
-    "platforms": ["darwin", "linux", "win32"],
-    "parameters": ["webDriverBiDi"],
-    "expectations": ["FAIL"],
-    "comment": "TODO: add a comment explaining why this expectation is required (include links to issues)"
-  },
-  {
-    "testIdPattern": "[ariaqueryhandler.spec] AriaQueryHandler queryOne (Chromium web test) should find by role \"heading\"",
-    "platforms": ["darwin", "linux", "win32"],
-    "parameters": ["webDriverBiDi"],
-    "expectations": ["FAIL"],
-    "comment": "TODO: add a comment explaining why this expectation is required (include links to issues)"
-  },
   {
     "testIdPattern": "[autofill.spec] *",
     "platforms": ["darwin", "linux", "win32"],
@@ -924,6 +910,20 @@
     "expectations": ["FAIL"],
     "comment": "Change in A11Y tree on Canary"
   },
+  {
+    "testIdPattern": "[ariaqueryhandler.spec] AriaQueryHandler queryOne (Chromium web test) should find by role \"button\"",
+    "platforms": ["darwin", "linux", "win32"],
+    "parameters": ["firefox", "webDriverBiDi"],
+    "expectations": ["FAIL"],
+    "comment": "Querying by a11y attributes is not standard behavior"
+  },
+  {
+    "testIdPattern": "[ariaqueryhandler.spec] AriaQueryHandler queryOne (Chromium web test) should find by role \"heading\"",
+    "platforms": ["darwin", "linux", "win32"],
+    "parameters": ["firefox", "webDriverBiDi"],
+    "expectations": ["FAIL"],
+    "comment": "Querying by a11y attributes is not standard behavior"
+  },
   {
     "testIdPattern": "[bfcache.spec] BFCache can navigate to a BFCached page containing an OOPIF and a worker",
     "platforms": ["darwin", "linux", "win32"],

diff --git a/test/src/ariaqueryhandler.spec.ts b/test/src/ariaqueryhandler.spec.ts
@@ -697,20 +697,13 @@ describe('AriaQueryHandler', () => {
         ElementHandle<HTMLButtonElement>
       >;
       const ids = await getIds(found);
-      expect(ids).toEqual([
-        'node5',
-        'node6',
-        'node7',
-        'node8',
-        'node10',
-        'node21',
-      ]);
+      expect(ids).toEqual(['node5', 'node6', 'node8', 'node10', 'node21']);
     });
     it('should find by role "heading"', async () => {
       const {page} = await setupPage();
       const found = await page.$$('aria/[role="heading"]');
       const ids = await getIds(found);
-      expect(ids).toEqual(['shown', 'hidden', 'node11', 'node13']);
+      expect(ids).toEqual(['shown', 'node11', 'node13']);
     });
     it('should find both ignored and unignored', async () => {
       const {page} = await setupPage();

diff --git a/tools/update_chrome_revision.mjs b/tools/update_chrome_revision.mjs
@@ -99,6 +99,12 @@ async function updateDevToolsProtocolVersion(revision) {
     `"devtools-protocol": "${currentProtocol}"`,
     `"devtools-protocol": "${bestNewProtocol}"`
   );
+
+  await replaceInFile(
+    './packages/puppeteer/package.json',
+    `"devtools-protocol": "${currentProtocol}"`,
+    `"devtools-protocol": "${bestNewProtocol}"`
+  );
 }
 
 async function updateVersionFileLastMaintained(oldVersion, newVersion) {

diff --git a/versions.js b/versions.js
@@ -7,6 +7,7 @@
 const versionsPerRelease = new Map([
   // This is a mapping from Chrome version => Puppeteer version.
   // In Chrome roll patches, use `NEXT` for the Puppeteer version.
+  ['123.0.6312.58', 'NEXT'],
   ['122.0.6261.128', 'v22.5.0'],
   ['122.0.6261.111', 'v22.4.1'],
   ['122.0.6261.94', 'v22.4.0'],
@@ -67,7 +68,7 @@ const versionsPerRelease = new Map([
 ]);
 
 // Should not be more than 2 major versions behind Chrome Stable (https://chromestatus.com/roadmap).
-const lastMaintainedChromeVersion = '119.0.6045.105';
+const lastMaintainedChromeVersion = '120.0.6099.109';
 
 if (!versionsPerRelease.has(lastMaintainedChromeVersion)) {
   throw new Error(