Skip to content

Commit

Permalink
Merge branch 'main' into chrome-129
Browse files Browse the repository at this point in the history
  • Loading branch information
soulgalore authored Sep 22, 2024
2 parents 35e25f7 + c95a35a commit 3d55540
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 22 deletions.
11 changes: 5 additions & 6 deletions lib/support/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@ function validateInput(argv) {
}
}

// hack to keep backward compability to --android
if (argv.android[0] === true) {
set(argv, 'android.enabled', true);
}

if (argv.chrome && argv.chrome.mobileEmulation) {
const m = argv.chrome.mobileEmulation;
if (!(m.deviceName || (m.height && m.width && m.pixelRatio))) {
Expand Down Expand Up @@ -144,7 +139,11 @@ function validateInput(argv) {
}

export function parseCommandLine() {
let yargsInstance = yargs(hideBin(process.argv));
let argvFix = process.argv.map(arg =>
arg === '--android' ? '--android.enabled' : arg
);

let yargsInstance = yargs(hideBin(argvFix));
let validated = yargsInstance
.parserConfiguration({
'camel-case-expansion': false,
Expand Down
28 changes: 14 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dayjs": "1.11.13",
"execa": "9.3.1",
"fast-stats": "0.0.7",
"ff-test-bidi-har-export": "0.0.14",
"ff-test-bidi-har-export": "0.0.15",
"find-up": "7.0.0",
"get-port": "7.1.0",
"hasbin": "1.2.3",
Expand All @@ -30,7 +30,7 @@
"lodash.merge": "4.6.2",
"lodash.pick": "4.4.0",
"lodash.set": "4.3.2",
"selenium-webdriver": "4.24.0",
"selenium-webdriver": "4.25.0",
"usb-power-profiling": "1.4.0",
"yargs": "17.7.2"
},
Expand Down

0 comments on commit 3d55540

Please sign in to comment.