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

package/core/gather/gatherers/devtools-log.js

@@ -10,9 +10,9 @@
  * 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';
 
-class DevtoolsLog extends FRGatherer {
+class DevtoolsLog extends BaseGatherer {
   static symbol = Symbol('DevtoolsLog');
 
   /** @type {LH.Gatherer.GathererMeta} */
@@ -31,7 +31,7 @@ class DevtoolsLog extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    */
   async startSensitiveInstrumentation({driver}) {
     this._messageLog.reset();
@@ -42,7 +42,7 @@ class DevtoolsLog extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    */
   async stopSensitiveInstrumentation({driver}) {
     this._messageLog.endRecording();

package/core/gather/gatherers/dobetterweb/doctype.d.ts

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

package/core/gather/gatherers/dobetterweb/doctype.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 document */
 
@@ -25,14 +25,14 @@ function getDoctype() {
   return {name, publicId, systemId, documentCompatMode};
 }
 
-class Doctype extends FRGatherer {
+class Doctype extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'navigation'],
   };
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    * @return {Promise<LH.Artifacts['Doctype']>}
    */
   getArtifact(passContext) {

package/core/gather/gatherers/dobetterweb/domstats.d.ts

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

package/core/gather/gatherers/dobetterweb/domstats.js

@@ -12,7 +12,7 @@
 /* global getNodeDetails document */
 
 
-import FRGatherer from '../../base-gatherer.js';
+import BaseGatherer from '../../base-gatherer.js';
 import {pageFunctions} from '../../../lib/page-functions.js';
 
 /**
@@ -75,14 +75,14 @@ function getDOMStats(element = document.body, deep = true) {
 }
 /* c8 ignore stop */
 
-class DOMStats extends FRGatherer {
+class DOMStats extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'navigation'],
   };
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    * @return {Promise<LH.Artifacts['DOMStats']>}
    */
   async getArtifact(passContext) {

package/core/gather/gatherers/dobetterweb/optimized-images.d.ts

@@ -6,7 +6,7 @@ export type SimplifiedNetworkRecord = {
     resourceSize: number;
 };
 /** @typedef {{requestId: string, url: string, mimeType: string, resourceSize: number}} SimplifiedNetworkRecord */
-declare class OptimizedImages extends FRGatherer {
+declare class OptimizedImages extends BaseGatherer {
     /**
      * @param {Array<LH.Artifacts.NetworkRequest>} networkRecords
      * @return {Array<SimplifiedNetworkRecord>}
@@ -16,46 +16,34 @@ declare class OptimizedImages extends FRGatherer {
     meta: LH.Gatherer.GathererMeta<'DevtoolsLog'>;
     _encodingStartAt: number;
     /**
-     * @param {LH.Gatherer.FRProtocolSession} session
+     * @param {LH.Gatherer.ProtocolSession} session
      * @param {string} requestId
      * @param {'jpeg'|'webp'} encoding Either webp or jpeg.
      * @return {Promise<LH.Crdp.Audits.GetEncodedResponseResponse>}
      */
-    _getEncodedResponse(session: LH.Gatherer.FRProtocolSession, requestId: string, encoding: 'jpeg' | 'webp'): Promise<LH.Crdp.Audits.GetEncodedResponseResponse>;
+    _getEncodedResponse(session: LH.Gatherer.ProtocolSession, requestId: string, encoding: 'jpeg' | 'webp'): Promise<LH.Crdp.Audits.GetEncodedResponseResponse>;
     /**
-     * @param {LH.Gatherer.FRProtocolSession} session
+     * @param {LH.Gatherer.ProtocolSession} session
      * @param {SimplifiedNetworkRecord} networkRecord
      * @return {Promise<{originalSize: number, jpegSize?: number, webpSize?: number}>}
      */
-    calculateImageStats(session: LH.Gatherer.FRProtocolSession, networkRecord: SimplifiedNetworkRecord): Promise<{
+    calculateImageStats(session: LH.Gatherer.ProtocolSession, networkRecord: SimplifiedNetworkRecord): Promise<{
         originalSize: number;
         jpegSize?: number | undefined;
         webpSize?: number | undefined;
     }>;
     /**
-     * @param {LH.Gatherer.FRProtocolSession} session
+     * @param {LH.Gatherer.ProtocolSession} session
      * @param {Array<SimplifiedNetworkRecord>} imageRecords
      * @return {Promise<LH.Artifacts['OptimizedImages']>}
      */
-    computeOptimizedImages(session: LH.Gatherer.FRProtocolSession, imageRecords: Array<SimplifiedNetworkRecord>): Promise<LH.Artifacts['OptimizedImages']>;
+    computeOptimizedImages(session: LH.Gatherer.ProtocolSession, imageRecords: Array<SimplifiedNetworkRecord>): Promise<LH.Artifacts['OptimizedImages']>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
-     * @param {LH.Artifacts.NetworkRequest[]} networkRecords
+     * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
      * @return {Promise<LH.Artifacts['OptimizedImages']>}
      */
-    _getArtifact(context: LH.Gatherer.FRTransitionalContext, networkRecords: LH.Artifacts.NetworkRequest[]): Promise<LH.Artifacts['OptimizedImages']>;
-    /**
-     * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
-     * @return {Promise<LH.Artifacts['OptimizedImages']>}
-     */
-    getArtifact(context: LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>): Promise<LH.Artifacts['OptimizedImages']>;
-    /**
-     * @param {LH.Gatherer.PassContext} passContext
-     * @param {LH.Gatherer.LoadData} loadData
-     * @return {Promise<LH.Artifacts['OptimizedImages']>}
-     */
-    afterPass(passContext: LH.Gatherer.PassContext, loadData: LH.Gatherer.LoadData): Promise<LH.Artifacts['OptimizedImages']>;
+    getArtifact(context: LH.Gatherer.Context<'DevtoolsLog'>): Promise<LH.Artifacts['OptimizedImages']>;
 }
-import FRGatherer from '../../base-gatherer.js';
+import BaseGatherer from '../../base-gatherer.js';
 import { NetworkRequest } from '../../../lib/network-request.js';
 //# sourceMappingURL=optimized-images.d.ts.map

package/core/gather/gatherers/dobetterweb/optimized-images.js

@@ -12,7 +12,7 @@
 
 import log from 'lighthouse-logger';
 
-import FRGatherer from '../../base-gatherer.js';
+import BaseGatherer from '../../base-gatherer.js';
 import UrlUtils from '../../../lib/url-utils.js';
 import {NetworkRequest} from '../../../lib/network-request.js';
 import {Sentry} from '../../../lib/sentry.js';
@@ -34,7 +34,7 @@ const IMAGE_REGEX = /^image\/((x|ms|x-ms)-)?(png|bmp|jpeg)$/;
 
 /** @typedef {{requestId: string, url: string, mimeType: string, resourceSize: number}} SimplifiedNetworkRecord */
 
-class OptimizedImages extends FRGatherer {
+class OptimizedImages extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
   meta = {
     supportedModes: ['timespan', 'navigation'],
@@ -78,7 +78,7 @@ class OptimizedImages extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRProtocolSession} session
+   * @param {LH.Gatherer.ProtocolSession} session
    * @param {string} requestId
    * @param {'jpeg'|'webp'} encoding Either webp or jpeg.
    * @return {Promise<LH.Crdp.Audits.GetEncodedResponseResponse>}
@@ -92,7 +92,7 @@ class OptimizedImages extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRProtocolSession} session
+   * @param {LH.Gatherer.ProtocolSession} session
    * @param {SimplifiedNetworkRecord} networkRecord
    * @return {Promise<{originalSize: number, jpegSize?: number, webpSize?: number}>}
    */
@@ -116,7 +116,7 @@ class OptimizedImages extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRProtocolSession} session
+   * @param {LH.Gatherer.ProtocolSession} session
    * @param {Array<SimplifiedNetworkRecord>} imageRecords
    * @return {Promise<LH.Artifacts['OptimizedImages']>}
    */
@@ -153,11 +153,13 @@ class OptimizedImages extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
-   * @param {LH.Artifacts.NetworkRequest[]} networkRecords
+   * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
    * @return {Promise<LH.Artifacts['OptimizedImages']>}
    */
-  async _getArtifact(context, networkRecords) {
+  async getArtifact(context) {
+    const devtoolsLog = context.dependencies.DevtoolsLog;
+    const networkRecords = await NetworkRecords.request(devtoolsLog, context);
+
     const imageRecords = OptimizedImages
       .filterImageRequests(networkRecords)
       .sort((a, b) => b.resourceSize - a.resourceSize);
@@ -169,25 +171,6 @@ class OptimizedImages extends FRGatherer {
     }
     return results;
   }
-
-  /**
-   * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
-   * @return {Promise<LH.Artifacts['OptimizedImages']>}
-   */
-  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['OptimizedImages']>}
-   */
-  async afterPass(passContext, loadData) {
-    return this._getArtifact({...passContext, dependencies: {}}, loadData.networkRecords);
-  }
 }
 
 export default OptimizedImages;

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,7 +13,7 @@
 import {Buffer} from 'buffer';
 import {gzip} from 'zlib';
 
-import FRGatherer from '../../base-gatherer.js';
+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';
@@ -39,7 +39,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 +91,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);
 
@@ -132,22 +132,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,7 +6,7 @@
 
 /* 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';
@@ -65,14 +65,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) {
@@ -120,7 +120,7 @@ class FullPageScreenshot extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    * @return {Promise<LH.Result.FullPageScreenshot['screenshot']>}
    */
   async _takeScreenshot(context) {
@@ -150,7 +150,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 +189,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
    */