From 945351c91e81680eed45b87d9647af946ec3a92a Mon Sep 17 00:00:00 2001 From: Adam Raine <6752989+adamraine@users.noreply.github.com> Date: Mon, 10 Jun 2024 16:35:37 -0700 Subject: [PATCH] deps: upgrade puppeteer to 22.10.0 (#16054) --- core/test/scenarios/api-test-pptr.js | 13 ++++--- package.json | 4 +- yarn.lock | 56 ++++++++++++++-------------- 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/core/test/scenarios/api-test-pptr.js b/core/test/scenarios/api-test-pptr.js index 4eb9d1979d25..08ff01633985 100644 --- a/core/test/scenarios/api-test-pptr.js +++ b/core/test/scenarios/api-test-pptr.js @@ -190,10 +190,11 @@ describe('Individual modes API', function() { // @ts-expect-error .sort((a, b) => a.url.localeCompare(b.url)); - // These results will differ slightly from `yarn smoke oopif-scripts` - // The main worker requests will be assigned to the worker instead of the worker's parent - // This is because this test launches Chrome using puppeteer instead of Chrome launcher, - // and Puppeteer uses the flag `--disable-field-trial-config` + // These results can change depending on which Chrome version is used. + // The expectation here is tuned for ToT Chromium WITHOUT the `--disable-field-trial-config` + // + // Adding the `--disable-field-trial-config` flag or using Chrome canary can change which + // target the root worker requests are associated with. expect(networkRequests).toMatchInlineSnapshot(` Array [ Object { @@ -213,7 +214,7 @@ Array [ "url": "http://localhost:10200/simple-worker.js", }, Object { - "sessionTargetType": "worker", + "sessionTargetType": "page", "url": "http://localhost:10200/simple-worker.mjs", }, Object { @@ -233,7 +234,7 @@ Array [ "url": "http://localhost:10503/simple-worker.js", }, Object { - "sessionTargetType": "worker", + "sessionTargetType": "iframe", "url": "http://localhost:10503/simple-worker.mjs", }, ] diff --git a/package.json b/package.json index 72e222e6feda..59a6b99a0897 100644 --- a/package.json +++ b/package.json @@ -167,7 +167,7 @@ "pako": "^2.0.3", "preact": "^10.7.2", "pretty-json-stringify": "^0.0.2", - "puppeteer": "^22.6.5", + "puppeteer": "^22.10.0", "resolve": "^1.22.1", "rollup": "^2.52.7", "rollup-plugin-polyfill-node": "^0.12.0", @@ -200,7 +200,7 @@ "metaviewport-parser": "0.3.0", "open": "^8.4.0", "parse-cache-control": "1.0.1", - "puppeteer-core": "^22.6.5", + "puppeteer-core": "^22.10.0", "robots-parser": "^3.0.1", "semver": "^5.3.0", "speedline-core": "^1.4.3", diff --git a/yarn.lock b/yarn.lock index eca576551011..9cdb3467bb7c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1138,10 +1138,10 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= -"@puppeteer/browsers@2.2.2": - version "2.2.2" - resolved "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-2.2.2.tgz#c43b00a9808370fec3e548779d81d1e0b972e8bb" - integrity sha512-hZ/JhxPIceWaGSEzUZp83/8M49CoxlkuThfTR7t4AoCu5+ZvJ3vktLm60Otww2TXeROB5igiZ8D9oPQh6ckBVg== +"@puppeteer/browsers@2.2.3": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-2.2.3.tgz#ad6b79129c50825e77ddaba082680f4dad0b674e" + integrity sha512-bJ0UBsk0ESOs6RFcLXOt99a3yTDcOKlzfjad+rhFwdaG1Lu/Wzq58GHYCDTlZ9z6mldf4g+NTb+TXEfe0PpnsQ== dependencies: debug "4.3.4" extract-zip "2.0.1" @@ -2356,10 +2356,10 @@ chrome-launcher@^1.1.1: is-wsl "^2.2.0" lighthouse-logger "^2.0.1" -chromium-bidi@0.5.17: - version "0.5.17" - resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.5.17.tgz#04b66fa77f9ab80234b72206e71fc2af96fd08c4" - integrity sha512-BqOuIWUgTPj8ayuBFJUYCCuwIcwjBsb3/614P7tt1bEPJ4i1M0kCdIl0Wi9xhtswBXnfO2bTpTMkHD71H8rJMg== +chromium-bidi@0.5.19: + version "0.5.19" + resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.5.19.tgz#e4f4951b7d9b20d668d6b387839f7b7bf2d69ef4" + integrity sha512-UA6zL77b7RYCjJkZBsZ0wlvCTD+jTjllZ8f6wdO4buevXgTZYjV+XLB9CiEa2OuuTGGTLnI7eN9I60YxuALGQg== dependencies: mitt "3.0.1" urlpattern-polyfill "10.0.0" @@ -2938,7 +2938,7 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= -devtools-protocol@0.0.1262051, devtools-protocol@0.0.1299070: +devtools-protocol@0.0.1286932, devtools-protocol@0.0.1299070: version "0.0.1299070" resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1299070.tgz#b3e4cf0b678a46f0f907ae6e07e03ad3a53c00df" integrity sha512-+qtL3eX50qsJ7c+qVyagqi7AWMoQCBGNfoyJZMwm/NSXVqLYbuitrWEEIzxfUmTNy7//Xe8yhMmQ+elj3uAqSg== @@ -6035,26 +6035,26 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -puppeteer-core@22.6.5, puppeteer-core@^22.6.5: - version "22.6.5" - resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-22.6.5.tgz#320eb6ab51e479c6a04cbb831b414e1cd51a7220" - integrity sha512-s0/5XkAWe0/dWISiljdrybjwDCHhgN31Nu/wznOZPKeikgcJtZtbvPKBz0t802XWqfSQnQDt3L6xiAE5JLlfuw== +puppeteer-core@22.10.0, puppeteer-core@^22.10.0: + version "22.10.0" + resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-22.10.0.tgz#eef5735f90ed29e3b10815d142b3437e05939283" + integrity sha512-I54J4Vy4I07UHsgB1QSmuFoF7KNQjJWcvFBPhtY+ezMdBfwgGDr8dzYrJa11aPgP9kxIUHjhktcMmmfJkOAtTw== dependencies: - "@puppeteer/browsers" "2.2.2" - chromium-bidi "0.5.17" + "@puppeteer/browsers" "2.2.3" + chromium-bidi "0.5.19" debug "4.3.4" - devtools-protocol "0.0.1262051" - ws "8.16.0" + devtools-protocol "0.0.1286932" + ws "8.17.0" -puppeteer@^22.6.5: - version "22.6.5" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-22.6.5.tgz#f72246fef1d0e0451f6f79b48087905251fd474b" - integrity sha512-YuoRKGj3MxHhUwrey7vmNvU4odGdUdNsj1ee8pfcqQlLWIXfMOXZCAXh8xdzpZESHH3tCGWp2xmPZE8E6iUEWg== +puppeteer@^22.10.0: + version "22.10.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-22.10.0.tgz#10b7f8fbe5bd49933f1f3655f18573086290fefc" + integrity sha512-ZOkZd6a6t0BdKcWb0wAYHWQqCfdlN1PPnXOmg/XNrbo6gJhYWFX4qCNb6ahSn8TpAqBqLCoD4Q010F7GwOM7mA== dependencies: - "@puppeteer/browsers" "2.2.2" + "@puppeteer/browsers" "2.2.3" cosmiconfig "9.0.0" - devtools-protocol "0.0.1262051" - puppeteer-core "22.6.5" + devtools-protocol "0.0.1286932" + puppeteer-core "22.10.0" q@^1.5.1: version "1.5.1" @@ -7458,10 +7458,10 @@ write-file-atomic@^4.0.1: imurmurhash "^0.1.4" signal-exit "^3.0.7" -ws@8.16.0: - version "8.16.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" - integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ== +ws@8.17.0: + version "8.17.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.0.tgz#d145d18eca2ed25aaf791a183903f7be5e295fea" + integrity sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow== ws@>=7.4.6: version "8.13.0"