From 9c5562d11aee64a18948ca5a4b025bc50fe8bc78 Mon Sep 17 00:00:00 2001 From: soulgalore Date: Wed, 19 Jul 2023 16:01:54 +0200 Subject: [PATCH 01/16] Add the full log since its hard to know what is relevant --- .github/ISSUE_TEMPLATE/BUG_REPORT.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml index 06b969c61..3cb1a2600 100644 --- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml +++ b/.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 \ No newline at end of file From 7b48a351faa4a5e4524f18cc81d1f320ef73459b Mon Sep 17 00:00:00 2001 From: Peter Hedenskog Date: Wed, 19 Jul 2023 17:59:50 +0200 Subject: [PATCH 02/16] Chrome and Chromedriver 115 (#1967) --- Dockerfile | 2 +- package-lock.json | 36 +++++++++--------------------------- package.json | 2 +- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d8061d28..8f046ea24 100644 --- a/Dockerfile +++ b/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 diff --git a/package-lock.json b/package-lock.json index 86f594496..292cdc320 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@cypress/xvfb": "1.2.4", "@devicefarmer/adbkit": "2.11.3", - "@sitespeed.io/chromedriver": "114.0.5735-90", + "@sitespeed.io/chromedriver": "115.0.5790-98", "@sitespeed.io/edgedriver": "113.0.1774-9b", "@sitespeed.io/geckodriver": "0.33.0", "@sitespeed.io/throttle": "5.0.0", @@ -792,26 +792,15 @@ } }, "node_modules/@sitespeed.io/chromedriver": { - "version": "114.0.5735-90", - "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-114.0.5735-90.tgz", - "integrity": "sha512-buKrmpoJrN9AA6AeMAQffrzqml6lF+BCi2G73gY4QCnXjv0tcroMK38vMmswGpPtMz31Zyspht5uxR7FX1AY1w==", + "version": "115.0.5790-98", + "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-115.0.5790-98.tgz", + "integrity": "sha512-8HOYBZaid7PZhqe1lSO3X/l9WS/bLrYlsh0Pu7mphVYSvYH7Lkx80yQ5s7ccjBMEgCiUX58XbwZ6NtRL3n7ZHg==", "hasInstallScript": true, "dependencies": { - "node-downloader-helper": "2.1.5", + "node-downloader-helper": "2.1.7", "node-stream-zip": "1.15.0" } }, - "node_modules/@sitespeed.io/chromedriver/node_modules/node-downloader-helper": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-2.1.5.tgz", - "integrity": "sha512-sLedzfv8C4VMAvTdDQcjLFAl3gydNeBXh2bLcCzvZRmd4EK0rkoTxJ8tkxnriUSJO/n13skJzH7l6CzCdBwYGg==", - "bin": { - "ndh": "bin/ndh" - }, - "engines": { - "node": ">=14.18" - } - }, "node_modules/@sitespeed.io/edgedriver": { "version": "113.0.1774-9b", "resolved": "https://registry.npmjs.org/@sitespeed.io/edgedriver/-/edgedriver-113.0.1774-9b.tgz", @@ -6687,19 +6676,12 @@ } }, "@sitespeed.io/chromedriver": { - "version": "114.0.5735-90", - "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-114.0.5735-90.tgz", - "integrity": "sha512-buKrmpoJrN9AA6AeMAQffrzqml6lF+BCi2G73gY4QCnXjv0tcroMK38vMmswGpPtMz31Zyspht5uxR7FX1AY1w==", + "version": "115.0.5790-98", + "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-115.0.5790-98.tgz", + "integrity": "sha512-8HOYBZaid7PZhqe1lSO3X/l9WS/bLrYlsh0Pu7mphVYSvYH7Lkx80yQ5s7ccjBMEgCiUX58XbwZ6NtRL3n7ZHg==", "requires": { - "node-downloader-helper": "2.1.5", + "node-downloader-helper": "2.1.7", "node-stream-zip": "1.15.0" - }, - "dependencies": { - "node-downloader-helper": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-2.1.5.tgz", - "integrity": "sha512-sLedzfv8C4VMAvTdDQcjLFAl3gydNeBXh2bLcCzvZRmd4EK0rkoTxJ8tkxnriUSJO/n13skJzH7l6CzCdBwYGg==" - } } }, "@sitespeed.io/edgedriver": { diff --git a/package.json b/package.json index ff82cec45..10710a1d0 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dependencies": { "@cypress/xvfb": "1.2.4", "@devicefarmer/adbkit": "2.11.3", - "@sitespeed.io/chromedriver": "114.0.5735-90", + "@sitespeed.io/chromedriver": "115.0.5790-98", "@sitespeed.io/edgedriver": "113.0.1774-9b", "@sitespeed.io/geckodriver": "0.33.0", "@sitespeed.io/throttle": "5.0.0", From ca5fffac83ea15c7349fcf20eb51f3b4d94c47b8 Mon Sep 17 00:00:00 2001 From: soulgalore Date: Wed, 19 Jul 2023 21:23:50 +0200 Subject: [PATCH 03/16] new release --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee77b2ebf..a1fc0f333 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Browsertime changelog (we do [semantic versioning](https://semver.org)) +## 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). From 9f6755cd59673e192973753dd576da5845b7d29d Mon Sep 17 00:00:00 2001 From: soulgalore Date: Wed, 19 Jul 2023 21:25:01 +0200 Subject: [PATCH 04/16] 17.12.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 292cdc320..98e9ee74b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "browsertime", - "version": "17.11.2", + "version": "17.12.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "browsertime", - "version": "17.11.2", + "version": "17.12.0", "license": "MIT", "dependencies": { "@cypress/xvfb": "1.2.4", diff --git a/package.json b/package.json index 10710a1d0..1b709183d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "browsertime", "description": "Get performance metrics from your web page using Browsertime.", - "version": "17.11.2", + "version": "17.12.0", "bin": "./bin/browsertime.js", "type": "module", "dependencies": { From 3e9cdeca3ce62b0574c18e1cf96ca385962dba8a Mon Sep 17 00:00:00 2001 From: soulgalore Date: Wed, 19 Jul 2023 21:39:19 +0200 Subject: [PATCH 05/16] Chromedriver 114 --- package-lock.json | 36 +++++++++++++++++++++++++++--------- package.json | 2 +- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 98e9ee74b..5ea3c0e5a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@cypress/xvfb": "1.2.4", "@devicefarmer/adbkit": "2.11.3", - "@sitespeed.io/chromedriver": "115.0.5790-98", + "@sitespeed.io/chromedriver": "114.0.5735-90", "@sitespeed.io/edgedriver": "113.0.1774-9b", "@sitespeed.io/geckodriver": "0.33.0", "@sitespeed.io/throttle": "5.0.0", @@ -792,15 +792,26 @@ } }, "node_modules/@sitespeed.io/chromedriver": { - "version": "115.0.5790-98", - "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-115.0.5790-98.tgz", - "integrity": "sha512-8HOYBZaid7PZhqe1lSO3X/l9WS/bLrYlsh0Pu7mphVYSvYH7Lkx80yQ5s7ccjBMEgCiUX58XbwZ6NtRL3n7ZHg==", + "version": "114.0.5735-90", + "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-114.0.5735-90.tgz", + "integrity": "sha512-buKrmpoJrN9AA6AeMAQffrzqml6lF+BCi2G73gY4QCnXjv0tcroMK38vMmswGpPtMz31Zyspht5uxR7FX1AY1w==", "hasInstallScript": true, "dependencies": { - "node-downloader-helper": "2.1.7", + "node-downloader-helper": "2.1.5", "node-stream-zip": "1.15.0" } }, + "node_modules/@sitespeed.io/chromedriver/node_modules/node-downloader-helper": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-2.1.5.tgz", + "integrity": "sha512-sLedzfv8C4VMAvTdDQcjLFAl3gydNeBXh2bLcCzvZRmd4EK0rkoTxJ8tkxnriUSJO/n13skJzH7l6CzCdBwYGg==", + "bin": { + "ndh": "bin/ndh" + }, + "engines": { + "node": ">=14.18" + } + }, "node_modules/@sitespeed.io/edgedriver": { "version": "113.0.1774-9b", "resolved": "https://registry.npmjs.org/@sitespeed.io/edgedriver/-/edgedriver-113.0.1774-9b.tgz", @@ -6676,12 +6687,19 @@ } }, "@sitespeed.io/chromedriver": { - "version": "115.0.5790-98", - "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-115.0.5790-98.tgz", - "integrity": "sha512-8HOYBZaid7PZhqe1lSO3X/l9WS/bLrYlsh0Pu7mphVYSvYH7Lkx80yQ5s7ccjBMEgCiUX58XbwZ6NtRL3n7ZHg==", + "version": "114.0.5735-90", + "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-114.0.5735-90.tgz", + "integrity": "sha512-buKrmpoJrN9AA6AeMAQffrzqml6lF+BCi2G73gY4QCnXjv0tcroMK38vMmswGpPtMz31Zyspht5uxR7FX1AY1w==", "requires": { - "node-downloader-helper": "2.1.7", + "node-downloader-helper": "2.1.5", "node-stream-zip": "1.15.0" + }, + "dependencies": { + "node-downloader-helper": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-2.1.5.tgz", + "integrity": "sha512-sLedzfv8C4VMAvTdDQcjLFAl3gydNeBXh2bLcCzvZRmd4EK0rkoTxJ8tkxnriUSJO/n13skJzH7l6CzCdBwYGg==" + } } }, "@sitespeed.io/edgedriver": { diff --git a/package.json b/package.json index 1b709183d..f96002fd8 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dependencies": { "@cypress/xvfb": "1.2.4", "@devicefarmer/adbkit": "2.11.3", - "@sitespeed.io/chromedriver": "115.0.5790-98", + "@sitespeed.io/chromedriver": "114.0.5735-90", "@sitespeed.io/edgedriver": "113.0.1774-9b", "@sitespeed.io/geckodriver": "0.33.0", "@sitespeed.io/throttle": "5.0.0", From ebf4b45d3a153a6a8873334bb3983408b92ef1e8 Mon Sep 17 00:00:00 2001 From: soulgalore Date: Wed, 19 Jul 2023 21:40:17 +0200 Subject: [PATCH 06/16] new release --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1fc0f333..8f83dac7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Browsertime changelog (we do [semantic versioning](https://semver.org)) +## 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). From e086c3723b9434c5b31afd6884bfa4560084335f Mon Sep 17 00:00:00 2001 From: soulgalore Date: Wed, 19 Jul 2023 21:40:54 +0200 Subject: [PATCH 07/16] 17.12.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5ea3c0e5a..44b9397cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "browsertime", - "version": "17.12.0", + "version": "17.12.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "browsertime", - "version": "17.12.0", + "version": "17.12.1", "license": "MIT", "dependencies": { "@cypress/xvfb": "1.2.4", diff --git a/package.json b/package.json index f96002fd8..4c707de36 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "browsertime", "description": "Get performance metrics from your web page using Browsertime.", - "version": "17.12.0", + "version": "17.12.1", "bin": "./bin/browsertime.js", "type": "module", "dependencies": { From cd1d8938ae8c733bd7b0ca37bd174221b393151f Mon Sep 17 00:00:00 2001 From: Peter Hedenskog Date: Fri, 21 Jul 2023 07:43:28 +0200 Subject: [PATCH 08/16] edgedriver 114 (#1969) --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 44b9397cd..27acc5ce5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@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/edgedriver": "114.0.1823-82", "@sitespeed.io/geckodriver": "0.33.0", "@sitespeed.io/throttle": "5.0.0", "@sitespeed.io/tracium": "0.3.3", @@ -813,9 +813,9 @@ } }, "node_modules/@sitespeed.io/edgedriver": { - "version": "113.0.1774-9b", - "resolved": "https://registry.npmjs.org/@sitespeed.io/edgedriver/-/edgedriver-113.0.1774-9b.tgz", - "integrity": "sha512-uc8PGVlD2x5MdT4yNAMEfgRnAuaoewcUNQ41NXIPf50xhrbRIyZt5qKO4feblLbjMPRIhmw76wJms1UZOuAknw==", + "version": "114.0.1823-82", + "resolved": "https://registry.npmjs.org/@sitespeed.io/edgedriver/-/edgedriver-114.0.1823-82.tgz", + "integrity": "sha512-R86i9TN8fgp1XgeVIzL+Jp4nCwaPcxVwEu/BtZlHWYBnJFLdgr3d6YJLOO04rkAFrWsnEQWhT9tkJXtnShFbdA==", "hasInstallScript": true, "dependencies": { "node-downloader-helper": "2.1.7", @@ -6703,9 +6703,9 @@ } }, "@sitespeed.io/edgedriver": { - "version": "113.0.1774-9b", - "resolved": "https://registry.npmjs.org/@sitespeed.io/edgedriver/-/edgedriver-113.0.1774-9b.tgz", - "integrity": "sha512-uc8PGVlD2x5MdT4yNAMEfgRnAuaoewcUNQ41NXIPf50xhrbRIyZt5qKO4feblLbjMPRIhmw76wJms1UZOuAknw==", + "version": "114.0.1823-82", + "resolved": "https://registry.npmjs.org/@sitespeed.io/edgedriver/-/edgedriver-114.0.1823-82.tgz", + "integrity": "sha512-R86i9TN8fgp1XgeVIzL+Jp4nCwaPcxVwEu/BtZlHWYBnJFLdgr3d6YJLOO04rkAFrWsnEQWhT9tkJXtnShFbdA==", "requires": { "node-downloader-helper": "2.1.7", "node-stream-zip": "1.15.0" diff --git a/package.json b/package.json index 4c707de36..ca2a81865 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@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/edgedriver": "114.0.1823-82", "@sitespeed.io/geckodriver": "0.33.0", "@sitespeed.io/throttle": "5.0.0", "@sitespeed.io/tracium": "0.3.3", From 8b4f448117530dffab9672c031bd1cdb4e1f8565 Mon Sep 17 00:00:00 2001 From: Peter Hedenskog Date: Fri, 21 Jul 2023 07:44:01 +0200 Subject: [PATCH 09/16] Run Firefox , Edge and Chrome tests on Mac. (#1970) * Run Firefox and Chrome tests on Mac. It turns out the Chrome team didn't test the new Chrome/Chromedriver 115 setup so I guess it's best we do it for them. https://github.com/sitespeedio/browsertime/issues/1968 * Also test on Edge --- .github/workflows/mac.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/mac.yml diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml new file mode 100644 index 000000000..643014d38 --- /dev/null +++ b/.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/ + \ No newline at end of file From 5000028f256fc64fb090f769fe6c2fab17e0a067 Mon Sep 17 00:00:00 2001 From: Peter Hedenskog Date: Fri, 21 Jul 2023 11:10:11 +0200 Subject: [PATCH 10/16] Fix for Chromedriver 115 bug. (#1971) https://github.com/sitespeedio/browsertime/issues/1968 --- lib/chrome/webdriver/setupChromiumOptions.js | 9 +++++ package-lock.json | 36 +++++--------------- package.json | 2 +- 3 files changed, 19 insertions(+), 28 deletions(-) diff --git a/lib/chrome/webdriver/setupChromiumOptions.js b/lib/chrome/webdriver/setupChromiumOptions.js index afa266af4..fdc8194ca 100644 --- a/lib/chrome/webdriver/setupChromiumOptions.js +++ b/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) { diff --git a/package-lock.json b/package-lock.json index 27acc5ce5..ebce7858e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@cypress/xvfb": "1.2.4", "@devicefarmer/adbkit": "2.11.3", - "@sitespeed.io/chromedriver": "114.0.5735-90", + "@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", @@ -792,26 +792,15 @@ } }, "node_modules/@sitespeed.io/chromedriver": { - "version": "114.0.5735-90", - "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-114.0.5735-90.tgz", - "integrity": "sha512-buKrmpoJrN9AA6AeMAQffrzqml6lF+BCi2G73gY4QCnXjv0tcroMK38vMmswGpPtMz31Zyspht5uxR7FX1AY1w==", + "version": "115.0.5790-98b", + "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-115.0.5790-98b.tgz", + "integrity": "sha512-L1/qyTWor7n/P96fSL2i6GzfgZw2WF3SqXlq5inAYl2fjPHyBaeJUws65hJ0ohZ+VHUwMSJmhSbJClcIonerhQ==", "hasInstallScript": true, "dependencies": { - "node-downloader-helper": "2.1.5", + "node-downloader-helper": "2.1.7", "node-stream-zip": "1.15.0" } }, - "node_modules/@sitespeed.io/chromedriver/node_modules/node-downloader-helper": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-2.1.5.tgz", - "integrity": "sha512-sLedzfv8C4VMAvTdDQcjLFAl3gydNeBXh2bLcCzvZRmd4EK0rkoTxJ8tkxnriUSJO/n13skJzH7l6CzCdBwYGg==", - "bin": { - "ndh": "bin/ndh" - }, - "engines": { - "node": ">=14.18" - } - }, "node_modules/@sitespeed.io/edgedriver": { "version": "114.0.1823-82", "resolved": "https://registry.npmjs.org/@sitespeed.io/edgedriver/-/edgedriver-114.0.1823-82.tgz", @@ -6687,19 +6676,12 @@ } }, "@sitespeed.io/chromedriver": { - "version": "114.0.5735-90", - "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-114.0.5735-90.tgz", - "integrity": "sha512-buKrmpoJrN9AA6AeMAQffrzqml6lF+BCi2G73gY4QCnXjv0tcroMK38vMmswGpPtMz31Zyspht5uxR7FX1AY1w==", + "version": "115.0.5790-98b", + "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-115.0.5790-98b.tgz", + "integrity": "sha512-L1/qyTWor7n/P96fSL2i6GzfgZw2WF3SqXlq5inAYl2fjPHyBaeJUws65hJ0ohZ+VHUwMSJmhSbJClcIonerhQ==", "requires": { - "node-downloader-helper": "2.1.5", + "node-downloader-helper": "2.1.7", "node-stream-zip": "1.15.0" - }, - "dependencies": { - "node-downloader-helper": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-2.1.5.tgz", - "integrity": "sha512-sLedzfv8C4VMAvTdDQcjLFAl3gydNeBXh2bLcCzvZRmd4EK0rkoTxJ8tkxnriUSJO/n13skJzH7l6CzCdBwYGg==" - } } }, "@sitespeed.io/edgedriver": { diff --git a/package.json b/package.json index ca2a81865..52d593128 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dependencies": { "@cypress/xvfb": "1.2.4", "@devicefarmer/adbkit": "2.11.3", - "@sitespeed.io/chromedriver": "114.0.5735-90", + "@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", From 489258d68cd9d43cc08acbd83dc4e8bf046dd825 Mon Sep 17 00:00:00 2001 From: soulgalore Date: Fri, 21 Jul 2023 13:56:56 +0200 Subject: [PATCH 11/16] changelog: chromedriver 115 again --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f83dac7c..8421a4658 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Browsertime changelog (we do [semantic versioning](https://semver.org)) + +## 17.13.0 - UNRELEASED +### 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. From 51472374092231313f88c54336cd48ec833908b6 Mon Sep 17 00:00:00 2001 From: soulgalore Date: Fri, 21 Jul 2023 20:49:10 +0200 Subject: [PATCH 12/16] new release --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8421a4658..93d96c6ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Browsertime changelog (we do [semantic versioning](https://semver.org)) -## 17.13.0 - UNRELEASED +## 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). From d360390bae248191f415654880b35189f78cb4b4 Mon Sep 17 00:00:00 2001 From: soulgalore Date: Fri, 21 Jul 2023 20:49:47 +0200 Subject: [PATCH 13/16] 17.13.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index ebce7858e..cdd29aca4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "browsertime", - "version": "17.12.1", + "version": "17.13.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "browsertime", - "version": "17.12.1", + "version": "17.13.0", "license": "MIT", "dependencies": { "@cypress/xvfb": "1.2.4", diff --git a/package.json b/package.json index 52d593128..22e2542a6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "browsertime", "description": "Get performance metrics from your web page using Browsertime.", - "version": "17.12.1", + "version": "17.13.0", "bin": "./bin/browsertime.js", "type": "module", "dependencies": { From 6a261776c4c264140ea445f1d0f768ea4975b220 Mon Sep 17 00:00:00 2001 From: Peter Hedenskog Date: Sat, 22 Jul 2023 07:14:38 +0200 Subject: [PATCH 14/16] tech: move renderblocking field so it exists for all browsers (#1972) --- lib/core/engine/collector.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/core/engine/collector.js b/lib/core/engine/collector.js index 29c301694..d3449c01b 100644 --- a/lib/core/engine/collector.js +++ b/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({ From 392c56a38843cdb34623380a77ab9efe3c28ace2 Mon Sep 17 00:00:00 2001 From: soulgalore Date: Sat, 22 Jul 2023 07:16:04 +0200 Subject: [PATCH 15/16] new release --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93d96c6ca..6f8a6ba41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # 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 From ea9a2df396ecd64dc76579bf7d6db28b5e8b2a3f Mon Sep 17 00:00:00 2001 From: soulgalore Date: Sat, 22 Jul 2023 07:16:42 +0200 Subject: [PATCH 16/16] 17.13.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index cdd29aca4..ba981e3d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "browsertime", - "version": "17.13.0", + "version": "17.13.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "browsertime", - "version": "17.13.0", + "version": "17.13.1", "license": "MIT", "dependencies": { "@cypress/xvfb": "1.2.4", diff --git a/package.json b/package.json index 22e2542a6..4414407de 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "browsertime", "description": "Get performance metrics from your web page using Browsertime.", - "version": "17.13.0", + "version": "17.13.1", "bin": "./bin/browsertime.js", "type": "module", "dependencies": {