lighthouse 10.4.0 → 11.0.0

package/core/gather/gatherers/bf-cache-failures.js

@@ -4,14 +4,14 @@
  * 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';
 import {waitForFrameNavigated, waitForLoadEvent} from '../driver/wait-for-condition.js';
 import DevtoolsLog from './devtools-log.js';
 
 const AFTER_RETURN_TIMEOUT = 100;
 const TEMP_PAGE_PAUSE_TIMEOUT = 100;
 
-class BFCacheFailures extends FRGatherer {
+class BFCacheFailures extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
   meta = {
     supportedModes: ['navigation', 'timespan'],
@@ -83,7 +83,7 @@ class BFCacheFailures extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    * @return {Promise<LH.Crdp.Page.BackForwardCacheNotUsedEvent|undefined>}
    */
   async activelyCollectBFCacheEvent(context) {
@@ -137,7 +137,7 @@ class BFCacheFailures extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
+   * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
    * @return {LH.Crdp.Page.BackForwardCacheNotUsedEvent[]}
    */
   passivelyCollectBFCacheEvents(context) {
@@ -151,7 +151,7 @@ class BFCacheFailures extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
+   * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
    * @return {Promise<LH.Artifacts['BFCacheFailures']>}
    */
   async getArtifact(context) {
@@ -163,15 +163,6 @@ class BFCacheFailures extends FRGatherer {
 
     return events.map(BFCacheFailures.processBFCacheEvent);
   }
-
-  /**
-   * @param {LH.Gatherer.PassContext} passContext
-   * @param {LH.Gatherer.LoadData} loadData
-   * @return {Promise<LH.Artifacts['BFCacheFailures']>}
-   */
-  async afterPass(passContext, loadData) {
-    return this.getArtifact({...passContext, dependencies: {DevtoolsLog: loadData.devtoolsLog}});
-  }
 }
 
 export default BFCacheFailures;

package/core/gather/gatherers/cache-contents.d.ts

@@ -1,11 +1,11 @@
 export default CacheContents;
-declare class CacheContents extends FRGatherer {
+declare class CacheContents extends BaseGatherer {
     /**
      * Creates an array of cached URLs.
-     * @param {LH.Gatherer.FRTransitionalContext} passContext
+     * @param {LH.Gatherer.Context} passContext
      * @return {Promise<LH.Artifacts['CacheContents']>}
      */
-    getArtifact(passContext: LH.Gatherer.FRTransitionalContext): Promise<LH.Artifacts['CacheContents']>;
+    getArtifact(passContext: LH.Gatherer.Context): Promise<LH.Artifacts['CacheContents']>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=cache-contents.d.ts.map

package/core/gather/gatherers/cache-contents.js

@@ -6,7 +6,7 @@
 
 /* global caches */
 
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 
 /**
  * @return {Promise<Array<string>>}
@@ -36,7 +36,7 @@ function getCacheContents() {
 }
 /* c8 ignore stop */
 
-class CacheContents extends FRGatherer {
+class CacheContents extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'navigation'],
@@ -44,7 +44,7 @@ class CacheContents extends FRGatherer {
 
   /**
    * Creates an array of cached URLs.
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    * @return {Promise<LH.Artifacts['CacheContents']>}
    */
   async getArtifact(passContext) {

package/core/gather/gatherers/console-messages.d.ts

@@ -1,5 +1,5 @@
 export default ConsoleMessages;
-declare class ConsoleMessages extends FRGatherer {
+declare class ConsoleMessages extends BaseGatherer {
     /** @type {LH.Artifacts.ConsoleMessage[]} */
     _logEntries: LH.Artifacts.ConsoleMessage[];
     _onConsoleAPICalled: (event: LH.Crdp.Runtime.ConsoleAPICalledEvent) => void;
@@ -22,18 +22,18 @@ declare class ConsoleMessages extends FRGatherer {
      */
     onLogEntry(event: LH.Crdp.Log.EntryAddedEvent): void;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} passContext
+     * @param {LH.Gatherer.Context} passContext
      */
-    startInstrumentation(passContext: LH.Gatherer.FRTransitionalContext): Promise<void>;
+    startInstrumentation(passContext: LH.Gatherer.Context): Promise<void>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} passContext
+     * @param {LH.Gatherer.Context} passContext
      * @return {Promise<void>}
      */
-    stopInstrumentation({ driver }: LH.Gatherer.FRTransitionalContext): Promise<void>;
+    stopInstrumentation({ driver }: LH.Gatherer.Context): Promise<void>;
     /**
      * @return {Promise<LH.Artifacts['ConsoleMessages']>}
      */
     getArtifact(): Promise<LH.Artifacts['ConsoleMessages']>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=console-messages.d.ts.map

package/core/gather/gatherers/console-messages.js

@@ -10,7 +10,7 @@
  */
 
 
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 
 /**
  * @param {LH.Crdp.Runtime.RemoteObject} obj
@@ -29,7 +29,7 @@ function remoteObjectToString(obj) {
   return `[${type} ${className}]`;
 }
 
-class ConsoleMessages extends FRGatherer {
+class ConsoleMessages extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['timespan', 'navigation'],
@@ -134,7 +134,7 @@ class ConsoleMessages extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    */
   async startInstrumentation(passContext) {
     const session = passContext.driver.defaultSession;
@@ -151,7 +151,7 @@ class ConsoleMessages extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    * @return {Promise<void>}
    */
   async stopInstrumentation({driver}) {

package/core/gather/gatherers/css-usage.d.ts

@@ -1,7 +1,7 @@
 export default CSSUsage;
-declare class CSSUsage extends FRGatherer {
-    /** @type {LH.Gatherer.FRProtocolSession|undefined} */
-    _session: LH.Gatherer.FRProtocolSession | undefined;
+declare class CSSUsage extends BaseGatherer {
+    /** @type {LH.Gatherer.ProtocolSession|undefined} */
+    _session: LH.Gatherer.ProtocolSession | undefined;
     /** @type {Map<string, Promise<LH.Artifacts.CSSStyleSheetInfo|Error>>} */
     _sheetPromises: Map<string, Promise<LH.Artifacts.CSSStyleSheetInfo | Error>>;
     /**
@@ -14,26 +14,26 @@ declare class CSSUsage extends FRGatherer {
      */
     _onStylesheetAdded(event: LH.Crdp.CSS.StyleSheetAddedEvent): Promise<void>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      */
-    startCSSUsageTracking(context: LH.Gatherer.FRTransitionalContext): Promise<void>;
+    startCSSUsageTracking(context: LH.Gatherer.Context): Promise<void>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      */
-    stopCSSUsageTracking(context: LH.Gatherer.FRTransitionalContext): Promise<void>;
+    stopCSSUsageTracking(context: LH.Gatherer.Context): Promise<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 {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      * @return {Promise<LH.Artifacts['CSSUsage']>}
      */
-    getArtifact(context: LH.Gatherer.FRTransitionalContext): Promise<LH.Artifacts['CSSUsage']>;
+    getArtifact(context: LH.Gatherer.Context): Promise<LH.Artifacts['CSSUsage']>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=css-usage.d.ts.map

package/core/gather/gatherers/css-usage.js

@@ -10,13 +10,13 @@
 
 import log from 'lighthouse-logger';
 
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 import {Sentry} from '../../lib/sentry.js';
 
-class CSSUsage extends FRGatherer {
+class CSSUsage extends BaseGatherer {
   constructor() {
     super();
-    /** @type {LH.Gatherer.FRProtocolSession|undefined} */
+    /** @type {LH.Gatherer.ProtocolSession|undefined} */
     this._session = undefined;
     /** @type {Map<string, Promise<LH.Artifacts.CSSStyleSheetInfo|Error>>} */
     this._sheetPromises = new Map();
@@ -51,7 +51,7 @@ class CSSUsage extends FRGatherer {
         );
         Sentry.captureException(err, {
           tags: {
-            gatherer: this.name,
+            gatherer: 'CSSUsage',
           },
           extra: {
             url: event.header.sourceURL,
@@ -64,7 +64,7 @@ class CSSUsage extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    */
   async startCSSUsageTracking(context) {
     const session = context.driver.defaultSession;
@@ -78,7 +78,7 @@ class CSSUsage extends FRGatherer {
 
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    */
   async stopCSSUsageTracking(context) {
     const session = context.driver.defaultSession;
@@ -88,7 +88,7 @@ class CSSUsage extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    */
   async startInstrumentation(context) {
     if (context.gatherMode !== 'timespan') return;
@@ -96,7 +96,7 @@ class CSSUsage extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    */
   async stopInstrumentation(context) {
     if (context.gatherMode !== 'timespan') return;
@@ -104,7 +104,7 @@ class CSSUsage extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    * @return {Promise<LH.Artifacts['CSSUsage']>}
    */
   async getArtifact(context) {

package/core/gather/gatherers/devtools-log-compat.d.ts

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

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

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

package/core/gather/gatherers/devtools-log.d.ts

@@ -1,17 +1,17 @@
 export default DevtoolsLog;
-declare class DevtoolsLog extends FRGatherer {
+declare class DevtoolsLog extends BaseGatherer {
     static symbol: symbol;
     _messageLog: DevtoolsMessageLog;
     /** @param {LH.Protocol.RawEventMessage} e */
     _onProtocolMessage: (e: LH.Protocol.RawEventMessage) => void;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} passContext
+     * @param {LH.Gatherer.Context} passContext
      */
-    startSensitiveInstrumentation({ driver }: LH.Gatherer.FRTransitionalContext): Promise<void>;
+    startSensitiveInstrumentation({ driver }: 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>;
     /**
      * @return {Promise<LH.Artifacts['DevtoolsLog']>}
      */
@@ -44,5 +44,5 @@ export class DevtoolsMessageLog {
      */
     record(message: LH.Protocol.RawEventMessage): void;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=devtools-log.d.ts.map

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;