From 6f5b3bc9b88c6d3204dda396f8963591ea6eb883 Mon Sep 17 00:00:00 2001 From: browser-automation-bot <133232582+browser-automation-bot@users.noreply.github.com> Date: Wed, 20 Mar 2024 07:57:06 +0100 Subject: [PATCH] feat: roll to Chrome 123.0.6312.58 (r1262506) (#12110) Co-authored-by: Alex Rudenko --- package-lock.json | 18 ++++++++++----- packages/puppeteer-core/package.json | 2 +- packages/puppeteer-core/src/revisions.ts | 4 ++-- packages/puppeteer/package.json | 3 ++- test/TestExpectations.json | 28 ++++++++++++------------ test/src/ariaqueryhandler.spec.ts | 11 ++-------- tools/update_chrome_revision.mjs | 6 +++++ versions.js | 3 ++- 8 files changed, 41 insertions(+), 34 deletions(-) diff --git a/package-lock.json b/package-lock.json index 92b9c04aa1af3..4958c01f18e5b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2918,11 +2918,6 @@ "node": ">= 14" } }, - "node_modules/devtools-protocol": { - "version": "0.0.1249869", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1249869.tgz", - "integrity": "sha512-Ctp4hInA0BEavlUoRy9mhGq0i+JSo/AwVyX2EFgZmV1kYB+Zq+EMBAn52QWu6FbRr10hRb6pBl420upbp4++vg==" - }, "node_modules/dezalgo": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz", @@ -12168,6 +12163,7 @@ "dependencies": { "@puppeteer/browsers": "2.2.0", "cosmiconfig": "9.0.0", + "devtools-protocol": "0.0.1262051", "puppeteer-core": "22.5.0" }, "bin": { @@ -12187,7 +12183,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": { @@ -12220,6 +12216,11 @@ "devtools-protocol": "*" } }, + "packages/puppeteer-core/node_modules/devtools-protocol": { + "version": "0.0.1262051", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1262051.tgz", + "integrity": "sha512-YJe4CT5SA8on3Spa+UDtNhEqtuV6Epwz3OZ4HQVLhlRccpZ9/PAYk0/cy/oKxFKRrZPBUPyxympQci4yWNWZ9g==" + }, "packages/puppeteer-core/node_modules/rxjs": { "version": "7.8.1", "dev": true, @@ -12262,6 +12263,11 @@ } } }, + "packages/puppeteer/node_modules/devtools-protocol": { + "version": "0.0.1262051", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1262051.tgz", + "integrity": "sha512-YJe4CT5SA8on3Spa+UDtNhEqtuV6Epwz3OZ4HQVLhlRccpZ9/PAYk0/cy/oKxFKRrZPBUPyxympQci4yWNWZ9g==" + }, "packages/puppeteer/node_modules/parse-json": { "version": "5.2.0", "license": "MIT", diff --git a/packages/puppeteer-core/package.json b/packages/puppeteer-core/package.json index 8d5fe73a31bbd..5e7e532f235b7 100644 --- 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 index f0491907ce2f9..554a36d6383d3 100644 --- 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 index 3716e9ba715a9..da7d093015122 100644 --- 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 index 9654c4e248a4c..7ad5e925ccfe4 100644 --- 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 index 0ffb8ae6a51ec..4ab1df3a0a39c 100644 --- a/test/src/ariaqueryhandler.spec.ts +++ b/test/src/ariaqueryhandler.spec.ts @@ -697,20 +697,13 @@ describe('AriaQueryHandler', () => { ElementHandle >; 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 index 64eeef74d5808..0083bc0bbbf31 100644 --- 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 index 998e4c56b2c92..87cd781dd6b4e 100644 --- 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(