Merge branch 'main' into new-network-idle

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -58,8 +58,8 @@ body:
   - type: textarea
     id: logs
     attributes:
-      label: Relevant log output
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      label: Log output
+      description: Please copy and paste the full log output from your test (please DO NOT take a screenshot of the log output). This will be automatically formatted into code, so no need for backticks. If the log output is large please use a [gist](https://gist.github.com)!
       render: shell
     validations:
       required: false

.github/workflows/mac.yml

@@ -0,0 +1,37 @@
+name: OSX Chrome, Firefox and Edge
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+    branches:
+    - main
+jobs:
+  build:
+    runs-on: macos-13
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@v3
+    - name: Use Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: '18.x'
+    - name: Install browsertime
+      run: npm ci
+    - name: Install python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.11' 
+    - name: Install dependencies
+      run: |
+        brew update
+        brew install google-chrome
+        brew install --cask firefox
+        brew install --cask microsoft-edge
+    - name: Test Chrome 
+      run: ./bin/browsertime.js -b chrome -n 1 https://www.sitespeed.io/
+    - name: Test Firefox
+      run: ./bin/browsertime.js -b firefox -n 1 https://www.sitespeed.io/
+    - name: Test Edge
+      run: ./bin/browsertime.js -b edge -n 1 https://www.sitespeed.io/
+

CHANGELOG.md

@@ -1,5 +1,31 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
+## 17.13.1 - 2022-07-22
+
+### Tech
+* Internal fix how the render blocking result is added [#1972](https://github.com/sitespeedio/browsertime/pull/1972).
+
+
+## 17.13.0 - 2022-07-21
+### Fixed
+* Fix for Chromedriver 115 so that it works on Mac again [#1971](https://github.com/sitespeedio/browsertime/pull/1971).
+
+### Added
+* Edgedriver 114 [#1969](https://github.com/sitespeedio/browsertime/pull/1969)
+
+### Tech
+* Run tests on Chrome/Firefox/Edge on Mac OS on our GitHub Actions to catch the next time Chromedriver is broken on Mac [#1970](https://github.com/sitespeedio/browsertime/pull/1970)
+
+## 17.12.1 - 2022-07-19
+### Fixed
+* Hmm, Chromedriver 115 doesn't seems to work on Mac so reverted to 114.
+
+## 17.12.0 - 2022-07-19
+### Added
+* Chrome and Chromedriver 115. The Chrome team has changed the hosting of Chromedriver, so the logic for downloading Chromedriver has changed [#1967](https://github.com/sitespeedio/browsertime/pull/1967).
+
+* If you collect the Chrome devtools trace using `--cpu` we will now also collect the number of elements that needs recalculate styles before FCP/LCP.[#1964](https://github.com/sitespeedio/browsertime/pull/1964).
+
 ## 17.11.2 - 2022-06-19
 ### Fixed
 * Fix --debug mode. Thank you [Gregory Mierzwinski](https://github.com/gmierz) for PR [#1959](https://github.com/sitespeedio/browsertime/pull/1959).

Dockerfile

@@ -1,4 +1,4 @@
-FROM sitespeedio/webbrowsers:chrome-114.0-firefox-115.0-edge-114.0 
+FROM sitespeedio/webbrowsers:chrome-115.0-firefox-115.0-edge-114.0 
 
 ARG TARGETPLATFORM=linux/amd64
 

lib/chrome/webdriver/setupChromiumOptions.js

@@ -1,4 +1,5 @@
 import { readFileSync } from 'node:fs';
+import { platform } from 'node:os';
 import intel from 'intel';
 import { chromeDesktopOptions as defaultChromeOptions } from '../settings/chromeDesktopOptions.js';
 import { chromeAndroidOptions as defaultAndroidChromeOptions } from '../settings/chromeAndroidOptions.js';
@@ -188,6 +189,14 @@ export function setupChromiumOptions(
 
   if (browserOptions.binaryPath) {
     seleniumOptions.setChromeBinaryPath(browserOptions.binaryPath);
+  } else {
+    // Fix for https://github.com/sitespeedio/browsertime/issues/1968
+    // Same settings for Chrome/Edge
+    if (options.browser === 'chrome' && platform() === 'darwin') {
+      seleniumOptions.setChromeBinaryPath(
+        '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'
+      );
+    }
   }
 
   if (browserOptions.mobileEmulation) {

lib/core/engine/collector.js

@@ -51,6 +51,7 @@ function getNewResult(url, options) {
     fullyLoaded: [],
     mainDocumentTimings: [],
     errors: [],
+    renderBlocking: [],
     server: { processesAtStart: [] }
   };
 }
@@ -400,9 +401,6 @@ export class Collector {
       }
 
       if (data.renderBlocking) {
-        if (!results.renderBlocking) {
-          results.renderBlocking = [];
-        }
         results.renderBlocking.push(data.renderBlocking);
 
         statistics.addDeep({

package.json

@@ -1,14 +1,14 @@
 {
   "name": "browsertime",
   "description": "Get performance metrics from your web page using Browsertime.",
-  "version": "17.11.2",
+  "version": "17.13.1",
   "bin": "./bin/browsertime.js",
   "type": "module",
   "dependencies": {
     "@cypress/xvfb": "1.2.4",
     "@devicefarmer/adbkit": "2.11.3",
-    "@sitespeed.io/chromedriver": "114.0.5735-90",
-    "@sitespeed.io/edgedriver": "113.0.1774-9b",
+    "@sitespeed.io/chromedriver": "115.0.5790-98b",
+    "@sitespeed.io/edgedriver": "114.0.1823-82",
     "@sitespeed.io/geckodriver": "0.33.0",
     "@sitespeed.io/throttle": "5.0.0",
     "@sitespeed.io/tracium": "0.3.3",