lighthouse 10.4.0-dev.20230712 → 10.4.0-dev.20230714

package/core/index.cjs

@@ -11,12 +11,6 @@ const lighthouse = async function lighthouse(...args) {
   return lighthouse(...args);
 };
 
-/** @type {import('./index.js')['legacyNavigation']} */
-const legacyNavigation = async function legacyNavigation(...args) {
-  const {legacyNavigation} = await import('./index.js');
-  return legacyNavigation(...args);
-};
-
 /** @type {import('./index.js')['startFlow']} */
 const startFlow = async function startFlow(...args) {
   const {startFlow} = await import('./index.js');
@@ -42,7 +36,6 @@ const snapshot = async function snapshot(...args) {
 };
 
 module.exports = lighthouse;
-module.exports.legacyNavigation = legacyNavigation;
 module.exports.startFlow = startFlow;
 module.exports.navigation = navigation;
 module.exports.startTimespan = startTimespan;

package/core/index.d.ts

@@ -5,8 +5,6 @@ export { NetworkRecords } from "./computed/network-records.js";
 export { default as defaultConfig } from "./config/default-config.js";
 export { default as desktopConfig } from "./config/desktop-config.js";
 export * from "../types/lh.js";
-export type Connection = import('./legacy/gather/connections/connection.js').Connection;
-/** @typedef {import('./legacy/gather/connections/connection.js').Connection} Connection */
 /**
  * Run Lighthouse.
  * @param {string=} url The URL to test. Optional if running in auditMode.
@@ -18,19 +16,6 @@ export type Connection = import('./legacy/gather/connections/connection.js').Con
  * @return {Promise<LH.RunnerResult|undefined>}
  */
 declare function lighthouse(url?: string | undefined, flags?: LH.Flags | undefined, config?: LH.Config | undefined, page?: LH.Puppeteer.Page | undefined): Promise<LH.RunnerResult | undefined>;
-/**
- * Run Lighthouse using the legacy navigation runner.
- * This is left in place for any clients that don't support FR navigations yet (e.g. Lightrider)
- * @deprecated
- * @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=} config Configuration for the Lighthouse run. If
- *   not present, the default config is used.
- * @param {Connection=} userConnection
- * @return {Promise<LH.RunnerResult|undefined>}
- */
-export function legacyNavigation(url?: string | undefined, flags?: LH.Flags | undefined, config?: LH.Config | undefined, userConnection?: Connection | undefined): Promise<LH.RunnerResult | undefined>;
 /**
  * @param {LH.Puppeteer.Page} page
  * @param {LH.UserFlow.Options} [options]

package/core/index.js

@@ -4,13 +4,8 @@
  * 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.
  */
 
-import log from 'lighthouse-logger';
-
+import Trace from './gather/gatherers/trace.js';
 import {Runner} from './runner.js';
-import {CriConnection} from './legacy/gather/connections/cri.js';
-import {LegacyResolvedConfig} from './legacy/config/config.js';
-import UrlUtils from './lib/url-utils.js';
-import {Driver} from './legacy/gather/driver.js';
 import {UserFlow, auditGatherSteps} from './user-flow.js';
 import {ReportGenerator} from '../report/generator/report-generator.js';
 import {startTimespanGather} from './gather/timespan-runner.js';
@@ -18,8 +13,6 @@ import {snapshotGather} from './gather/snapshot-runner.js';
 import {navigationGather} from './gather/navigation-runner.js';
 import * as LH from '../types/lh.js';
 
-/** @typedef {import('./legacy/gather/connections/connection.js').Connection} Connection */
-
 /*
  * The relationship between these root modules:
  *
@@ -47,36 +40,6 @@ async function lighthouse(url, flags = {}, config, page) {
   return navigation(page, url, {config, flags});
 }
 
-/**
- * Run Lighthouse using the legacy navigation runner.
- * This is left in place for any clients that don't support FR navigations yet (e.g. Lightrider)
- * @deprecated
- * @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=} 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 = {}, config, userConnection) {
-  // set logging preferences, assume quiet
-  flags.logLevel = flags.logLevel || 'error';
-  log.setLevel(flags.logLevel);
-
-  const resolvedConfig = await LegacyResolvedConfig.fromJson(config, flags);
-  const computedCache = new Map();
-  const options = {resolvedConfig, computedCache};
-  const connection = userConnection || new CriConnection(flags.port, flags.hostname);
-
-  // kick off a lighthouse run
-  const artifacts = await Runner.gather(() => {
-    const requestedUrl = UrlUtils.normalizeUrl(url);
-    return Runner._gatherArtifactsFromBrowser(requestedUrl, options, connection);
-  }, options);
-  return Runner.audit(artifacts, options);
-}
-
 /**
  * @param {LH.Puppeteer.Page} page
  * @param {LH.UserFlow.Options} [options]
@@ -150,7 +113,7 @@ function getAuditList() {
   return Runner.getAuditList();
 }
 
-const traceCategories = Driver.traceCategories;
+const traceCategories = Trace.getDefaultTraceCategories();
 
 export default lighthouse;
 export {Audit} from './audits/audit.js';
@@ -160,7 +123,6 @@ export {default as defaultConfig} from './config/default-config.js';
 export {default as desktopConfig} from './config/desktop-config.js';
 export * from '../types/lh.js';
 export {
-  legacyNavigation,
   startFlow,
   navigation,
   startTimespan,

package/core/lib/asset-saver.js

@@ -220,13 +220,17 @@ async function saveArtifacts(artifacts, basePath) {
   const {traces, devtoolsLogs, DevtoolsLog, Trace, ...restArtifacts} = artifacts;
 
   // save traces
-  for (const [passName, trace] of Object.entries(traces)) {
-    await saveTrace(trace, `${basePath}/${passName}${traceSuffix}`);
+  if (traces) {
+    for (const [passName, trace] of Object.entries(traces)) {
+      await saveTrace(trace, `${basePath}/${passName}${traceSuffix}`);
+    }
   }
 
   // save devtools log
-  for (const [passName, devtoolsLog] of Object.entries(devtoolsLogs)) {
-    await saveDevtoolsLog(devtoolsLog, `${basePath}/${passName}${devtoolsLogSuffix}`);
+  if (devtoolsLogs) {
+    for (const [passName, devtoolsLog] of Object.entries(devtoolsLogs)) {
+      await saveDevtoolsLog(devtoolsLog, `${basePath}/${passName}${devtoolsLogSuffix}`);
+    }
   }
 
   // save everything else, using a replacer to serialize LighthouseErrors in the artifacts.

package/core/lib/axe.js

@@ -7,7 +7,7 @@
 import fs from 'fs';
 import {createRequire} from 'module';
 
-// This is removed by rollup, because the only usage is to resolve a module path
+// This is removed by esbuild (if minified), because the only usage is to resolve a module path
 // but that is replaced by the inline-fs plugin, leaving `require` unused.
 const require = /* #__PURE__ */ createRequire(import.meta.url);
 const axeSource = fs.readFileSync(require.resolve('axe-core/axe.min.js'), 'utf8');

package/core/lib/emulation.d.ts

@@ -1,43 +1,43 @@
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {LH.Config.Settings} settings
  * @return {Promise<void>}
  */
-export function emulate(session: LH.Gatherer.FRProtocolSession, settings: LH.Config.Settings): Promise<void>;
+export function emulate(session: LH.Gatherer.ProtocolSession, settings: LH.Config.Settings): Promise<void>;
 /**
  * Sets the throttling options specified in config settings, clearing existing network throttling if
  * throttlingMethod is not `devtools` (but not CPU throttling, suspected requirement of WPT-compat).
  *
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {LH.Config.Settings} settings
  * @return {Promise<void>}
  */
-export function throttle(session: LH.Gatherer.FRProtocolSession, settings: LH.Config.Settings): Promise<void>;
+export function throttle(session: LH.Gatherer.ProtocolSession, settings: LH.Config.Settings): Promise<void>;
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {Promise<void>}
  */
-export function clearThrottling(session: LH.Gatherer.FRProtocolSession): Promise<void>;
+export function clearThrottling(session: LH.Gatherer.ProtocolSession): Promise<void>;
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {Required<LH.ThrottlingSettings>} throttlingSettings
  * @return {Promise<void>}
  */
-export function enableNetworkThrottling(session: LH.Gatherer.FRProtocolSession, throttlingSettings: Required<LH.ThrottlingSettings>): Promise<void>;
+export function enableNetworkThrottling(session: LH.Gatherer.ProtocolSession, throttlingSettings: Required<LH.ThrottlingSettings>): Promise<void>;
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {Promise<void>}
  */
-export function clearNetworkThrottling(session: LH.Gatherer.FRProtocolSession): Promise<void>;
+export function clearNetworkThrottling(session: LH.Gatherer.ProtocolSession): Promise<void>;
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {Required<LH.ThrottlingSettings>} throttlingSettings
  * @return {Promise<void>}
  */
-export function enableCPUThrottling(session: LH.Gatherer.FRProtocolSession, throttlingSettings: Required<LH.ThrottlingSettings>): Promise<void>;
+export function enableCPUThrottling(session: LH.Gatherer.ProtocolSession, throttlingSettings: Required<LH.ThrottlingSettings>): Promise<void>;
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {Promise<void>}
  */
-export function clearCPUThrottling(session: LH.Gatherer.FRProtocolSession): Promise<void>;
+export function clearCPUThrottling(session: LH.Gatherer.ProtocolSession): Promise<void>;
 //# sourceMappingURL=emulation.d.ts.map

package/core/lib/emulation.js

@@ -58,7 +58,7 @@ function parseUseragentIntoMetadata(userAgent, formFactor) {
 }
 
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {LH.Config.Settings} settings
  * @return {Promise<void>}
  */
@@ -85,7 +85,7 @@ async function emulate(session, settings) {
  * Sets the throttling options specified in config settings, clearing existing network throttling if
  * throttlingMethod is not `devtools` (but not CPU throttling, suspected requirement of WPT-compat).
  *
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {LH.Config.Settings} settings
  * @return {Promise<void>}
  */
@@ -99,7 +99,7 @@ async function throttle(session, settings) {
 }
 
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {Promise<void>}
  */
 async function clearThrottling(session) {
@@ -107,7 +107,7 @@ async function clearThrottling(session) {
 }
 
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {Required<LH.ThrottlingSettings>} throttlingSettings
  * @return {Promise<void>}
  */
@@ -127,7 +127,7 @@ function enableNetworkThrottling(session, throttlingSettings) {
 }
 
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {Promise<void>}
  */
 function clearNetworkThrottling(session) {
@@ -135,7 +135,7 @@ function clearNetworkThrottling(session) {
 }
 
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {Required<LH.ThrottlingSettings>} throttlingSettings
  * @return {Promise<void>}
  */
@@ -145,7 +145,7 @@ function enableCPUThrottling(session, throttlingSettings) {
 }
 
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {Promise<void>}
  */
 function clearCPUThrottling(session) {

package/core/lib/page-functions.d.ts

@@ -11,6 +11,7 @@ export namespace pageFunctions {
     export { wrapRequestIdleCallback };
     export { getBoundingClientRect };
     export { truncate };
+    export { esbuildFunctionNameStubString };
 }
 /**
  * `typed-query-selector`'s CSS selector parser.
@@ -157,5 +158,6 @@ declare function truncate(string: string, characterLimit: number): string;
 declare namespace truncate {
     function toString(): string;
 }
+declare const esbuildFunctionNameStubString: "var __name=(fn)=>fn;";
 export {};
 //# sourceMappingURL=page-functions.d.ts.map

package/core/lib/page-functions.js

@@ -513,6 +513,15 @@ function truncate(string, characterLimit) {
   return Util.truncate(string, characterLimit);
 }
 
+// This is to support bundled lighthouse.
+// esbuild calls every function with a builtin `__name`, whose purpose is to store the
+// real name of the function so that esbuild can rename it to avoid collisions. There is no way to
+// disable this renaming, even if esbuild minification (and thus function name mangling) is disabled.
+// Anywhere we inject dynamically generated code at runtime for the browser to process,
+// we must manually include this function (because esbuild only does so once at the top scope
+// of the bundle, which is irrelevant for code executed in the browser).
+const esbuildFunctionNameStubString = 'var __name=(fn)=>fn;';
+
 /** @type {string} */
 const truncateRawString = truncate.toString();
 truncate.toString = () => `function truncate(string, characterLimit) {
@@ -560,4 +569,5 @@ export const pageFunctions = {
   wrapRequestIdleCallback,
   getBoundingClientRect,
   truncate,
+  esbuildFunctionNameStubString,
 };

package/core/lib/sentry.js

@@ -126,9 +126,16 @@ async function init(opts) {
         if (opts.tags) {
           scope.setTags(opts.tags);
         }
-        if (opts.extra) {
-          scope.setExtras(opts.extra);
+
+        // Add extra details
+        let extra;
+        if (opts.extra) extra = {...opts.extra};
+        // @ts-expect-error Non-standard property
+        if (err.extra) extra = {...extra, ...err.extra};
+        if (extra) {
+          scope.setExtras(extra);
         }
+
         Sentry.captureException(err);
       });
     };

package/core/runner.d.ts

@@ -1,19 +1,13 @@
-export type Connection = import('./legacy/gather/connections/connection.js').Connection;
 export type ArbitraryEqualityMap = import('./lib/arbitrary-equality-map.js').ArbitraryEqualityMap;
-export type Config = LH.Config.LegacyResolvedConfig;
-/** @typedef {import('./legacy/gather/connections/connection.js').Connection} Connection */
 /** @typedef {import('./lib/arbitrary-equality-map.js').ArbitraryEqualityMap} ArbitraryEqualityMap */
-/** @typedef {LH.Config.LegacyResolvedConfig} Config */
 export class Runner {
     /**
-     * @template {LH.Config.LegacyResolvedConfig | LH.Config.ResolvedConfig} TConfig
      * @param {LH.Artifacts} artifacts
-     * @param {{resolvedConfig: TConfig, driverMock?: Driver, computedCache: Map<string, ArbitraryEqualityMap>}} options
+     * @param {{resolvedConfig: LH.Config.ResolvedConfig, computedCache: Map<string, ArbitraryEqualityMap>}} options
      * @return {Promise<LH.RunnerResult|undefined>}
      */
-    static audit<TConfig extends import("../types/config.js").default.ResolvedConfig | import("../types/config.js").default.LegacyResolvedConfig>(artifacts: LH.Artifacts, options: {
-        resolvedConfig: TConfig;
-        driverMock?: Driver | undefined;
+    static audit(artifacts: LH.Artifacts, options: {
+        resolvedConfig: LH.Config.ResolvedConfig;
         computedCache: Map<string, ArbitraryEqualityMap>;
     }): Promise<LH.RunnerResult | undefined>;
     /**
@@ -26,17 +20,14 @@ export class Runner {
      * -G and -A will run partial lighthouse pipelines,
      * and -GA will run everything plus save artifacts and lhr to disk.
      *
-     * @template {LH.Config.LegacyResolvedConfig | LH.Config.ResolvedConfig} TConfig
-     * @param {(runnerData: {resolvedConfig: TConfig, driverMock?: Driver}) => Promise<LH.Artifacts>} gatherFn
-     * @param {{resolvedConfig: TConfig, driverMock?: Driver, computedCache: Map<string, ArbitraryEqualityMap>}} options
+     * @param {(runnerData: {resolvedConfig: LH.Config.ResolvedConfig}) => Promise<LH.Artifacts>} gatherFn
+     * @param {{resolvedConfig: LH.Config.ResolvedConfig, computedCache: Map<string, ArbitraryEqualityMap>}} options
      * @return {Promise<LH.Artifacts>}
      */
-    static gather<TConfig_1 extends import("../types/config.js").default.ResolvedConfig | import("../types/config.js").default.LegacyResolvedConfig>(gatherFn: (runnerData: {
-        resolvedConfig: TConfig_1;
-        driverMock?: Driver | undefined;
+    static gather(gatherFn: (runnerData: {
+        resolvedConfig: LH.Config.ResolvedConfig;
     }) => Promise<LH.Artifacts>, options: {
-        resolvedConfig: TConfig_1;
-        driverMock?: Driver | undefined;
+        resolvedConfig: LH.Config.ResolvedConfig;
         computedCache: Map<string, ArbitraryEqualityMap>;
     }): Promise<LH.Artifacts>;
     /**
@@ -52,18 +43,6 @@ export class Runner {
      * @return {LH.Result.Timing}
      */
     static _getTiming(artifacts: LH.Artifacts): LH.Result.Timing;
-    /**
-     * Establish connection, load page and collect all required artifacts
-     * @param {string} requestedUrl
-     * @param {{resolvedConfig: Config, computedCache: Map<string, ArbitraryEqualityMap>, driverMock?: Driver}} runnerOpts
-     * @param {Connection} connection
-     * @return {Promise<LH.Artifacts>}
-     */
-    static _gatherArtifactsFromBrowser(requestedUrl: string, runnerOpts: {
-        resolvedConfig: Config;
-        computedCache: Map<string, ArbitraryEqualityMap>;
-        driverMock?: Driver;
-    }, connection: Connection): Promise<LH.Artifacts>;
     /**
      * Run all audits with specified settings and artifacts.
      * @param {LH.Config.Settings} settings
@@ -109,6 +88,5 @@ export class Runner {
      */
     static _getDataSavePath(settings: LH.Config.Settings): string;
 }
-import { Driver } from './legacy/gather/driver.js';
 import { Audit } from './audits/audit.js';
 //# sourceMappingURL=runner.d.ts.map

package/core/runner.js

@@ -11,8 +11,6 @@ import path from 'path';
 import log from 'lighthouse-logger';
 import isDeepEqual from 'lodash/isEqual.js';
 
-import {Driver} from './legacy/gather/driver.js';
-import {GatherRunner} from './legacy/gather/gather-runner.js';
 import {ReportScoring} from './scoring.js';
 import {Audit} from './audits/audit.js';
 import * as format from '../shared/localization/format.js';
@@ -28,15 +26,12 @@ import UrlUtils from './lib/url-utils.js';
 
 const moduleDir = getModuleDirectory(import.meta);
 
-/** @typedef {import('./legacy/gather/connections/connection.js').Connection} Connection */
 /** @typedef {import('./lib/arbitrary-equality-map.js').ArbitraryEqualityMap} ArbitraryEqualityMap */
-/** @typedef {LH.Config.LegacyResolvedConfig} Config */
 
 class Runner {
   /**
-   * @template {LH.Config.LegacyResolvedConfig | LH.Config.ResolvedConfig} TConfig
    * @param {LH.Artifacts} artifacts
-   * @param {{resolvedConfig: TConfig, driverMock?: Driver, computedCache: Map<string, ArbitraryEqualityMap>}} options
+   * @param {{resolvedConfig: LH.Config.ResolvedConfig, computedCache: Map<string, ArbitraryEqualityMap>}} options
    * @return {Promise<LH.RunnerResult|undefined>}
    */
   static async audit(artifacts, options) {
@@ -153,7 +148,7 @@ class Runner {
    * @param {LH.Artifacts.ComputedContext} context
    */
   static async getEntityClassification(artifacts, context) {
-    const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
+    const devtoolsLog = artifacts.devtoolsLogs?.[Audit.DEFAULT_PASS];
     if (!devtoolsLog) return;
     const classifiedEntities = await EntityClassification.request(
       {URL: artifacts.URL, devtoolsLog}, context);
@@ -188,9 +183,8 @@ class Runner {
    * -G and -A will run partial lighthouse pipelines,
    * and -GA will run everything plus save artifacts and lhr to disk.
    *
-   * @template {LH.Config.LegacyResolvedConfig | LH.Config.ResolvedConfig} TConfig
-   * @param {(runnerData: {resolvedConfig: TConfig, driverMock?: Driver}) => Promise<LH.Artifacts>} gatherFn
-   * @param {{resolvedConfig: TConfig, driverMock?: Driver, computedCache: Map<string, ArbitraryEqualityMap>}} options
+   * @param {(runnerData: {resolvedConfig: LH.Config.ResolvedConfig}) => Promise<LH.Artifacts>} gatherFn
+   * @param {{resolvedConfig: LH.Config.ResolvedConfig, computedCache: Map<string, ArbitraryEqualityMap>}} options
    * @return {Promise<LH.Artifacts>}
    */
   static async gather(gatherFn, options) {
@@ -217,7 +211,6 @@ class Runner {
 
         artifacts = await gatherFn({
           resolvedConfig: options.resolvedConfig,
-          driverMock: options.driverMock,
         });
 
         log.timeEnd(runnerStatus);
@@ -291,28 +284,6 @@ class Runner {
     return {entries: timingEntries, total: gatherTiming + auditTiming};
   }
 
-  /**
-   * Establish connection, load page and collect all required artifacts
-   * @param {string} requestedUrl
-   * @param {{resolvedConfig: Config, computedCache: Map<string, ArbitraryEqualityMap>, driverMock?: Driver}} runnerOpts
-   * @param {Connection} connection
-   * @return {Promise<LH.Artifacts>}
-   */
-  static async _gatherArtifactsFromBrowser(requestedUrl, runnerOpts, connection) {
-    if (!runnerOpts.resolvedConfig.passes) {
-      throw new Error('No browser artifacts are either provided or requested.');
-    }
-    const driver = runnerOpts.driverMock || new Driver(connection);
-    const gatherOpts = {
-      driver,
-      requestedUrl,
-      settings: runnerOpts.resolvedConfig.settings,
-      computedCache: runnerOpts.computedCache,
-    };
-    const artifacts = await GatherRunner.run(runnerOpts.resolvedConfig.passes, gatherOpts);
-    return artifacts;
-  }
-
   /**
    * Run all audits with specified settings and artifacts.
    * @param {LH.Config.Settings} settings
@@ -419,15 +390,11 @@ class Runner {
           // @ts-expect-error: TODO why is this a type error now?
           const artifactError = artifacts[artifactName];
 
-          Sentry.captureException(artifactError, {
-            tags: {gatherer: artifactName},
-            level: 'error',
-          });
-
           log.warn('Runner', `${artifactName} gatherer, required by audit ${audit.meta.id},` +
             ` encountered an error: ${artifactError.message}`);
 
-          // Create a friendlier display error and mark it as expected to avoid duplicates in Sentry
+          // Create a friendlier display error and mark it as expected to avoid duplicates in Sentry.
+          // The artifact error was already sent to Sentry in `collectPhaseArtifacts`.
           const error = new LighthouseError(LighthouseError.errors.ERRORED_REQUIRED_ARTIFACT,
               {artifactName, errorMessage: artifactError.message}, {cause: artifactError});
           // @ts-expect-error Non-standard property added to Error

package/core/user-flow.d.ts

@@ -1,4 +1,4 @@
-export type GatherStepRunnerOptions = WeakMap<LH.UserFlow.GatherStep, LH.Gatherer.FRGatherResult['runnerOptions']>;
+export type GatherStepRunnerOptions = WeakMap<LH.UserFlow.GatherStep, LH.Gatherer.GatherResult['runnerOptions']>;
 export class UserFlow {
     /**
      * @param {LH.Puppeteer.Page} page
@@ -24,10 +24,10 @@ export class UserFlow {
      */
     _getNextNavigationFlags(flags: LH.UserFlow.StepFlags | undefined): LH.UserFlow.StepFlags;
     /**
-     * @param {LH.Gatherer.FRGatherResult} gatherResult
+     * @param {LH.Gatherer.GatherResult} gatherResult
      * @param {LH.UserFlow.StepFlags} [flags]
      */
-    _addGatherStep(gatherResult: LH.Gatherer.FRGatherResult, flags?: LH.UserFlow.StepFlags | undefined): void;
+    _addGatherStep(gatherResult: LH.Gatherer.GatherResult, flags?: LH.UserFlow.StepFlags | undefined): void;
     /**
      * @param {LH.NavigationRequestor} requestor
      * @param {LH.UserFlow.StepFlags} [flags]
@@ -50,7 +50,7 @@ export class UserFlow {
     startTimespan(flags?: LH.UserFlow.StepFlags | undefined): Promise<void>;
     currentTimespan: {
         timespan: {
-            endTimespanGather(): Promise<LH.Gatherer.FRGatherResult>;
+            endTimespanGather(): Promise<LH.Gatherer.GatherResult>;
         };
         flags: LH.UserFlow.StepFlags | undefined;
     } | undefined;

package/core/user-flow.js

@@ -15,7 +15,7 @@ import {mergeConfigFragment, deepClone} from './config/config-helpers.js';
 import * as i18n from './lib/i18n/i18n.js';
 import * as LH from '../types/lh.js';
 
-/** @typedef {WeakMap<LH.UserFlow.GatherStep, LH.Gatherer.FRGatherResult['runnerOptions']>} GatherStepRunnerOptions */
+/** @typedef {WeakMap<LH.UserFlow.GatherStep, LH.Gatherer.GatherResult['runnerOptions']>} GatherStepRunnerOptions */
 
 const UIStrings = {
   /**
@@ -107,7 +107,7 @@ class UserFlow {
   }
 
   /**
-   * @param {LH.Gatherer.FRGatherResult} gatherResult
+   * @param {LH.Gatherer.GatherResult} gatherResult
    * @param {LH.UserFlow.StepFlags} [flags]
    */
   _addGatherStep(gatherResult, flags) {