Merge pull request #1349 from macbre/puppeteer/22.4.1

bump puppeteer to v22.4.1 (HeadlessChrome/122.0.0.0)
macbre · Mar 10, 2024 · d18d4da · d18d4da
2 parents 62bd88e + 633bfd1
commit d18d4da
Show file tree

Hide file tree

Showing 4 changed files with 197 additions and 99 deletions.
diff --git a/extensions/devices/devices.js b/extensions/devices/devices.js
@@ -5,16 +5,16 @@
 
 module.exports = function (phantomas) {
   const puppeteer = require("puppeteer"),
-    devices = puppeteer.devices,
-    // @see https://github.com/GoogleChrome/puppeteer/blob/master/DeviceDescriptors.js
+    devices = puppeteer.KnownDevices,
+    // @see https://github.com/puppeteer/puppeteer/blob/main/packages/puppeteer-core/src/common/Device.ts
     availableDevices = {
       phone: "Galaxy S5", // 360x640
       "phone-landscape": "Galaxy S5 landscape", // 640x360
       tablet: "Kindle Fire HDX", // 800x1200
       "tablet-landscape": "Kindle Fire HDX landscape", // 1280x800
     };
 
-  var device;
+  let device;
 
   // check if --phone or --tablet option was passed
   Object.keys(availableDevices).forEach(function (item) {

diff --git a/extensions/postLoadDelay/postLoadDelay.js b/extensions/postLoadDelay/postLoadDelay.js
@@ -3,6 +3,8 @@
  */
 "use strict";
 
+const { setTimeout } = require("timers/promises");
+
 module.exports = function (phantomas) {
   // e.g. --post-load-delay 5
   var delay = parseInt(phantomas.getParam("post-load-delay"), 10);
@@ -14,9 +16,9 @@ module.exports = function (phantomas) {
   // https://github.com/GoogleChrome/puppeteer/blob/v1.11.0/docs/api.md#framewaitforselectororfunctionortimeout-options-args
   phantomas.log("Will wait %d second(s) after load", delay);
 
-  phantomas.on("beforeClose", (page) => {
+  phantomas.on("beforeClose", async () => {
     phantomas.log("Sleeping for %d seconds", delay);
 
-    return page.waitForTimeout(delay * 1000);
+    return setTimeout(delay * 1000);
   });
 };