Merge pull request #18590 from timvandermeij/puppeteer-23

Upgrade Puppeteer to version 23.1.1
This commit is contained in:
Tim van der Meij 2024-08-29 20:14:19 +02:00 committed by GitHub
commit ea090fec02
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 46 additions and 51 deletions

9
.puppeteerrc Normal file
View file

@ -0,0 +1,9 @@
{
"chrome": {
"skipDownload": false
},
"firefox": {
"skipDownload": false,
"version": "nightly"
}
}

68
package-lock.json generated
View file

@ -5,7 +5,6 @@
"packages": { "packages": {
"": { "": {
"name": "pdf.js", "name": "pdf.js",
"hasInstallScript": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"devDependencies": { "devDependencies": {
"@babel/core": "^7.25.2", "@babel/core": "^7.25.2",
@ -21,7 +20,6 @@
"caniuse-lite": "^1.0.30001653", "caniuse-lite": "^1.0.30001653",
"canvas": "^2.11.2", "canvas": "^2.11.2",
"core-js": "^3.38.1", "core-js": "^3.38.1",
"cross-env": "^7.0.3",
"eslint": "^8.57.0", "eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"eslint-plugin-fetch-options": "^0.0.5", "eslint-plugin-fetch-options": "^0.0.5",
@ -54,7 +52,7 @@
"postcss-discard-comments": "^7.0.2", "postcss-discard-comments": "^7.0.2",
"postcss-nesting": "^13.0.0", "postcss-nesting": "^13.0.0",
"prettier": "^3.3.3", "prettier": "^3.3.3",
"puppeteer": "^22.15.0", "puppeteer": "^23.1.1",
"stylelint": "^16.8.2", "stylelint": "^16.8.2",
"stylelint-prettier": "^5.0.2", "stylelint-prettier": "^5.0.2",
"terser-webpack-plugin": "^5.3.10", "terser-webpack-plugin": "^5.3.10",
@ -2649,13 +2647,13 @@
} }
}, },
"node_modules/@puppeteer/browsers": { "node_modules/@puppeteer/browsers": {
"version": "2.3.0", "version": "2.3.1",
"resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz", "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.1.tgz",
"integrity": "sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==", "integrity": "sha512-uK7o3hHkK+naEobMSJ+2ySYyXtQkBxIH8Gn4MK9ciePjNV+Pf+PgY/W7iPzn2MTjl3stcYB5AlcTmPYw7AXDwA==",
"dev": true, "dev": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"debug": "^4.3.5", "debug": "^4.3.6",
"extract-zip": "^2.0.1", "extract-zip": "^2.0.1",
"progress": "^2.0.3", "progress": "^2.0.3",
"proxy-agent": "^6.4.0", "proxy-agent": "^6.4.0",
@ -3958,9 +3956,9 @@
} }
}, },
"node_modules/chromium-bidi": { "node_modules/chromium-bidi": {
"version": "0.6.3", "version": "0.6.4",
"resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.3.tgz", "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.4.tgz",
"integrity": "sha512-qXlsCmpCZJAnoTYI83Iu6EdYQpMYdVkCfq08KDh2pmlVqK5t5IA9mGs4/LwCwp4fqisSOMXZxP3HIh8w8aRn0A==", "integrity": "sha512-8zoq6ogmhQQkAKZVKO2ObFTl4uOkqoX1PlKQX3hZQ5E9cbUotcAb7h4pTNVAGGv8Z36PF3CtdOriEp/Rz82JqQ==",
"dev": true, "dev": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
@ -4409,24 +4407,6 @@
"url": "https://github.com/sponsors/sindresorhus" "url": "https://github.com/sponsors/sindresorhus"
} }
}, },
"node_modules/cross-env": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
"integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
"dev": true,
"dependencies": {
"cross-spawn": "^7.0.1"
},
"bin": {
"cross-env": "src/bin/cross-env.js",
"cross-env-shell": "src/bin/cross-env-shell.js"
},
"engines": {
"node": ">=10.14",
"npm": ">=6",
"yarn": ">=1"
}
},
"node_modules/cross-spawn": { "node_modules/cross-spawn": {
"version": "7.0.3", "version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@ -10622,36 +10602,39 @@
} }
}, },
"node_modules/puppeteer": { "node_modules/puppeteer": {
"version": "22.15.0", "version": "23.1.1",
"resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-22.15.0.tgz", "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.1.1.tgz",
"integrity": "sha512-XjCY1SiSEi1T7iSYuxS82ft85kwDJUS7wj1Z0eGVXKdtr5g4xnVcbjwxhq5xBnpK/E7x1VZZoJDxpjAOasHT4Q==", "integrity": "sha512-giN4Ikwl5hkkouH/dVyxIPTPslWuqZ8fjALdSw5Cvt+r0LuDpLdfPxRADlB75YJ2UjPZhgok+xYBYk8ffzv4MA==",
"dev": true, "dev": true,
"hasInstallScript": true, "hasInstallScript": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"@puppeteer/browsers": "2.3.0", "@puppeteer/browsers": "2.3.1",
"chromium-bidi": "0.6.4",
"cosmiconfig": "^9.0.0", "cosmiconfig": "^9.0.0",
"devtools-protocol": "0.0.1312386", "devtools-protocol": "0.0.1312386",
"puppeteer-core": "22.15.0" "puppeteer-core": "23.1.1",
"typed-query-selector": "^2.12.0"
}, },
"bin": { "bin": {
"puppeteer": "lib/esm/puppeteer/node/cli.js" "puppeteer": "lib/cjs/puppeteer/node/cli.js"
}, },
"engines": { "engines": {
"node": ">=18" "node": ">=18"
} }
}, },
"node_modules/puppeteer-core": { "node_modules/puppeteer-core": {
"version": "22.15.0", "version": "23.1.1",
"resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.15.0.tgz", "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.1.1.tgz",
"integrity": "sha512-cHArnywCiAAVXa3t4GGL2vttNxh7GqXtIYGym99egkNJ3oG//wL9LkvO4WE8W1TJe95t1F1ocu9X4xWaGsOKOA==", "integrity": "sha512-OeTqNiYGF9qZtwZU4Yc88DDqFJs4TJ4rnK81jkillh6MwDeQodyisM9xe5lBmPhwiDy92s5J5DQtQLjCKHFQ3g==",
"dev": true, "dev": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"@puppeteer/browsers": "2.3.0", "@puppeteer/browsers": "2.3.1",
"chromium-bidi": "0.6.3", "chromium-bidi": "0.6.4",
"debug": "^4.3.6", "debug": "^4.3.6",
"devtools-protocol": "0.0.1312386", "devtools-protocol": "0.0.1312386",
"typed-query-selector": "^2.12.0",
"ws": "^8.18.0" "ws": "^8.18.0"
}, },
"engines": { "engines": {
@ -12756,6 +12739,13 @@
"url": "https://github.com/sponsors/ljharb" "url": "https://github.com/sponsors/ljharb"
} }
}, },
"node_modules/typed-query-selector": {
"version": "2.12.0",
"resolved": "https://registry.npmjs.org/typed-query-selector/-/typed-query-selector-2.12.0.tgz",
"integrity": "sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==",
"dev": true,
"license": "MIT"
},
"node_modules/typescript": { "node_modules/typescript": {
"version": "5.5.4", "version": "5.5.4",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",

View file

@ -15,7 +15,6 @@
"caniuse-lite": "^1.0.30001653", "caniuse-lite": "^1.0.30001653",
"canvas": "^2.11.2", "canvas": "^2.11.2",
"core-js": "^3.38.1", "core-js": "^3.38.1",
"cross-env": "^7.0.3",
"eslint": "^8.57.0", "eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"eslint-plugin-fetch-options": "^0.0.5", "eslint-plugin-fetch-options": "^0.0.5",
@ -48,7 +47,7 @@
"postcss-discard-comments": "^7.0.2", "postcss-discard-comments": "^7.0.2",
"postcss-nesting": "^13.0.0", "postcss-nesting": "^13.0.0",
"prettier": "^3.3.3", "prettier": "^3.3.3",
"puppeteer": "^22.15.0", "puppeteer": "^23.1.1",
"stylelint": "^16.8.2", "stylelint": "^16.8.2",
"stylelint-prettier": "^5.0.2", "stylelint-prettier": "^5.0.2",
"terser-webpack-plugin": "^5.3.10", "terser-webpack-plugin": "^5.3.10",
@ -60,9 +59,6 @@
"webpack-stream": "^7.0.0", "webpack-stream": "^7.0.0",
"yargs": "^17.7.2" "yargs": "^17.7.2"
}, },
"scripts": {
"postinstall": "cross-env PUPPETEER_PRODUCT=firefox node node_modules/puppeteer/install.mjs"
},
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/mozilla/pdf.js.git" "url": "git://github.com/mozilla/pdf.js.git"

