lighthouse 9.2.0 → 9.3.0

package/lighthouse-core/audits/preload-lcp-image.js

@@ -176,7 +176,7 @@ class PreloadLCPImageAudit extends Audit {
       const node = modifiedNodesById.get(nodeId);
       if (!node) throw new Error('Impossible - node should never be undefined');
       const timings = simulationAfterChanges.nodeTimings.get(node);
-      const endTime = timings && timings.endTime || 0;
+      const endTime = timings?.endTime || 0;
       maxDependencyEndTime = Math.max(maxDependencyEndTime, endTime);
     }
 
@@ -198,7 +198,7 @@ class PreloadLCPImageAudit extends Audit {
    * @param {LH.Audit.Context} context
    * @return {Promise<LH.Audit.Product>}
    */
-  static async audit_(artifacts, context) {
+  static async audit(artifacts, context) {
     const gatherContext = artifacts.GatherContext;
     const trace = artifacts.traces[PreloadLCPImageAudit.DEFAULT_PASS];
     const devtoolsLog = artifacts.devtoolsLogs[PreloadLCPImageAudit.DEFAULT_PASS];
@@ -236,16 +236,6 @@ class PreloadLCPImageAudit extends Audit {
       details,
     };
   }
-
-  /**
-   * @return {Promise<LH.Audit.Product>}
-   */
-  static async audit() {
-    // Preload advice is dangerous until https://bugs.chromium.org/p/chromium/issues/detail?id=788757
-    // has been fixed and validated. All preload audits are on hold until then.
-    // See https://github.com/GoogleChrome/lighthouse/issues/11960 for more discussion.
-    return {score: 1, notApplicable: true, details: Audit.makeOpportunityDetails([], [], 0)};
-  }
 }
 
 module.exports = PreloadLCPImageAudit;

package/lighthouse-core/audits/seo/is-crawlable.js

@@ -6,7 +6,8 @@
 'use strict';
 
 const Audit = require('../audit.js');
-const robotsParser = require('robots-parser');
+// TODO(esmodules): cast can be removed when this switches to import.
+const robotsParser = /** @type {typeof import('robots-parser').default} */ (/** @type {unknown} */(require('robots-parser'))); // eslint-disable-line max-len
 const URL = require('../../lib/url-shim.js');
 const MainResource = require('../../computed/main-resource.js');
 const BLOCKLIST = new Set([

package/lighthouse-core/audits/themed-omnibox.js

@@ -101,7 +101,7 @@ class ThemedOmnibox extends MultiCheckAudit {
     return {
       failures,
       manifestValues,
-      themeColor: (themeColorMeta && themeColorMeta.content) || null,
+      themeColor: themeColorMeta?.content || null,
     };
   }
 }

package/lighthouse-core/audits/uses-rel-preload.js

@@ -257,9 +257,8 @@ class UsesRelPreloadAudit extends Audit {
    * @return {Promise<LH.Audit.Product>}
    */
   static async audit() {
-    // Preload advice is dangerous until https://bugs.chromium.org/p/chromium/issues/detail?id=788757
-    // has been fixed and validated. All preload audits are on hold until then.
-    // See https://github.com/GoogleChrome/lighthouse/issues/11960 for more discussion.
+    // Preload advice is on hold until https://github.com/GoogleChrome/lighthouse/issues/11960
+    // is resolved.
     return {score: 1, notApplicable: true, details: Audit.makeOpportunityDetails([], [], 0)};
   }
 }

package/lighthouse-core/audits/valid-source-maps.js

@@ -93,7 +93,7 @@ class ValidSourceMaps extends Audit {
       }
 
       // Sources content errors.
-      if (sourceMap && sourceMap.map) {
+      if (sourceMap?.map) {
         const sourcesContent = sourceMap.map.sourcesContent || [];
         let missingSourcesContentCount = 0;
         for (let i = 0; i < sourceMap.map.sources.length; i++) {
@@ -108,7 +108,7 @@ class ValidSourceMaps extends Audit {
       if (sourceMap || errors.length) {
         results.push({
           scriptUrl: scriptElement.src,
-          sourceMapUrl: sourceMap && sourceMap.sourceMapUrl,
+          sourceMapUrl: sourceMap?.sourceMapUrl,
           subItems: {
             type: /** @type {const} */ ('subitems'),
             items: errors,

package/lighthouse-core/computed/image-records.js

@@ -39,7 +39,7 @@ class ImageRecords {
 
     for (const element of data.ImageElements) {
       const networkRecord = indexedNetworkRecords[element.src];
-      const mimeType = networkRecord && networkRecord.mimeType;
+      const mimeType = networkRecord?.mimeType;
 
       // Don't change the guessed mime type if no mime type was found.
       imageRecords.push({

package/lighthouse-core/computed/js-bundles.js

@@ -100,7 +100,7 @@ class JSBundles {
       const mapUrl = SourceMap.sourceMapUrl || 'compiled.js.map';
       const map = new SDK.TextSourceMap(compiledUrl, mapUrl, rawMap);
 
-      const content = scriptElement && scriptElement.content ? scriptElement.content : '';
+      const content = scriptElement?.content ? scriptElement.content : '';
       const sizes = computeGeneratedFileSizes(map, content);
 
       const bundle = {

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

@@ -111,7 +111,7 @@ class LanternMetricArtifact {
     const processedTrace = await ProcessedTrace.request(trace, context);
     const processedNavigation = await ProcessedNavigation.request(processedTrace, context);
     const simulator = data.simulator ||
-        await LoadSimulator.request({devtoolsLog, settings}, context);
+        (await LoadSimulator.request({devtoolsLog, settings}, context));
 
     const optimisticGraph = this.getOptimisticGraph(graph, processedNavigation);
     const pessimisticGraph = this.getPessimisticGraph(graph, processedNavigation);

package/lighthouse-core/computed/metrics/timing-summary.js

@@ -67,22 +67,22 @@ class TimingSummary {
     /** @type {LH.Artifacts.TimingSummary} */
     const metrics = {
       // Include the simulated/observed performance metrics
-      firstContentfulPaint: firstContentfulPaint && firstContentfulPaint.timing,
-      firstContentfulPaintTs: firstContentfulPaint && firstContentfulPaint.timestamp,
-      firstContentfulPaintAllFrames: firstContentfulPaintAllFrames && firstContentfulPaintAllFrames.timing,
-      firstContentfulPaintAllFramesTs: firstContentfulPaintAllFrames && firstContentfulPaintAllFrames.timestamp,
-      firstMeaningfulPaint: firstMeaningfulPaint && firstMeaningfulPaint.timing,
-      firstMeaningfulPaintTs: firstMeaningfulPaint && firstMeaningfulPaint.timestamp,
-      largestContentfulPaint: largestContentfulPaint && largestContentfulPaint.timing,
-      largestContentfulPaintTs: largestContentfulPaint && largestContentfulPaint.timestamp,
-      largestContentfulPaintAllFrames: largestContentfulPaintAllFrames && largestContentfulPaintAllFrames.timing,
-      largestContentfulPaintAllFramesTs: largestContentfulPaintAllFrames && largestContentfulPaintAllFrames.timestamp,
-      interactive: interactive && interactive.timing,
-      interactiveTs: interactive && interactive.timestamp,
-      speedIndex: speedIndex && speedIndex.timing,
-      speedIndexTs: speedIndex && speedIndex.timestamp,
-      totalBlockingTime: totalBlockingTime && totalBlockingTime.timing,
-      maxPotentialFID: maxPotentialFID && maxPotentialFID.timing,
+      firstContentfulPaint: firstContentfulPaint?.timing,
+      firstContentfulPaintTs: firstContentfulPaint?.timestamp,
+      firstContentfulPaintAllFrames: firstContentfulPaintAllFrames?.timing,
+      firstContentfulPaintAllFramesTs: firstContentfulPaintAllFrames?.timestamp,
+      firstMeaningfulPaint: firstMeaningfulPaint?.timing,
+      firstMeaningfulPaintTs: firstMeaningfulPaint?.timestamp,
+      largestContentfulPaint: largestContentfulPaint?.timing,
+      largestContentfulPaintTs: largestContentfulPaint?.timestamp,
+      largestContentfulPaintAllFrames: largestContentfulPaintAllFrames?.timing,
+      largestContentfulPaintAllFramesTs: largestContentfulPaintAllFrames?.timestamp,
+      interactive: interactive?.timing,
+      interactiveTs: interactive?.timestamp,
+      speedIndex: speedIndex?.timing,
+      speedIndexTs: speedIndex?.timestamp,
+      totalBlockingTime: totalBlockingTime?.timing,
+      maxPotentialFID: maxPotentialFID?.timing,
       cumulativeLayoutShift,
       cumulativeLayoutShiftMainFrame,
       totalCumulativeLayoutShift,
@@ -91,26 +91,26 @@ class TimingSummary {
       observedTimeOrigin: processedTrace.timings.timeOrigin,
       observedTimeOriginTs: processedTrace.timestamps.timeOrigin,
       // For now, navigationStart is always timeOrigin.
-      observedNavigationStart: processedNavigation && processedNavigation.timings.timeOrigin,
-      observedNavigationStartTs: processedNavigation && processedNavigation.timestamps.timeOrigin,
-      observedFirstPaint: processedNavigation && processedNavigation.timings.firstPaint,
-      observedFirstPaintTs: processedNavigation && processedNavigation.timestamps.firstPaint,
-      observedFirstContentfulPaint: processedNavigation && processedNavigation.timings.firstContentfulPaint,
-      observedFirstContentfulPaintTs: processedNavigation && processedNavigation.timestamps.firstContentfulPaint,
-      observedFirstContentfulPaintAllFrames: processedNavigation && processedNavigation.timings.firstContentfulPaintAllFrames,
-      observedFirstContentfulPaintAllFramesTs: processedNavigation && processedNavigation.timestamps.firstContentfulPaintAllFrames,
-      observedFirstMeaningfulPaint: processedNavigation && processedNavigation.timings.firstMeaningfulPaint,
-      observedFirstMeaningfulPaintTs: processedNavigation && processedNavigation.timestamps.firstMeaningfulPaint,
-      observedLargestContentfulPaint: processedNavigation && processedNavigation.timings.largestContentfulPaint,
-      observedLargestContentfulPaintTs: processedNavigation && processedNavigation.timestamps.largestContentfulPaint,
-      observedLargestContentfulPaintAllFrames: processedNavigation && processedNavigation.timings.largestContentfulPaintAllFrames,
-      observedLargestContentfulPaintAllFramesTs: processedNavigation && processedNavigation.timestamps.largestContentfulPaintAllFrames,
+      observedNavigationStart: processedNavigation?.timings.timeOrigin,
+      observedNavigationStartTs: processedNavigation?.timestamps.timeOrigin,
+      observedFirstPaint: processedNavigation?.timings.firstPaint,
+      observedFirstPaintTs: processedNavigation?.timestamps.firstPaint,
+      observedFirstContentfulPaint: processedNavigation?.timings.firstContentfulPaint,
+      observedFirstContentfulPaintTs: processedNavigation?.timestamps.firstContentfulPaint,
+      observedFirstContentfulPaintAllFrames: processedNavigation?.timings.firstContentfulPaintAllFrames,
+      observedFirstContentfulPaintAllFramesTs: processedNavigation?.timestamps.firstContentfulPaintAllFrames,
+      observedFirstMeaningfulPaint: processedNavigation?.timings.firstMeaningfulPaint,
+      observedFirstMeaningfulPaintTs: processedNavigation?.timestamps.firstMeaningfulPaint,
+      observedLargestContentfulPaint: processedNavigation?.timings.largestContentfulPaint,
+      observedLargestContentfulPaintTs: processedNavigation?.timestamps.largestContentfulPaint,
+      observedLargestContentfulPaintAllFrames: processedNavigation?.timings.largestContentfulPaintAllFrames,
+      observedLargestContentfulPaintAllFramesTs: processedNavigation?.timestamps.largestContentfulPaintAllFrames,
       observedTraceEnd: processedTrace.timings.traceEnd,
       observedTraceEndTs: processedTrace.timestamps.traceEnd,
-      observedLoad: processedNavigation && processedNavigation.timings.load,
-      observedLoadTs: processedNavigation && processedNavigation.timestamps.load,
-      observedDomContentLoaded: processedNavigation && processedNavigation.timings.domContentLoaded,
-      observedDomContentLoadedTs: processedNavigation && processedNavigation.timestamps.domContentLoaded,
+      observedLoad: processedNavigation?.timings.load,
+      observedLoadTs: processedNavigation?.timestamps.load,
+      observedDomContentLoaded: processedNavigation?.timings.domContentLoaded,
+      observedDomContentLoadedTs: processedNavigation?.timestamps.domContentLoaded,
       observedCumulativeLayoutShift: cumulativeLayoutShift,
       observedCumulativeLayoutShiftMainFrame: cumulativeLayoutShiftMainFrame,
       observedTotalCumulativeLayoutShift: totalCumulativeLayoutShift,
@@ -128,7 +128,7 @@ class TimingSummary {
 
     /** @type {Record<string,boolean>} */
     const debugInfo = {
-      lcpInvalidated: !!(processedNavigation && processedNavigation.lcpInvalidated),
+      lcpInvalidated: !!processedNavigation?.lcpInvalidated,
     };
 
     return {metrics, debugInfo};

package/lighthouse-core/computed/page-dependency-graph.js

@@ -205,7 +205,7 @@ class PageDependencyGraph {
           networkNode.startTime <= cpuNode.startTime) return;
       const {record} = networkNode;
       const resourceType = record.resourceType ||
-        record.redirectDestination && record.redirectDestination.resourceType;
+        record.redirectDestination?.resourceType;
       if (!linkableResourceTypes.has(resourceType)) {
         // We only link some resources to CPU nodes because we observe LCP simulation
         // regressions when including images, etc.
@@ -405,7 +405,7 @@ class PageDependencyGraph {
 
     // The root request is the earliest request in the main document redirect chain.
     // Will be undefined if there were no redirects.
-    const rootRequest = mainDocumentNode.record.redirects && mainDocumentNode.record.redirects[0];
+    const rootRequest = mainDocumentNode.record.redirects?.[0];
 
     let rootNode;
     if (rootRequest) {

package/lighthouse-core/computed/resource-summary.js

@@ -55,7 +55,7 @@ class ResourceSummary {
     const budget = Budget.getMatchingBudget(budgets, mainResourceURL);
     /** @type {ReadonlyArray<string>} */
     let firstPartyHosts = [];
-    if (budget && budget.options && budget.options.firstPartyHostnames) {
+    if (budget?.options?.firstPartyHostnames) {
       firstPartyHosts = budget.options.firstPartyHostnames;
     } else {
       const rootDomain = Util.getRootDomain(mainResourceURL);

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

@@ -295,7 +295,7 @@ function resolveSettings(settingsJson = {}, overrides = undefined) {
   // however `lookupLocale` will always determine which of our supported locales to use (falling
   // back if necessary).
   // TODO: could do more work to sniff out the user's locale
-  const locale = i18n.lookupLocale((overrides && overrides.locale) || settingsJson.locale);
+  const locale = i18n.lookupLocale(overrides?.locale || settingsJson.locale);
 
   // Fill in missing settings with defaults
   const {defaultSettings} = constants;
@@ -332,7 +332,7 @@ function resolveSettings(settingsJson = {}, overrides = undefined) {
  */
 function mergePlugins(configJSON, configDir, flags) {
   const configPlugins = configJSON.plugins || [];
-  const flagPlugins = (flags && flags.plugins) || [];
+  const flagPlugins = flags?.plugins || [];
   const pluginNames = new Set([...configPlugins, ...flagPlugins]);
 
   for (const pluginName of pluginNames) {

package/lighthouse-core/config/config.js

@@ -161,7 +161,7 @@ class Config {
   constructor(configJSON, flags) {
     const status = {msg: 'Create config', id: 'lh:init:config'};
     log.time(status, 'verbose');
-    let configPath = flags && flags.configPath;
+    let configPath = flags?.configPath;
 
     if (!configJSON) {
       configJSON = defaultConfig;

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

@@ -5,6 +5,8 @@
  */
 'use strict';
 
+const log = require('lighthouse-logger');
+
 const Audit = require('../../audits/audit.js');
 
 /** @type {Record<keyof LH.FRBaseArtifacts, string>} */
@@ -45,7 +47,7 @@ function getAuditIdsInCategories(allCategories, onlyCategories) {
 
   onlyCategories = onlyCategories || Object.keys(allCategories);
   const categories = onlyCategories.map(categoryId => allCategories[categoryId]);
-  const auditRefs = categories.flatMap(category => category.auditRefs);
+  const auditRefs = categories.flatMap(category => category?.auditRefs || []);
   return new Set(auditRefs.map(auditRef => auditRef.id));
 }
 
@@ -194,6 +196,24 @@ function filterCategoriesByExplicitFilters(categories, onlyCategories) {
   return Object.fromEntries(categoriesToKeep);
 }
 
+/**
+ * Logs a warning if any specified onlyCategory is not a known category that can
+ * be included.
+ *
+ * @param {LH.Config.Config['categories']} allCategories
+ * @param {string[] | null} onlyCategories
+ * @return {void}
+ */
+function warnOnUnknownOnlyCategories(allCategories, onlyCategories) {
+  if (!onlyCategories) return;
+
+  for (const onlyCategoryId of onlyCategories) {
+    if (!allCategories?.[onlyCategoryId]) {
+      log.warn('config', `unrecognized category in 'onlyCategories': ${onlyCategoryId}`);
+    }
+  }
+}
+
 /**
  * Filters a categories object and their auditRefs down to the set that can be computed using
  * only the specified audits.
@@ -266,6 +286,8 @@ function filterConfigByGatherMode(config, mode) {
 function filterConfigByExplicitFilters(config, filters) {
   const {onlyAudits, onlyCategories, skipAudits} = filters;
 
+  warnOnUnknownOnlyCategories(config.categories, onlyCategories);
+
   let baseAuditIds = getAuditIdsInCategories(config.categories, undefined);
   if (onlyCategories) {
     baseAuditIds = getAuditIdsInCategories(config.categories, onlyCategories);

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

@@ -49,7 +49,7 @@ function assertValidPluginName(configJSON, pluginName) {
     throw new Error(`plugin name '${pluginName}' does not start with 'lighthouse-plugin-'`);
   }
 
-  if (configJSON.categories && configJSON.categories[pluginName]) {
+  if (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
   }
 }
@@ -123,7 +123,7 @@ function assertValidFRNavigations(navigationsDefn) {
 function assertValidAudit(auditDefinition) {
   const {implementation, path: auditPath} = auditDefinition;
   const auditName = auditPath ||
-    (implementation && implementation.meta && implementation.meta.id) ||
+    implementation?.meta?.id ||
     'Unknown audit';
 
   if (typeof implementation.audit !== 'function' || implementation.audit === Audit.audit) {

package/lighthouse-core/fraggle-rock/gather/navigation-runner.js

@@ -22,6 +22,7 @@ const {initializeConfig} = require('../config/config.js');
 const {getBaseArtifacts, finalizeArtifacts} = require('./base-artifacts.js');
 const format = require('../../../shared/localization/format.js');
 const LighthouseError = require('../../lib/lh-error.js');
+const URL = require('../../lib/url-shim.js');
 const {getPageLoadError} = require('../../lib/navigation-error.js');
 const Trace = require('../../gather/gatherers/trace.js');
 const DevtoolsLog = require('../../gather/gatherers/devtools-log.js');
@@ -136,11 +137,11 @@ async function _collectDebugData(navigationContext, phaseState) {
   await collectPhaseArtifacts({...phaseState, phase: 'getArtifact', artifactDefinitions});
   const getArtifactState = phaseState.artifactState.getArtifact;
 
-  const devtoolsLogArtifactId = devtoolsLogArtifactDefn && devtoolsLogArtifactDefn.id;
+  const devtoolsLogArtifactId = devtoolsLogArtifactDefn?.id;
   const devtoolsLog = devtoolsLogArtifactId && await getArtifactState[devtoolsLogArtifactId];
   const records = devtoolsLog && await NetworkRecords.request(devtoolsLog, navigationContext);
 
-  const traceArtifactId = traceArtifactDefn && traceArtifactDefn.id;
+  const traceArtifactId = traceArtifactDefn?.id;
   const trace = traceArtifactId && await getArtifactState[traceArtifactId];
 
   return {devtoolsLog, records, trace};
@@ -279,7 +280,7 @@ async function _cleanup({requestedUrl, driver, config}) {
  * @return {Promise<LH.RunnerResult|undefined>}
  */
 async function navigation(options) {
-  const {url: requestedUrl, page, configContext = {}} = options;
+  const {url, page, configContext = {}} = options;
   const {config} = initializeConfig(options.config, {...configContext, gatherMode: 'navigation'});
   const computedCache = new Map();
   const internalOptions = {
@@ -289,6 +290,7 @@ async function navigation(options) {
   return Runner.run(
     async () => {
       const driver = new Driver(page);
+      const requestedUrl = URL.normalizeUrl(url);
       const context = {driver, config, requestedUrl, options: internalOptions};
       const {baseArtifacts} = await _setup(context);
       const {artifacts} = await _navigations({...context, baseArtifacts, computedCache});
@@ -297,7 +299,6 @@ async function navigation(options) {
       return finalizeArtifacts(baseArtifacts, artifacts);
     },
     {
-      url: requestedUrl,
       config,
       computedCache: new Map(),
     }

package/lighthouse-core/fraggle-rock/gather/snapshot-runner.js

@@ -51,7 +51,6 @@ async function snapshot(options) {
       return finalizeArtifacts(baseArtifacts, artifacts);
     },
     {
-      url,
       config,
       computedCache,
     }

package/lighthouse-core/fraggle-rock/gather/timespan-runner.js

@@ -64,7 +64,6 @@ async function startTimespan(options) {
           return finalizeArtifacts(baseArtifacts, artifacts);
         },
         {
-          url: finalUrl,
           config,
           computedCache,
         }

package/lighthouse-core/fraggle-rock/user-flow.js

@@ -23,7 +23,7 @@ class UserFlow {
     /** @type {FrOptions} */
     this.options = {page, ...options};
     /** @type {string|undefined} */
-    this.name = options && options.name;
+    this.name = options?.name;
     /** @type {LH.FlowResult.Step[]} */
     this.steps = [];
   }
@@ -90,7 +90,7 @@ class UserFlow {
     const result = await navigation(this._getNextNavigationOptions(url, stepOptions));
     if (!result) throw Error('Navigation returned undefined');
 
-    const providedName = stepOptions && stepOptions.stepName;
+    const providedName = stepOptions?.stepName;
     this.steps.push({
       lhr: result.lhr,
       name: providedName || this._getDefaultStepName(result.lhr),
@@ -118,7 +118,7 @@ class UserFlow {
     this.currentTimespan = undefined;
     if (!result) throw Error('Timespan returned undefined');
 
-    const providedName = options && options.stepName;
+    const providedName = options?.stepName;
     this.steps.push({
       lhr: result.lhr,
       name: providedName || this._getDefaultStepName(result.lhr),
@@ -137,7 +137,7 @@ class UserFlow {
     const result = await snapshot(options);
     if (!result) throw Error('Snapshot returned undefined');
 
-    const providedName = stepOptions && stepOptions.stepName;
+    const providedName = stepOptions?.stepName;
     this.steps.push({
       lhr: result.lhr,
       name: providedName || this._getDefaultStepName(result.lhr),

package/lighthouse-core/gather/connections/connection.js

@@ -148,7 +148,7 @@ class Connection {
     } else {
       // In DevTools we receive responses to commands we did not send which we cannot act on, so we
       // just log these occurrences.
-      const error = object.error && object.error.message;
+      const error = object.error?.message;
       log.formatProtocol(`disowned method <= browser ${error ? 'ERR' : 'OK'}`,
           {method: 'UNKNOWN', params: error || object.result}, 'verbose');
     }

package/lighthouse-core/gather/driver/execution-context.js

@@ -121,7 +121,7 @@ class ExecutionContext {
         new Error('Runtime.evaluate response did not contain a "result" object'));
     }
     const value = response.result.value;
-    if (value && value.__failedInBrowser) {
+    if (value?.__failedInBrowser) {
       return Promise.reject(Object.assign(new Error(), value));
     } else {
       return value;

package/lighthouse-core/gather/driver/network-monitor.js

@@ -144,7 +144,7 @@ class NetworkMonitor {
     const finalNavigation = mainFrameNavigations[mainFrameNavigations.length - 1];
     if (!finalNavigation) log.warn('NetworkMonitor', 'No detected navigations');
 
-    return finalNavigation && finalNavigation.url;
+    return finalNavigation?.url;
   }
 
   /**
@@ -172,7 +172,7 @@ class NetworkMonitor {
     if (!this._networkRecorder) return false;
     const requests = this._networkRecorder.getRawRecords();
     const rootFrameRequest = requests.find(r => r.resourceType === 'Document');
-    const rootFrameId = rootFrameRequest && rootFrameRequest.frameId;
+    const rootFrameId = rootFrameRequest?.frameId;
 
     return this._isActiveIdlePeriod(
       0,

package/lighthouse-core/gather/driver/target-manager.js

@@ -49,7 +49,7 @@ class TargetManager {
   async _onSessionAttached(session) {
     try {
       const target = await session.sendCommand('Target.getTargetInfo').catch(() => null);
-      const targetType = target && target.targetInfo && target.targetInfo.type;
+      const targetType = target?.targetInfo?.type;
       const hasValidTargetType = targetType === 'page' || targetType === 'iframe';
       if (!target || !hasValidTargetType) return;
 

package/lighthouse-core/gather/driver.js

@@ -425,7 +425,7 @@ class Driver {
    * @return {Promise<void>}
    */
   async beginTrace(settings) {
-    const additionalCategories = (settings && settings.additionalTraceCategories &&
+    const additionalCategories = (settings?.additionalTraceCategories &&
         settings.additionalTraceCategories.split(',')) || [];
     const traceCategories = TraceGatherer.getDefaultTraceCategories().concat(additionalCategories);
 

package/lighthouse-core/gather/gatherers/console-messages.js

@@ -66,7 +66,7 @@ class ConsoleMessages extends FRGatherer {
     }
 
     const {url, lineNumber, columnNumber} =
-      event.stackTrace && event.stackTrace.callFrames[0] || {};
+      event.stackTrace?.callFrames[0] || {};
     /** @type {LH.Artifacts.ConsoleMessage} */
     const consoleMessage = {
       eventType: 'consoleAPI',
@@ -117,7 +117,7 @@ class ConsoleMessages extends FRGatherer {
 
     // JS events have a stack trace, which we use to get the column.
     // CSS/HTML events only expose a line number.
-    const {columnNumber} = event.entry.stackTrace && event.entry.stackTrace.callFrames[0] || {};
+    const {columnNumber} = event.entry.stackTrace?.callFrames[0] || {};
 
     this._logEntries.push({
       eventType: 'protocolLog',

package/lighthouse-core/gather/gatherers/inspector-issues.js

@@ -58,58 +58,46 @@ class InspectorIssues extends FRGatherer {
    * @return {Promise<LH.Artifacts['InspectorIssues']>}
    */
   async _getArtifact(networkRecords) {
+    /** @type {LH.Artifacts.InspectorIssues} */
     const artifact = {
-      /** @type {Array<LH.Crdp.Audits.MixedContentIssueDetails>} */
-      mixedContent: [],
-      /** @type {Array<LH.Crdp.Audits.SameSiteCookieIssueDetails>} */
-      sameSiteCookies: [],
-      /** @type {Array<LH.Crdp.Audits.BlockedByResponseIssueDetails>} */
-      blockedByResponse: [],
-      /** @type {Array<LH.Crdp.Audits.HeavyAdIssueDetails>} */
-      heavyAds: [],
-      /** @type {Array<LH.Crdp.Audits.ContentSecurityPolicyIssueDetails>} */
-      contentSecurityPolicy: [],
-      /** @type {Array<LH.Crdp.Audits.DeprecationIssueDetails>} */
-      deprecations: [],
+      attributionReportingIssue: [],
+      blockedByResponseIssue: [],
+      clientHintIssue: [],
+      contentSecurityPolicyIssue: [],
+      corsIssue: [],
+      deprecationIssue: [],
+      federatedAuthRequestIssue: [],
+      genericIssue: [],
+      heavyAdIssue: [],
+      lowTextContrastIssue: [],
+      mixedContentIssue: [],
+      navigatorUserAgentIssue: [],
+      quirksModeIssue: [],
+      sameSiteCookieIssue: [],
+      sharedArrayBufferIssue: [],
+      twaQualityEnforcement: [],
     };
-
-    for (const issue of this._issues) {
-      if (issue.details.mixedContentIssueDetails) {
-        const issueDetails = issue.details.mixedContentIssueDetails;
-        const issueReqId = issueDetails.request && issueDetails.request.requestId;
-        // Duplicate issues can occur for the same request; only use the one with a matching networkRequest.
-        if (issueReqId &&
-          networkRecords.find(req => req.requestId === issueReqId)) {
-          artifact.mixedContent.push(issueDetails);
+    const keys = /** @type {Array<keyof LH.Artifacts['InspectorIssues']>} */(Object.keys(artifact));
+    for (const key of keys) {
+      /** @type {`${key}Details`} */
+      const detailsKey = `${key}Details`;
+      const allDetails = this._issues.map(issue => issue.details[detailsKey]);
+      for (const detail of allDetails) {
+        if (!detail) {
+          continue;
         }
-      }
-      if (issue.details.sameSiteCookieIssueDetails) {
-        const issueDetails = issue.details.sameSiteCookieIssueDetails;
-        const issueReqId = issueDetails.request && issueDetails.request.requestId;
         // Duplicate issues can occur for the same request; only use the one with a matching networkRequest.
-        if (issueReqId &&
-          networkRecords.find(req => req.requestId === issueReqId)) {
-          artifact.sameSiteCookies.push(issueDetails);
+        const requestId = 'request' in detail && detail.request && detail.request.requestId;
+        if (requestId) {
+          if (networkRecords.find(req => req.requestId === requestId)) {
+            // @ts-expect-error - detail types are not all compatible
+            artifact[key].push(detail);
+          }
+        } else {
+          // @ts-expect-error - detail types are not all compatible
+          artifact[key].push(detail);
         }
       }
-      if (issue.details.blockedByResponseIssueDetails) {
-        const issueDetails = issue.details.blockedByResponseIssueDetails;
-        const issueReqId = issueDetails.request && issueDetails.request.requestId;
-        // Duplicate issues can occur for the same request; only use the one with a matching networkRequest.
-        if (issueReqId &&
-          networkRecords.find(req => req.requestId === issueReqId)) {
-          artifact.blockedByResponse.push(issueDetails);
-        }
-      }
-      if (issue.details.heavyAdIssueDetails) {
-        artifact.heavyAds.push(issue.details.heavyAdIssueDetails);
-      }
-      if (issue.details.contentSecurityPolicyIssueDetails) {
-        artifact.contentSecurityPolicy.push(issue.details.contentSecurityPolicyIssueDetails);
-      }
-      if (issue.details.deprecationIssueDetails) {
-        artifact.deprecations.push(issue.details.deprecationIssueDetails);
-      }
     }
 
     return artifact;

package/lighthouse-core/gather/gatherers/js-usage.js

@@ -116,7 +116,7 @@ class JsUsage extends FRGatherer {
       let url = scriptUsage.url;
       const scriptParsedEvent =
         this._scriptParsedEvents.find(e => e.scriptId === scriptUsage.scriptId);
-      if (scriptParsedEvent && scriptParsedEvent.embedderName) {
+      if (scriptParsedEvent?.embedderName) {
         url = scriptParsedEvent.embedderName;
       }
 

package/lighthouse-core/gather/gatherers/seo/font-size.js

@@ -355,7 +355,7 @@ class FontSize extends FRGatherer {
     // For the nodes whose computed style we could attribute to a stylesheet, assign
     // the stylsheet to the data.
     analyzedFailingNodesData
-      .filter(data => data.cssRule && data.cssRule.styleSheetId)
+      .filter(data => data.cssRule?.styleSheetId)
       // @ts-expect-error - guaranteed to exist from the filter immediately above
       .forEach(data => (data.cssRule.stylesheet = stylesheets.get(data.cssRule.styleSheetId)));