lighthouse 10.4.0 → 11.0.0

package/core/gather/gatherers/scripts.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';
 
 /**
  * @template T, U
@@ -47,9 +47,12 @@ function isLighthouseRuntimeEvaluateScript(script) {
 /**
  * @fileoverview Gets JavaScript file contents.
  */
-class Scripts extends FRGatherer {
+class Scripts extends BaseGatherer {
+  static symbol = Symbol('Scripts');
+
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
+    symbol: Scripts.symbol,
     supportedModes: ['timespan', 'navigation'],
   };
 
@@ -74,7 +77,7 @@ class Scripts extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    */
   async startInstrumentation(context) {
     const session = context.driver.defaultSession;
@@ -83,7 +86,7 @@ class Scripts extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    */
   async stopInstrumentation(context) {
     const session = context.driver.defaultSession;
@@ -91,11 +94,6 @@ class Scripts extends FRGatherer {
 
     session.off('Debugger.scriptParsed', this.onScriptParsed);
 
-    // Without this line the Debugger domain will be off in FR runner,
-    // because only the legacy gatherer has special handling for multiple,
-    // overlapped enabled/disable calls.
-    await session.sendCommand('Debugger.enable');
-
     // If run on a mobile device, be sensitive to memory limitations and only
     // request one at a time.
     this._scriptContents = await runInSeriesOrParallel(

package/core/gather/gatherers/seo/embedded-content.d.ts

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

package/core/gather/gatherers/seo/embedded-content.js

@@ -6,7 +6,7 @@
 
 /* globals getElementsInDocument getNodeDetails */
 
-import FRGatherer from '../../base-gatherer.js';
+import BaseGatherer from '../../base-gatherer.js';
 import {pageFunctions} from '../../../lib/page-functions.js';
 
 /**
@@ -39,14 +39,14 @@ function getEmbeddedContent() {
     }));
 }
 
-class EmbeddedContent extends FRGatherer {
+class EmbeddedContent extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'navigation'],
   };
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    * @return {Promise<LH.Artifacts['EmbeddedContent']>}
    */
   getArtifact(passContext) {

package/core/gather/gatherers/seo/font-size.d.ts

@@ -4,12 +4,12 @@ export type BackendIdsToFontData = Map<number, {
     fontSize: number;
     textLength: number;
 }>;
-declare class FontSize extends FRGatherer {
+declare class FontSize extends BaseGatherer {
     /**
-     * @param {LH.Gatherer.FRProtocolSession} session
+     * @param {LH.Gatherer.ProtocolSession} session
      * @param {Array<NodeFontData>} failingNodes
      */
-    static fetchFailingNodeSourceRules(session: LH.Gatherer.FRProtocolSession, failingNodes: Array<NodeFontData>): Promise<{
+    static fetchFailingNodeSourceRules(session: LH.Gatherer.ProtocolSession, failingNodes: Array<NodeFontData>): Promise<{
         analyzedFailingNodesData: {
             nodeId: number;
             fontSize: number;
@@ -104,10 +104,10 @@ declare class FontSize extends FRGatherer {
         }[];
     };
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} passContext
+     * @param {LH.Gatherer.Context} passContext
      * @return {Promise<LH.Artifacts.FontSize>} font-size analysis
      */
-    getArtifact(passContext: LH.Gatherer.FRTransitionalContext): Promise<LH.Artifacts.FontSize>;
+    getArtifact(passContext: LH.Gatherer.Context): Promise<LH.Artifacts.FontSize>;
 }
 /**
  * Returns the governing/winning CSS font-size rule for the set of styles given.
@@ -126,5 +126,5 @@ export function getEffectiveFontRule({ attributesStyle, inlineStyle, matchedCSSR
  * @return {NodeFontData['cssRule']|undefined}
  */
 export function findMostSpecificMatchedCSSRule(matchedCSSRules: import("devtools-protocol").Protocol.CSS.RuleMatch[] | undefined, isDeclarationOfInterest: (arg0: LH.Crdp.CSS.CSSStyle) => boolean | string | undefined): NodeFontData['cssRule'] | undefined;
-import FRGatherer from '../../base-gatherer.js';
+import BaseGatherer from '../../base-gatherer.js';
 //# sourceMappingURL=font-size.d.ts.map

package/core/gather/gatherers/seo/font-size.js

@@ -15,7 +15,7 @@
  * This gatherer collects stylesheet metadata by itself, instead of relying on the styles gatherer which is slow (because it parses the stylesheet content).
  */
 
-import FRGatherer from '../../base-gatherer.js';
+import BaseGatherer from '../../base-gatherer.js';
 
 const FONT_SIZE_PROPERTY_NAME = 'font-size';
 const MINIMAL_LEGIBLE_FONT_SIZE_PX = 12;
@@ -116,7 +116,7 @@ function getTextLength(text) {
 }
 
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {number} nodeId text node
  * @return {Promise<NodeFontData['cssRule']|undefined>}
  */
@@ -138,14 +138,14 @@ async function fetchSourceRule(session, nodeId) {
   };
 }
 
-class FontSize extends FRGatherer {
+class FontSize extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'navigation'],
   };
 
   /**
-   * @param {LH.Gatherer.FRProtocolSession} session
+   * @param {LH.Gatherer.ProtocolSession} session
    * @param {Array<NodeFontData>} failingNodes
    */
   static async fetchFailingNodeSourceRules(session, failingNodes) {
@@ -274,7 +274,7 @@ class FontSize extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    * @return {Promise<LH.Artifacts.FontSize>} font-size analysis
    */
   async getArtifact(passContext) {

package/core/gather/gatherers/seo/robots-txt.d.ts

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

package/core/gather/gatherers/seo/robots-txt.js

@@ -4,16 +4,16 @@
  * 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';
 
-class RobotsTxt extends FRGatherer {
+class RobotsTxt extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'navigation'],
   };
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    * @return {Promise<LH.Artifacts['RobotsTxt']>}
    */
   async getArtifact(passContext) {

package/core/gather/gatherers/seo/tap-targets.d.ts

@@ -1,21 +1,21 @@
 export default TapTargets;
-declare class TapTargets extends FRGatherer {
+declare class TapTargets extends BaseGatherer {
     /**
-     * @param {LH.Gatherer.FRProtocolSession} session
+     * @param {LH.Gatherer.ProtocolSession} session
      * @param {string} className
      * @return {Promise<string>}
      */
-    addStyleRule(session: LH.Gatherer.FRProtocolSession, className: string): Promise<string>;
+    addStyleRule(session: LH.Gatherer.ProtocolSession, className: string): Promise<string>;
     /**
-     * @param {LH.Gatherer.FRProtocolSession} session
+     * @param {LH.Gatherer.ProtocolSession} session
      * @param {string} styleSheetId
      */
-    removeStyleRule(session: LH.Gatherer.FRProtocolSession, styleSheetId: string): Promise<void>;
+    removeStyleRule(session: LH.Gatherer.ProtocolSession, styleSheetId: string): Promise<void>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} passContext
+     * @param {LH.Gatherer.Context} passContext
      * @return {Promise<LH.Artifacts.TapTarget[]>} All visible tap targets with their positions and sizes
      */
-    getArtifact(passContext: LH.Gatherer.FRTransitionalContext): Promise<LH.Artifacts.TapTarget[]>;
+    getArtifact(passContext: LH.Gatherer.Context): Promise<LH.Artifacts.TapTarget[]>;
 }
-import FRGatherer from '../../base-gatherer.js';
+import BaseGatherer from '../../base-gatherer.js';
 //# sourceMappingURL=tap-targets.d.ts.map

package/core/gather/gatherers/seo/tap-targets.js

@@ -6,7 +6,7 @@
 
 /* global document, window, getComputedStyle, getElementsInDocument, Node, getNodeDetails, getRectCenterPoint */
 
-import FRGatherer from '../../base-gatherer.js';
+import BaseGatherer from '../../base-gatherer.js';
 import {pageFunctions} from '../../../lib/page-functions.js';
 import * as RectHelpers from '../../../lib/rect-helpers.js';
 
@@ -301,7 +301,7 @@ function gatherTapTargetsAndResetScroll(tapTargetsSelector, className) {
 }
 /* c8 ignore stop */
 
-class TapTargets extends FRGatherer {
+class TapTargets extends BaseGatherer {
   constructor() {
     super();
     /**
@@ -315,7 +315,7 @@ class TapTargets extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRProtocolSession} session
+   * @param {LH.Gatherer.ProtocolSession} session
    * @param {string} className
    * @return {Promise<string>}
    */
@@ -333,7 +333,7 @@ class TapTargets extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRProtocolSession} session
+   * @param {LH.Gatherer.ProtocolSession} session
    * @param {string} styleSheetId
    */
   async removeStyleRule(session, styleSheetId) {
@@ -344,7 +344,7 @@ class TapTargets extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    * @return {Promise<LH.Artifacts.TapTarget[]>} All visible tap targets with their positions and sizes
    */
   async getArtifact(passContext) {

package/core/gather/gatherers/service-worker.d.ts

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

package/core/gather/gatherers/service-worker.js

@@ -4,29 +4,17 @@
  * 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 * as serviceWorkers from '../driver/service-workers.js';
 
-class ServiceWorker extends FRGatherer {
+class ServiceWorker extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['navigation'],
   };
 
   /**
-   * @param {LH.Gatherer.PassContext} passContext
-   * @return {Promise<LH.Artifacts['ServiceWorker']>}
-   */
-  async beforePass(passContext) {
-    return this.getArtifact({...passContext, dependencies: {}});
-  }
-
-  // This gatherer is run in a separate pass for legacy mode.
-  // Legacy compat code is in `beforePass`.
-  async afterPass() { }
-
-  /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    * @return {Promise<LH.Artifacts['ServiceWorker']>}
    */
   async getArtifact(context) {

package/core/gather/gatherers/source-maps.d.ts

@@ -2,19 +2,15 @@ export default SourceMaps;
 /**
  * @fileoverview Gets JavaScript source maps.
  */
-declare class SourceMaps extends FRGatherer {
-    /** @type {LH.Crdp.Debugger.ScriptParsedEvent[]} */
-    _scriptParsedEvents: LH.Crdp.Debugger.ScriptParsedEvent[];
+declare class SourceMaps extends BaseGatherer {
+    /** @type {LH.Gatherer.GathererMeta<'Scripts'>} */
+    meta: LH.Gatherer.GathererMeta<'Scripts'>;
     /**
-     * @param {LH.Crdp.Debugger.ScriptParsedEvent} event
-     */
-    onScriptParsed(event: LH.Crdp.Debugger.ScriptParsedEvent): void;
-    /**
-     * @param {LH.Gatherer.FRTransitionalDriver} driver
+     * @param {LH.Gatherer.Driver} driver
      * @param {string} sourceMapUrl
      * @return {Promise<LH.Artifacts.RawSourceMap>}
      */
-    fetchSourceMap(driver: LH.Gatherer.FRTransitionalDriver, sourceMapUrl: string): Promise<LH.Artifacts.RawSourceMap>;
+    fetchSourceMap(driver: LH.Gatherer.Driver, sourceMapUrl: string): Promise<LH.Artifacts.RawSourceMap>;
     /**
      * @param {string} sourceMapURL
      * @return {LH.Artifacts.RawSourceMap}
@@ -27,24 +23,16 @@ declare class SourceMaps extends FRGatherer {
      */
     _resolveUrl(url: string, base: string): string | undefined;
     /**
-     * @param {LH.Gatherer.FRTransitionalDriver} driver
-     * @param {LH.Crdp.Debugger.ScriptParsedEvent} event
+     * @param {LH.Gatherer.Driver} driver
+     * @param {LH.Artifacts.Script} script
      * @return {Promise<LH.Artifacts.SourceMap>}
      */
-    _retrieveMapFromScriptParsedEvent(driver: LH.Gatherer.FRTransitionalDriver, event: LH.Crdp.Debugger.ScriptParsedEvent): Promise<LH.Artifacts.SourceMap>;
-    /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
-     */
-    startSensitiveInstrumentation(context: LH.Gatherer.FRTransitionalContext): Promise<void>;
-    /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
-     */
-    stopSensitiveInstrumentation(context: LH.Gatherer.FRTransitionalContext): Promise<void>;
+    _retrieveMapFromScript(driver: LH.Gatherer.Driver, script: LH.Artifacts.Script): Promise<LH.Artifacts.SourceMap>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context<'Scripts'>} context
      * @return {Promise<LH.Artifacts['SourceMaps']>}
      */
-    getArtifact(context: LH.Gatherer.FRTransitionalContext): Promise<LH.Artifacts['SourceMaps']>;
+    getArtifact(context: LH.Gatherer.Context<'Scripts'>): Promise<LH.Artifacts['SourceMaps']>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=source-maps.d.ts.map

package/core/gather/gatherers/source-maps.js

@@ -5,26 +5,21 @@
  */
 
 import SDK from '../../lib/cdt/SDK.js';
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
+import Scripts from './scripts.js';
 
 /**
  * @fileoverview Gets JavaScript source maps.
  */
-class SourceMaps extends FRGatherer {
-  /** @type {LH.Gatherer.GathererMeta} */
+class SourceMaps extends BaseGatherer {
+  /** @type {LH.Gatherer.GathererMeta<'Scripts'>} */
   meta = {
     supportedModes: ['timespan', 'navigation'],
+    dependencies: {Scripts: Scripts.symbol},
   };
 
-  constructor() {
-    super();
-    /** @type {LH.Crdp.Debugger.ScriptParsedEvent[]} */
-    this._scriptParsedEvents = [];
-    this.onScriptParsed = this.onScriptParsed.bind(this);
-  }
-
   /**
-   * @param {LH.Gatherer.FRTransitionalDriver} driver
+   * @param {LH.Gatherer.Driver} driver
    * @param {string} sourceMapUrl
    * @return {Promise<LH.Artifacts.RawSourceMap>}
    */
@@ -45,15 +40,6 @@ class SourceMaps extends FRGatherer {
     return SDK.SourceMap.parseSourceMap(buffer.toString());
   }
 
-  /**
-   * @param {LH.Crdp.Debugger.ScriptParsedEvent} event
-   */
-  onScriptParsed(event) {
-    if (event.sourceMapURL) {
-      this._scriptParsedEvents.push(event);
-    }
-  }
-
   /**
    * @param {string} url
    * @param {string} base
@@ -68,28 +54,28 @@ class SourceMaps extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalDriver} driver
-   * @param {LH.Crdp.Debugger.ScriptParsedEvent} event
+   * @param {LH.Gatherer.Driver} driver
+   * @param {LH.Artifacts.Script} script
    * @return {Promise<LH.Artifacts.SourceMap>}
    */
-  async _retrieveMapFromScriptParsedEvent(driver, event) {
-    if (!event.sourceMapURL) {
+  async _retrieveMapFromScript(driver, script) {
+    if (!script.sourceMapURL) {
       throw new Error('precondition failed: event.sourceMapURL should exist');
     }
 
     // `sourceMapURL` is simply the URL found in either a magic comment or an x-sourcemap header.
     // It has not been resolved to a base url.
-    const isSourceMapADataUri = event.sourceMapURL.startsWith('data:');
-    const scriptUrl = event.url;
+    const isSourceMapADataUri = script.sourceMapURL.startsWith('data:');
+    const scriptUrl = script.name;
     const rawSourceMapUrl = isSourceMapADataUri ?
-        event.sourceMapURL :
-        this._resolveUrl(event.sourceMapURL, event.url);
+        script.sourceMapURL :
+        this._resolveUrl(script.sourceMapURL, script.name);
 
     if (!rawSourceMapUrl) {
       return {
-        scriptId: event.scriptId,
+        scriptId: script.scriptId,
         scriptUrl,
-        errorMessage: `Could not resolve map url: ${event.sourceMapURL}`,
+        errorMessage: `Could not resolve map url: ${script.sourceMapURL}`,
       };
     }
 
@@ -109,14 +95,14 @@ class SourceMaps extends FRGatherer {
         map.sections = map.sections.filter(section => section.map);
       }
       return {
-        scriptId: event.scriptId,
+        scriptId: script.scriptId,
         scriptUrl,
         sourceMapUrl,
         map,
       };
     } catch (err) {
       return {
-        scriptId: event.scriptId,
+        scriptId: script.scriptId,
         scriptUrl,
         sourceMapUrl,
         errorMessage: err.toString(),
@@ -125,30 +111,13 @@ class SourceMaps extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
-   */
-  async startSensitiveInstrumentation(context) {
-    const session = context.driver.defaultSession;
-    session.on('Debugger.scriptParsed', this.onScriptParsed);
-    await session.sendCommand('Debugger.enable');
-  }
-
-  /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
-   */
-  async stopSensitiveInstrumentation(context) {
-    const session = context.driver.defaultSession;
-    await session.sendCommand('Debugger.disable');
-    session.off('Debugger.scriptParsed', this.onScriptParsed);
-  }
-
-  /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context<'Scripts'>} context
    * @return {Promise<LH.Artifacts['SourceMaps']>}
    */
   async getArtifact(context) {
-    const eventProcessPromises = this._scriptParsedEvents
-      .map((event) => this._retrieveMapFromScriptParsedEvent(context.driver, event));
+    const eventProcessPromises = context.dependencies.Scripts
+      .filter(script => script.sourceMapURL)
+      .map(script => this._retrieveMapFromScript(context.driver, script));
     return Promise.all(eventProcessPromises);
   }
 }

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

@@ -21,18 +21,18 @@ export type JSLibrary = {
     version: string | number | null;
     npm: string | null;
 };
-/** @implements {LH.Gatherer.FRGathererInstance} */
-declare class Stacks extends FRGatherer implements LH.Gatherer.FRGathererInstance {
+/** @implements {LH.Gatherer.GathererInstance} */
+declare class Stacks extends BaseGatherer implements LH.Gatherer.GathererInstance {
     /**
-     * @param {LH.Gatherer.FRTransitionalDriver['executionContext']} executionContext
+     * @param {LH.Gatherer.Driver['executionContext']} executionContext
      * @return {Promise<LH.Artifacts['Stacks']>}
      */
-    static collectStacks(executionContext: LH.Gatherer.FRTransitionalDriver['executionContext']): Promise<LH.Artifacts['Stacks']>;
+    static collectStacks(executionContext: LH.Gatherer.Driver['executionContext']): Promise<LH.Artifacts['Stacks']>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      * @return {Promise<LH.Artifacts['Stacks']>}
      */
-    getArtifact(context: LH.Gatherer.FRTransitionalContext): Promise<LH.Artifacts['Stacks']>;
+    getArtifact(context: LH.Gatherer.Context): Promise<LH.Artifacts['Stacks']>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=stacks.d.ts.map

package/core/gather/gatherers/stacks.js

@@ -16,10 +16,10 @@ import {createRequire} from 'module';
 
 import log from 'lighthouse-logger';
 
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 
 
-// This is removed by rollup, because the only usage is to resolve a module path
+// This is removed by esbuild (if minified), because the only usage is to resolve a module path
 // but that is replaced by the inline-fs plugin, leaving `require` unused.
 const require = /* #__PURE__ */ createRequire(import.meta.url);
 
@@ -85,8 +85,8 @@ async function detectLibraries() {
 /* c8 ignore stop */
 
 
-/** @implements {LH.Gatherer.FRGathererInstance} */
-class Stacks extends FRGatherer {
+/** @implements {LH.Gatherer.GathererInstance} */
+class Stacks extends BaseGatherer {
   constructor() {
     super();
 
@@ -97,7 +97,7 @@ class Stacks extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalDriver['executionContext']} executionContext
+   * @param {LH.Gatherer.Driver['executionContext']} executionContext
    * @return {Promise<LH.Artifacts['Stacks']>}
    */
   static async collectStacks(executionContext) {
@@ -122,7 +122,7 @@ class Stacks extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    * @return {Promise<LH.Artifacts['Stacks']>}
    */
   async getArtifact(context) {

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

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

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

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