lighthouse 8.4.0 → 8.5.0-dev.20210921

package/lighthouse-cli/test/smokehouse/lighthouse-runners/bundle.js

@@ -11,8 +11,9 @@
  * Currently uses `lighthouse-dt-bundle.js`.
  */
 
-const ChromeLauncher = require('chrome-launcher');
-const ChromeProtocol = require('../../../../lighthouse-core/gather/connections/cri.js');
+import ChromeLauncher from 'chrome-launcher';
+
+import ChromeProtocol from '../../../../lighthouse-core/gather/connections/cri.js';
 
 const originalRequire = global.require;
 if (typeof globalThis === 'undefined') {
@@ -22,7 +23,7 @@ if (typeof globalThis === 'undefined') {
 
 // Load bundle, which creates a `global.runBundledLighthouse`.
 // @ts-ignore - file exists if `yarn build-all` is run, but not used for types anyways.
-require('../../../../dist/lighthouse-dt-bundle.js'); // eslint-disable-line
+import '../../../../dist/lighthouse-dt-bundle.js'; // eslint-disable-line
 
 global.require = originalRequire;
 
@@ -43,20 +44,23 @@ async function runLighthouse(url, configJson, testRunnerOptions = {}) {
   const port = launchedChrome.port;
   const connection = new ChromeProtocol(port);
 
-  // Run Lighthouse.
-  const logLevel = testRunnerOptions.isDebug ? 'info' : undefined;
-  const runnerResult = await lighthouse(url, {port, logLevel}, configJson, connection);
-  if (!runnerResult) throw new Error('No runnerResult');
-
-  // Clean up and return results.
-  await launchedChrome.kill();
-  return {
-    lhr: runnerResult.lhr,
-    artifacts: runnerResult.artifacts,
-    log: '', // TODO: if want to run in parallel, need to capture lighthouse-logger output.
-  };
+  try {
+    // Run Lighthouse.
+    const logLevel = testRunnerOptions.isDebug ? 'info' : undefined;
+    const runnerResult = await lighthouse(url, {port, logLevel}, configJson, connection);
+    if (!runnerResult) throw new Error('No runnerResult');
+
+    return {
+      lhr: runnerResult.lhr,
+      artifacts: runnerResult.artifacts,
+      log: '', // TODO: if want to run in parallel, need to capture lighthouse-logger output.
+    };
+  } finally {
+    // Clean up and return results.
+    await launchedChrome.kill();
+  }
 }
 
-module.exports = {
+export {
   runLighthouse,
 };

package/lighthouse-cli/test/smokehouse/lighthouse-runners/cli.js

@@ -12,16 +12,18 @@
  * them.
  */
 
-const fs = require('fs').promises;
-const os = require('os');
-const {promisify} = require('util');
-const execFileAsync = promisify(require('child_process').execFile);
+import {promises as fs} from 'fs';
+import {promisify} from 'util';
+import {execFile} from 'child_process';
 
-const log = require('lighthouse-logger');
+import log from 'lighthouse-logger';
 
-const assetSaver = require('../../../../lighthouse-core/lib/asset-saver.js');
-const LocalConsole = require('../lib/local-console.js');
-const ChildProcessError = require('../lib/child-process-error.js');
+import assetSaver from '../../../../lighthouse-core/lib/asset-saver.js';
+import {LocalConsole} from '../lib/local-console.js';
+import {ChildProcessError} from '../lib/child-process-error.js';
+import {LH_ROOT} from '../../../../root.js';
+
+const execFileAsync = promisify(execFile);
 
 /**
  * Launch Chrome and do a full Lighthouse run via the Lighthouse CLI.
@@ -31,9 +33,10 @@ const ChildProcessError = require('../lib/child-process-error.js');
  * @return {Promise<{lhr: LH.Result, artifacts: LH.Artifacts, log: string}>}
  */
 async function runLighthouse(url, configJson, testRunnerOptions = {}) {
-  const tmpPath = await fs.mkdtemp(`${os.tmpdir()}/smokehouse-`);
-
   const {isDebug} = testRunnerOptions;
+  const tmpDir = `${LH_ROOT}/.tmp/smokehouse`;
+  await fs.mkdir(tmpDir, {recursive: true});
+  const tmpPath = await fs.mkdtemp(`${tmpDir}/smokehouse-`);
   return internalRun(url, tmpPath, configJson, testRunnerOptions)
     // Wait for internalRun() before removing scratch directory.
     .finally(() => !isDebug && fs.rmdir(tmpPath, {recursive: true}));
@@ -69,7 +72,7 @@ async function internalRun(url, tmpPath, configJson, options) {
   const artifactsDirectory = `${tmpPath}/artifacts/`;
 
   const args = [
-    `${__dirname}/../../../index.js`, // 'lighthouse-cli/index.js'
+    `${LH_ROOT}/lighthouse-cli/index.js`,
     `${url}`,
     `--output-path=${outputPath}`,
     '--output=json',
@@ -142,6 +145,6 @@ async function internalRun(url, tmpPath, configJson, options) {
   };
 }
 
-module.exports = {
+export {
   runLighthouse,
 };

package/lighthouse-cli/test/smokehouse/report-assert.js

@@ -10,15 +10,10 @@
  * against the results actually collected from Lighthouse.
  */
 
-const cloneDeep = require('lodash.clonedeep');
-const log = require('lighthouse-logger');
-const LocalConsole = require('./lib/local-console.js');
+import cloneDeep from 'lodash.clonedeep';
+import log from 'lighthouse-logger';
 
-const NUMBER_REGEXP = /(?:\d|\.)+/.source;
-const OPS_REGEXP = /<=?|>=?|\+\/-|±/.source;
-// An optional number, optional whitespace, an operator, optional whitespace, a number.
-const NUMERICAL_EXPECTATION_REGEXP =
-  new RegExp(`^(${NUMBER_REGEXP})?\\s*(${OPS_REGEXP})\\s*(${NUMBER_REGEXP})$`);
+import {LocalConsole} from './lib/local-console.js';
 
 /**
  * @typedef Difference
@@ -36,6 +31,12 @@ const NUMERICAL_EXPECTATION_REGEXP =
  * @property {Difference|null} [diff]
  */
 
+const NUMBER_REGEXP = /(?:\d|\.)+/.source;
+const OPS_REGEXP = /<=?|>=?|\+\/-|±/.source;
+// An optional number, optional whitespace, an operator, optional whitespace, a number.
+const NUMERICAL_EXPECTATION_REGEXP =
+  new RegExp(`^(${NUMBER_REGEXP})?\\s*(${OPS_REGEXP})\\s*(${NUMBER_REGEXP})$`);
+
 /**
  * Checks if the actual value matches the expectation. Does not recursively search. This supports
  *    - Greater than/less than operators, e.g. "<100", ">90"
@@ -157,9 +158,11 @@ function makeComparison(name, actualResult, expectedResult) {
  * @param {LocalConsole} localConsole
  * @param {LH.Result} lhr
  * @param {Smokehouse.ExpectedRunnerResult} expected
+ * @param {{isBundled?: boolean}=} reportOptions
  */
-function pruneExpectations(localConsole, lhr, expected) {
+function pruneExpectations(localConsole, lhr, expected, reportOptions) {
   const isFraggleRock = lhr.configSettings.channel === 'fraggle-rock-cli';
+  const isBundled = reportOptions && reportOptions.isBundled;
 
   /**
    * Lazily compute the Chrome version because some reports are explicitly asserting error conditions.
@@ -211,6 +214,12 @@ function pruneExpectations(localConsole, lhr, expected) {
           `Actual channel: ${lhr.configSettings.channel}`,
         ].join(' '));
         delete obj[key];
+      } else if (value._skipInBundled && !isBundled) {
+        localConsole.log([
+          `[${key}] marked as skip in bundled and runner is bundled, pruning expectation:`,
+          JSON.stringify(value, null, 2),
+        ].join(' '));
+        delete obj[key];
       } else {
         pruneRecursively(value);
       }
@@ -218,6 +227,7 @@ function pruneExpectations(localConsole, lhr, expected) {
 
     delete obj._legacyOnly;
     delete obj._fraggleRockOnly;
+    delete obj._skipInBundled;
     delete obj._minChromiumMilestone;
     delete obj._maxChromiumMilestone;
   }
@@ -358,13 +368,13 @@ function reportAssertion(localConsole, assertion) {
  * summary. Returns count of passed and failed tests.
  * @param {{lhr: LH.Result, artifacts: LH.Artifacts, networkRequests?: string[]}} actual
  * @param {Smokehouse.ExpectedRunnerResult} expected
- * @param {{isDebug?: boolean}=} reportOptions
+ * @param {{isDebug?: boolean, isBundled?: boolean}=} reportOptions
  * @return {{passed: number, failed: number, log: string}}
  */
-function report(actual, expected, reportOptions = {}) {
+function getAssertionReport(actual, expected, reportOptions = {}) {
   const localConsole = new LocalConsole();
 
-  expected = pruneExpectations(localConsole, actual.lhr, expected);
+  expected = pruneExpectations(localConsole, actual.lhr, expected, reportOptions);
   const comparisons = collateResults(localConsole, actual, expected);
 
   let correctCount = 0;
@@ -389,4 +399,4 @@ function report(actual, expected, reportOptions = {}) {
   };
 }
 
-module.exports = report;
+export {getAssertionReport};

package/lighthouse-cli/test/smokehouse/smokehouse.js

@@ -11,27 +11,38 @@
  * smoke tests passed.
  */
 
-const log = require('lighthouse-logger');
-const cliLighthouseRunner = require('./lighthouse-runners/cli.js').runLighthouse;
-const getAssertionReport = require('./report-assert.js');
-const LocalConsole = require('./lib/local-console.js');
-const ConcurrentMapper = require('./lib/concurrent-mapper.js');
-
 /* eslint-disable no-console */
 
-/** @typedef {import('./lib/child-process-error.js')} ChildProcessError */
+/** @typedef {import('./lib/child-process-error.js').ChildProcessError} ChildProcessError */
 
-// The number of concurrent (`!runSerially`) tests to run if `jobs` isn't set.
-const DEFAULT_CONCURRENT_RUNS = 5;
-const DEFAULT_RETRIES = 0;
+/**
+ * @typedef Run
+ * @property {string[] | undefined} networkRequests
+ * @property {LH.Result} lhr
+ * @property {LH.Artifacts} artifacts
+ * @property {string} lighthouseLog
+ * @property {string} assertionLog
+ */
 
 /**
  * @typedef SmokehouseResult
  * @property {string} id
  * @property {number} passed
  * @property {number} failed
+ * @property {Run[]} runs
  */
 
+import log from 'lighthouse-logger';
+
+import {runLighthouse as cliLighthouseRunner} from './lighthouse-runners/cli.js';
+import {getAssertionReport} from './report-assert.js';
+import {LocalConsole} from './lib/local-console.js';
+import {ConcurrentMapper} from './lib/concurrent-mapper.js';
+
+// The number of concurrent (`!runSerially`) tests to run if `jobs` isn't set.
+const DEFAULT_CONCURRENT_RUNS = 5;
+const DEFAULT_RETRIES = 0;
+
 /**
  * Runs the selected smoke tests. Returns whether all assertions pass.
  * @param {Array<Smokehouse.TestDfn>} smokeTestDefns
@@ -120,6 +131,8 @@ async function runSmokeTest(smokeTestDefn, testOptions) {
   console.log(`${purpleify(id)} smoketest starting…`);
 
   // Rerun test until there's a passing result or retries are exhausted to prevent flakes.
+  /** @type {Run[]} */
+  const runs = [];
   let result;
   let report;
   const bufferedConsole = new LocalConsole();
@@ -145,6 +158,13 @@ async function runSmokeTest(smokeTestDefn, testOptions) {
 
     // Assert result.
     report = getAssertionReport(result, expectations, {isDebug});
+
+    runs.push({
+      ...result,
+      lighthouseLog: result.log,
+      assertionLog: report.log,
+    });
+
     if (report.failed) {
       bufferedConsole.log(`  ${getAssertionLog(report.failed)} failed.`);
       continue; // Retry, if possible.
@@ -180,6 +200,7 @@ async function runSmokeTest(smokeTestDefn, testOptions) {
     id,
     passed,
     failed,
+    runs,
   };
 }
 
@@ -206,6 +227,6 @@ function getAssertionLog(count) {
   return `${count} assertion${plural}`;
 }
 
-module.exports = {
+export {
   runSmokehouse,
 };

package/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js

@@ -129,7 +129,6 @@ class UnusedBytes extends Audit {
     const [result, graph, simulator] = await Promise.all([
       this.audit_(artifacts, networkRecords, context),
       // Page dependency graph is only used in navigation mode.
-      // TODO(FR-COMPAT): Use dependency graph in timespan mode.
       gatherContext.gatherMode === 'navigation' ?
         PageDependencyGraph.request({trace, devtoolsLog}, context) :
         null,
@@ -201,7 +200,6 @@ class UnusedBytes extends Audit {
   }
 
   /**
-   * TODO(FR-COMPAT): Rework opportunities to remove emphasis on `wastedMs`
    * @param {number} wastedBytes
    * @param {Simulator} simulator
    */

package/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js

@@ -17,6 +17,10 @@ const URL = require('../../lib/url-shim.js');
 const i18n = require('../../lib/i18n/i18n.js');
 
 const UIStrings = {
+  /** Descriptive title of a Lighthouse audit that checks if images match their displayed dimensions. This is displayed when the audit is passing. */
+  title: 'Images were appropriate for their displayed size',
+  /** Descriptive title of a Lighthouse audit that checks if images match their displayed dimensions. This is displayed when the audit is failing. */
+  failureTitle: 'Images were larger than their displayed size',
   /** Label for a column in a data table; entries will be the dimensions of an image as it appears on the page. */
   columnDisplayedDimensions: 'Displayed dimensions',
   /** Label for a column in a data table; entries will be the dimensions of an image from it's source file. */
@@ -35,7 +39,8 @@ class UsesResponsiveImagesSnapshot extends Audit {
   static get meta() {
     return {
       id: 'uses-responsive-images-snapshot',
-      title: UsesResponsiveImages.str_(UsesResponsiveImages.UIStrings.title),
+      title: str_(UIStrings.title),
+      failureTitle: str_(UIStrings.failureTitle),
       description: UsesResponsiveImages.str_(UsesResponsiveImages.UIStrings.description),
       supportedModes: ['snapshot'],
       requiredArtifacts: ['ImageElements', 'ViewportDimensions'],

package/lighthouse-core/audits/dobetterweb/js-libraries.js

@@ -32,6 +32,7 @@ class JsLibrariesAudit extends Audit {
     return {
       id: 'js-libraries',
       title: str_(UIStrings.title),
+      scoreDisplayMode: Audit.SCORING_MODES.INFORMATIVE,
       description: str_(UIStrings.description),
       requiredArtifacts: ['Stacks'],
     };
@@ -69,6 +70,10 @@ class JsLibrariesAudit extends Audit {
       }),
     };
 
+    if (!libDetails.length) {
+      return {score: null, notApplicable: true};
+    }
+
     return {
       score: 1, // Always pass for now.
       details: {

package/lighthouse-core/audits/dobetterweb/uses-http2.js

@@ -60,6 +60,7 @@ class UsesHTTP2Audit extends Audit {
       id: 'uses-http2',
       title: str_(UIStrings.title),
       description: str_(UIStrings.description),
+      scoreDisplayMode: Audit.SCORING_MODES.NUMERIC,
       supportedModes: ['navigation'],
       requiredArtifacts: ['URL', 'devtoolsLogs', 'traces'],
     };

package/lighthouse-core/audits/lcp-lazy-loaded.js

@@ -27,6 +27,7 @@ class LargestContentfulPaintLazyLoaded extends Audit {
     return {
       id: 'lcp-lazy-loaded',
       title: str_(UIStrings.title),
+      failureTitle: str_(UIStrings.failureTitle),
       description: str_(UIStrings.description),
       supportedModes: ['navigation'],
       requiredArtifacts: ['TraceElements', 'ViewportDimensions', 'ImageElements'],

package/lighthouse-core/audits/oopif-iframe-test-audit.js

@@ -0,0 +1,30 @@
+/**
+ * @license Copyright 2021 The Lighthouse Authors. All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+'use strict';
+
+/**
+ * @fileoverview This is a fake audit used exclusively in smoke tests to force inclusion of IFrameElements artifact.
+ * It is included here for complex reasons in the way the bundled smoketests work.
+ *
+ * The smokehouse configs are evaluated first in the node CLI side (which requires an absolute path using LH_ROOT).
+ * The smokehouse configs are then *re-evaluated* in the bundled context for execution by Lighthouse (which *cannot* use an absolute path using LH_ROOT).
+ *
+ * This mismatch in environment demands that the audit path in the config must be context-aware,
+ * yet the require-graph for the config is included before even the CLI knows that it will be using
+ * a bundled runner. Rather than force a massive smoketest architecture change, we include a harmless,
+ * test-only audit in our core list instead.
+ */
+
+module.exports = {
+  meta: {
+    id: 'oopif-iframe-test-audit',
+    title: 'IFrame Elements',
+    failureTitle: 'IFrame Elements',
+    description: 'Audit to force the inclusion of IFrameElements artifact',
+    requiredArtifacts: ['IFrameElements'],
+  },
+  audit: () => ({score: 1}),
+};

package/lighthouse-core/computed/metrics/metric.js

@@ -69,7 +69,8 @@ class Metric {
     }
 
     const processedTrace = await ProcessedTrace.request(trace, context);
-    const processedNavigation = await ProcessedNavigation.request(processedTrace, context);
+    const processedNavigation = gatherContext.gatherMode === 'timespan' ?
+      undefined : await ProcessedNavigation.request(processedTrace, context);
 
     const augmentedData = Object.assign({
       networkRecords: await NetworkRecords.request(devtoolsLog, context),

package/lighthouse-core/config/config-helpers.js

@@ -9,6 +9,7 @@ const path = require('path');
 const isDeepEqual = require('lodash.isequal');
 const constants = require('./constants.js');
 const Budget = require('./budget.js');
+const ConfigPlugin = require('./config-plugin.js');
 const Runner = require('../runner.js');
 const i18n = require('../lib/i18n/i18n.js');
 const validation = require('../fraggle-rock/config/validation.js');
@@ -17,6 +18,21 @@ const validation = require('../fraggle-rock/config/validation.js');
 /** @typedef {typeof import('../audits/audit.js')} Audit */
 /** @typedef {InstanceType<GathererConstructor>} Gatherer */
 
+function isBundledEnvironment() {
+  // If we're in DevTools or LightRider, we are definitely bundled.
+  // TODO: refactor and delete `global.isDevtools`.
+  if (global.isDevtools || global.isLightrider) return true;
+
+  try {
+    // Not foolproof, but `lighthouse-logger` is a dependency of lighthouse that should always be resolvable.
+    // `require.resolve` will only throw in atypical/bundled environments.
+    require.resolve('lighthouse-logger');
+    return false;
+  } catch (err) {
+    return true;
+  }
+}
+
 /**
  * If any items with identical `path` properties are found in the input array,
  * merge their `options` properties into the first instance and then discard any
@@ -224,9 +240,8 @@ function requireAudit(auditPath, coreAuditList, configDir) {
   const coreAudit = coreAuditList.find(a => a === auditPathJs);
   let requirePath = `../audits/${auditPath}`;
   if (!coreAudit) {
-  // TODO: refactor and delete `global.isDevtools`.
-    if (global.isDevtools || global.isLightrider) {
-    // This is for pubads bundling.
+    if (isBundledEnvironment()) {
+      // This is for pubads bundling.
       requirePath = auditPath;
     } else {
     // Otherwise, attempt to find it elsewhere. This throws if not found.
@@ -298,6 +313,34 @@ function resolveSettings(settingsJson = {}, overrides = undefined) {
 }
 
 
+/**
+ * @param {LH.Config.Json} configJSON
+ * @param {string | undefined} configDir
+ * @param {{plugins?: string[]} | undefined} flags
+ * @return {LH.Config.Json}
+ */
+function mergePlugins(configJSON, configDir, flags) {
+  const configPlugins = configJSON.plugins || [];
+  const flagPlugins = (flags && flags.plugins) || [];
+  const pluginNames = new Set([...configPlugins, ...flagPlugins]);
+
+  for (const pluginName of pluginNames) {
+    validation.assertValidPluginName(configJSON, pluginName);
+
+    // In bundled contexts, `resolveModulePath` will fail, so use the raw pluginName directly.
+    const pluginPath = isBundledEnvironment() ?
+        pluginName :
+        resolveModulePath(pluginName, configDir, 'plugin');
+    const rawPluginJson = require(pluginPath);
+    const pluginJson = ConfigPlugin.parsePlugin(rawPluginJson, pluginName);
+
+    configJSON = mergeConfigFragment(configJSON, pluginJson);
+  }
+
+  return configJSON;
+}
+
+
 /**
  * Turns a GathererJson into a GathererDefn which involves a few main steps:
  *    - Expanding the JSON shorthand the full definition format.
@@ -528,6 +571,7 @@ module.exports = {
   mergeOptionsOfItems,
   mergeConfigFragment,
   mergeConfigFragmentArrayByKey,
+  mergePlugins,
   resolveSettings,
   resolveGathererToDefn,
   resolveAuditsToDefns,

package/lighthouse-core/config/config.js

@@ -14,13 +14,12 @@ const validation = require('./../fraggle-rock/config/validation.js');
 const log = require('lighthouse-logger');
 const path = require('path');
 const Runner = require('../runner.js');
-const ConfigPlugin = require('./config-plugin.js');
 const {
+  mergePlugins,
   mergeConfigFragment,
   resolveSettings,
   resolveAuditsToDefns,
   resolveGathererToDefn,
-  resolveModulePath,
   deepClone,
   deepCloneConfigJson,
 } = require('./config-helpers.js');
@@ -40,6 +39,7 @@ const BASE_ARTIFACT_BLANKS = {
   NetworkUserAgent: '',
   BenchmarkIndex: '',
   WebAppManifest: '',
+  GatherContext: '',
   InstallabilityErrors: '',
   Stacks: '',
   traces: '',
@@ -148,22 +148,6 @@ function assertValidFlags(flags) {
   }
 }
 
-/**
- * Throws if pluginName is invalid or (somehow) collides with a category in the
- * configJSON being added to.
- * @param {LH.Config.Json} configJSON
- * @param {string} pluginName
- */
-function assertValidPluginName(configJSON, pluginName) {
-  if (!pluginName.startsWith('lighthouse-plugin-')) {
-    throw new Error(`plugin name '${pluginName}' does not start with 'lighthouse-plugin-'`);
-  }
-
-  if (configJSON.categories && configJSON.categories[pluginName]) {
-    throw new Error(`plugin name '${pluginName}' not allowed because it is the id of a category already found in config`); // eslint-disable-line max-len
-  }
-}
-
 
 /**
  * @implements {LH.Config.Config}
@@ -203,7 +187,7 @@ class Config {
     const configDir = configPath ? path.dirname(configPath) : undefined;
 
     // Validate and merge in plugins (if any).
-    configJSON = Config.mergePlugins(configJSON, flags, configDir);
+    configJSON = mergePlugins(configJSON, configDir, flags);
 
     if (flags) {
       assertValidFlags(flags);
@@ -294,33 +278,6 @@ class Config {
     return mergeConfigFragment(baseJSON, extendJSON);
   }
 
-  /**
-   * @param {LH.Config.Json} configJSON
-   * @param {LH.Flags=} flags
-   * @param {string=} configDir
-   * @return {LH.Config.Json}
-   */
-  static mergePlugins(configJSON, flags, configDir) {
-    const configPlugins = configJSON.plugins || [];
-    const flagPlugins = (flags && flags.plugins) || [];
-    const pluginNames = new Set([...configPlugins, ...flagPlugins]);
-
-    for (const pluginName of pluginNames) {
-      assertValidPluginName(configJSON, pluginName);
-
-      // TODO: refactor and delete `global.isDevtools`.
-      const pluginPath = global.isDevtools || global.isLightrider ?
-        pluginName :
-        resolveModulePath(pluginName, configDir, 'plugin');
-      const rawPluginJson = require(pluginPath);
-      const pluginJson = ConfigPlugin.parsePlugin(rawPluginJson, pluginName);
-
-      configJSON = Config.extendConfigJSON(configJSON, pluginJson);
-    }
-
-    return configJSON;
-  }
-
   /**
    * @param {LH.Config.Json['passes']} passes
    * @return {?Array<Required<LH.Config.PassJson>>}

package/lighthouse-core/config/default-config.js

@@ -146,7 +146,6 @@ const defaultConfig = {
       'iframe-elements',
       'form-elements',
       'main-document-content',
-      'gather-context',
       'global-listeners',
       'dobetterweb/appcache',
       'dobetterweb/doctype',

package/lighthouse-core/fraggle-rock/config/config.js

@@ -24,11 +24,14 @@ const {
   resolveSettings,
   resolveAuditsToDefns,
   resolveGathererToDefn,
+  mergePlugins,
   mergeConfigFragment,
   mergeConfigFragmentArrayByKey,
 } = require('../../config/config-helpers.js');
 const defaultConfigPath = path.join(__dirname, './default-config.js');
 
+/** @typedef {Omit<LH.Config.FRContext, 'gatherMode'> & {gatherMode: LH.Gatherer.GatherMode}} ConfigContext */
+
 /**
  * @param {LH.Config.Json|undefined} configJSON
  * @param {{configPath?: string}} context
@@ -132,7 +135,7 @@ function resolveArtifactsToDefns(artifacts, configDir) {
   const coreGathererList = Runner.getGathererList();
   const artifactDefns = artifacts.map(artifactJson => {
     /** @type {LH.Config.GathererJson} */
-    // @ts-expect-error FR-COMPAT - eventually move the config-helpers to support new types
+    // @ts-expect-error - remove when legacy runner path is removed.
     const gathererJson = artifactJson.gatherer;
 
     const gatherer = resolveGathererToDefn(gathererJson, coreGathererList, configDir);
@@ -158,6 +161,20 @@ function resolveArtifactsToDefns(artifacts, configDir) {
   return artifactDefns;
 }
 
+/**
+ * Overrides the settings that may not apply to the chosen gather mode.
+ *
+ * @param {LH.Config.Settings} settings
+ * @param {ConfigContext} context
+ */
+function overrideSettingsForGatherMode(settings, context) {
+  if (context.gatherMode === 'timespan') {
+    if (settings.throttlingMethod === 'simulate') {
+      settings.throttlingMethod = 'devtools';
+    }
+  }
+}
+
 /**
  * Overrides the quiet windows when throttlingMethod requires observation.
  *
@@ -224,7 +241,7 @@ function resolveNavigationsToDefns(navigations, artifactDefns, settings) {
 
 /**
  * @param {LH.Config.Json|undefined} configJSON
- * @param {Omit<LH.Config.FRContext, 'gatherMode'> & {gatherMode: LH.Gatherer.GatherMode}} context
+ * @param {ConfigContext} context
  * @return {{config: LH.Config.FRConfig, warnings: string[]}}
  */
 function initializeConfig(configJSON, context) {
@@ -234,10 +251,11 @@ function initializeConfig(configJSON, context) {
   let {configWorkingCopy, configDir} = resolveWorkingCopy(configJSON, context); // eslint-disable-line prefer-const
 
   configWorkingCopy = resolveExtensions(configWorkingCopy);
-
-  // TODO(FR-COMPAT): handle config plugins
+  configWorkingCopy = mergePlugins(configWorkingCopy, configDir, context.settingsOverrides);
 
   const settings = resolveSettings(configWorkingCopy.settings || {}, context.settingsOverrides);
+  overrideSettingsForGatherMode(settings, context);
+
   const artifacts = resolveArtifactsToDefns(configWorkingCopy.artifacts, configDir);
   const navigations = resolveNavigationsToDefns(configWorkingCopy.navigations, artifacts, settings);