lighthouse 9.5.0-dev.20230111 → 9.5.0-dev.20230113

package/core/config/config.js

@@ -38,19 +38,19 @@ const defaultConfigPath = path.join(
 );
 
 /**
- * @param {LH.Config.Json|undefined} configJSON
+ * @param {LH.Config|undefined} config
  * @param {{configPath?: string}} context
- * @return {{configWorkingCopy: LH.Config.Json, configDir?: string, configPath?: string}}
+ * @return {{configWorkingCopy: LH.Config, configDir?: string, configPath?: string}}
  */
-function resolveWorkingCopy(configJSON, context) {
+function resolveWorkingCopy(config, context) {
   let {configPath} = context;
 
   if (configPath && !path.isAbsolute(configPath)) {
     throw new Error('configPath must be an absolute path');
   }
 
-  if (!configJSON) {
-    configJSON = defaultConfig;
+  if (!config) {
+    config = defaultConfig;
     configPath = defaultConfigPath;
   }
 
@@ -58,24 +58,24 @@ function resolveWorkingCopy(configJSON, context) {
   const configDir = configPath ? path.dirname(configPath) : undefined;
 
   return {
-    configWorkingCopy: deepCloneConfigJson(configJSON),
+    configWorkingCopy: deepCloneConfigJson(config),
     configPath,
     configDir,
   };
 }
 
 /**
- * @param {LH.Config.Json} configJSON
- * @return {LH.Config.Json}
+ * @param {LH.Config} config
+ * @return {LH.Config}
  */
-function resolveExtensions(configJSON) {
-  if (!configJSON.extends) return configJSON;
+function resolveExtensions(config) {
+  if (!config.extends) return config;
 
-  if (configJSON.extends !== 'lighthouse:default') {
+  if (config.extends !== 'lighthouse:default') {
     throw new Error('`lighthouse:default` is the only valid extension method.');
   }
 
-  const {artifacts, ...extensionJSON} = configJSON;
+  const {artifacts, ...extensionJSON} = config;
   const defaultClone = deepCloneConfigJson(defaultConfig);
   const mergedConfig = mergeConfigFragment(defaultClone, extensionJSON);
 
@@ -236,15 +236,15 @@ function resolveFakeNavigations(artifactDefns, settings) {
 
 /**
  * @param {LH.Gatherer.GatherMode} gatherMode
- * @param {LH.Config.Json=} configJSON
+ * @param {LH.Config=} config
  * @param {LH.Flags=} flags
  * @return {Promise<{resolvedConfig: LH.Config.ResolvedConfig, warnings: string[]}>}
  */
-async function initializeConfig(gatherMode, configJSON, flags = {}) {
+async function initializeConfig(gatherMode, config, flags = {}) {
   const status = {msg: 'Initialize config', id: 'lh:config'};
   log.time(status, 'verbose');
 
-  let {configWorkingCopy, configDir} = resolveWorkingCopy(configJSON, flags);
+  let {configWorkingCopy, configDir} = resolveWorkingCopy(config, flags);
 
   configWorkingCopy = resolveExtensions(configWorkingCopy);
   configWorkingCopy = await mergePlugins(configWorkingCopy, configDir, flags);

package/core/config/constants.js

@@ -111,6 +111,7 @@ const defaultSettings = {
   debugNavigation: false,
   channel: 'node',
   usePassiveGathering: false,
+  disableFullPageScreenshot: false,
   skipAboutBlank: false,
   blankPage: 'about:blank',
 

package/core/config/default-config.js

@@ -170,7 +170,7 @@ for (const key of Object.keys(artifacts)) {
   artifacts[/** @type {keyof typeof artifacts} */ (key)] = key;
 }
 
-/** @type {LH.Config.Json} */
+/** @type {LH.Config} */
 const defaultConfig = {
   settings: constants.defaultSettings,
   artifacts: [
@@ -278,7 +278,6 @@ const defaultConfig = {
     'valid-source-maps',
     'preload-lcp-image',
     'csp-xss',
-    'full-page-screenshot',
     'script-treemap-data',
     'manual/pwa-cross-browser',
     'manual/pwa-page-transitions',
@@ -517,7 +516,6 @@ const defaultConfig = {
         {id: 'non-composited-animations', weight: 0},
         {id: 'unsized-images', weight: 0},
         {id: 'viewport', weight: 0},
-        {id: 'no-unload-listeners', weight: 0},
         {id: 'uses-responsive-images-snapshot', weight: 0},
         {id: 'work-during-interaction', weight: 0},
         {id: 'bf-cache', weight: 0},
@@ -623,6 +621,7 @@ const defaultConfig = {
         {id: 'doctype', weight: 1, group: 'best-practices-browser-compat'},
         {id: 'charset', weight: 1, group: 'best-practices-browser-compat'},
         // General Group
+        {id: 'no-unload-listeners', weight: 1, group: 'best-practices-general'},
         {id: 'js-libraries', weight: 0, group: 'best-practices-general'},
         {id: 'deprecations', weight: 1, group: 'best-practices-general'},
         {id: 'errors-in-console', weight: 1, group: 'best-practices-general'},

package/core/config/desktop-config.js

@@ -6,7 +6,7 @@
 
 import * as constants from './constants.js';
 
-/** @type {LH.Config.Json} */
+/** @type {LH.Config} */
 const config = {
   extends: 'lighthouse:default',
   settings: {

package/core/config/experimental-config.js

@@ -9,7 +9,7 @@
  * being enabled by default.
  */
 
-/** @type {LH.Config.Json} */
+/** @type {LH.Config} */
 const config = {
   extends: 'lighthouse:default',
   audits: [

package/core/config/filters.js

@@ -27,12 +27,13 @@ const baseArtifactKeys = Object.keys(baseArtifactKeySource);
 
 // Some audits are used by the report for additional information.
 // Keep these audits unless they are *directly* skipped with `skipAudits`.
-const filterResistantAuditIds = ['full-page-screenshot'];
+/** @type {string[]} */
+const filterResistantAuditIds = [];
 
 // Some artifacts are used by the report for additional information.
 // Always run these artifacts even if audits do not request them.
 // These are similar to base artifacts but they cannot be run in all 3 modes.
-const filterResistantArtifactIds = ['Stacks', 'NetworkUserAgent'];
+const filterResistantArtifactIds = ['Stacks', 'NetworkUserAgent', 'FullPageScreenshot'];
 
 /**
  * Returns the set of audit IDs used in the list of categories.
@@ -302,7 +303,7 @@ function filterConfigByExplicitFilters(resolvedConfig, filters) {
     [
       ...baseAuditIds, // Start with our base audits.
       ...(onlyAudits || []), // Additionally include the opt-in audits from `onlyAudits`.
-      ...filterResistantAuditIds, // Always include our filter-resistant audits (full-page-screenshot).
+      ...filterResistantAuditIds, // Always include any filter-resistant audits.
     ].filter(auditId => !skipAudits || !skipAudits.includes(auditId))
   );
 
@@ -313,7 +314,10 @@ function filterConfigByExplicitFilters(resolvedConfig, filters) {
   const availableCategories =
     filterCategoriesByAvailableAudits(resolvedConfig.categories, audits || []);
   const categories = filterCategoriesByExplicitFilters(availableCategories, onlyCategories);
-  const artifacts = filterArtifactsByAvailableAudits(resolvedConfig.artifacts, audits);
+  let artifacts = filterArtifactsByAvailableAudits(resolvedConfig.artifacts, audits);
+  if (artifacts && resolvedConfig.settings.disableFullPageScreenshot) {
+    artifacts = artifacts.filter(({id}) => id !== 'FullPageScreenshot');
+  }
   const navigations =
     filterNavigationsByAvailableArtifacts(resolvedConfig.navigations, artifacts || []);
 

package/core/config/full-config.js

@@ -4,7 +4,7 @@
  * 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.
  */
 
-/** @type {LH.Config.Json} */
+/** @type {LH.Config} */
 const fullConfig = {
   extends: 'lighthouse:default',
   settings: {},

package/core/config/lr-desktop-config.js

@@ -6,7 +6,7 @@
 
 import * as constants from './constants.js';
 
-/** @type {LH.Config.Json} */
+/** @type {LH.Config} */
 const config = {
   extends: 'lighthouse:default',
   settings: {

package/core/config/lr-mobile-config.js

@@ -4,7 +4,7 @@
  * 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.
  */
 
-/** @type {LH.Config.Json} */
+/** @type {LH.Config} */
 const config = {
   extends: 'lighthouse:default',
   settings: {

package/core/config/perf-config.js

@@ -4,7 +4,7 @@
  * 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.
  */
 
-/** @type {LH.Config.Json} */
+/** @type {LH.Config} */
 const perfConfig = {
   extends: 'lighthouse:default',
   settings: {

package/core/config/validation.js

@@ -39,16 +39,16 @@ function isValidArtifactDependency(dependent, dependency) {
 
 /**
  * Throws if pluginName is invalid or (somehow) collides with a category in the
- * configJSON being added to.
- * @param {LH.Config.Json} configJSON
+ * config being added to.
+ * @param {LH.Config} config
  * @param {string} pluginName
  */
-function assertValidPluginName(configJSON, pluginName) {
+function assertValidPluginName(config, pluginName) {
   if (!pluginName.startsWith('lighthouse-plugin-')) {
     throw new Error(`plugin name '${pluginName}' does not start with 'lighthouse-plugin-'`);
   }
 
-  if (configJSON.categories?.[pluginName]) {
+  if (config.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
   }
 }

package/core/gather/gatherers/accessibility.js

@@ -81,6 +81,19 @@ async function runA11yChecks() {
   };
 }
 
+async function runA11yChecksAndResetScroll() {
+  const originalScrollPosition = {
+    x: window.scrollX,
+    y: window.scrollY,
+  };
+
+  try {
+    return await runA11yChecks();
+  } finally {
+    window.scrollTo(originalScrollPosition.x, originalScrollPosition.y);
+  }
+}
+
 /**
  * @param {import('axe-core/axe').Result} result
  * @return {LH.Artifacts.AxeRuleResult}
@@ -168,13 +181,14 @@ class Accessibility extends FRGatherer {
   getArtifact(passContext) {
     const driver = passContext.driver;
 
-    return driver.executionContext.evaluate(runA11yChecks, {
+    return driver.executionContext.evaluate(runA11yChecksAndResetScroll, {
       args: [],
       useIsolation: true,
       deps: [
         axeSource,
         pageFunctions.getNodeDetails,
         createAxeRuleResultArtifact,
+        runA11yChecks,
       ],
     });
   }

package/core/gather/gatherers/full-page-screenshot.js

@@ -47,7 +47,7 @@ function getObservedDeviceMetrics() {
 }
 
 /**
- * The screenshot dimensions are sized to `window.outerHeight` / `window.innerWidth`,
+ * The screenshot dimensions are sized to `window.outerHeight` / `window.outerWidth`,
  * however the bounding boxes of the elements are relative to `window.innerHeight` / `window.innerWidth`.
  */
 function getScreenshotAreaSize() {
@@ -74,9 +74,8 @@ class FullPageScreenshot extends FRGatherer {
   /**
    * @param {LH.Gatherer.FRTransitionalContext} context
    * @param {{height: number, width: number, mobile: boolean}} deviceMetrics
-   * @return {Promise<LH.Artifacts.FullPageScreenshot['screenshot']>}
    */
-  async _takeScreenshot(context, deviceMetrics) {
+  async _resizeViewport(context, deviceMetrics) {
     const session = context.driver.defaultSession;
     const metrics = await session.sendCommand('Page.getLayoutMetrics');
 
@@ -118,8 +117,14 @@ class FullPageScreenshot extends FRGatherer {
 
     // Now that new resources are (probably) fetched, wait long enough for a layout.
     await context.driver.executionContext.evaluate(waitForDoubleRaf, {args: []});
+  }
 
-    const result = await session.sendCommand('Page.captureScreenshot', {
+  /**
+   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @return {Promise<LH.Result.FullPageScreenshot['screenshot']>}
+   */
+  async _takeScreenshot(context) {
+    const result = await context.driver.defaultSession.sendCommand('Page.captureScreenshot', {
       format: 'webp',
       quality: FULL_PAGE_SCREENSHOT_QUALITY,
     });
@@ -129,8 +134,8 @@ class FullPageScreenshot extends FRGatherer {
       await context.driver.executionContext.evaluate(getScreenshotAreaSize, {
         args: [],
         useIsolation: true,
-        deps: [kebabCaseToCamelCase],
       });
+
     return {
       data,
       width: screenshotAreaSize.width,
@@ -146,11 +151,11 @@ class FullPageScreenshot extends FRGatherer {
    * to re-collect the bounding client rectangle.
    * @see pageFunctions.getNodeDetails
    * @param {LH.Gatherer.FRTransitionalContext} context
-   * @return {Promise<LH.Artifacts.FullPageScreenshot['nodes']>}
+   * @return {Promise<LH.Result.FullPageScreenshot['nodes']>}
    */
   async _resolveNodes(context) {
     function resolveNodes() {
-      /** @type {LH.Artifacts.FullPageScreenshot['nodes']} */
+      /** @type {LH.Result.FullPageScreenshot['nodes']} */
       const nodes = {};
       if (!window.__lighthouseNodesDontTouchOrAllVarianceGoesAway) return nodes;
 
@@ -197,44 +202,50 @@ class FullPageScreenshot extends FRGatherer {
     /** @type {{width: number, height: number, deviceScaleFactor: number, mobile: boolean}} */
     const deviceMetrics = {...settings.screenEmulation};
 
-    // In case some other program is controlling emulation, remember what the device looks like now and reset after gatherer is done.
-    // If we're gathering with mobile screenEmulation on (overlay scrollbars, etc), continue to use that for this screenshot.
-    if (!lighthouseControlsEmulation) {
-      const observedDeviceMetrics = await executionContext.evaluate(getObservedDeviceMetrics, {
-        args: [],
-        useIsolation: true,
-        deps: [kebabCaseToCamelCase],
-      });
-      deviceMetrics.height = observedDeviceMetrics.height;
-      deviceMetrics.width = observedDeviceMetrics.width;
-      deviceMetrics.deviceScaleFactor = observedDeviceMetrics.deviceScaleFactor;
-      // If screen emulation is disabled, use formFactor to determine if we are on mobile.
-      deviceMetrics.mobile = settings.formFactor === 'mobile';
-    }
-
     try {
+      if (!settings.usePassiveGathering) {
+        // In case some other program is controlling emulation, remember what the device looks like now and reset after gatherer is done.
+        // If we're gathering with mobile screenEmulation on (overlay scrollbars, etc), continue to use that for this screenshot.
+        if (!lighthouseControlsEmulation) {
+          const observedDeviceMetrics = await executionContext.evaluate(getObservedDeviceMetrics, {
+            args: [],
+            useIsolation: true,
+            deps: [kebabCaseToCamelCase],
+          });
+          deviceMetrics.height = observedDeviceMetrics.height;
+          deviceMetrics.width = observedDeviceMetrics.width;
+          deviceMetrics.deviceScaleFactor = observedDeviceMetrics.deviceScaleFactor;
+          // If screen emulation is disabled, use formFactor to determine if we are on mobile.
+          deviceMetrics.mobile = settings.formFactor === 'mobile';
+        }
+
+        await this._resizeViewport(context, deviceMetrics);
+      }
+
       return {
-        screenshot: await this._takeScreenshot(context, deviceMetrics),
+        screenshot: await this._takeScreenshot(context),
         nodes: await this._resolveNodes(context),
       };
     } finally {
-      // Revert resized page.
-      if (lighthouseControlsEmulation) {
-        await emulation.emulate(session, settings);
-      } else {
-        // Best effort to reset emulation to what it was.
-        // https://github.com/GoogleChrome/lighthouse/pull/10716#discussion_r428970681
-        // TODO: seems like this would be brittle. Should at least work for devtools, but what
-        // about scripted puppeteer usages? Better to introduce a "setEmulation" callback
-        // in the LH runner api, which for ex. puppeteer consumers would setup puppeteer emulation,
-        // and then just call that to reset?
-        // https://github.com/GoogleChrome/lighthouse/issues/11122
-        await session.sendCommand('Emulation.setDeviceMetricsOverride', {
-          mobile: deviceMetrics.mobile,
-          deviceScaleFactor: deviceMetrics.deviceScaleFactor,
-          height: deviceMetrics.height,
-          width: 0, // Leave width unchanged
-        });
+      if (!settings.usePassiveGathering) {
+        // Revert resized page.
+        if (lighthouseControlsEmulation) {
+          await emulation.emulate(session, settings);
+        } else {
+          // Best effort to reset emulation to what it was.
+          // https://github.com/GoogleChrome/lighthouse/pull/10716#discussion_r428970681
+          // TODO: seems like this would be brittle. Should at least work for devtools, but what
+          // about scripted puppeteer usages? Better to introduce a "setEmulation" callback
+          // in the LH runner api, which for ex. puppeteer consumers would setup puppeteer emulation,
+          // and then just call that to reset?
+          // https://github.com/GoogleChrome/lighthouse/issues/11122
+          await session.sendCommand('Emulation.setDeviceMetricsOverride', {
+            mobile: deviceMetrics.mobile,
+            deviceScaleFactor: deviceMetrics.deviceScaleFactor,
+            height: deviceMetrics.height,
+            width: 0, // Leave width unchanged
+          });
+        }
       }
     }
   }

package/core/gather/gatherers/seo/tap-targets.js

@@ -281,6 +281,24 @@ function gatherTapTargets(tapTargetsSelector, className) {
 
   return targets;
 }
+
+/**
+ * @param {string} tapTargetsSelector
+ * @param {string} className
+ * @return {LH.Artifacts.TapTarget[]}
+ */
+function gatherTapTargetsAndResetScroll(tapTargetsSelector, className) {
+  const originalScrollPosition = {
+    x: window.scrollX,
+    y: window.scrollY,
+  };
+
+  try {
+    return gatherTapTargets(tapTargetsSelector, className);
+  } finally {
+    window.scrollTo(originalScrollPosition.x, originalScrollPosition.y);
+  }
+}
 /* c8 ignore stop */
 
 class TapTargets extends FRGatherer {
@@ -337,25 +355,27 @@ class TapTargets extends FRGatherer {
     const className = 'lighthouse-disable-pointer-events';
     const styleSheetId = await this.addStyleRule(session, className);
 
-    const tapTargets = await passContext.driver.executionContext.evaluate(gatherTapTargets, {
-      args: [tapTargetsSelector, className],
-      useIsolation: true,
-      deps: [
-        pageFunctions.getNodeDetails,
-        pageFunctions.getElementsInDocument,
-        disableFixedAndStickyElementPointerEvents,
-        elementIsVisible,
-        elementHasAncestorTapTarget,
-        elementCenterIsAtZAxisTop,
-        getClientRects,
-        hasTextNodeSiblingsFormingTextBlock,
-        elementIsInTextBlock,
-        RectHelpers.getRectCenterPoint,
-        pageFunctions.getNodePath,
-        pageFunctions.getNodeSelector,
-        pageFunctions.getNodeLabel,
-      ],
-    });
+    const tapTargets =
+      await passContext.driver.executionContext.evaluate(gatherTapTargetsAndResetScroll, {
+        args: [tapTargetsSelector, className],
+        useIsolation: true,
+        deps: [
+          pageFunctions.getNodeDetails,
+          pageFunctions.getElementsInDocument,
+          disableFixedAndStickyElementPointerEvents,
+          elementIsVisible,
+          elementHasAncestorTapTarget,
+          elementCenterIsAtZAxisTop,
+          getClientRects,
+          hasTextNodeSiblingsFormingTextBlock,
+          elementIsInTextBlock,
+          RectHelpers.getRectCenterPoint,
+          pageFunctions.getNodePath,
+          pageFunctions.getNodeSelector,
+          pageFunctions.getNodeLabel,
+          gatherTapTargets,
+        ],
+      });
 
     await this.removeStyleRule(session, styleSheetId);
 

package/core/gather/navigation-runner.js

@@ -311,7 +311,7 @@ async function _cleanup({requestedUrl, driver, resolvedConfig}) {
 /**
  * @param {LH.Puppeteer.Page|undefined} page
  * @param {LH.NavigationRequestor|undefined} requestor
- * @param {{config?: LH.Config.Json, flags?: LH.Flags}} [options]
+ * @param {{config?: LH.Config, flags?: LH.Flags}} [options]
  * @return {Promise<LH.Gatherer.FRGatherResult>}
  */
 async function navigationGather(page, requestor, options = {}) {

package/core/gather/snapshot-runner.js

@@ -14,7 +14,7 @@ import {getBaseArtifacts, finalizeArtifacts} from './base-artifacts.js';
 
 /**
  * @param {LH.Puppeteer.Page} page
- * @param {{config?: LH.Config.Json, flags?: LH.Flags}} [options]
+ * @param {{config?: LH.Config, flags?: LH.Flags}} [options]
  * @return {Promise<LH.Gatherer.FRGatherResult>}
  */
 async function snapshotGather(page, options = {}) {

package/core/gather/timespan-runner.js

@@ -15,7 +15,7 @@ import {getBaseArtifacts, finalizeArtifacts} from './base-artifacts.js';
 
 /**
  * @param {LH.Puppeteer.Page} page
- * @param {{config?: LH.Config.Json, flags?: LH.Flags}} [options]
+ * @param {{config?: LH.Config, flags?: LH.Flags}} [options]
  * @return {Promise<{endTimespanGather(): Promise<LH.Gatherer.FRGatherResult>}>}
  */
 async function startTimespanGather(page, options = {}) {

package/core/index.js

@@ -37,13 +37,13 @@ import {navigationGather} from './gather/navigation-runner.js';
  * @param {string=} url The URL to test. Optional if running in auditMode.
  * @param {LH.Flags=} flags Optional settings for the Lighthouse run. If present,
  *   they will override any settings in the config.
- * @param {LH.Config.Json=} configJSON Configuration for the Lighthouse run. If
+ * @param {LH.Config=} config Configuration for the Lighthouse run. If
  *   not present, the default config is used.
  * @param {LH.Puppeteer.Page=} page
  * @return {Promise<LH.RunnerResult|undefined>}
  */
-async function lighthouse(url, flags = {}, configJSON, page) {
-  return navigation(page, url, {config: configJSON, flags});
+async function lighthouse(url, flags = {}, config, page) {
+  return navigation(page, url, {config, flags});
 }
 
 /**
@@ -53,17 +53,17 @@ async function lighthouse(url, flags = {}, configJSON, page) {
  * @param {string=} url The URL to test. Optional if running in auditMode.
  * @param {LH.Flags=} flags Optional settings for the Lighthouse run. If present,
  *   they will override any settings in the config.
- * @param {LH.Config.Json=} configJSON Configuration for the Lighthouse run. If
+ * @param {LH.Config=} config Configuration for the Lighthouse run. If
  *   not present, the default config is used.
  * @param {Connection=} userConnection
  * @return {Promise<LH.RunnerResult|undefined>}
  */
-async function legacyNavigation(url, flags = {}, configJSON, userConnection) {
+async function legacyNavigation(url, flags = {}, config, userConnection) {
   // set logging preferences, assume quiet
   flags.logLevel = flags.logLevel || 'error';
   log.setLevel(flags.logLevel);
 
-  const resolvedConfig = await LegacyResolvedConfig.fromJson(configJSON, flags);
+  const resolvedConfig = await LegacyResolvedConfig.fromJson(config, flags);
   const computedCache = new Map();
   const options = {resolvedConfig, computedCache};
   const connection = userConnection || new CriConnection(flags.port, flags.hostname);
@@ -87,7 +87,7 @@ async function startFlow(page, options) {
 /**
  * @param {LH.Puppeteer.Page|undefined} page
  * @param {LH.NavigationRequestor|undefined} requestor
- * @param {{config?: LH.Config.Json, flags?: LH.Flags}} [options]
+ * @param {{config?: LH.Config, flags?: LH.Flags}} [options]
  * @return {Promise<LH.RunnerResult|undefined>}
  */
 async function navigation(page, requestor, options) {
@@ -97,7 +97,7 @@ async function navigation(page, requestor, options) {
 
 /**
  * @param {LH.Puppeteer.Page} page
- * @param {{config?: LH.Config.Json, flags?: LH.Flags}} [options]
+ * @param {{config?: LH.Config, flags?: LH.Flags}} [options]
  * @return {Promise<LH.RunnerResult|undefined>}
  */
 async function snapshot(page, options) {
@@ -107,7 +107,7 @@ async function snapshot(page, options) {
 
 /**
  * @param {LH.Puppeteer.Page} page
- * @param {{config?: LH.Config.Json, flags?: LH.Flags}} [options]
+ * @param {{config?: LH.Config, flags?: LH.Flags}} [options]
  * @return {Promise<{endTimespan: () => Promise<LH.RunnerResult|undefined>}>}
  */
 async function startTimespan(page, options) {
@@ -138,7 +138,7 @@ function generateReport(result, format = 'html') {
 
 /**
  * @param {LH.UserFlow.FlowArtifacts} flowArtifacts
- * @param {LH.Config.Json} [config]
+ * @param {LH.Config} [config]
  */
 async function auditFlowArtifacts(flowArtifacts, config) {
   const {gatherSteps, name} = flowArtifacts;