lighthouse 10.4.0-dev.20230713 → 10.4.0-dev.20230715

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

@@ -1,13 +1,13 @@
 export default TraceCompat;
-/** @implements {LH.Gatherer.FRGathererInstance<'Trace'>} */
-declare class TraceCompat extends FRGatherer implements LH.Gatherer.FRGathererInstance<'Trace'> {
+/** @implements {LH.Gatherer.GathererInstance<'Trace'>} */
+declare class TraceCompat extends BaseGatherer implements LH.Gatherer.GathererInstance<'Trace'> {
     /** @type {LH.Gatherer.GathererMeta<'Trace'>} */
     meta: LH.Gatherer.GathererMeta<'Trace'>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext<'Trace'>} passContext
+     * @param {LH.Gatherer.Context<'Trace'>} passContext
      * @return {Promise<LH.Artifacts['traces']>}
      */
-    getArtifact(passContext: LH.Gatherer.FRTransitionalContext<'Trace'>): Promise<LH.Artifacts['traces']>;
+    getArtifact(passContext: LH.Gatherer.Context<'Trace'>): Promise<LH.Artifacts['traces']>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=trace-compat.d.ts.map

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

@@ -11,10 +11,10 @@
  */
 
 import TraceGatherer from './trace.js';
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 
-/** @implements {LH.Gatherer.FRGathererInstance<'Trace'>} */
-class TraceCompat extends FRGatherer {
+/** @implements {LH.Gatherer.GathererInstance<'Trace'>} */
+class TraceCompat extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta<'Trace'>} */
   meta = {
     supportedModes: ['timespan', 'navigation'],
@@ -22,7 +22,7 @@ class TraceCompat extends FRGatherer {
   };
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext<'Trace'>} passContext
+   * @param {LH.Gatherer.Context<'Trace'>} passContext
    * @return {Promise<LH.Artifacts['traces']>}
    */
   async getArtifact(passContext) {

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

@@ -9,7 +9,7 @@ export type TraceElementData = {
     }[];
     type?: string;
 };
-declare class TraceElements extends FRGatherer {
+declare class TraceElements extends BaseGatherer {
     /**
      * @param {Array<number>} rect
      * @return {LH.Artifacts.Rect}
@@ -27,16 +27,16 @@ declare class TraceElements extends FRGatherer {
     static getTopLayoutShiftElements(processedTrace: LH.Artifacts.ProcessedTrace): Array<TraceElementData>;
     /**
      * @param {LH.Trace} trace
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      * @return {Promise<TraceElementData|undefined>}
      */
-    static getResponsivenessElement(trace: LH.Trace, context: LH.Gatherer.FRTransitionalContext): Promise<TraceElementData | undefined>;
+    static getResponsivenessElement(trace: LH.Trace, context: LH.Gatherer.Context): Promise<TraceElementData | undefined>;
     /**
      * @param {LH.Trace} trace
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      * @return {Promise<{nodeId: number, type: string} | undefined>}
      */
-    static getLcpElement(trace: LH.Trace, context: LH.Gatherer.FRTransitionalContext): Promise<{
+    static getLcpElement(trace: LH.Trace, context: LH.Gatherer.Context): Promise<{
         nodeId: number;
         type: string;
     } | undefined>;
@@ -53,32 +53,20 @@ declare class TraceElements extends FRGatherer {
      */
     getAnimatedElements(mainThreadEvents: Array<LH.TraceEvent>): Promise<Array<TraceElementData>>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      */
-    startInstrumentation(context: LH.Gatherer.FRTransitionalContext): Promise<void>;
+    startInstrumentation(context: LH.Gatherer.Context): Promise<void>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      */
-    stopInstrumentation(context: LH.Gatherer.FRTransitionalContext): Promise<void>;
+    stopInstrumentation(context: LH.Gatherer.Context): Promise<void>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
-     * @param {LH.Trace|undefined} trace
-     * @return {Promise<LH.Artifacts['TraceElements']>}
-     */
-    _getArtifact(context: LH.Gatherer.FRTransitionalContext, trace: LH.Trace | undefined): Promise<LH.Artifacts['TraceElements']>;
-    /**
-     * @param {LH.Gatherer.FRTransitionalContext<'Trace'>} context
+     * @param {LH.Gatherer.Context<'Trace'>} context
      * @return {Promise<LH.Artifacts.TraceElement[]>}
      */
-    getArtifact(context: LH.Gatherer.FRTransitionalContext<'Trace'>): Promise<LH.Artifacts.TraceElement[]>;
-    /**
-     * @param {LH.Gatherer.PassContext} passContext
-     * @param {LH.Gatherer.LoadData} loadData
-     * @return {Promise<LH.Artifacts.TraceElement[]>}
-     */
-    afterPass(passContext: LH.Gatherer.PassContext, loadData: LH.Gatherer.LoadData): Promise<LH.Artifacts.TraceElement[]>;
+    getArtifact(context: LH.Gatherer.Context<'Trace'>): Promise<LH.Artifacts.TraceElement[]>;
 }
-import FRGatherer from '../base-gatherer.js';
-import Trace from './trace.js';
+import BaseGatherer from '../base-gatherer.js';
 import { ProcessedTrace } from '../../computed/processed-trace.js';
+import Trace from './trace.js';
 //# sourceMappingURL=trace-elements.d.ts.map

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

@@ -12,7 +12,7 @@
  * We take the backend nodeId from the trace and use it to find the corresponding element in the DOM.
  */
 
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 import {resolveNodeIdToObjectId} from '../driver/dom.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 import * as RectHelpers from '../../lib/rect-helpers.js';
@@ -41,7 +41,7 @@ function getNodeDetailsData() {
 }
 /* c8 ignore stop */
 
-class TraceElements extends FRGatherer {
+class TraceElements extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta<'Trace'>} */
   meta = {
     supportedModes: ['timespan', 'navigation'],
@@ -135,7 +135,7 @@ class TraceElements extends FRGatherer {
 
   /**
    * @param {LH.Trace} trace
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    * @return {Promise<TraceElementData|undefined>}
    */
   static async getResponsivenessElement(trace, context) {
@@ -205,7 +205,7 @@ class TraceElements extends FRGatherer {
 
   /**
    * @param {LH.Trace} trace
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    * @return {Promise<{nodeId: number, type: string} | undefined>}
    */
   static async getLcpElement(trace, context) {
@@ -233,7 +233,7 @@ class TraceElements extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    */
   async startInstrumentation(context) {
     await context.driver.defaultSession.sendCommand('Animation.enable');
@@ -241,7 +241,7 @@ class TraceElements extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    */
   async stopInstrumentation(context) {
     context.driver.defaultSession.off('Animation.animationStarted', this._onAnimationStarted);
@@ -249,12 +249,13 @@ class TraceElements extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
-   * @param {LH.Trace|undefined} trace
-   * @return {Promise<LH.Artifacts['TraceElements']>}
+   * @param {LH.Gatherer.Context<'Trace'>} context
+   * @return {Promise<LH.Artifacts.TraceElement[]>}
    */
-  async _getArtifact(context, trace) {
+  async getArtifact(context) {
     const session = context.driver.defaultSession;
+
+    const trace = context.dependencies.Trace;
     if (!trace) {
       throw new Error('Trace is missing!');
     }
@@ -286,6 +287,7 @@ class TraceElements extends FRGatherer {
           response = await session.sendCommand('Runtime.callFunctionOn', {
             objectId,
             functionDeclaration: `function () {
+              ${pageFunctions.esbuildFunctionNameStubString}
               ${getNodeDetailsData.toString()};
               ${pageFunctions.getNodeDetails};
               return getNodeDetailsData.call(this);
@@ -295,7 +297,7 @@ class TraceElements extends FRGatherer {
           });
         } catch (err) {
           Sentry.captureException(err, {
-            tags: {gatherer: this.name},
+            tags: {gatherer: 'TraceElements'},
             level: 'error',
           });
           continue;
@@ -316,25 +318,6 @@ class TraceElements extends FRGatherer {
 
     return traceElements;
   }
-
-  /**
-   * @param {LH.Gatherer.FRTransitionalContext<'Trace'>} context
-   * @return {Promise<LH.Artifacts.TraceElement[]>}
-   */
-  async getArtifact(context) {
-    return this._getArtifact(context, context.dependencies.Trace);
-  }
-
-  /**
-   * @param {LH.Gatherer.PassContext} passContext
-   * @param {LH.Gatherer.LoadData} loadData
-   * @return {Promise<LH.Artifacts.TraceElement[]>}
-   */
-  async afterPass(passContext, loadData) {
-    const context = {...passContext, dependencies: {}};
-    await this.stopInstrumentation(context);
-    return this._getArtifact(context, loadData.trace);
-  }
 }
 
 export default TraceElements;

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

@@ -1,23 +1,23 @@
 export default Trace;
-declare class Trace extends FRGatherer {
+declare class Trace extends BaseGatherer {
     static getDefaultTraceCategories(): string[];
     /**
-     * @param {LH.Gatherer.FRProtocolSession} session
+     * @param {LH.Gatherer.ProtocolSession} session
      * @return {Promise<LH.Trace>}
      */
-    static endTraceAndCollectEvents(session: LH.Gatherer.FRProtocolSession): Promise<LH.Trace>;
+    static endTraceAndCollectEvents(session: LH.Gatherer.ProtocolSession): Promise<LH.Trace>;
     static symbol: symbol;
     /** @type {LH.Trace} */
     _trace: LH.Trace;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} passContext
+     * @param {LH.Gatherer.Context} passContext
      */
-    startSensitiveInstrumentation({ driver, gatherMode, settings }: LH.Gatherer.FRTransitionalContext): Promise<void>;
+    startSensitiveInstrumentation({ driver, gatherMode, settings }: LH.Gatherer.Context): Promise<void>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} passContext
+     * @param {LH.Gatherer.Context} passContext
      */
-    stopSensitiveInstrumentation({ driver }: LH.Gatherer.FRTransitionalContext): Promise<void>;
+    stopSensitiveInstrumentation({ driver }: LH.Gatherer.Context): Promise<void>;
     getArtifact(): import("../../index.js").Trace;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=trace.d.ts.map

package/core/gather/gatherers/trace.js

@@ -10,10 +10,10 @@
  * This protocol log can be used to recreate the network records using lib/network-recorder.js.
  */
 
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 import {TraceProcessor} from '../../lib/tracehouse/trace-processor.js';
 
-class Trace extends FRGatherer {
+class Trace extends BaseGatherer {
   /** @type {LH.Trace} */
   _trace = {traceEvents: []};
 
@@ -63,7 +63,7 @@ class Trace extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRProtocolSession} session
+   * @param {LH.Gatherer.ProtocolSession} session
    * @return {Promise<LH.Trace>}
    */
   static async endTraceAndCollectEvents(session) {
@@ -98,7 +98,7 @@ class Trace extends FRGatherer {
   };
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    */
   async startSensitiveInstrumentation({driver, gatherMode, settings}) {
     const traceCategories = Trace.getDefaultTraceCategories()
@@ -116,7 +116,7 @@ class Trace extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    */
   async stopSensitiveInstrumentation({driver}) {
     this._trace = await Trace.endTraceAndCollectEvents(driver.defaultSession);

package/core/gather/gatherers/viewport-dimensions.d.ts

@@ -1,10 +1,10 @@
 export default ViewportDimensions;
-declare class ViewportDimensions extends FRGatherer {
+declare class ViewportDimensions extends BaseGatherer {
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} passContext
+     * @param {LH.Gatherer.Context} passContext
      * @return {Promise<LH.Artifacts.ViewportDimensions>}
      */
-    getArtifact(passContext: LH.Gatherer.FRTransitionalContext): Promise<LH.Artifacts.ViewportDimensions>;
+    getArtifact(passContext: LH.Gatherer.Context): Promise<LH.Artifacts.ViewportDimensions>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=viewport-dimensions.d.ts.map

package/core/gather/gatherers/viewport-dimensions.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.
  */
 
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 
 /* global window */
 
@@ -26,14 +26,14 @@ function getViewportDimensions() {
 }
 /* c8 ignore stop */
 
-class ViewportDimensions extends FRGatherer {
+class ViewportDimensions extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'timespan', 'navigation'],
   };
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    * @return {Promise<LH.Artifacts.ViewportDimensions>}
    */
   async getArtifact(passContext) {

package/core/gather/gatherers/web-app-manifest.d.ts

@@ -1,10 +1,10 @@
 export default WebAppManifest;
-declare class WebAppManifest extends FRGatherer {
+declare class WebAppManifest extends BaseGatherer {
     /**
-     * @param {LH.Gatherer.FRProtocolSession} session
+     * @param {LH.Gatherer.ProtocolSession} session
      * @return {Promise<{url: string, data: string}|null>}
      */
-    static fetchAppManifest(session: LH.Gatherer.FRProtocolSession): Promise<{
+    static fetchAppManifest(session: LH.Gatherer.ProtocolSession): Promise<{
         url: string;
         data: string;
     } | null>;
@@ -17,16 +17,16 @@ declare class WebAppManifest extends FRGatherer {
      * was unparseable as JSON, manifest.value will be undefined and manifest.warning
      * will have the reason. See manifest-parser.js for more information.
      *
-     * @param {LH.Gatherer.FRProtocolSession} session
+     * @param {LH.Gatherer.ProtocolSession} session
      * @param {string} pageUrl
      * @return {Promise<LH.Artifacts.Manifest|null>}
      */
-    static getWebAppManifest(session: LH.Gatherer.FRProtocolSession, pageUrl: string): Promise<LH.Artifacts.Manifest | null>;
+    static getWebAppManifest(session: LH.Gatherer.ProtocolSession, pageUrl: string): Promise<LH.Artifacts.Manifest | null>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      * @return {Promise<LH.Artifacts['WebAppManifest']>}
      */
-    getArtifact(context: LH.Gatherer.FRTransitionalContext): Promise<LH.Artifacts['WebAppManifest']>;
+    getArtifact(context: LH.Gatherer.Context): Promise<LH.Artifacts['WebAppManifest']>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=web-app-manifest.d.ts.map

package/core/gather/gatherers/web-app-manifest.js

@@ -7,16 +7,16 @@
 import log from 'lighthouse-logger';
 
 import {parseManifest} from '../../lib/manifest-parser.js';
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 
-class WebAppManifest extends FRGatherer {
+class WebAppManifest extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'navigation'],
   };
 
   /**
-   * @param {LH.Gatherer.FRProtocolSession} session
+   * @param {LH.Gatherer.ProtocolSession} session
    * @return {Promise<{url: string, data: string}|null>}
    */
   static async fetchAppManifest(session) {
@@ -74,7 +74,7 @@ class WebAppManifest extends FRGatherer {
    * was unparseable as JSON, manifest.value will be undefined and manifest.warning
    * will have the reason. See manifest-parser.js for more information.
    *
-   * @param {LH.Gatherer.FRProtocolSession} session
+   * @param {LH.Gatherer.ProtocolSession} session
    * @param {string} pageUrl
    * @return {Promise<LH.Artifacts.Manifest|null>}
    */
@@ -89,7 +89,7 @@ class WebAppManifest extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    * @return {Promise<LH.Artifacts['WebAppManifest']>}
    */
   async getArtifact(context) {

package/core/gather/navigation-runner.d.ts

@@ -4,7 +4,7 @@ export type NavigationContext = {
     resolvedConfig: LH.Config.ResolvedConfig;
     navigation: LH.Config.NavigationDefn;
     requestor: LH.NavigationRequestor;
-    baseArtifacts: LH.FRBaseArtifacts;
+    baseArtifacts: LH.BaseArtifacts;
     computedCache: Map<string, LH.ArbitraryEqualityMap>;
 };
 export type PhaseState = Omit<Parameters<typeof collectPhaseArtifacts>[0], 'phase'>;
@@ -12,22 +12,22 @@ export type PhaseState = Omit<Parameters<typeof collectPhaseArtifacts>[0], 'phas
  * @param {LH.Puppeteer.Page|undefined} page
  * @param {LH.NavigationRequestor|undefined} requestor
  * @param {{config?: LH.Config, flags?: LH.Flags}} [options]
- * @return {Promise<LH.Gatherer.FRGatherResult>}
+ * @return {Promise<LH.Gatherer.GatherResult>}
  */
 export function navigationGather(page: LH.Puppeteer.Page | undefined, requestor: LH.NavigationRequestor | undefined, options?: {
     config?: import("../../types/config.js").default | undefined;
     flags?: import("../index.js").Flags | undefined;
-} | undefined): Promise<LH.Gatherer.FRGatherResult>;
+} | undefined): Promise<LH.Gatherer.GatherResult>;
 /**
  * @param {{driver: Driver, resolvedConfig: LH.Config.ResolvedConfig, requestor: LH.NavigationRequestor}} args
- * @return {Promise<{baseArtifacts: LH.FRBaseArtifacts}>}
+ * @return {Promise<{baseArtifacts: LH.BaseArtifacts}>}
  */
 export function _setup({ driver, resolvedConfig, requestor }: {
     driver: Driver;
     resolvedConfig: LH.Config.ResolvedConfig;
     requestor: LH.NavigationRequestor;
 }): Promise<{
-    baseArtifacts: LH.FRBaseArtifacts;
+    baseArtifacts: LH.BaseArtifacts;
 }>;
 /**
  * @param {NavigationContext} navigationContext
@@ -52,18 +52,18 @@ export function _navigate(navigationContext: NavigationContext): Promise<{
  */
 export function _navigation(navigationContext: NavigationContext): ReturnType<typeof _computeNavigationResult>;
 /**
- * @param {{driver: Driver, page: LH.Puppeteer.Page, resolvedConfig: LH.Config.ResolvedConfig, requestor: LH.NavigationRequestor; baseArtifacts: LH.FRBaseArtifacts, computedCache: NavigationContext['computedCache']}} args
- * @return {Promise<{artifacts: Partial<LH.FRArtifacts & LH.FRBaseArtifacts>}>}
+ * @param {{driver: Driver, page: LH.Puppeteer.Page, resolvedConfig: LH.Config.ResolvedConfig, requestor: LH.NavigationRequestor; baseArtifacts: LH.BaseArtifacts, computedCache: NavigationContext['computedCache']}} args
+ * @return {Promise<{artifacts: Partial<LH.Artifacts & LH.BaseArtifacts>}>}
  */
 export function _navigations(args: {
     driver: Driver;
     page: LH.Puppeteer.Page;
     resolvedConfig: LH.Config.ResolvedConfig;
     requestor: LH.NavigationRequestor;
-    baseArtifacts: LH.FRBaseArtifacts;
+    baseArtifacts: LH.BaseArtifacts;
     computedCache: NavigationContext['computedCache'];
 }): Promise<{
-    artifacts: Partial<LH.FRArtifacts & LH.FRBaseArtifacts>;
+    artifacts: Partial<LH.Artifacts & LH.BaseArtifacts>;
 }>;
 /**
  * @param {{requestedUrl?: string, driver: Driver, resolvedConfig: LH.Config.ResolvedConfig, lhBrowser?: LH.Puppeteer.Browser, lhPage?: LH.Puppeteer.Page}} args

package/core/gather/navigation-runner.js

@@ -32,7 +32,7 @@ import {NetworkRecords} from '../computed/network-records.js';
  * @property {LH.Config.ResolvedConfig} resolvedConfig
  * @property {LH.Config.NavigationDefn} navigation
  * @property {LH.NavigationRequestor} requestor
- * @property {LH.FRBaseArtifacts} baseArtifacts
+ * @property {LH.BaseArtifacts} baseArtifacts
  * @property {Map<string, LH.ArbitraryEqualityMap>} computedCache
  */
 
@@ -43,7 +43,7 @@ const DEFAULT_PORT = 9222;
 
 /**
  * @param {{driver: Driver, resolvedConfig: LH.Config.ResolvedConfig, requestor: LH.NavigationRequestor}} args
- * @return {Promise<{baseArtifacts: LH.FRBaseArtifacts}>}
+ * @return {Promise<{baseArtifacts: LH.BaseArtifacts}>}
  */
 async function _setup({driver, resolvedConfig, requestor}) {
   await driver.connect();
@@ -260,8 +260,8 @@ async function _navigation(navigationContext) {
 }
 
 /**
- * @param {{driver: Driver, page: LH.Puppeteer.Page, resolvedConfig: LH.Config.ResolvedConfig, requestor: LH.NavigationRequestor; baseArtifacts: LH.FRBaseArtifacts, computedCache: NavigationContext['computedCache']}} args
- * @return {Promise<{artifacts: Partial<LH.FRArtifacts & LH.FRBaseArtifacts>}>}
+ * @param {{driver: Driver, page: LH.Puppeteer.Page, resolvedConfig: LH.Config.ResolvedConfig, requestor: LH.NavigationRequestor; baseArtifacts: LH.BaseArtifacts, computedCache: NavigationContext['computedCache']}} args
+ * @return {Promise<{artifacts: Partial<LH.Artifacts & LH.BaseArtifacts>}>}
  */
 async function _navigations(args) {
   const {
@@ -277,7 +277,7 @@ async function _navigations(args) {
     throw new Error('No artifacts were defined on the config');
   }
 
-  /** @type {Partial<LH.FRArtifacts & LH.FRBaseArtifacts>} */
+  /** @type {Partial<LH.Artifacts & LH.BaseArtifacts>} */
   const artifacts = {};
   /** @type {Array<LH.IcuMessage>} */
   const LighthouseRunWarnings = [];
@@ -328,7 +328,7 @@ async function _cleanup({requestedUrl, driver, resolvedConfig, lhBrowser, lhPage
  * @param {LH.Puppeteer.Page|undefined} page
  * @param {LH.NavigationRequestor|undefined} requestor
  * @param {{config?: LH.Config, flags?: LH.Flags}} [options]
- * @return {Promise<LH.Gatherer.FRGatherResult>}
+ * @return {Promise<LH.Gatherer.GatherResult>}
  */
 async function navigationGather(page, requestor, options = {}) {
   const {flags = {}, config} = options;

package/core/gather/runner-helpers.d.ts

@@ -3,15 +3,15 @@ export type CollectPhaseArtifactOptions = {
     page: LH.Puppeteer.Page;
     artifactDefinitions: Array<LH.Config.AnyArtifactDefn>;
     artifactState: ArtifactState;
-    baseArtifacts: LH.FRBaseArtifacts;
-    phase: LH.Gatherer.FRGatherPhase;
+    baseArtifacts: LH.BaseArtifacts;
+    phase: LH.Gatherer.GatherPhase;
     gatherMode: LH.Gatherer.GatherMode;
     computedCache: Map<string, LH.ArbitraryEqualityMap>;
     settings: LH.Config.Settings;
 };
 export type IntermediateArtifacts = Record<string, Promise<any>>;
 export type ArtifactState = Record<CollectPhaseArtifactOptions['phase'], IntermediateArtifacts>;
-export type Dependencies = LH.Gatherer.FRTransitionalContext<LH.Gatherer.DependencyKey>['dependencies'];
+export type Dependencies = LH.Gatherer.Context<LH.Gatherer.DependencyKey>['dependencies'];
 /** @return {ArtifactState} */
 export function getEmptyArtifactState(): ArtifactState;
 /**

package/core/gather/runner-helpers.js

@@ -10,8 +10,8 @@
  * @property {LH.Puppeteer.Page} page
  * @property {Array<LH.Config.AnyArtifactDefn>} artifactDefinitions
  * @property {ArtifactState} artifactState
- * @property {LH.FRBaseArtifacts} baseArtifacts
- * @property {LH.Gatherer.FRGatherPhase} phase
+ * @property {LH.BaseArtifacts} baseArtifacts
+ * @property {LH.Gatherer.GatherPhase} phase
  * @property {LH.Gatherer.GatherMode} gatherMode
  * @property {Map<string, LH.ArbitraryEqualityMap>} computedCache
  * @property {LH.Config.Settings} settings
@@ -21,10 +21,12 @@
 
 /** @typedef {Record<CollectPhaseArtifactOptions['phase'], IntermediateArtifacts>} ArtifactState */
 
-/** @typedef {LH.Gatherer.FRTransitionalContext<LH.Gatherer.DependencyKey>['dependencies']} Dependencies */
+/** @typedef {LH.Gatherer.Context<LH.Gatherer.DependencyKey>['dependencies']} Dependencies */
 
 import log from 'lighthouse-logger';
 
+import {Sentry} from '../lib/sentry.js';
+
 /**
  *
  * @param {{id: string}} dependency
@@ -115,7 +117,13 @@ async function collectPhaseArtifacts(options) {
       return artifact;
     });
 
-    await artifactPromise.catch(() => {});
+    await artifactPromise.catch((err) => {
+      Sentry.captureException(err, {
+        tags: {gatherer: artifactDefn.id, phase},
+        level: 'error',
+      });
+      log.error(artifactDefn.id, err.message);
+    });
     artifactState[phase][artifactDefn.id] = artifactPromise;
   }
 }

package/core/gather/session.d.ts

@@ -1,7 +1,7 @@
 export type CrdpEventMessageEmitter = LH.Protocol.StrictEventEmitterClass<LH.CrdpEvents>;
 declare const ProtocolSession_base: CrdpEventMessageEmitter;
-/** @implements {LH.Gatherer.FRProtocolSession} */
-export class ProtocolSession extends ProtocolSession_base implements LH.Gatherer.FRProtocolSession {
+/** @implements {LH.Gatherer.ProtocolSession} */
+export class ProtocolSession extends ProtocolSession_base implements LH.Gatherer.ProtocolSession {
     /**
      * @param {LH.Puppeteer.CDPSession} cdpSession
      */

package/core/gather/session.js

@@ -14,7 +14,7 @@ const DEFAULT_PROTOCOL_TIMEOUT = 30000;
 /** @typedef {LH.Protocol.StrictEventEmitterClass<LH.CrdpEvents>} CrdpEventMessageEmitter */
 const CrdpEventEmitter = /** @type {CrdpEventMessageEmitter} */ (EventEmitter);
 
-/** @implements {LH.Gatherer.FRProtocolSession} */
+/** @implements {LH.Gatherer.ProtocolSession} */
 class ProtocolSession extends CrdpEventEmitter {
   /**
    * @param {LH.Puppeteer.CDPSession} cdpSession

package/core/gather/snapshot-runner.d.ts

@@ -1,10 +1,10 @@
 /**
  * @param {LH.Puppeteer.Page} page
  * @param {{config?: LH.Config, flags?: LH.Flags}} [options]
- * @return {Promise<LH.Gatherer.FRGatherResult>}
+ * @return {Promise<LH.Gatherer.GatherResult>}
  */
 export function snapshotGather(page: LH.Puppeteer.Page, options?: {
     config?: import("../../types/config.js").default | undefined;
     flags?: import("../index.js").Flags | undefined;
-} | undefined): Promise<LH.Gatherer.FRGatherResult>;
+} | undefined): Promise<LH.Gatherer.GatherResult>;
 //# sourceMappingURL=snapshot-runner.d.ts.map

package/core/gather/snapshot-runner.js

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

package/core/gather/timespan-runner.d.ts

@@ -1,12 +1,12 @@
 /**
  * @param {LH.Puppeteer.Page} page
  * @param {{config?: LH.Config, flags?: LH.Flags}} [options]
- * @return {Promise<{endTimespanGather(): Promise<LH.Gatherer.FRGatherResult>}>}
+ * @return {Promise<{endTimespanGather(): Promise<LH.Gatherer.GatherResult>}>}
  */
 export function startTimespanGather(page: LH.Puppeteer.Page, options?: {
     config?: import("../../types/config.js").default | undefined;
     flags?: import("../index.js").Flags | undefined;
 } | undefined): Promise<{
-    endTimespanGather(): Promise<LH.Gatherer.FRGatherResult>;
+    endTimespanGather(): Promise<LH.Gatherer.GatherResult>;
 }>;
 //# sourceMappingURL=timespan-runner.d.ts.map

package/core/gather/timespan-runner.js

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