Merge pull request #18590 from timvandermeij/puppeteer-23

Upgrade Puppeteer to version 23.1.1
mozilla · Aug 29, 2024 · ea090fe · ea090fe
2 parents a41cd38 + 54eead7
commit ea090fe
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 51 deletions.
diff --git a/.puppeteerrc b/.puppeteerrc
@@ -0,0 +1,9 @@
+{
+  "chrome": {
+    "skipDownload": false
+  },
+  "firefox": {
+    "skipDownload": false,
+    "version": "nightly"
+  }
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,7 +15,6 @@
     "caniuse-lite": "^1.0.30001653",
     "canvas": "^2.11.2",
     "core-js": "^3.38.1",
-    "cross-env": "^7.0.3",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-fetch-options": "^0.0.5",
@@ -48,7 +47,7 @@
     "postcss-discard-comments": "^7.0.2",
     "postcss-nesting": "^13.0.0",
     "prettier": "^3.3.3",
-    "puppeteer": "^22.15.0",
+    "puppeteer": "^23.1.1",
     "stylelint": "^16.8.2",
     "stylelint-prettier": "^5.0.2",
     "terser-webpack-plugin": "^5.3.10",
@@ -60,9 +59,6 @@
     "webpack-stream": "^7.0.0",
     "yargs": "^17.7.2"
   },
-  "scripts": {
-    "postinstall": "cross-env PUPPETEER_PRODUCT=firefox node node_modules/puppeteer/install.mjs"
-  },
   "repository": {
     "type": "git",
     "url": "git://github.com/mozilla/pdf.js.git"

diff --git a/test/integration/freetext_editor_spec.mjs b/test/integration/freetext_editor_spec.mjs
@@ -1675,7 +1675,7 @@ describe("FreeText Editor", () => {
               clip: rect,
               type: "png",
             });
-            const editorImage = PNG.sync.read(editorPng);
+            const editorImage = PNG.sync.read(Buffer.from(editorPng));
             const editorFirstPix = getFirstPixel(
               editorImage.data,
               editorImage.width,
@@ -1703,7 +1703,7 @@ describe("FreeText Editor", () => {
               clip: rect,
               type: "png",
             });
-            const editorImage = PNG.sync.read(editorPng);
+            const editorImage = PNG.sync.read(Buffer.from(editorPng));
             const editorFirstPix = getFirstPixel(
               editorImage.data,
               editorImage.width,
@@ -1836,7 +1836,7 @@ describe("FreeText Editor", () => {
               clip: rect,
               type: "png",
             });
-            const editorImage = PNG.sync.read(editorPng);
+            const editorImage = PNG.sync.read(Buffer.from(editorPng));
             const editorFirstPix = getFirstPixel(
               editorImage.data,
               editorImage.width,
@@ -1870,7 +1870,7 @@ describe("FreeText Editor", () => {
               clip: rect,
               type: "png",
             });
-            const editorImage = PNG.sync.read(editorPng);
+            const editorImage = PNG.sync.read(Buffer.from(editorPng));
             const editorFirstPix = getFirstPixel(
               editorImage.data,
               editorImage.width,
@@ -3589,7 +3589,7 @@ describe("FreeText Editor", () => {
             "[data-annotation-id='998R']",
             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))
             .withContext(`In ${browserName}`)
             .toBeTrue();
@@ -3636,7 +3636,7 @@ describe("FreeText Editor", () => {
             clip: editorRect,
             type: "png",
           });
-          editorImage = PNG.sync.read(editorPng);
+          editorImage = PNG.sync.read(Buffer.from(editorPng));
           expect(editorImage.data.every(x => x === 0xff))
             .withContext(`In ${browserName}`)
             .toBeFalse();

diff --git a/test/test.mjs b/test/test.mjs
@@ -882,7 +882,7 @@ async function startBrowser({
   extraPrefsFirefox = {},
 }) {
   const options = {
-    product: browserName,
+    browser: browserName,
     protocol: "webDriverBiDi",
     headless,
     dumpio: true,