Update Browsertime, Chrome and Edge (#3528)

This commit is contained in:
Peter Hedenskog 2022-01-10 15:48:42 +01:00 committed by GitHub
parent f12b9f934b
commit b0dcce807d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 41 additions and 21 deletions

View File

@ -1,4 +1,4 @@
FROM sitespeedio/webbrowsers:chrome-96.0-firefox-94.0-edge-95.0-dev
FROM sitespeedio/webbrowsers:chrome-97.0-firefox-94.0-edge-97.0-dev
ENV SITESPEED_IO_BROWSERTIME__XVFB true
ENV SITESPEED_IO_BROWSERTIME__DOCKER true

View File

@ -1 +1 @@
14.13.1
14.14.0

View File

@ -124,8 +124,9 @@ connectivity
--connectivity.rtt, --connectivity.latency This option requires --connectivity.profile be set to "custom".
--connectivity.variance This option requires --connectivity.engine be set to "throttle". It will add a variance to the rtt between each run. --connectivity.variance 2 means it will run with a random variance of max 2% between runs.
--connectivity.alias Give your connectivity profile a custom name
--connectivity.engine The engine for connectivity. Throttle works on Mac and tc based Linux. Use external if you set the connectivity outside of Browsertime. The best way do to this is described in https://github.com/sitespeedio/browsertime#connectivity. [choices: "external", "throttle", "tsproxy"] [default: "external"]
--connectivity.engine The engine for connectivity. Throttle works on Mac and tc based Linux. For mobile you can use Humble if you have a Humble setup. Use external if you set the connectivity outside of Browsertime. The best way do to this is described in https://github.com/sitespeedio/browsertime#connectivity. [choices: "external", "throttle", "tsproxy", "humble"] [default: "external"]
--connectivity.throttle.localhost Add latency/delay on localhost. Perfect for testing with WebPageReplay [boolean] [default: false]
--connectivity.humble.url The path to your Humble instance. For example http://raspberrypi:3000 [string]
Options:
--cpu Easy way to enable both chrome.timeline for Chrome and geckoProfile for Firefox [boolean]

View File

@ -113,6 +113,18 @@ function validateInput(argv) {
return 'Error: You have a miss match between number of alias for groups and URLs.';
}
if (
argv.browsertime.connectivity &&
argv.browsertime.connectivity.engine === 'humble'
) {
if (
!argv.browsertime.connectivity.humble ||
!argv.browsertime.connectivity.humble.url
) {
return 'You need to specify the URL to Humble by using the --browsertime.connectivity.humble.url option.';
}
}
if (
argv.browsertime.safari &&
argv.browsertime.safari.useSimulator &&
@ -291,12 +303,19 @@ module.exports.parseCommandLine = function parseCommandLine() {
.option('browsertime.connectivity.engine', {
alias: 'connectivity.engine',
default: 'external',
choices: ['external', 'throttle', 'tsproxy'],
choices: ['external', 'throttle', 'tsproxy', 'humble'],
describe:
'The engine for connectivity. Throttle works on Mac and tc based Linux. Use external if you set the connectivity outside of Browsertime. Use tsproxy if you are using Kubernetes. More documentation at https://www.sitespeed.io/documentation/sitespeed.io/connectivity/.',
'The engine for connectivity. Throttle works on Mac and tc based Linux. For mobile you can use Humble if you have a Humble setup. Use external if you set the connectivity outside of Browsertime. Use tsproxy if you are using Kubernetes. More documentation at https://www.sitespeed.io/documentation/sitespeed.io/connectivity/.',
type: 'string',
group: 'Browser'
})
.option('browsertime.connectivity.humble.url', {
alias: 'connectivity.humble.url',
type: 'string',
describe:
'The path to your Humble instance. For example http://raspberrypi:3000',
group: 'Browser'
})
.option('browsertime.pageCompleteCheck', {
alias: 'pageCompleteCheck',
describe:

30
npm-shrinkwrap.json generated
View File

@ -13,7 +13,7 @@
"@tgwf/co2": "0.8.0",
"aws-sdk": "2.882.0",
"axe-core": "4.3.5",
"browsertime": "14.13.0",
"browsertime": "14.14.0",
"cli-color": "2.0.0",
"coach-core": "7.0.0",
"concurrent-queue": "7.0.2",
@ -910,9 +910,9 @@
"optional": true
},
"node_modules/@sitespeed.io/chromedriver": {
"version": "96.0.4664-35",
"resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-96.0.4664-35.tgz",
"integrity": "sha512-XhTaEmG+BNlLdXSuUPkxVAzM+dl4caHjEW76ATL4q9aMqesP3VtZIxK5i4ePnskaJiPhXm2Eg6zNkORLYP8/ag==",
"version": "97.0.4692-71",
"resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-97.0.4692-71.tgz",
"integrity": "sha512-q1oCQ8tvmimXYE8D8Lc+Q8sLf1ZH8fVCyV8AJ/rdl3QZgzKWtjRHd0rGqcNOnW8Er+eW4EKAPBm4qtCmDVM5TA==",
"hasInstallScript": true,
"dependencies": {
"node-downloader-helper": "1.0.19",
@ -1465,13 +1465,13 @@
}
},
"node_modules/browsertime": {
"version": "14.13.0",
"resolved": "https://registry.npmjs.org/browsertime/-/browsertime-14.13.0.tgz",
"integrity": "sha512-CuND3iQiylttzWPLEmBGedKWt1LmhLpwt4Vai/fqrwWEAYWip9oATqVSk8+FkOISnm65Mp5boJo2OJIOc1hQoA==",
"version": "14.14.0",
"resolved": "https://registry.npmjs.org/browsertime/-/browsertime-14.14.0.tgz",
"integrity": "sha512-zpgBcyrbP0EvN0Sx3S+cDRiGRuBp4Aa5c5rJAvY+dRwcqDP1pfAiwmLgu3PwPWr04Zrhc6AtgANxGi/QcmFwGA==",
"dependencies": {
"@cypress/xvfb": "1.2.4",
"@devicefarmer/adbkit": "2.11.3",
"@sitespeed.io/chromedriver": "96.0.4664-35",
"@sitespeed.io/chromedriver": "97.0.4692-71",
"@sitespeed.io/edgedriver": "95.0.1020-30",
"@sitespeed.io/geckodriver": "0.29.1-2",
"@sitespeed.io/throttle": "3.0.0",
@ -8180,9 +8180,9 @@
}
},
"@sitespeed.io/chromedriver": {
"version": "96.0.4664-35",
"resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-96.0.4664-35.tgz",
"integrity": "sha512-XhTaEmG+BNlLdXSuUPkxVAzM+dl4caHjEW76ATL4q9aMqesP3VtZIxK5i4ePnskaJiPhXm2Eg6zNkORLYP8/ag==",
"version": "97.0.4692-71",
"resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-97.0.4692-71.tgz",
"integrity": "sha512-q1oCQ8tvmimXYE8D8Lc+Q8sLf1ZH8fVCyV8AJ/rdl3QZgzKWtjRHd0rGqcNOnW8Er+eW4EKAPBm4qtCmDVM5TA==",
"requires": {
"node-downloader-helper": "1.0.19",
"node-stream-zip": "1.15.0"
@ -8631,13 +8631,13 @@
}
},
"browsertime": {
"version": "14.13.0",
"resolved": "https://registry.npmjs.org/browsertime/-/browsertime-14.13.0.tgz",
"integrity": "sha512-CuND3iQiylttzWPLEmBGedKWt1LmhLpwt4Vai/fqrwWEAYWip9oATqVSk8+FkOISnm65Mp5boJo2OJIOc1hQoA==",
"version": "14.14.0",
"resolved": "https://registry.npmjs.org/browsertime/-/browsertime-14.14.0.tgz",
"integrity": "sha512-zpgBcyrbP0EvN0Sx3S+cDRiGRuBp4Aa5c5rJAvY+dRwcqDP1pfAiwmLgu3PwPWr04Zrhc6AtgANxGi/QcmFwGA==",
"requires": {
"@cypress/xvfb": "1.2.4",
"@devicefarmer/adbkit": "2.11.3",
"@sitespeed.io/chromedriver": "96.0.4664-35",
"@sitespeed.io/chromedriver": "97.0.4692-71",
"@sitespeed.io/edgedriver": "95.0.1020-30",
"@sitespeed.io/geckodriver": "0.29.1-2",
"@sitespeed.io/throttle": "3.0.0",

View File

@ -74,7 +74,7 @@
"@tgwf/co2": "0.8.0",
"aws-sdk": "2.882.0",
"axe-core": "4.3.5",
"browsertime": "14.13.0",
"browsertime": "14.14.0",
"coach-core": "7.0.0",
"cli-color": "2.0.0",
"concurrent-queue": "7.0.2",