View file

@ -1675,7 +1675,7 @@ describe("FreeText Editor", () => {
clip: rect, clip: rect,
type: "png", type: "png",
}); });
const editorImage = PNG.sync.read(editorPng); const editorImage = PNG.sync.read(Buffer.from(editorPng));
const editorFirstPix = getFirstPixel( const editorFirstPix = getFirstPixel(
editorImage.data, editorImage.data,
editorImage.width, editorImage.width,
@ -1703,7 +1703,7 @@ describe("FreeText Editor", () => {
clip: rect, clip: rect,
type: "png", type: "png",
}); });
const editorImage = PNG.sync.read(editorPng); const editorImage = PNG.sync.read(Buffer.from(editorPng));
const editorFirstPix = getFirstPixel( const editorFirstPix = getFirstPixel(
editorImage.data, editorImage.data,
editorImage.width, editorImage.width,
@ -1836,7 +1836,7 @@ describe("FreeText Editor", () => {
clip: rect, clip: rect,
type: "png", type: "png",
}); });
const editorImage = PNG.sync.read(editorPng); const editorImage = PNG.sync.read(Buffer.from(editorPng));
const editorFirstPix = getFirstPixel( const editorFirstPix = getFirstPixel(
editorImage.data, editorImage.data,
editorImage.width, editorImage.width,
@ -1870,7 +1870,7 @@ describe("FreeText Editor", () => {
clip: rect, clip: rect,
type: "png", type: "png",
}); });
const editorImage = PNG.sync.read(editorPng); const editorImage = PNG.sync.read(Buffer.from(editorPng));
const editorFirstPix = getFirstPixel( const editorFirstPix = getFirstPixel(
editorImage.data, editorImage.data,
editorImage.width, editorImage.width,
@ -3589,7 +3589,7 @@ describe("FreeText Editor", () => {
"[data-annotation-id='998R']", "[data-annotation-id='998R']",
el => (el.hidden = false) el => (el.hidden = false)
); );
let editorImage = PNG.sync.read(editorPng); let editorImage = PNG.sync.read(Buffer.from(editorPng));
expect(editorImage.data.every(x => x === 0xff)) expect(editorImage.data.every(x => x === 0xff))
.withContext(`In ${browserName}`) .withContext(`In ${browserName}`)
.toBeTrue(); .toBeTrue();
@ -3636,7 +3636,7 @@ describe("FreeText Editor", () => {
clip: editorRect, clip: editorRect,
type: "png", type: "png",
}); });
editorImage = PNG.sync.read(editorPng); editorImage = PNG.sync.read(Buffer.from(editorPng));
expect(editorImage.data.every(x => x === 0xff)) expect(editorImage.data.every(x => x === 0xff))
.withContext(`In ${browserName}`) .withContext(`In ${browserName}`)
.toBeFalse(); .toBeFalse();

View file

@ -882,7 +882,7 @@ async function startBrowser({
extraPrefsFirefox = {}, extraPrefsFirefox = {},
}) { }) {
const options = { const options = {
product: browserName, browser: browserName,
protocol: "webDriverBiDi", protocol: "webDriverBiDi",
headless, headless,
dumpio: true, dumpio: true,