Skip to content

deps: [email protected] #9339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulirish merged 3 commits into from
Jul 10, 2019
Merged

deps: [email protected] #9339

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bb0587
deps: [email protected]
paulirish Jul 10, 2019
b2dfec5
update manual chrome launcher
paulirish Jul 10, 2019
0cc1d2c
feedback
paulirish Jul 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions lighthouse-core/scripts/manual-chrome-launcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/usr/bin/env node

'use strict';

/**
* @fileoverview Script to launch a clean Chrome instance on-demand.
*
Expand All @@ -14,29 +13,36 @@
* chrome-debug --enable-extensions
*/

const {launch} = require('chrome-launcher');
const {Launcher, launch} = require('chrome-launcher');

const args = process.argv.slice(2);
let chromeFlags;
const chromeFlags = [];
let startingUrl;
let port;
let enableExtensions;
let shouldEnableExtensions;
Copy link
Collaborator

@patrickhulce patrickhulce Jul 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like these two variables always have the same value, yes?

feels like we could ditch shouldEnableExtensions at this point if it's just the if

let ignoreDefaultFlags;

if (args.length) {
chromeFlags = args.filter(flag => flag.startsWith('--'));
const providedFlags = args.filter(flag => flag.startsWith('--'));

const portFlag = chromeFlags.find(flag => flag.startsWith('--port='));
const portFlag = providedFlags.find(flag => flag.startsWith('--port='));
if (portFlag) port = parseInt(portFlag.replace('--port=', ''), 10);

enableExtensions = !!chromeFlags.find(flag => flag === '--enable-extensions');
shouldEnableExtensions = !!providedFlags.find(flag => flag === '--enable-extensions');
// The basic pattern for enabling Chrome extensions
if (shouldEnableExtensions) {
ignoreDefaultFlags = true;
chromeFlags.push(...Launcher.defaultFlags().filter(flag => flag !== '--disable-extensions'));
}

chromeFlags.push(...providedFlags);
startingUrl = args.find(flag => !flag.startsWith('--'));
}

launch({
startingUrl,
port,
enableExtensions,
ignoreDefaultFlags,
chromeFlags,
})
// eslint-disable-next-line no-console
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
},
"dependencies": {
"axe-core": "3.2.2",
"chrome-launcher": "^0.10.7",
"chrome-launcher": "^0.11.1",
"configstore": "^3.1.1",
"cssstyle": "1.2.1",
"details-element-polyfill": "2.2.0",
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1788,13 +1788,13 @@ chownr@^1.0.1:
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==

chrome-launcher@^0.10.7:
version "0.10.7"
resolved "https://registry.yarnpkg.com/chrome-launcher/-/chrome-launcher-0.10.7.tgz#5e2a9e99f212e0501d9c7024802acd01a812f5d5"
integrity sha512-IoQLp64s2n8OQuvKZwt77CscVj3UlV2Dj7yZtd1EBMld9mSdGcsGy9fN5hd/r4vJuWZR09it78n1+A17gB+AIQ==
chrome-launcher@^0.11.1:
version "0.11.1"
resolved "https://registry.yarnpkg.com/chrome-launcher/-/chrome-launcher-0.11.1.tgz#ccc5bd971c76cdd263d17acacaeb762454c1af92"
integrity sha512-Om9LtiJ+FIh8sfhx8HaN4Petj75dIVeTBNUbXIXPIS5W3y9dyNRGmChcl0Z5trQkcy+8XDJA3NWicYdpZeF+DA==
dependencies:
"@types/node" "*"
is-wsl "^1.1.0"
is-wsl "^2.1.0"
lighthouse-logger "^1.0.0"
mkdirp "0.5.1"
rimraf "^2.6.1"
Expand Down Expand Up @@ -4288,10 +4288,10 @@ is-windows@^1.0.2:
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==

is-wsl@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
is-wsl@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.0.tgz#94369bbeb2249ef07b831b1b08590e686330ccbb"
integrity sha512-pFTjpv/x5HRj8kbZ/Msxi9VrvtOMRBqaDi3OIcbwPI3OuH+r3lLxVWukLITBaOGJIbA/w2+M1eVmVa4XNQlAmQ==

[email protected], isarray@~1.0.0:
version "1.0.0"
Expand Down