lighthouse 12.8.2 → 13.0.0-dev.20251009

package/core/config/experimental-config.js

@@ -14,44 +14,13 @@ const config = {
   extends: 'lighthouse:default',
   audits: [
     'autocomplete',
-    // Preload advice is on hold until https://github.com/GoogleChrome/lighthouse/issues/11960
-    'preload-fonts',
-    'uses-rel-preload',
   ],
   categories: {
-    // @ts-ignore: `title` is required in CategoryJson. setting to the same value as the default
-    // config is awkward - easier to omit the property here. Will defer to default config.
-    'performance': {
-      auditRefs: [
-        {id: 'uses-rel-preload', weight: 0, group: 'diagnostics'},
-
-        // TODO: Remove this when insights aren't hidden by default
-        // Insight audits.
-        {id: 'cache-insight', weight: 0, group: 'insights'},
-        {id: 'cls-culprits-insight', weight: 0, group: 'insights'},
-        {id: 'document-latency-insight', weight: 0, group: 'insights'},
-        {id: 'dom-size-insight', weight: 0, group: 'insights'},
-        {id: 'duplicated-javascript-insight', weight: 0, group: 'insights'},
-        {id: 'font-display-insight', weight: 0, group: 'insights'},
-        {id: 'forced-reflow-insight', weight: 0, group: 'insights'},
-        {id: 'image-delivery-insight', weight: 0, group: 'insights'},
-        {id: 'inp-breakdown-insight', weight: 0, group: 'insights'},
-        {id: 'lcp-breakdown-insight', weight: 0, group: 'insights'},
-        {id: 'lcp-discovery-insight', weight: 0, group: 'insights'},
-        {id: 'legacy-javascript-insight', weight: 0, group: 'insights'},
-        {id: 'modern-http-insight', weight: 0, group: 'insights'},
-        {id: 'network-dependency-tree-insight', weight: 0, group: 'insights'},
-        {id: 'render-blocking-insight', weight: 0, group: 'insights'},
-        {id: 'third-parties-insight', weight: 0, group: 'insights'},
-        {id: 'viewport-insight', weight: 0, group: 'insights'},
-      ],
-    },
-    // @ts-ignore: `title` is required in CategoryJson. setting to the same value as the default
+    // @ts-expect-error: `title` is required in CategoryJson. setting to the same value as the default
     // config is awkward - easier to omit the property here. Will defer to default config.
     'best-practices': {
       auditRefs: [
         {id: 'autocomplete', weight: 0, group: 'best-practices-ux'},
-        {id: 'preload-fonts', weight: 0, group: 'best-practices-ux'},
       ],
     },
   },

package/core/config/filters.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import log from 'lighthouse-logger';
-
 import {Audit} from '../audits/audit.js';
 
 /** @type {Record<keyof LH.BaseArtifacts, string>} */
@@ -176,20 +174,19 @@ function filterCategoriesByExplicitFilters(categories, onlyCategories) {
 }
 
 /**
- * Logs a warning if any specified onlyCategory is not a known category that can
+ * Throw an error if any specified onlyCategory is not a known category that can
  * be included.
  *
  * @param {LH.Config.ResolvedConfig['categories']} allCategories
  * @param {string[] | null} onlyCategories
  * @return {void}
  */
-function warnOnUnknownOnlyCategories(allCategories, onlyCategories) {
+function errorOnUnknownOnlyCategories(allCategories, onlyCategories) {
   if (!onlyCategories) return;
 
-  for (const onlyCategoryId of onlyCategories) {
-    if (!allCategories?.[onlyCategoryId]) {
-      log.warn('config', `unrecognized category in 'onlyCategories': ${onlyCategoryId}`);
-    }
+  const unknown = onlyCategories.filter(c => !allCategories?.[c]);
+  if (unknown.length) {
+    throw new Error(`unrecognized category in 'onlyCategories': ${unknown.join(', ')}`);
   }
 }
 
@@ -271,7 +268,7 @@ function filterConfigByExplicitFilters(resolvedConfig, filters) {
     throw new Error(`onlyCategories cannot be an empty array.`);
   }
 
-  warnOnUnknownOnlyCategories(resolvedConfig.categories, onlyCategories);
+  errorOnUnknownOnlyCategories(resolvedConfig.categories, onlyCategories);
 
   let baseAuditIds = getAuditIdsInCategories(resolvedConfig.categories, undefined);
   if (onlyCategories) {

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

@@ -18,7 +18,6 @@ const config = {
     emulatedUserAgent: constants.userAgents.desktop,
     skipAudits: [
       // Skip the h2 audit so it doesn't lie to us. See https://github.com/GoogleChrome/lighthouse/issues/6539
-      'uses-http2',
       'modern-http-insight',
       // There are always bf-cache failures when testing in headless. Reenable when headless can give us realistic bf-cache insights.
       'bf-cache',

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

@@ -17,7 +17,6 @@ const config = {
     },
     skipAudits: [
       // Skip the h2 audit so it doesn't lie to us. See https://github.com/GoogleChrome/lighthouse/issues/6539
-      'uses-http2',
       'modern-http-insight',
       // There are always bf-cache failures when testing in headless. Reenable when headless can give us realistic bf-cache insights.
       'bf-cache',

package/core/gather/driver/target-manager.d.ts

@@ -17,7 +17,7 @@ export class TargetManager extends TargetManager_base {
     /** @param {LH.Puppeteer.CDPSession} cdpSession */
     constructor(cdpSession: LH.Puppeteer.CDPSession);
     _enabled: boolean;
-    _rootCdpSession: import("../../index.js").Puppeteer.CDPSession;
+    _rootCdpSession: import("puppeteer-core").CDPSession;
     _mainFrameId: string;
     /**
      * A map of target id to target/session information. Used to ensure unique

package/core/gather/driver.d.ts

@@ -4,7 +4,7 @@ export class Driver implements LH.Gatherer.Driver {
      * @param {LH.Puppeteer.Page} page
      */
     constructor(page: LH.Puppeteer.Page);
-    _page: import("../index.js").Puppeteer.Page;
+    _page: import("puppeteer-core").Page;
     /** @type {TargetManager|undefined} */
     _targetManager: TargetManager | undefined;
     /** @type {NetworkMonitor|undefined} */

package/core/gather/gatherers/anchor-elements.js

@@ -157,33 +157,17 @@ class AnchorElements extends BaseGatherer {
 
     // DOM.getDocument is necessary for pushNodesByBackendIdsToFrontend to properly retrieve nodeIds if the `DOM` domain was enabled before this gatherer, invoke it to be safe.
     await session.sendCommand('DOM.getDocument', {depth: -1, pierce: true});
-    const anchorsWithEventListeners = anchors.map(async anchor => {
-      const listeners = await getEventListeners(session, anchor.node.devtoolsNodePath);
-
-      /** @type {Set<{type: string}>} */
-      const ancestorListeners = new Set();
-      const splitPath = anchor.node.devtoolsNodePath.split(',');
-      const ancestorListenerPromises = [];
-      while (splitPath.length >= 2) {
-        splitPath.length -= 2;
-        const path = splitPath.join(',');
-        const promise = getEventListeners(session, path).then(listeners => {
-          for (const listener of listeners) {
-            ancestorListeners.add(listener);
-          }
-        }).catch(() => {});
-        ancestorListenerPromises.push(promise);
-      }
-
-      await Promise.all(ancestorListenerPromises);
 
-      return {
-        ...anchor,
-        listeners,
-        ancestorListeners: Array.from(ancestorListeners),
-      };
+    const anchorsWithEventListeners = anchors.map( anchor => {
+      return getEventListeners(session, anchor.node.devtoolsNodePath).then(listeners => {
+        return {
+          ...anchor,
+          listeners,
+        };
+      });
     });
 
+
     const result = await Promise.all(anchorsWithEventListeners);
     await session.sendCommand('DOM.disable');
     return result;

package/core/gather/gatherers/image-elements.js

@@ -3,17 +3,16 @@
  * Copyright 2017 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-/**
-  * @fileoverview Gathers all images used on the page with their src, size,
-  *   and attribute information. Executes script in the context of the page.
-  */
 
+/**
+ * @fileoverview Gathers all images used on the page with their src, size,
+ * and attribute information. Executes script in the context of the page.
+ */
 
 import log from 'lighthouse-logger';
 
 import BaseGatherer from '../base-gatherer.js';
 import {pageFunctions} from '../../lib/page-functions.js';
-import * as FontSize from './seo/font-size.js';
 
 /* global getElementsInDocument, getNodeDetails */
 
@@ -186,6 +185,33 @@ function findSizeDeclaration(rule, property) {
   return definedProp.value;
 }
 
+/**
+ * Finds the most specific directly matched CSS font-size rule from the list.
+ *
+ * @param {Array<LH.Crdp.CSS.RuleMatch>} matchedCSSRules
+ * @param {function(LH.Crdp.CSS.CSSStyle):boolean|string|undefined} isDeclarationOfInterest
+ */
+function findMostSpecificMatchedCSSRule(matchedCSSRules = [], isDeclarationOfInterest) {
+  let mostSpecificRule;
+  for (let i = matchedCSSRules.length - 1; i >= 0; i--) {
+    if (isDeclarationOfInterest(matchedCSSRules[i].rule.style)) {
+      mostSpecificRule = matchedCSSRules[i].rule;
+      break;
+    }
+  }
+
+  if (mostSpecificRule) {
+    return {
+      type: 'Regular',
+      ...mostSpecificRule.style,
+      parentRule: {
+        origin: mostSpecificRule.origin,
+        selectors: mostSpecificRule.selectorList.selectors,
+      },
+    };
+  }
+}
+
 /**
  * Finds the most specific directly matched CSS font-size rule from the list.
  *
@@ -196,7 +222,7 @@ function findSizeDeclaration(rule, property) {
 function findMostSpecificCSSRule(matchedCSSRules, property) {
   /** @param {LH.Crdp.CSS.CSSStyle} declaration */
   const isDeclarationofInterest = (declaration) => findSizeDeclaration(declaration, property);
-  const rule = FontSize.findMostSpecificMatchedCSSRule(matchedCSSRules, isDeclarationofInterest);
+  const rule = findMostSpecificMatchedCSSRule(matchedCSSRules, isDeclarationofInterest);
   if (!rule) return;
 
   return findSizeDeclaration(rule, property);

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

@@ -61,34 +61,7 @@ class InspectorIssues extends BaseGatherer {
     const networkRecords = await NetworkRecords.request(devtoolsLog, context);
 
     /** @type {LH.Artifacts.InspectorIssues} */
-    const artifact = {
-      // TODO(v13): remove empty arrays.
-      attributionReportingIssue: [],
-      blockedByResponseIssue: [],
-      bounceTrackingIssue: [],
-      clientHintIssue: [],
-      contentSecurityPolicyIssue: [],
-      cookieDeprecationMetadataIssue: [],
-      corsIssue: [],
-      deprecationIssue: [],
-      federatedAuthRequestIssue: [],
-      genericIssue: [],
-      heavyAdIssue: [],
-      lowTextContrastIssue: [],
-      mixedContentIssue: [],
-      navigatorUserAgentIssue: [],
-      partitioningBlobURLIssue: [],
-      propertyRuleIssue: [],
-      quirksModeIssue: [],
-      cookieIssue: [],
-      elementAccessibilityIssue: [],
-      sharedArrayBufferIssue: [],
-      sharedDictionaryIssue: [],
-      stylesheetLoadingIssue: [],
-      sriMessageSignatureIssue: [],
-      federatedAuthUserInfoRequestIssue: [],
-      userReidentificationIssue: [],
-    };
+    const artifact = {};
 
     for (const issue of this._issues) {
       const detailsKey = /** @type {keyof LH.Crdp.Audits.InspectorIssueDetails} */(

package/core/gather/gatherers/trace-elements.d.ts

@@ -32,11 +32,11 @@ declare class TraceElements extends BaseGatherer {
      * that may have caused the shift.
      *
      * @param {LH.Trace} trace
-     * @param {LH.Artifacts.TraceEngineResult['parsedTrace']} traceEngineResult
+     * @param {LH.Artifacts.TraceEngineResult} traceEngineResult
      * @param {LH.Gatherer.Context} context
      * @return {Promise<Array<{nodeId: number}>>}
      */
-    static getTopLayoutShifts(trace: LH.Trace, traceEngineResult: LH.Artifacts.TraceEngineResult["parsedTrace"], context: LH.Gatherer.Context): Promise<Array<{
+    static getTopLayoutShifts(trace: LH.Trace, traceEngineResult: LH.Artifacts.TraceEngineResult, context: LH.Gatherer.Context): Promise<Array<{
         nodeId: number;
     }>>;
     /**
@@ -45,15 +45,6 @@ declare class TraceElements extends BaseGatherer {
      * @return {Promise<TraceElementData|undefined>}
      */
     static getResponsivenessElement(trace: LH.Trace, context: LH.Gatherer.Context): Promise<TraceElementData | undefined>;
-    /**
-     * @param {LH.Trace} trace
-     * @param {LH.Gatherer.Context} context
-     * @return {Promise<{nodeId: number, type: string} | undefined>}
-     */
-    static getLcpElement(trace: LH.Trace, context: LH.Gatherer.Context): Promise<{
-        nodeId: number;
-        type: string;
-    } | undefined>;
     /** @type {LH.Gatherer.GathererMeta<'Trace'|'SourceMaps'>} */
     meta: LH.Gatherer.GathererMeta<"Trace" | "SourceMaps">;
     /** @type {Map<string, string>} */

package/core/gather/gatherers/trace-elements.js

@@ -18,8 +18,6 @@ import {pageFunctions} from '../../lib/page-functions.js';
 import {Sentry} from '../../lib/sentry.js';
 import Trace from './trace.js';
 import {ProcessedTrace} from '../../computed/processed-trace.js';
-import {ProcessedNavigation} from '../../computed/processed-navigation.js';
-import {LighthouseError} from '../../lib/lh-error.js';
 import {Responsiveness} from '../../computed/metrics/responsiveness.js';
 import {CumulativeLayoutShift} from '../../computed/metrics/cumulative-layout-shift.js';
 import {ExecutionContext} from '../driver/execution-context.js';
@@ -35,7 +33,12 @@ const MAX_LAYOUT_SHIFTS = 15;
  */
 /* c8 ignore start */
 function getNodeDetailsData() {
-  const elem = this.nodeType === document.ELEMENT_NODE ? this : this.parentElement;
+  /** @type {Element|null} */
+  let elem = this.nodeType === document.ELEMENT_NODE ? this : this.parentElement;
+  if (!elem && this instanceof ShadowRoot) {
+    elem = this.host;
+  }
+
   let traceElement;
   if (elem) {
     // @ts-expect-error - getNodeDetails put into scope via stringification
@@ -173,13 +176,13 @@ class TraceElements extends BaseGatherer {
    * that may have caused the shift.
    *
    * @param {LH.Trace} trace
-   * @param {LH.Artifacts.TraceEngineResult['parsedTrace']} traceEngineResult
+   * @param {LH.Artifacts.TraceEngineResult} traceEngineResult
    * @param {LH.Gatherer.Context} context
    * @return {Promise<Array<{nodeId: number}>>}
    */
   static async getTopLayoutShifts(trace, traceEngineResult, context) {
     const {impactByNodeId} = await CumulativeLayoutShift.request(trace, context);
-    const clusters = traceEngineResult.LayoutShifts.clusters ?? [];
+    const clusters = traceEngineResult.data.LayoutShifts.clusters ?? [];
     const layoutShiftEvents =
       /** @type {import('../../lib/trace-engine.js').SaneSyntheticLayoutShift[]} */(
         clusters.flatMap(c => c.events)
@@ -271,35 +274,6 @@ class TraceElements extends BaseGatherer {
     return animatedElementData;
   }
 
-  /**
-   * @param {LH.Trace} trace
-   * @param {LH.Gatherer.Context} context
-   * @return {Promise<{nodeId: number, type: string} | undefined>}
-   */
-  static async getLcpElement(trace, context) {
-    let processedNavigation;
-    try {
-      processedNavigation = await ProcessedNavigation.request(trace, context);
-    } catch (err) {
-      // If we were running in timespan mode and there was no paint, treat LCP as missing.
-      if (context.gatherMode === 'timespan' && err.code === LighthouseError.errors.NO_FCP.code) {
-        return;
-      }
-
-      throw err;
-    }
-
-    // Use main-frame-only LCP to match the metric value.
-    const lcpData = processedNavigation.largestContentfulPaintEvt?.args?.data;
-    // These should exist, but trace types are loose.
-    if (lcpData?.nodeId === undefined || !lcpData.type) return;
-
-    return {
-      nodeId: lcpData.nodeId,
-      type: lcpData.type,
-    };
-  }
-
   /**
    * @param {LH.Gatherer.Context} context
    */
@@ -367,19 +341,15 @@ class TraceElements extends BaseGatherer {
 
     const traceEngineData = await TraceElements.getTraceEngineElements(
       traceEngineResult, navigationId);
-    const lcpNodeData = await TraceElements.getLcpElement(trace, context);
     const shiftsData = await TraceElements.getTopLayoutShifts(
-      trace, traceEngineResult.parsedTrace, context);
+      trace, traceEngineResult, context);
     const animatedElementData = await this.getAnimatedElements(mainThreadEvents);
-    const responsivenessElementData = await TraceElements.getResponsivenessElement(trace, context);
 
     /** @type {Map<string, TraceElementData[]>} */
     const backendNodeDataMap = new Map([
       ['trace-engine', traceEngineData],
-      ['largest-contentful-paint', lcpNodeData ? [lcpNodeData] : []],
       ['layout-shift', shiftsData],
       ['animation', animatedElementData],
-      ['responsiveness', responsivenessElementData ? [responsivenessElementData] : []],
     ]);
 
     /** @type {Map<number, LH.Crdp.Runtime.CallFunctionOnResponse | null>} */

package/core/gather/navigation-runner.js

@@ -158,14 +158,11 @@ async function _computeNavigationResult(
 
     /** @type {Partial<LH.GathererArtifacts>} */
     const artifacts = {};
-    const pageLoadErrorId = 'pageLoadError-defaultPass';
     if (debugData.devtoolsLog) {
       artifacts.DevtoolsLogError = debugData.devtoolsLog;
-      artifacts.devtoolsLogs = {[pageLoadErrorId]: debugData.devtoolsLog};
     }
     if (debugData.trace) {
       artifacts.TraceError = debugData.trace;
-      artifacts.traces = {[pageLoadErrorId]: debugData.trace};
     }
 
     navigationContext.baseArtifacts.LighthouseRunWarnings.push(pageLoadError.friendlyMessage);

package/core/gather/session.d.ts

@@ -6,7 +6,7 @@ export class ProtocolSession extends ProtocolSession_base implements LH.Gatherer
      * @param {LH.Puppeteer.CDPSession} cdpSession
      */
     constructor(cdpSession: LH.Puppeteer.CDPSession);
-    _cdpSession: import("../index.js").Puppeteer.CDPSession;
+    _cdpSession: import("puppeteer-core").CDPSession;
     /** @type {LH.Crdp.Target.TargetInfo|undefined} */
     _targetInfo: LH.Crdp.Target.TargetInfo | undefined;
     /** @type {number|undefined} */

package/core/lib/asset-saver.d.ts

@@ -20,8 +20,8 @@ export function saveArtifacts(artifacts: LH.Artifacts, basePath: string, options
  *     step0/                          --  Directory containing artifacts for the first step.
  *       options.json                  --  First step's options (e.g. step flags).
  *       artifacts.json                --  First step's artifacts except the DevTools log and trace.
- *       defaultPass.devtoolslog.json  --  First step's DevTools log.
- *       defaultPass.trace.json        --  First step's trace.
+ *       devtoolslog.json              --  First step's DevTools log.
+ *       trace.json                    --  First step's trace.
  *     step1/                          --  Directory containing artifacts for the second step.
  *
  * @param {LH.UserFlow.FlowArtifacts} flowArtifacts

package/core/lib/asset-saver.js

@@ -22,10 +22,9 @@ import {LH_ROOT} from '../../shared/root.js';
 
 const optionsFilename = 'options.json';
 const artifactsFilename = 'artifacts.json';
-const traceSuffix = '.trace.json';
-const devtoolsLogSuffix = '.devtoolslog.json';
-const defaultPrefix = 'defaultPass';
-const errorPrefix = 'pageLoadError-defaultPass';
+const traceFilename = 'trace.json';
+const devtoolsFilename = 'devtoolslog.json';
+const errorPrefix = 'pageLoadError.';
 const stepDirectoryRegex = /^step(\d+)$/;
 
 /**
@@ -94,29 +93,26 @@ function loadArtifacts(basePath) {
 
   const filenames = fs.readdirSync(basePath);
 
-  filenames.filter(f => endsWithSuffix(f, devtoolsLogSuffix)).forEach(filename => {
-    if (!artifacts.devtoolsLogs) artifacts.devtoolsLogs = {};
-    const prefix = filename.replace(devtoolsLogSuffix + '.gz', '').replace(devtoolsLogSuffix, '');
+  filenames.filter(f => endsWithSuffix(f, devtoolsFilename)).forEach(filename => {
     const devtoolsLog = readJson(path.join(basePath, filename));
-    artifacts.devtoolsLogs[prefix] = devtoolsLog;
-    if (prefix === defaultPrefix) {
+
+    if (filename.startsWith(devtoolsFilename)) {
       artifacts.DevtoolsLog = devtoolsLog;
-    }
-    if (prefix === errorPrefix) {
+    } else if (filename.startsWith(errorPrefix)) {
       artifacts.DevtoolsLogError = devtoolsLog;
     }
   });
 
-  filenames.filter(f => endsWithSuffix(f, traceSuffix)).forEach(filename => {
-    if (!artifacts.traces) artifacts.traces = {};
-    const trace = readJson(path.join(basePath, filename));
-    const prefix = filename.replace(traceSuffix + '.gz', '').replace(traceSuffix, '');
-    artifacts.traces[prefix] = Array.isArray(trace) ? {traceEvents: trace} : trace;
-    if (prefix === defaultPrefix) {
-      artifacts.Trace = artifacts.traces[prefix];
+  filenames.filter(f => endsWithSuffix(f, traceFilename)).forEach(filename => {
+    let trace = readJson(path.join(basePath, filename));
+    if (Array.isArray(trace)) {
+      trace = {traceEvents: trace};
     }
-    if (prefix === errorPrefix) {
-      artifacts.TraceError = artifacts.traces[prefix];
+
+    if (filename.startsWith(traceFilename)) {
+      artifacts.Trace = trace;
+    } else if (filename.startsWith(errorPrefix)) {
+      artifacts.TraceError = trace;
     }
   });
 
@@ -196,8 +192,8 @@ function stringifyReplacer(key, value) {
  *     step0/                          --  Directory containing artifacts for the first step.
  *       options.json                  --  First step's options (e.g. step flags).
  *       artifacts.json                --  First step's artifacts except the DevTools log and trace.
- *       defaultPass.devtoolslog.json  --  First step's DevTools log.
- *       defaultPass.trace.json        --  First step's trace.
+ *       devtoolslog.json              --  First step's DevTools log.
+ *       trace.json                    --  First step's trace.
  *     step1/                          --  Directory containing artifacts for the second step.
  *
  * @param {LH.UserFlow.FlowArtifacts} flowArtifacts
@@ -254,21 +250,15 @@ async function saveArtifacts(artifacts, basePath, options = {}) {
   const filenames = fs.readdirSync(basePath);
   for (const filename of filenames) {
     const isPreviousFile =
-      filename.endsWith(traceSuffix) || filename.endsWith(devtoolsLogSuffix) ||
-      filename.endsWith(traceSuffix + '.gz') || filename.endsWith(devtoolsLogSuffix + '.gz') ||
+      filename.endsWith(traceFilename) || filename.endsWith(devtoolsFilename) ||
+      filename.endsWith(traceFilename + '.gz') || filename.endsWith(devtoolsFilename + '.gz') ||
       filename === artifactsFilename || filename === artifactsFilename + '.gz';
     if (isPreviousFile) {
       fs.unlinkSync(`${basePath}/${filename}`);
     }
   }
 
-  // `devtoolsLogs` and `traces` are duplicate compat artifacts.
-  // We don't need to save them twice, so extract them here. TODO(v13): remove
   const {
-    // eslint-disable-next-line no-unused-vars
-    traces,
-    // eslint-disable-next-line no-unused-vars
-    devtoolsLogs,
     DevtoolsLog,
     Trace,
     DevtoolsLogError,
@@ -277,21 +267,21 @@ async function saveArtifacts(artifacts, basePath, options = {}) {
   } = artifacts;
 
   if (Trace) {
-    await saveTrace(Trace, `${basePath}/${defaultPrefix}${traceSuffix}`, options);
+    await saveTrace(Trace, `${basePath}/${traceFilename}`, options);
   }
 
   if (TraceError) {
-    await saveTrace(TraceError, `${basePath}/${errorPrefix}${traceSuffix}`, options);
+    await saveTrace(TraceError, `${basePath}/${errorPrefix}${traceFilename}`, options);
   }
 
   if (DevtoolsLog) {
     await saveDevtoolsLog(
-      DevtoolsLog, `${basePath}/${defaultPrefix}${devtoolsLogSuffix}`, options);
+      DevtoolsLog, `${basePath}/${devtoolsFilename}`, options);
   }
 
   if (DevtoolsLogError) {
     await saveDevtoolsLog(
-      DevtoolsLogError, `${basePath}/${errorPrefix}${devtoolsLogSuffix}`, options);
+      DevtoolsLogError, `${basePath}/${errorPrefix}${devtoolsFilename}`, options);
   }
 
   // save everything else, using a replacer to serialize LighthouseErrors in the artifacts.
@@ -452,9 +442,9 @@ async function saveLanternDebugTraces(pathWithBasename) {
   for (const [label, nodeTimings] of Lantern.Simulation.Simulator.allNodeTimings) {
     if (lanternTraceSaver.simulationNamesToIgnore.includes(label)) continue;
 
-    const traceFilename = `${pathWithBasename}-${label}${traceSuffix}`;
-    await saveTrace(lanternTraceSaver.convertNodeTimingsToTrace(nodeTimings), traceFilename);
-    log.log('saveAssets', `${label} lantern trace file streamed to disk: ${traceFilename}`);
+    const filename = `${pathWithBasename}-${label}.${traceFilename}`;
+    await saveTrace(lanternTraceSaver.convertNodeTimingsToTrace(nodeTimings), filename);
+    log.log('saveAssets', `${label} lantern trace file streamed to disk: ${filename}`);
   }
 }
 
@@ -469,15 +459,15 @@ async function saveAssets(artifacts, audits, pathWithBasename) {
   const allAssets = await prepareAssets(artifacts, audits);
   const saveAll = allAssets.map(async (assets, index) => {
     if (assets.devtoolsLog) {
-      const devtoolsLogFilename = `${pathWithBasename}-${index}${devtoolsLogSuffix}`;
-      await saveDevtoolsLog(assets.devtoolsLog, devtoolsLogFilename);
-      log.log('saveAssets', 'devtools log saved to disk: ' + devtoolsLogFilename);
+      const filename = `${pathWithBasename}-${index}.${devtoolsFilename}`;
+      await saveDevtoolsLog(assets.devtoolsLog, filename);
+      log.log('saveAssets', 'devtools log saved to disk: ' + filename);
     }
 
     if (assets.traceData) {
-      const traceFilename = `${pathWithBasename}-${index}${traceSuffix}`;
-      await saveTrace(assets.traceData, traceFilename);
-      log.log('saveAssets', 'trace file streamed to disk: ' + traceFilename);
+      const filename = `${pathWithBasename}-${index}.${traceFilename}`;
+      await saveTrace(assets.traceData, filename);
+      log.log('saveAssets', 'trace file streamed to disk: ' + filename);
     }
   });
 

package/core/lib/bf-cache-strings.js

@@ -534,17 +534,17 @@ const UIStrings = {
   cookieDisabled:
       'Back/forward cache is disabled because cookies are disabled on a page that uses `Cache-Control: no-store`.',
   /**
-   * @description Description text for not restored reason WebRTCSticky.
+   * @description Description text for not restored reason WebRTCUsedWithCCNS.
    */
-  webRTCSticky: 'Back/forward cache is disabled because WebRTC has been used.',
+  webRTCUsedWithCCNS: 'Back/forward cache is disabled because WebRTC has been used.',
   /**
-   * @description Description text for not restored reason WebTransportSticky.
+   * @description Description text for not restored reason WebTransportUsedWithCCNS.
    */
-  webTransportSticky: 'Back/forward cache is disabled because WebTransport has been used.',
+  webTransportUsedWithCCNS: 'Back/forward cache is disabled because WebTransport has been used.',
   /**
-   * @description Description text for not restored reason WebSocketSticky.
+   * @description Description text for not restored reason WebSocketUsedWithCCNS.
    */
-  webSocketSticky: 'Back/forward cache is disabled because WebSocket has been used.',
+  webSocketUsedWithCCNS: 'Back/forward cache is disabled because WebSocket has been used.',
 
 };
 
@@ -567,6 +567,7 @@ const NotRestoredReasonDescription = {
   JavaScriptExecution: {name: str_(UIStrings.JavaScriptExecution)},
   RendererProcessKilled: {name: str_(UIStrings.rendererProcessKilled)},
   RendererProcessCrashed: {name: str_(UIStrings.rendererProcessCrashed)},
+  // kept for backwards compatibly
   GrantedMediaStreamAccess: {name: str_(UIStrings.grantedMediaStreamAccess)},
   CacheFlushed: {name: str_(UIStrings.cacheFlushed)},
   ServiceWorkerVersionActivation: {name: str_(UIStrings.serviceWorkerVersionActivation)},
@@ -691,9 +692,9 @@ const NotRestoredReasonDescription = {
       {name: str_(UIStrings.jsNetworkRequestReceivedCacheControlNoStoreResource)},
   IndexedDBEvent: {name: str_(UIStrings.indexedDBEvent)},
   CookieDisabled: {name: str_(UIStrings.cookieDisabled)},
-  WebRTCSticky: {name: str_(UIStrings.webRTCSticky)},
-  WebTransportSticky: {name: str_(UIStrings.webTransportSticky)},
-  WebSocketSticky: {name: str_(UIStrings.webSocketSticky)},
+  WebRTCUsedWithCCNS: {name: str_(UIStrings.webRTCUsedWithCCNS)},
+  WebTransportUsedWithCCNS: {name: str_(UIStrings.webTransportUsedWithCCNS)},
+  WebSocketUsedWithCCNS: {name: str_(UIStrings.webSocketUsedWithCCNS)},
   HTTPAuthRequired: {name: ('HTTPAuthRequired')},
   CookieFlushed: {name: ('CookieFlushed')},
   SmartCard: {name: ('SmartCard')},