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

package/core/gather/driver/wait-for-condition.js

@@ -45,7 +45,7 @@ function waitForNothing() {
 /**
  * Returns a promise that resolve when a frame has been navigated.
  * Used for detecting that our about:blank reset has been completed.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {CancellableWait<LH.Crdp.Page.FrameNavigatedEvent>}
  */
 function waitForFrameNavigated(session) {
@@ -68,7 +68,7 @@ function waitForFrameNavigated(session) {
 
 /**
  * Returns a promise that resolve when a frame has a FCP.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {number} pauseAfterFcpMs
  * @param {number} maxWaitForFcpMs
  * @return {CancellableWait}
@@ -119,7 +119,7 @@ function waitForFcp(session, pauseAfterFcpMs, maxWaitForFcpMs) {
 /**
  * Returns a promise that resolves when the network has been idle (after DCL) for
  * `networkQuietThresholdMs` ms and a method to cancel internal network listeners/timeout.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {NetworkMonitor} networkMonitor
  * @param {{networkQuietThresholdMs: number, busyEvent: NetworkMonitorEvent, idleEvent: NetworkMonitorEvent, isIdle(recorder: NetworkMonitor): boolean, pretendDCLAlreadyFired?: boolean}} networkQuietOptions
  * @return {CancellableWait}
@@ -213,7 +213,7 @@ function waitForNetworkIdle(session, networkMonitor, networkQuietOptions) {
 
 /**
  * Resolves when there have been no long tasks for at least waitForCPUQuiet ms.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {number} waitForCPUQuiet
  * @return {CancellableWait}
  */
@@ -344,7 +344,7 @@ function checkTimeSinceLastLongTaskInPage() {
 /**
  * Return a promise that resolves `pauseAfterLoadMs` after the load event
  * fires and a method to cancel internal listeners and timeout.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {number} pauseAfterLoadMs
  * @return {CancellableWait}
  */
@@ -379,7 +379,7 @@ function waitForLoadEvent(session, pauseAfterLoadMs) {
 
 /**
  * Returns whether the page appears to be hung.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {Promise<boolean>}
  */
 async function isPageHung(session) {
@@ -410,7 +410,7 @@ const DEFAULT_WAIT_FUNCTIONS = {waitForFcp, waitForLoadEvent, waitForCPUIdle, wa
  *    - cpuQuietThresholdMs have passed since the last long task after network-2-quiet.
  * - maxWaitForLoadedMs milliseconds have passed.
  * See https://github.com/GoogleChrome/lighthouse/issues/627 for more.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {NetworkMonitor} networkMonitor
  * @param {WaitOptions} options
  * @return {Promise<{timedOut: boolean}>}
@@ -519,7 +519,7 @@ async function waitForFullyLoaded(session, networkMonitor, options) {
 }
 
 /**
- * @param {LH.Gatherer.FRTransitionalDriver} driver
+ * @param {LH.Gatherer.Driver} driver
  */
 function waitForUserToContinue(driver) {
   /* c8 ignore start */

package/core/gather/driver.d.ts

@@ -1,5 +1,5 @@
-/** @implements {LH.Gatherer.FRTransitionalDriver} */
-export class Driver implements LH.Gatherer.FRTransitionalDriver {
+/** @implements {LH.Gatherer.Driver} */
+export class Driver implements LH.Gatherer.Driver {
     /**
      * @param {LH.Puppeteer.Page} page
      */
@@ -11,8 +11,8 @@ export class Driver implements LH.Gatherer.FRTransitionalDriver {
     _executionContext: ExecutionContext | undefined;
     /** @type {Fetcher|undefined} */
     _fetcher: Fetcher | undefined;
-    defaultSession: import("../../types/gatherer.js").default.FRProtocolSession;
-    /** @return {LH.Gatherer.FRTransitionalDriver['executionContext']} */
+    defaultSession: import("../../types/gatherer.js").default.ProtocolSession;
+    /** @return {LH.Gatherer.Driver['executionContext']} */
     get executionContext(): ExecutionContext;
     /** @return {Fetcher} */
     get fetcher(): Fetcher;

package/core/gather/driver.js

@@ -15,7 +15,7 @@ const throwNotConnectedFn = () => {
   throw new Error('Session not connected');
 };
 
-/** @type {LH.Gatherer.FRProtocolSession} */
+/** @type {LH.Gatherer.ProtocolSession} */
 const throwingSession = {
   setTargetInfo: throwNotConnectedFn,
   hasNextProtocolTimeout: throwNotConnectedFn,
@@ -28,7 +28,7 @@ const throwingSession = {
   dispose: throwNotConnectedFn,
 };
 
-/** @implements {LH.Gatherer.FRTransitionalDriver} */
+/** @implements {LH.Gatherer.Driver} */
 class Driver {
   /**
    * @param {LH.Puppeteer.Page} page
@@ -45,7 +45,7 @@ class Driver {
     this.defaultSession = throwingSession;
   }
 
-  /** @return {LH.Gatherer.FRTransitionalDriver['executionContext']} */
+  /** @return {LH.Gatherer.Driver['executionContext']} */
   get executionContext() {
     if (!this._executionContext) return throwNotConnectedFn();
     return this._executionContext;

package/core/gather/fetcher.d.ts

@@ -9,10 +9,10 @@ export type FetchResponse = {
 /** @typedef {{content: string|null, status: number|null}} FetchResponse */
 export class Fetcher {
     /**
-     * @param {LH.Gatherer.FRProtocolSession} session
+     * @param {LH.Gatherer.ProtocolSession} session
      */
-    constructor(session: LH.Gatherer.FRProtocolSession);
-    session: LH.Gatherer.FRProtocolSession;
+    constructor(session: LH.Gatherer.ProtocolSession);
+    session: LH.Gatherer.ProtocolSession;
     /**
      * Fetches any resource using the network directly.
      *

package/core/gather/fetcher.js

@@ -17,7 +17,7 @@ import * as LH from '../../types/lh.js';
 
 class Fetcher {
   /**
-   * @param {LH.Gatherer.FRProtocolSession} session
+   * @param {LH.Gatherer.ProtocolSession} session
    */
   constructor(session) {
     this.session = session;

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

@@ -1,16 +1,16 @@
 export default Accessibility;
-declare class Accessibility extends FRGatherer {
+declare class Accessibility extends BaseGatherer {
     static pageFns: {
         runA11yChecks: typeof runA11yChecks;
         createAxeRuleResultArtifact: typeof createAxeRuleResultArtifact;
     };
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} passContext
+     * @param {LH.Gatherer.Context} passContext
      * @return {Promise<LH.Artifacts.Accessibility>}
      */
-    getArtifact(passContext: LH.Gatherer.FRTransitionalContext): Promise<LH.Artifacts.Accessibility>;
+    getArtifact(passContext: LH.Gatherer.Context): Promise<LH.Artifacts.Accessibility>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 /**
  * @return {Promise<LH.Artifacts.Accessibility>}
  */

package/core/gather/gatherers/accessibility.js

@@ -6,7 +6,7 @@
 
 /* global window, document, getNodeDetails */
 
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 import {axeSource} from '../../lib/axe.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 
@@ -169,7 +169,7 @@ function createAxeRuleResultArtifact(result) {
 }
 /* c8 ignore stop */
 
-class Accessibility extends FRGatherer {
+class Accessibility extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'navigation'],
@@ -181,7 +181,7 @@ class Accessibility extends FRGatherer {
   };
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    * @return {Promise<LH.Artifacts.Accessibility>}
    */
   getArtifact(passContext) {

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

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

package/core/gather/gatherers/anchor-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';
 import {resolveDevtoolsNodePathToObjectId} from '../driver/dom.js';
 
@@ -76,7 +76,7 @@ function collectAnchorElements() {
 /* c8 ignore stop */
 
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {string} devtoolsNodePath
  * @return {Promise<Array<{type: string}>>}
  */
@@ -91,14 +91,14 @@ async function getEventListeners(session, devtoolsNodePath) {
   return response.listeners.map(({type}) => ({type}));
 }
 
-class AnchorElements extends FRGatherer {
+class AnchorElements extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'navigation'],
   };
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    * @return {Promise<LH.Artifacts['AnchorElements']>}
    */
   async getArtifact(passContext) {

package/core/gather/gatherers/bf-cache-failures.d.ts

@@ -1,5 +1,5 @@
 export default BFCacheFailures;
-declare class BFCacheFailures extends FRGatherer {
+declare class BFCacheFailures extends BaseGatherer {
     /**
      * @param {LH.Crdp.Page.BackForwardCacheNotRestoredExplanation[]} errorList
      * @return {LH.Artifacts.BFCacheFailure}
@@ -18,26 +18,20 @@ declare class BFCacheFailures extends FRGatherer {
     /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
     meta: LH.Gatherer.GathererMeta<'DevtoolsLog'>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      * @return {Promise<LH.Crdp.Page.BackForwardCacheNotUsedEvent|undefined>}
      */
-    activelyCollectBFCacheEvent(context: LH.Gatherer.FRTransitionalContext): Promise<LH.Crdp.Page.BackForwardCacheNotUsedEvent | undefined>;
+    activelyCollectBFCacheEvent(context: LH.Gatherer.Context): Promise<LH.Crdp.Page.BackForwardCacheNotUsedEvent | undefined>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
+     * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
      * @return {LH.Crdp.Page.BackForwardCacheNotUsedEvent[]}
      */
-    passivelyCollectBFCacheEvents(context: LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>): LH.Crdp.Page.BackForwardCacheNotUsedEvent[];
+    passivelyCollectBFCacheEvents(context: LH.Gatherer.Context<'DevtoolsLog'>): LH.Crdp.Page.BackForwardCacheNotUsedEvent[];
     /**
-     * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
+     * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
      * @return {Promise<LH.Artifacts['BFCacheFailures']>}
      */
-    getArtifact(context: LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>): Promise<LH.Artifacts['BFCacheFailures']>;
-    /**
-     * @param {LH.Gatherer.PassContext} passContext
-     * @param {LH.Gatherer.LoadData} loadData
-     * @return {Promise<LH.Artifacts['BFCacheFailures']>}
-     */
-    afterPass(passContext: LH.Gatherer.PassContext, loadData: LH.Gatherer.LoadData): Promise<LH.Artifacts['BFCacheFailures']>;
+    getArtifact(context: LH.Gatherer.Context<'DevtoolsLog'>): Promise<LH.Artifacts['BFCacheFailures']>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=bf-cache-failures.d.ts.map

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