lighthouse 10.4.0 → 11.0.0

package/core/gather/gatherers/dobetterweb/response-compression.d.ts

@@ -1,5 +1,5 @@
 export default ResponseCompression;
-declare class ResponseCompression extends FRGatherer {
+declare class ResponseCompression extends BaseGatherer {
     /**
      * @param {LH.Artifacts.NetworkRequest[]} networkRecords
      * @return {LH.Artifacts['ResponseCompression']}
@@ -8,23 +8,17 @@ declare class ResponseCompression extends FRGatherer {
     /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
     meta: LH.Gatherer.GathererMeta<'DevtoolsLog'>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      * @param {LH.Artifacts.NetworkRequest[]} networkRecords
      * @return {Promise<LH.Artifacts['ResponseCompression']>}
      */
-    _getArtifact(context: LH.Gatherer.FRTransitionalContext, networkRecords: LH.Artifacts.NetworkRequest[]): Promise<LH.Artifacts['ResponseCompression']>;
+    getCompressibleRecords(context: LH.Gatherer.Context, networkRecords: LH.Artifacts.NetworkRequest[]): Promise<LH.Artifacts['ResponseCompression']>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
+     * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
      * @return {Promise<LH.Artifacts['ResponseCompression']>}
      */
-    getArtifact(context: LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>): Promise<LH.Artifacts['ResponseCompression']>;
-    /**
-     * @param {LH.Gatherer.PassContext} passContext
-     * @param {LH.Gatherer.LoadData} loadData
-     * @return {Promise<LH.Artifacts['ResponseCompression']>}
-     */
-    afterPass(passContext: LH.Gatherer.PassContext, loadData: LH.Gatherer.LoadData): Promise<LH.Artifacts['ResponseCompression']>;
+    getArtifact(context: LH.Gatherer.Context<'DevtoolsLog'>): Promise<LH.Artifacts['ResponseCompression']>;
 }
-import FRGatherer from '../../base-gatherer.js';
+import BaseGatherer from '../../base-gatherer.js';
 import { NetworkRequest } from '../../../lib/network-request.js';
 //# sourceMappingURL=response-compression.d.ts.map

package/core/gather/gatherers/dobetterweb/response-compression.js

@@ -13,9 +13,10 @@
 import {Buffer} from 'buffer';
 import {gzip} from 'zlib';
 
-import FRGatherer from '../../base-gatherer.js';
+import log from 'lighthouse-logger';
+
+import BaseGatherer from '../../base-gatherer.js';
 import UrlUtils from '../../../lib/url-utils.js';
-import {Sentry} from '../../../lib/sentry.js';
 import {NetworkRequest} from '../../../lib/network-request.js';
 import DevtoolsLog from '../devtools-log.js';
 import {fetchResponseBodyFromCache} from '../../driver/network.js';
@@ -39,7 +40,7 @@ const textResourceTypes = [
   NetworkRequest.TYPES.EventSource,
 ];
 
-class ResponseCompression extends FRGatherer {
+class ResponseCompression extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
   meta = {
     supportedModes: ['timespan', 'navigation'],
@@ -91,11 +92,11 @@ class ResponseCompression extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    * @param {LH.Artifacts.NetworkRequest[]} networkRecords
    * @return {Promise<LH.Artifacts['ResponseCompression']>}
    */
-  async _getArtifact(context, networkRecords) {
+  async getCompressibleRecords(context, networkRecords) {
     const session = context.driver.defaultSession;
     const textRecords = ResponseCompression.filterUnoptimizedResponses(networkRecords);
 
@@ -119,12 +120,13 @@ class ResponseCompression extends FRGatherer {
           });
         });
       }).catch(err => {
-        Sentry.captureException(err, {
-          tags: {gatherer: 'ResponseCompression'},
-          extra: {url: UrlUtils.elideDataURI(record.url)},
-          level: 'warning',
-        });
+        const isExpectedError = err?.message?.includes('No resource with given identifier found');
+        if (!isExpectedError) {
+          err.extra = {url: UrlUtils.elideDataURI(record.url)};
+          throw err;
+        }
 
+        log.error('ResponseCompression', err.message);
         record.gzipSize = undefined;
         return record;
       });
