browsertime 23.4.5 → 23.5.0

package/CHANGELOG.md

@@ -1,6 +1,19 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
-## 23.4.4 -  2024-12-20
+## 23.5.0 -  2024-12-23
+### Added
+* Added `--userTimingBlockList` [#2227](https://github.com/sitespeedio/browsertime/pull/2227).
+
+### Fixed
+* Updated to webdriver 4.28 [#2226](https://github.com/sitespeedio/browsertime/pull/2226).
+* Updated dev dependencies [#2228](https://github.com/sitespeedio/browsertime/pull/2228).
+* Fix so the check for gnirehtet always use --android.gnirehtet to fix problens setting it in sitespeed.io [#2229](https://github.com/sitespeedio/browsertime/pull/2229).
+* Update to execa 9.5.2 [#2231](https://github.com/sitespeedio/browsertime/pull/2231).
+* Update to adbkit 3.3.8 [#2232](https://github.com/sitespeedio/browsertime/pull/2232).
+* Fix so you cannot use gnirehtet with webpagereplay [#2230](https://github.com/sitespeedio/browsertime/pull/2230).
+
+
+## 23.4.5 -  2024-12-20
 ### Fixed
 * Change bottom margin from 10 to 14 pixel when recoring a video on mobile, se bug [#2224](https://github.com/sitespeedio/browsertime/issues/2224) and PR [#2225](https://github.com/sitespeedio/browsertime/pull/2225).
 

package/lib/core/engine/command/measure.js

@@ -6,7 +6,10 @@ import { timestamp as _timestamp } from '../../../support/engineUtils.js';
 import { Video } from '../../../video/video.js';
 import { pathToFolder } from '../../../support/pathToFolder.js';
 import { setOrangeBackground } from '../../../video/screenRecording/setOrangeBackground.js';
-import { filterAllowlisted } from '../../../support/userTiming.js';
+import {
+  filterAllowlisted,
+  filterBlocklisted
+} from '../../../support/userTiming.js';
 import { isAndroidConfigured, Android } from '../../../android/index.js';
 import { TCPDump } from '../../../support/tcpdump.js';
 import { lcpHighlightScript as highlightLargestContentfulPaint } from './util/lcpHighlightScript.js';
@@ -643,6 +646,14 @@ export class Measure {
       );
     }
 
+    if (this.options.userTimingBlockList) {
+      filterBlocklisted(
+        this.result[this.numberOfMeasuredPages].browserScripts.timings
+          .userTimings,
+        this.options.userTimingAllowList
+      );
+    }
+
     if (isAndroidConfigured(this.options) && this.options.processStartTime) {
       const packageName =
         this.options.browser === 'firefox'

package/lib/core/engine/index.js

@@ -93,7 +93,7 @@ export class Engine {
       await android._init();
       this.android = android;
 
-      if (options.gnirehtet === true) {
+      if (options.android.gnirehtet === true && !options.webpagereplay) {
         this.gnirehtet = new Gnirehtet(options);
         await this.gnirehtet.start();
       }
@@ -520,7 +520,12 @@ export class Engine {
       }
     }
 
-    if (options.gnirehtet === true && this.gnirehtet) {
+    if (
+      !options.webpagereplay &&
+      options.android &&
+      options.android.gnirehtet === true &&
+      this.gnirehtet
+    ) {
       await this.gnirehtet.stop();
     }
 

package/lib/support/cli.js

@@ -1255,6 +1255,10 @@ export function parseCommandLine() {
       describe:
         'All userTimings are captured by default this option takes a regex that will allow which userTimings to capture in the results.'
     })
+    .option('userTimingBlockList', {
+      describe:
+        'All userTimings are captured by default this option takes a regex that will block some usertimings in the results.'
+    })
     .option('headless', {
       type: 'boolean',
       default: false,

package/lib/support/userTiming.js

@@ -5,3 +5,13 @@ export function filterAllowlisted(userTimings, allowlistRegex) {
     allowed.test(measure.name)
   );
 }
+
+export function filterBlocklisted(userTimings, blocklistRegex) {
+  const blocked = new RegExp(blocklistRegex);
+  userTimings.marks = userTimings.marks.filter(
+    mark => !blocked.test(mark.name)
+  );
+  userTimings.measures = userTimings.measures.filter(
+    measure => !blocked.test(measure.name)
+  );
+}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "browsertime",
   "description": "Get performance metrics from your web page using Browsertime.",
-  "version": "23.4.5",
+  "version": "23.5.0",
   "bin": "./bin/browsertime.js",
   "type": "module",
   "types": "./types/scripting.d.ts",
   "dependencies": {
     "@cypress/xvfb": "1.2.4",
-    "@devicefarmer/adbkit": "3.2.6",
+    "@devicefarmer/adbkit": "3.3.8",
     "@sitespeed.io/chromedriver": "131.0.6778-69",
     "@sitespeed.io/edgedriver": "126.0.2592-102",
     "@sitespeed.io/geckodriver": "0.35.0-1",
@@ -17,7 +17,7 @@
     "chrome-har": "1.0.1",
     "chrome-remote-interface": "0.33.2",
     "dayjs": "1.11.13",
-    "execa": "9.3.1",
+    "execa": "9.5.2",
     "fast-stats": "0.0.7",
     "ff-test-bidi-har-export": "0.0.17",
     "find-up": "7.0.0",
@@ -30,7 +30,7 @@
     "lodash.merge": "4.6.2",
     "lodash.pick": "4.4.0",
     "lodash.set": "4.3.2",
-    "selenium-webdriver": "4.26.0",
+    "selenium-webdriver": "4.27.0",
     "usb-power-profiling": "1.5.0",
     "yargs": "17.7.2"
   },
@@ -39,17 +39,17 @@
   },
   "devDependencies": {
     "@types/selenium-webdriver": "4.1.25",
-    "ava": "6.1.3",
+    "ava": "6.2.0",
     "clean-jsdoc-theme": "4.3.0",
-    "eslint": "9.8.0",
+    "eslint": "9.17.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "5.2.1",
-    "eslint-plugin-unicorn": "55.0.0",
-    "jsdoc": "4.0.3",
-    "prettier": "3.3.3",
-    "serve": "14.2.3",
-    "serve-handler": "6.1.5",
-    "typescript": "5.5.4"
+    "eslint-plugin-unicorn": "56.0.1",
+    "jsdoc": "4.0.4",
+    "prettier": "3.4.2",
+    "serve": "14.2.4",
+    "serve-handler": "6.1.6",
+    "typescript": "5.7.2"
   },
   "engines": {
     "node": ">=18.0.0"

package/types/core/engine/command/measure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"measure.d.ts","sourceRoot":"","sources":["../../../../lib/core/engine/command/measure.js"],"names":[],"mappings":"AA6BA;;;;;;GAMG;AACH;IACE,gQAuGC;IAxFC;;OAEG;IACH,gBAAsB;IACtB;;OAEG;IACH,0BAA0C;IAC1C;;OAEG;IACH,cAAkB;IAClB;;OAEG;IACH,eAAoB;IACpB;;OAEG;IACH,uBAAoC;IACpC;;OAEG;IACH,gBAAsB;IACtB;;OAEG;IACH,0BAA0C;IAC1C;;OAEG;IACH,uBAAoC;IACpC;;OAEG;IACH,oBAAyD;IACzD;;OAEG;IACH,eAAoB;IACpB;;OAEG;IACH,0BAA0C;IAC1C;;OAEG;IACH,+BAAoD;IACpD;;OAEG;IACH,uBAAoC;IACpC;;OAEG;IACH,gBAAsB;IACtB;;OAEG;IACH,8BAA8B;IAC9B;;OAEG;IACH,6BAA6B;IAC7B;;OAEG;IACH,uBAA2B;IAC3B;;OAEG;IACH,mBAAoB;IACpB;;OAEG;IACH,gBAA6D;IAC7D;;OAEG;IACH,2BAAsE;IACtE;;OAEG;IACH,uBAA8D;IAC9D;;OAEG;IACH,2BAAqE;IAGvE;;;OAGG;IACH,oBAsBC;IArBC,aAAuE;IAuBzE;;;OAGG;IACH,mBAKC;IAED;;;OAGG;IACH,eAyBC;IAED;;;OAGG;IACH,iBAQC;IAED;;;;;;;;;;;;OAYG;IACH,kBAmBC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,kBALW,MAAM,kBACN,MAAM,GAEJ,OAAO,CAAC,IAAI,CAAC,CAmFzB;IAED;;;;;;;;OAQG;IACH,0BAJW,MAAM,gBAiBhB;IACD;;;;;;;;;OASG;IACH,qBAJW,MAAM,gBAyEhB;IAED;;;;;;;OAOG;IACH,UAJW,MAAM,SACN,GAAC,QAWX;IAED;;;;;;;OAOG;IACH,6BAOC;IAED;;;OAGG;IACH,gBA4KC;CACF;sBAlqBqB,yBAAyB"}
+{"version":3,"file":"measure.d.ts","sourceRoot":"","sources":["../../../../lib/core/engine/command/measure.js"],"names":[],"mappings":"AAgCA;;;;;;GAMG;AACH;IACE,gQAuGC;IAxFC;;OAEG;IACH,gBAAsB;IACtB;;OAEG;IACH,0BAA0C;IAC1C;;OAEG;IACH,cAAkB;IAClB;;OAEG;IACH,eAAoB;IACpB;;OAEG;IACH,uBAAoC;IACpC;;OAEG;IACH,gBAAsB;IACtB;;OAEG;IACH,0BAA0C;IAC1C;;OAEG;IACH,uBAAoC;IACpC;;OAEG;IACH,oBAAyD;IACzD;;OAEG;IACH,eAAoB;IACpB;;OAEG;IACH,0BAA0C;IAC1C;;OAEG;IACH,+BAAoD;IACpD;;OAEG;IACH,uBAAoC;IACpC;;OAEG;IACH,gBAAsB;IACtB;;OAEG;IACH,8BAA8B;IAC9B;;OAEG;IACH,6BAA6B;IAC7B;;OAEG;IACH,uBAA2B;IAC3B;;OAEG;IACH,mBAAoB;IACpB;;OAEG;IACH,gBAA6D;IAC7D;;OAEG;IACH,2BAAsE;IACtE;;OAEG;IACH,uBAA8D;IAC9D;;OAEG;IACH,2BAAqE;IAGvE;;;OAGG;IACH,oBAsBC;IArBC,aAAuE;IAuBzE;;;OAGG;IACH,mBAKC;IAED;;;OAGG;IACH,eAyBC;IAED;;;OAGG;IACH,iBAQC;IAED;;;;;;;;;;;;OAYG;IACH,kBAmBC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,kBALW,MAAM,kBACN,MAAM,GAEJ,OAAO,CAAC,IAAI,CAAC,CAmFzB;IAED;;;;;;;;OAQG;IACH,0BAJW,MAAM,gBAiBhB;IACD;;;;;;;;;OASG;IACH,qBAJW,MAAM,gBAyEhB;IAED;;;;;;;OAOG;IACH,UAJW,MAAM,SACN,GAAC,QAWX;IAED;;;;;;;OAOG;IACH,6BAOC;IAED;;;OAGG;IACH,gBAoLC;CACF;sBA7qBqB,yBAAyB"}

package/types/support/storageManager.d.ts

@@ -1,6 +1,5 @@
 export class StorageManager {
     constructor(url: any, { resultDir, prettyPrint }?: {
-        resultDir: any;
         prettyPrint?: boolean;
     });
     baseDir: string;

package/types/support/storageManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storageManager.d.ts","sourceRoot":"","sources":["../../lib/support/storageManager.js"],"names":[],"mappings":"AAmDA;IACE;;;OAKC;IAJC,gBAE6D;IAC7D,wBAA0C;IAG5C,iCAGC;IAED,kDAIC;IAED,iCAEC;IAED,kEASC;IAED,sEAQC;IAED,+DAcC;IAED,sEAmBC;IAED,wBAEC;CACF"}
+{"version":3,"file":"storageManager.d.ts","sourceRoot":"","sources":["../../lib/support/storageManager.js"],"names":[],"mappings":"AAmDA;IACE;;OAKC;IAJC,gBAE6D;IAC7D,wBAA0C;IAG5C,iCAGC;IAED,kDAIC;IAED,iCAEC;IAED,kEASC;IAED,sEAQC;IAED,+DAcC;IAED,sEAmBC;IAED,wBAEC;CACF"}

package/types/support/userTiming.d.ts

@@ -1,2 +1,3 @@
 export function filterAllowlisted(userTimings: any, allowlistRegex: any): void;
+export function filterBlocklisted(userTimings: any, blocklistRegex: any): void;
 //# sourceMappingURL=userTiming.d.ts.map

package/types/support/userTiming.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userTiming.d.ts","sourceRoot":"","sources":["../../lib/support/userTiming.js"],"names":[],"mappings":"AAAA,+EAMC"}
+{"version":3,"file":"userTiming.d.ts","sourceRoot":"","sources":["../../lib/support/userTiming.js"],"names":[],"mappings":"AAAA,+EAMC;AAED,+EAQC"}

package/types/video/defaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../lib/video/defaults.js"],"names":[],"mappings":"AAAA,2BAA4B;AAC5B,qBAAsB;AACtB,6BAA8B;AAC9B,4BAA6B;AAC7B,2BAA4B;AAC5B,wBAAyB"}
+{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../lib/video/defaults.js"],"names":[],"mappings":"AAAA,wBAAyB,EAAE,CAAC;AAC5B,kBAAmB,EAAE,CAAC;AACtB,0BAA2B,EAAE,CAAC;AAC9B,uBAAwB,IAAI,CAAC;AAC7B,sBAAuB,IAAI,CAAC;AAC5B,sBAAuB,CAAC,CAAC"}