Skip to content
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

Jump to bottom

cli(lighthouse): Add --mixed-content flag for triggering the mixed content audit #4441

Merged
merged 7 commits into from
Feb 8, 2018
Merged

cli(lighthouse): Add --mixed-content flag for triggering the mixed content audit #4441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3135cb4
Add --mixed-content flag
christhompson Feb 6, 2018
ba33e9a
Move flag check into bin.js
christhompson Feb 6, 2018
e511392
Add missing type info
christhompson Feb 6, 2018
2298099
Add headless Chrome flag. Minor usage text fix.
christhompson Feb 7, 2018
50b102b
simplify adding chromeFlags
paulirish Feb 7, 2018
510904d
trim whitespace
paulirish Feb 7, 2018
48a6493
document mixed-content after --perf in --help
paulirish Feb 7, 2018
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
6 changes: 6 additions & 0 deletions lighthouse-cli/bin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ const log = require('lighthouse-logger');
// @ts-ignore
const perfOnlyConfig = require('../lighthouse-core/config/perf.json');
// @ts-ignore
const mixedContentConfig = require('../lighthouse-core/config/mixed-content.js');
// @ts-ignore
const pkg = require('../package.json');
const Sentry = require('../lighthouse-core/lib/sentry');

Expand Down Expand Up @@ -56,6 +58,10 @@ if (cliFlags.configPath) {
config = /** @type {!LH.Config} */ (require(cliFlags.configPath));
} else if (cliFlags.perf) {
config = /** @type {!LH.Config} */ (perfOnlyConfig);
} else if (cliFlags.mixedContent) {
config = /** @type {!LH.Config} */ (mixedContentConfig);
// The mixed-content audits require headless Chrome (https://crbug.com/764505).
cliFlags.chromeFlags = `${cliFlags.chromeFlags} --headless`;
}

// set logging preferences
Expand Down
9 changes: 5 additions & 4 deletions lighthouse-cli/cli-flags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ function getFlags(manualArgv) {

.group(
[
'save-assets', 'list-all-audits', 'list-trace-categories',
'additional-trace-categories', 'config-path', 'chrome-flags', 'perf', 'port',
'hostname', 'max-wait-for-load', 'enable-error-reporting', 'gather-mode', 'audit-mode',
'save-assets', 'list-all-audits', 'list-trace-categories', 'additional-trace-categories',
'config-path', 'chrome-flags', 'perf', 'mixed-content', 'port', 'hostname',
'max-wait-for-load', 'enable-error-reporting', 'gather-mode', 'audit-mode',
],
'Configuration:')
.describe({
Expand All @@ -81,6 +81,7 @@ function getFlags(manualArgv) {
'additional-trace-categories':
'Additional categories to capture with the trace (comma-delimited).',
'config-path': 'The path to the config JSON.',
'mixed-content': 'Use the mixed-content auditing configuration.',
'chrome-flags':
`Custom flags to pass to Chrome (space-delimited). For a full list of flags, see http://bit.ly/chrome-flags
Additionally, use the CHROME_PATH environment variable to use a specific Chrome binary. Requires Chromium version 54.0 or later. If omitted, any detected Chrome Canary or Chrome stable will be used.`,
Expand Down Expand Up @@ -110,7 +111,7 @@ function getFlags(manualArgv) {
'disable-storage-reset', 'disable-device-emulation', 'disable-cpu-throttling',
'disable-network-throttling', 'save-assets', 'list-all-audits',
'list-trace-categories', 'perf', 'view', 'verbose', 'quiet', 'help',
'gather-mode', 'audit-mode',
'gather-mode', 'audit-mode', 'mixed-content',
])
.choices('output', printer.getValidOutputOptions())
// force as an array
Expand Down
2 changes: 1 addition & 1 deletion lighthouse-cli/run.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const _PROTOCOL_TIMEOUT_EXIT_CODE = 67;
*/
function parseChromeFlags(flags = '') {
const parsed = yargsParser(
flags, {configuration: {'camel-case-expansion': false, 'boolean-negation': false}});
flags.trim(), {configuration: {'camel-case-expansion': false, 'boolean-negation': false}});

return Object
.keys(parsed)
Expand Down
1 change: 0 additions & 1 deletion lighthouse-core/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ function lighthouse(url, flags = {}, configJSON) {

// Use ConfigParser to generate a valid config file
const config = new Config(configJSON, flags.configPath);

const connection = new ChromeProtocol(flags.port, flags.hostname);

// kick off a lighthouse run
Expand Down
1 change: 1 addition & 0 deletions typings/externs.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export interface Flags {
gatherMode: boolean;
configPath?: string;
perf: boolean;
mixedContent: boolean;
verbose: boolean;
quiet: boolean;
}
Expand Down