@@ -132,22 +134,13 @@ class ResponseCompression extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
+   * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
    * @return {Promise<LH.Artifacts['ResponseCompression']>}
    */
   async getArtifact(context) {
     const devtoolsLog = context.dependencies.DevtoolsLog;
     const networkRecords = await NetworkRecords.request(devtoolsLog, context);
-    return this._getArtifact(context, networkRecords);
-  }
-
-  /**
-   * @param {LH.Gatherer.PassContext} passContext
-   * @param {LH.Gatherer.LoadData} loadData
-   * @return {Promise<LH.Artifacts['ResponseCompression']>}
-   */
-  async afterPass(passContext, loadData) {
-    return this._getArtifact({...passContext, dependencies: {}}, loadData.networkRecords);
+    return this.getCompressibleRecords(context, networkRecords);
   }
 }
 

package/core/gather/gatherers/dobetterweb/tags-blocking-first-paint.d.ts

@@ -19,35 +19,29 @@ export type ScriptTag = {
     url: string;
     src: string;
 };
-declare class TagsBlockingFirstPaint extends FRGatherer {
+declare class TagsBlockingFirstPaint extends BaseGatherer {
     /**
      * @param {Array<LH.Artifacts.NetworkRequest>} networkRecords
      * @return {Map<string, LH.Artifacts.NetworkRequest>}
      */
     static _filteredAndIndexedByUrl(networkRecords: Array<LH.Artifacts.NetworkRequest>): Map<string, LH.Artifacts.NetworkRequest>;
     /**
-     * @param {LH.Gatherer.FRTransitionalDriver} driver
+     * @param {LH.Gatherer.Driver} driver
      * @param {Array<LH.Artifacts.NetworkRequest>} networkRecords
      * @return {Promise<Array<LH.Artifacts.TagBlockingFirstPaint>>}
      */
-    static findBlockingTags(driver: LH.Gatherer.FRTransitionalDriver, networkRecords: Array<LH.Artifacts.NetworkRequest>): Promise<Array<LH.Artifacts.TagBlockingFirstPaint>>;
+    static findBlockingTags(driver: LH.Gatherer.Driver, networkRecords: Array<LH.Artifacts.NetworkRequest>): Promise<Array<LH.Artifacts.TagBlockingFirstPaint>>;
     /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
     meta: LH.Gatherer.GathererMeta<'DevtoolsLog'>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      */
-    startSensitiveInstrumentation(context: LH.Gatherer.FRTransitionalContext): Promise<void>;
+    startSensitiveInstrumentation(context: LH.Gatherer.Context): Promise<void>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
+     * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
      * @return {Promise<LH.Artifacts['TagsBlockingFirstPaint']>}
      */
-    getArtifact(context: LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>): Promise<LH.Artifacts['TagsBlockingFirstPaint']>;
-    /**
-     * @param {LH.Gatherer.PassContext} passContext
-     * @param {LH.Gatherer.LoadData} loadData
-     * @return {Promise<LH.Artifacts['TagsBlockingFirstPaint']>}
-     */
-    afterPass(passContext: LH.Gatherer.PassContext, loadData: LH.Gatherer.LoadData): Promise<LH.Artifacts['TagsBlockingFirstPaint']>;
+    getArtifact(context: LH.Gatherer.Context<'DevtoolsLog'>): Promise<LH.Artifacts['TagsBlockingFirstPaint']>;
 }
-import FRGatherer from '../../base-gatherer.js';
+import BaseGatherer from '../../base-gatherer.js';
 //# sourceMappingURL=tags-blocking-first-paint.d.ts.map

package/core/gather/gatherers/dobetterweb/tags-blocking-first-paint.js

@@ -19,7 +19,7 @@
 
 import {NetworkRecords} from '../../../computed/network-records.js';
 import DevtoolsLog from '../devtools-log.js';
-import FRGatherer from '../../base-gatherer.js';
+import BaseGatherer from '../../base-gatherer.js';
 
 /* global document, window, HTMLLinkElement, SVGScriptElement */
 
@@ -113,7 +113,7 @@ async function collectTagsThatBlockFirstPaint() {
 }
 /* c8 ignore stop */
 
-class TagsBlockingFirstPaint extends FRGatherer {
+class TagsBlockingFirstPaint extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
   meta = {
     supportedModes: ['navigation'],
@@ -149,7 +149,7 @@ class TagsBlockingFirstPaint extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalDriver} driver
+   * @param {LH.Gatherer.Driver} driver
    * @param {Array<LH.Artifacts.NetworkRequest>} networkRecords
    * @return {Promise<Array<LH.Artifacts.TagBlockingFirstPaint>>}
    */
@@ -206,7 +206,7 @@ class TagsBlockingFirstPaint extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    */
   async startSensitiveInstrumentation(context) {
     const {executionContext} = context.driver;
@@ -215,7 +215,7 @@ class TagsBlockingFirstPaint extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
+   * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
    * @return {Promise<LH.Artifacts['TagsBlockingFirstPaint']>}
    */
   async getArtifact(context) {
@@ -223,15 +223,6 @@ class TagsBlockingFirstPaint extends FRGatherer {
     const networkRecords = await NetworkRecords.request(devtoolsLog, context);
     return TagsBlockingFirstPaint.findBlockingTags(context.driver, networkRecords);
   }
-
-  /**
-   * @param {LH.Gatherer.PassContext} passContext
-   * @param {LH.Gatherer.LoadData} loadData
-   * @return {Promise<LH.Artifacts['TagsBlockingFirstPaint']>}
-   */
-  afterPass(passContext, loadData) {
-    return TagsBlockingFirstPaint.findBlockingTags(passContext.driver, loadData.networkRecords);
-  }
 }
 
 export default TagsBlockingFirstPaint;

package/core/gather/gatherers/full-page-screenshot.d.ts

@@ -1,19 +1,19 @@
 export default FullPageScreenshot;
-declare class FullPageScreenshot extends FRGatherer {
+declare class FullPageScreenshot extends BaseGatherer {
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      * @param {{height: number, width: number, mobile: boolean}} deviceMetrics
      */
-    _resizeViewport(context: LH.Gatherer.FRTransitionalContext, deviceMetrics: {
+    _resizeViewport(context: LH.Gatherer.Context, deviceMetrics: {
         height: number;
         width: number;
         mobile: boolean;
     }): Promise<void>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      * @return {Promise<LH.Result.FullPageScreenshot['screenshot']>}
      */
-    _takeScreenshot(context: LH.Gatherer.FRTransitionalContext): Promise<LH.Result.FullPageScreenshot['screenshot']>;
+    _takeScreenshot(context: LH.Gatherer.Context): Promise<LH.Result.FullPageScreenshot['screenshot']>;
     /**
      * Gatherers can collect details about DOM nodes, including their position on the page.
      * Layout shifts occuring after a gatherer runs can cause these positions to be incorrect,
@@ -21,15 +21,15 @@ declare class FullPageScreenshot extends FRGatherer {
      * `getNodeDetails` maintains a collection of DOM objects in the page, which we can iterate
      * to re-collect the bounding client rectangle.
      * @see pageFunctions.getNodeDetails
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      * @return {Promise<LH.Result.FullPageScreenshot['nodes']>}
      */
-    _resolveNodes(context: LH.Gatherer.FRTransitionalContext): Promise<LH.Result.FullPageScreenshot['nodes']>;
+    _resolveNodes(context: LH.Gatherer.Context): Promise<LH.Result.FullPageScreenshot['nodes']>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      * @return {Promise<LH.Artifacts['FullPageScreenshot']>}
      */
-    getArtifact(context: LH.Gatherer.FRTransitionalContext): Promise<LH.Artifacts['FullPageScreenshot']>;
+    getArtifact(context: LH.Gatherer.Context): Promise<LH.Artifacts['FullPageScreenshot']>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=full-page-screenshot.d.ts.map

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

@@ -6,10 +6,9 @@
 
 /* globals window getBoundingClientRect requestAnimationFrame */
 
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 import * as emulation from '../../lib/emulation.js';
 import {pageFunctions} from '../../lib/page-functions.js';
-import {NetworkMonitor} from '../driver/network-monitor.js';
 import {waitForNetworkIdle} from '../driver/wait-for-condition.js';
 
 // JPEG quality setting
@@ -65,14 +64,14 @@ function waitForDoubleRaf() {
 
 /* c8 ignore stop */
 
-class FullPageScreenshot extends FRGatherer {
+class FullPageScreenshot extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'timespan', 'navigation'],
   };
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    * @param {{height: number, width: number, mobile: boolean}} deviceMetrics
    */
   async _resizeViewport(context, deviceMetrics) {
@@ -89,7 +88,7 @@ class FullPageScreenshot extends FRGatherer {
     const height = Math.min(fullHeight, MAX_WEBP_SIZE);
 
     // Setup network monitor before we change the viewport.
-    const networkMonitor = new NetworkMonitor(context.driver.targetManager);
+    const networkMonitor = context.driver.networkMonitor;
     const waitForNetworkIdleResult = waitForNetworkIdle(session, networkMonitor, {
       pretendDCLAlreadyFired: true,
       networkQuietThresholdMs: 1000,
@@ -97,7 +96,6 @@ class FullPageScreenshot extends FRGatherer {
       idleEvent: 'network-critical-idle',
       isIdle: recorder => recorder.isCriticalIdle(),
     });
-    await networkMonitor.enable();
 
     await session.sendCommand('Emulation.setDeviceMetricsOverride', {
       mobile: deviceMetrics.mobile,
@@ -113,14 +111,13 @@ class FullPageScreenshot extends FRGatherer {
       waitForNetworkIdleResult.promise,
     ]);
     waitForNetworkIdleResult.cancel();
-    await networkMonitor.disable();
 
     // Now that new resources are (probably) fetched, wait long enough for a layout.
     await context.driver.executionContext.evaluate(waitForDoubleRaf, {args: []});
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    * @return {Promise<LH.Result.FullPageScreenshot['screenshot']>}
    */
   async _takeScreenshot(context) {
@@ -150,7 +147,7 @@ class FullPageScreenshot extends FRGatherer {
    * `getNodeDetails` maintains a collection of DOM objects in the page, which we can iterate
    * to re-collect the bounding client rectangle.
    * @see pageFunctions.getNodeDetails
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    * @return {Promise<LH.Result.FullPageScreenshot['nodes']>}
    */
   async _resolveNodes(context) {
@@ -189,7 +186,7 @@ class FullPageScreenshot extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    * @return {Promise<LH.Artifacts['FullPageScreenshot']>}
    */
   async getArtifact(context) {

package/core/gather/gatherers/global-listeners.d.ts

@@ -1,5 +1,5 @@
 export default GlobalListeners;
-declare class GlobalListeners extends FRGatherer {
+declare class GlobalListeners extends BaseGatherer {
     /**
      * @param {LH.Crdp.DOMDebugger.EventListener} listener
      * @return {listener is {type: 'pagehide'|'unload'|'visibilitychange'} & LH.Crdp.DOMDebugger.EventListener}
@@ -18,10 +18,10 @@ declare class GlobalListeners extends FRGatherer {
      */
     dedupeListeners(listeners: LH.Artifacts['GlobalListeners']): LH.Artifacts['GlobalListeners'];
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} passContext
+     * @param {LH.Gatherer.Context} passContext
      * @return {Promise<LH.Artifacts['GlobalListeners']>}
      */
-    getArtifact(passContext: LH.Gatherer.FRTransitionalContext): Promise<LH.Artifacts['GlobalListeners']>;
+    getArtifact(passContext: LH.Gatherer.Context): Promise<LH.Artifacts['GlobalListeners']>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=global-listeners.d.ts.map

package/core/gather/gatherers/global-listeners.js

@@ -13,9 +13,9 @@
 
 import log from 'lighthouse-logger';
 
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 
-class GlobalListeners extends FRGatherer {
+class GlobalListeners extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'timespan', 'navigation'],
@@ -57,7 +57,7 @@ class GlobalListeners extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    * @return {Promise<LH.Artifacts['GlobalListeners']>}
    */
   async getArtifact(passContext) {

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

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

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

@@ -6,7 +6,7 @@
 
 /* global getNodeDetails */
 
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 
 /* eslint-env browser, node */
@@ -37,14 +37,14 @@ function collectIFrameElements() {
 }
 /* c8 ignore stop */
 
-class IFrameElements extends FRGatherer {
+class IFrameElements extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'navigation'],
   };
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    * @return {Promise<LH.Artifacts['IFrameElements']>}
    * @override
    */

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

@@ -1,35 +1,35 @@
 export default ImageElements;
-declare class ImageElements extends FRGatherer {
+declare class ImageElements extends BaseGatherer {
     /** @type {Map<string, {naturalWidth: number, naturalHeight: number}>} */
     _naturalSizeCache: Map<string, {
         naturalWidth: number;
         naturalHeight: number;
     }>;
     /**
-     * @param {LH.Gatherer.FRTransitionalDriver} driver
+     * @param {LH.Gatherer.Driver} driver
      * @param {LH.Artifacts.ImageElement} element
      */
-    fetchElementWithSizeInformation(driver: LH.Gatherer.FRTransitionalDriver, element: LH.Artifacts.ImageElement): Promise<void>;
+    fetchElementWithSizeInformation(driver: LH.Gatherer.Driver, element: LH.Artifacts.ImageElement): Promise<void>;
     /**
      * Images might be sized via CSS. In order to compute unsized-images failures, we need to collect
      * matched CSS rules to see if this is the case.
      * @url http://go/dwoqq (googlers only)
-     * @param {LH.Gatherer.FRProtocolSession} session
+     * @param {LH.Gatherer.ProtocolSession} session
      * @param {string} devtoolsNodePath
      * @param {LH.Artifacts.ImageElement} element
      */
-    fetchSourceRules(session: LH.Gatherer.FRProtocolSession, devtoolsNodePath: string, element: LH.Artifacts.ImageElement): Promise<void>;
+    fetchSourceRules(session: LH.Gatherer.ProtocolSession, devtoolsNodePath: string, element: LH.Artifacts.ImageElement): Promise<void>;
     /**
      *
-     * @param {LH.Gatherer.FRTransitionalDriver} driver
+     * @param {LH.Gatherer.Driver} driver
      * @param {LH.Artifacts.ImageElement[]} elements
      */
-    collectExtraDetails(driver: LH.Gatherer.FRTransitionalDriver, elements: LH.Artifacts.ImageElement[]): Promise<void>;
+    collectExtraDetails(driver: LH.Gatherer.Driver, elements: LH.Artifacts.ImageElement[]): Promise<void>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      * @return {Promise<LH.Artifacts['ImageElements']>}
      */
-    getArtifact(context: LH.Gatherer.FRTransitionalContext): Promise<LH.Artifacts['ImageElements']>;
+    getArtifact(context: LH.Gatherer.Context): Promise<LH.Artifacts['ImageElements']>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=image-elements.d.ts.map

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

@@ -11,7 +11,7 @@
 
 import log from 'lighthouse-logger';
 
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 import * as FontSize from './seo/font-size.js';
 
@@ -235,7 +235,7 @@ function getPixelArea(element) {
   return element.displayedHeight * element.displayedWidth;
 }
 
-class ImageElements extends FRGatherer {
+class ImageElements extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'timespan', 'navigation'],
@@ -248,7 +248,7 @@ class ImageElements extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalDriver} driver
+   * @param {LH.Gatherer.Driver} driver
    * @param {LH.Artifacts.ImageElement} element
    */
   async fetchElementWithSizeInformation(driver, element) {
@@ -276,7 +276,7 @@ class ImageElements extends FRGatherer {
    * Images might be sized via CSS. In order to compute unsized-images failures, we need to collect
    * matched CSS rules to see if this is the case.
    * @url http://go/dwoqq (googlers only)
-   * @param {LH.Gatherer.FRProtocolSession} session
+   * @param {LH.Gatherer.ProtocolSession} session
    * @param {string} devtoolsNodePath
    * @param {LH.Artifacts.ImageElement} element
    */
@@ -302,7 +302,7 @@ class ImageElements extends FRGatherer {
 
   /**
    *
-   * @param {LH.Gatherer.FRTransitionalDriver} driver
+   * @param {LH.Gatherer.Driver} driver
    * @param {LH.Artifacts.ImageElement[]} elements
    */
   async collectExtraDetails(driver, elements) {
@@ -334,7 +334,7 @@ class ImageElements extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    * @return {Promise<LH.Artifacts['ImageElements']>}
    */
   async getArtifact(context) {

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

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

package/core/gather/gatherers/inputs.js

@@ -6,7 +6,7 @@
 
 /* global getNodeDetails */
 
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 
 /* eslint-env browser, node */
@@ -93,14 +93,14 @@ function collectElements() {
 }
 /* c8 ignore stop */
 
-class Inputs extends FRGatherer {
+class Inputs extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'navigation'],
   };
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    * @return {Promise<LH.Artifacts['Inputs']>}
    */
   async getArtifact(passContext) {

package/core/gather/gatherers/inspector-issues.d.ts

@@ -1,5 +1,5 @@
 export default InspectorIssues;
-declare class InspectorIssues extends FRGatherer {
+declare class InspectorIssues extends BaseGatherer {
     /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
     meta: LH.Gatherer.GathererMeta<'DevtoolsLog'>;
     /** @type {Array<LH.Crdp.Audits.InspectorIssue>} */
@@ -10,29 +10,18 @@ declare class InspectorIssues extends FRGatherer {
      */
     onIssueAdded(entry: LH.Crdp.Audits.IssueAddedEvent): void;
     /**
-     * @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 {Array<LH.Artifacts.NetworkRequest>} networkRecords
+     * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
      * @return {Promise<LH.Artifacts['InspectorIssues']>}
      */
-    _getArtifact(networkRecords: Array<LH.Artifacts.NetworkRequest>): Promise<LH.Artifacts['InspectorIssues']>;
-    /**
-     * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
-     * @return {Promise<LH.Artifacts['InspectorIssues']>}
-     */
-    getArtifact(context: LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>): Promise<LH.Artifacts['InspectorIssues']>;
-    /**
-     * @param {LH.Gatherer.PassContext} passContext
-     * @param {LH.Gatherer.LoadData} loadData
-     * @return {Promise<LH.Artifacts['InspectorIssues']>}
-     */
-    afterPass(passContext: LH.Gatherer.PassContext, loadData: LH.Gatherer.LoadData): Promise<LH.Artifacts['InspectorIssues']>;
+    getArtifact(context: LH.Gatherer.Context<'DevtoolsLog'>): Promise<LH.Artifacts['InspectorIssues']>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=inspector-issues.d.ts.map