@browserless/goto 10.2.5 → 10.3.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "@browserless/goto",
   "description": "Go to a page aborting unnecessary requests",
   "homepage": "https://browserless.js.org/#/?id=gotopage-options",
-  "version": "10.2.5",
+  "version": "10.3.0",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -29,21 +29,21 @@
     "puppeteer"
   ],
   "dependencies": {
-    "@browserless/devices": "^10.2.5",
+    "@browserless/devices": "^10.3.0",
     "@cliqz/adblocker-puppeteer": "~1.26.15",
     "@kikobeats/time-span": "~1.0.3",
-    "@lukeed/ms": "~2.0.2",
     "debug-logfmt": "~1.2.1",
     "got": "~11.8.6",
     "is-url-http": "~2.3.7",
     "p-reflect": "~2.1.0",
     "p-timeout": "~4.1.0",
+    "pretty-ms": "~7.0.1",
     "shallow-equal": "~3.1.0",
     "tough-cookie": "~4.1.3"
   },
   "devDependencies": {
-    "@browserless/test": "^10.2.4",
-    "ava": "latest",
+    "@browserless/test": "^10.3.0",
+    "ava": "5",
     "p-wait-for": "3"
   },
   "engines": {
@@ -62,7 +62,7 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "d5f5d3bba991e4a2a3f88892e596414ce7a10688",
+  "gitHead": "6de02ac566c97aa7f31a3faaca0a02668884cd9c",
   "scripts": {
     "postinstall": "node scripts/postinstall",
     "test": "ava"

package/src/index.js

@@ -2,16 +2,16 @@
 
 const { PuppeteerBlocker } = require('@cliqz/adblocker-puppeteer')
 const { shallowEqualObjects } = require('shallow-equal')
+const { setTimeout } = require('node:timers/promises')
 const createDevices = require('@browserless/devices')
 const toughCookie = require('tough-cookie')
-const { format } = require('@lukeed/ms')
 const pReflect = require('p-reflect')
 const pTimeout = require('p-timeout')
 const isUrl = require('is-url-http')
 const path = require('path')
 const fs = require('fs')
 
-const timeSpan = require('@kikobeats/time-span')({ format: n => format(Math.round(n)) })
+const timeSpan = require('@kikobeats/time-span')({ format: require('pretty-ms') })
 
 const { DEFAULT_INTERCEPT_RESOLUTION_PRIORITY } = require('puppeteer')
 
@@ -204,7 +204,6 @@ module.exports = ({ defaultDevice = 'Macbook Pro 13', timeout: globalTimeout, ..
       waitForFunction,
       waitForSelector,
       waitForTimeout,
-      waitForXPath,
       waitUntil = 'auto',
       waitUntilAuto = _waitUntilAuto,
       onPageRequest,
@@ -371,15 +370,17 @@ module.exports = ({ defaultDevice = 'Macbook Pro 13', timeout: globalTimeout, ..
 
     for (const [key, value] of Object.entries({
       waitForSelector,
-      waitForXPath,
-      waitForFunction,
-      waitForTimeout
+      waitForFunction
     })) {
       if (value) {
         await run({ fn: page[key](value), timeout: gotoTimeout, debug: { [key]: value } })
       }
     }
 
+    if (waitForTimeout) {
+      await setTimeout(waitForTimeout)
+    }
+
     await inject(page, {
       timeout: actionTimeout,
       mediaType,