From 06e816bbfa7b9ca84284929f654de7288c51169d Mon Sep 17 00:00:00 2001 From: Alex Rudenko Date: Thu, 12 Jan 2023 11:31:20 +0100 Subject: [PATCH] feat(chromium): roll to Chromium 110.0.5479.0 (r1083080) (#9500) Closes #9470 --- package-lock.json | 16 ++++++++-------- packages/puppeteer-core/package.json | 2 +- packages/puppeteer-core/src/revisions.ts | 2 +- test/TestExpectations.json | 6 ++++++ test/golden-chromium/csscoverage-involved.txt | 4 ++-- test/src/coverage.spec.ts | 2 +- test/src/page.spec.ts | 7 +------ versions.js | 3 ++- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index c4df2850fbe..a23537ba8a8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3022,9 +3022,9 @@ } }, "node_modules/devtools-protocol": { - "version": "0.0.1068969", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1068969.tgz", - "integrity": "sha512-ATFTrPbY1dKYhPPvpjtwWKSK2mIwGmRwX54UASn9THEuIZCe2n9k3vVuMmt6jWeL+e5QaaguEv/pMyR+JQB7VQ==" + "version": "0.0.1082910", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1082910.tgz", + "integrity": "sha512-RqoZ2GmqaNxyx+99L/RemY5CkwG9D0WEfOKxekwCRXOGrDCep62ngezEJUVMq6rISYQ+085fJnWDQqGHlxVNww==" }, "node_modules/diff": { "version": "5.1.0", @@ -8684,7 +8684,7 @@ "dependencies": { "cross-fetch": "3.1.5", "debug": "4.3.4", - "devtools-protocol": "0.0.1068969", + "devtools-protocol": "0.0.1082910", "extract-zip": "2.0.1", "https-proxy-agent": "5.0.1", "proxy-from-env": "1.1.0", @@ -11249,9 +11249,9 @@ } }, "devtools-protocol": { - "version": "0.0.1068969", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1068969.tgz", - "integrity": "sha512-ATFTrPbY1dKYhPPvpjtwWKSK2mIwGmRwX54UASn9THEuIZCe2n9k3vVuMmt6jWeL+e5QaaguEv/pMyR+JQB7VQ==" + "version": "0.0.1082910", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1082910.tgz", + "integrity": "sha512-RqoZ2GmqaNxyx+99L/RemY5CkwG9D0WEfOKxekwCRXOGrDCep62ngezEJUVMq6rISYQ+085fJnWDQqGHlxVNww==" }, "diff": { "version": "5.1.0", @@ -14092,7 +14092,7 @@ "requires": { "cross-fetch": "3.1.5", "debug": "4.3.4", - "devtools-protocol": "0.0.1068969", + "devtools-protocol": "0.0.1082910", "extract-zip": "2.0.1", "https-proxy-agent": "5.0.1", "proxy-from-env": "1.1.0", diff --git a/packages/puppeteer-core/package.json b/packages/puppeteer-core/package.json index 13ffec73e9e..5244f6ad51c 100644 --- a/packages/puppeteer-core/package.json +++ b/packages/puppeteer-core/package.json @@ -152,7 +152,7 @@ "dependencies": { "cross-fetch": "3.1.5", "debug": "4.3.4", - "devtools-protocol": "0.0.1068969", + "devtools-protocol": "0.0.1082910", "extract-zip": "2.0.1", "https-proxy-agent": "5.0.1", "proxy-from-env": "1.1.0", diff --git a/packages/puppeteer-core/src/revisions.ts b/packages/puppeteer-core/src/revisions.ts index 52cbe99a80c..02fe5577525 100644 --- a/packages/puppeteer-core/src/revisions.ts +++ b/packages/puppeteer-core/src/revisions.ts @@ -18,6 +18,6 @@ * @internal */ export const PUPPETEER_REVISIONS = Object.freeze({ - chromium: '1069273', + chromium: '1083080', firefox: 'latest', }); diff --git a/test/TestExpectations.json b/test/TestExpectations.json index f57cca20601..bd5c8f37937 100644 --- a/test/TestExpectations.json +++ b/test/TestExpectations.json @@ -1,4 +1,10 @@ [ + { + "testIdPattern": "[page.spec] Page BrowserContext.overridePermissions should trigger permission onchange", + "platforms": ["darwin", "linux", "win32"], + "parameters": ["chrome"], + "expectations": ["FAIL"] + }, { "testIdPattern": "[accessibility.spec]", "platforms": ["darwin", "linux", "win32"], diff --git a/test/golden-chromium/csscoverage-involved.txt b/test/golden-chromium/csscoverage-involved.txt index 9b851d0bd3c..189ae05f970 100644 --- a/test/golden-chromium/csscoverage-involved.txt +++ b/test/golden-chromium/csscoverage-involved.txt @@ -7,8 +7,8 @@ "end": 297 }, { - "start": 327, - "end": 433 + "start": 306, + "end": 435 } ], "text": "\n@charset \"utf-8\";\n@namespace svg url(http://www.w3.org/2000/svg);\n@font-face {\n font-family: \"Example Font\";\n src: url(\"./Dosis-Regular.ttf\");\n}\n\n#fluffy {\n border: 1px solid black;\n z-index: 1;\n /* -webkit-disabled-property: rgb(1, 2, 3) */\n -lol-cats: \"dogs\" /* non-existing property */\n}\n\n@media (min-width: 1px) {\n span {\n -webkit-border-radius: 10px;\n font-family: \"Example Font\";\n animation: 1s identifier;\n }\n}\n" diff --git a/test/src/coverage.spec.ts b/test/src/coverage.spec.ts index 3ae1af63370..89e6f2f5bce 100644 --- a/test/src/coverage.spec.ts +++ b/test/src/coverage.spec.ts @@ -279,7 +279,7 @@ describe('Coverage specs', function () { const coverage = await page.coverage.stopCSSCoverage(); expect(coverage.length).toBe(1); expect(coverage[0]!.url).toContain('/csscoverage/media.html'); - expect(coverage[0]!.ranges).toEqual([{start: 17, end: 38}]); + expect(coverage[0]!.ranges).toEqual([{start: 8, end: 40}]); }); it('should work with complicated usecases', async () => { const {page, server} = getTestState(); diff --git a/test/src/page.spec.ts b/test/src/page.spec.ts index e5700164bf5..4876d7dbf73 100644 --- a/test/src/page.spec.ts +++ b/test/src/page.spec.ts @@ -391,12 +391,7 @@ describe('Page', function () { expect(await getPermission(page, 'geolocation')).toBe('prompt'); }); it('should trigger permission onchange', async () => { - const {page, server, context, isHeadless} = getTestState(); - - // TODO: re-enable this test in headful once crbug.com/1324480 rolls out. - if (!isHeadless) { - return; - } + const {page, server, context} = getTestState(); await page.goto(server.EMPTY_PAGE); await page.evaluate(() => { diff --git a/versions.js b/versions.js index 531cc11739f..274398d6cd1 100644 --- a/versions.js +++ b/versions.js @@ -17,6 +17,7 @@ const versionsPerRelease = new Map([ // This is a mapping from Chromium version => Puppeteer version. // In Chromium roll patches, use `NEXT` for the Puppeteer version. + ['110.0.5479.0', 'NEXT'], ['109.0.5412.0', 'v19.4.0'], ['108.0.5351.0', 'v19.2.0'], ['107.0.5296.0', 'v18.1.0'], @@ -53,7 +54,7 @@ const versionsPerRelease = new Map([ ['73.0.3679.0', 'v1.12.2'], ]); -// Should not be more then 2 major versions behind Chrome Stable (https://chromestatus.com/roadmap). +// Should not be more than 2 major versions behind Chrome Stable (https://chromestatus.com/roadmap). const lastMaintainedChromiumVersion = '107.0.5296.0'; if (!versionsPerRelease.has(lastMaintainedChromiumVersion)) {