lighthouse 10.4.0-dev.20230713 → 10.4.0-dev.20230714

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

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

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

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

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

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

package/core/gather/gatherers/inputs.js

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

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

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

package/core/gather/gatherers/inspector-issues.js

@@ -9,11 +9,11 @@
  */
 
 
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 import {NetworkRecords} from '../../computed/network-records.js';
 import DevtoolsLog from './devtools-log.js';
 
-class InspectorIssues extends FRGatherer {
+class InspectorIssues extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
   meta = {
     supportedModes: ['timespan', 'navigation'],
@@ -35,7 +35,7 @@ class InspectorIssues extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    */
   async startInstrumentation(context) {
     const session = context.driver.defaultSession;
@@ -44,7 +44,7 @@ class InspectorIssues extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    */
   async stopInstrumentation(context) {
     const session = context.driver.defaultSession;
@@ -53,10 +53,13 @@ class InspectorIssues extends FRGatherer {
   }
 
   /**
-   * @param {Array<LH.Artifacts.NetworkRequest>} networkRecords
+   * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
    * @return {Promise<LH.Artifacts['InspectorIssues']>}
    */
-  async _getArtifact(networkRecords) {
+  async getArtifact(context) {
+    const devtoolsLog = context.dependencies.DevtoolsLog;
+    const networkRecords = await NetworkRecords.request(devtoolsLog, context);
+
     /** @type {LH.Artifacts.InspectorIssues} */
     const artifact = {
       attributionReportingIssue: [],
@@ -103,26 +106,6 @@ class InspectorIssues extends FRGatherer {
 
     return artifact;
   }
-
-  /**
-   * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
-   * @return {Promise<LH.Artifacts['InspectorIssues']>}
-   */
-  async getArtifact(context) {
-    const devtoolsLog = context.dependencies.DevtoolsLog;
-    const networkRecords = await NetworkRecords.request(devtoolsLog, context);
-    return this._getArtifact(networkRecords);
-  }
-
-  /**
-   * @param {LH.Gatherer.PassContext} passContext
-   * @param {LH.Gatherer.LoadData} loadData
-   * @return {Promise<LH.Artifacts['InspectorIssues']>}
-   */
-  async afterPass(passContext, loadData) {
-    await this.stopInstrumentation({...passContext, dependencies: {}});
-    return this._getArtifact(loadData.networkRecords);
-  }
 }
 
 export default InspectorIssues;

package/core/gather/gatherers/installability-errors.d.ts

@@ -1,17 +1,17 @@
 export default InstallabilityErrors;
-declare class InstallabilityErrors extends FRGatherer {
+declare class InstallabilityErrors extends BaseGatherer {
     /**
      * Creates an Artifacts.InstallabilityErrors, tranforming data from the protocol
      * for old versions of Chrome.
-     * @param {LH.Gatherer.FRProtocolSession} session
+     * @param {LH.Gatherer.ProtocolSession} session
      * @return {Promise<LH.Artifacts['InstallabilityErrors']>}
      */
-    static getInstallabilityErrors(session: LH.Gatherer.FRProtocolSession): Promise<LH.Artifacts['InstallabilityErrors']>;
+    static getInstallabilityErrors(session: LH.Gatherer.ProtocolSession): Promise<LH.Artifacts['InstallabilityErrors']>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      * @return {Promise<LH.Artifacts['InstallabilityErrors']>}
      */
-    getArtifact(context: LH.Gatherer.FRTransitionalContext): Promise<LH.Artifacts['InstallabilityErrors']>;
+    getArtifact(context: LH.Gatherer.Context): Promise<LH.Artifacts['InstallabilityErrors']>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=installability-errors.d.ts.map

package/core/gather/gatherers/installability-errors.js

@@ -6,9 +6,9 @@
 
 import log from 'lighthouse-logger';
 
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 
-class InstallabilityErrors extends FRGatherer {
+class InstallabilityErrors extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'navigation'],
@@ -17,7 +17,7 @@ class InstallabilityErrors extends FRGatherer {
   /**
    * Creates an Artifacts.InstallabilityErrors, tranforming data from the protocol
    * for old versions of Chrome.
-   * @param {LH.Gatherer.FRProtocolSession} session
+   * @param {LH.Gatherer.ProtocolSession} session
    * @return {Promise<LH.Artifacts['InstallabilityErrors']>}
    */
   static async getInstallabilityErrors(session) {
@@ -35,7 +35,7 @@ class InstallabilityErrors extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    * @return {Promise<LH.Artifacts['InstallabilityErrors']>}
    */
   async getArtifact(context) {

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

@@ -2,21 +2,21 @@ export default JsUsage;
 /**
  * @fileoverview Tracks unused JavaScript
  */
-declare class JsUsage extends FRGatherer {
+declare class JsUsage extends BaseGatherer {
     /** @type {LH.Crdp.Profiler.ScriptCoverage[]} */
     _scriptUsages: LH.Crdp.Profiler.ScriptCoverage[];
     /**
-     * @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>;
     /**
      * @return {Promise<LH.Artifacts['JsUsage']>}
      */
     getArtifact(): Promise<LH.Artifacts['JsUsage']>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=js-usage.d.ts.map

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

@@ -4,12 +4,12 @@
  * 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';
 
 /**
  * @fileoverview Tracks unused JavaScript
  */
-class JsUsage extends FRGatherer {
+class JsUsage extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'timespan', 'navigation'],
@@ -22,7 +22,7 @@ class JsUsage extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    */
   async startInstrumentation(context) {
     const session = context.driver.defaultSession;
@@ -31,7 +31,7 @@ class JsUsage extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    */
   async stopInstrumentation(context) {
     const session = context.driver.defaultSession;

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

@@ -1,16 +1,16 @@
 export default LinkElements;
-declare class LinkElements extends FRGatherer {
+declare class LinkElements extends BaseGatherer {
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      * @return {Promise<LH.Artifacts['LinkElements']>}
      */
-    static getLinkElementsInDOM(context: LH.Gatherer.FRTransitionalContext): Promise<LH.Artifacts['LinkElements']>;
+    static getLinkElementsInDOM(context: LH.Gatherer.Context): Promise<LH.Artifacts['LinkElements']>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
+     * @param {LH.Gatherer.Context} context
      * @param {LH.Artifacts['DevtoolsLog']} devtoolsLog
      * @return {Promise<LH.Artifacts['LinkElements']>}
      */
-    static getLinkElementsInHeaders(context: LH.Gatherer.FRTransitionalContext, devtoolsLog: LH.Artifacts['DevtoolsLog']): Promise<LH.Artifacts['LinkElements']>;
+    static getLinkElementsInHeaders(context: LH.Gatherer.Context, devtoolsLog: LH.Artifacts['DevtoolsLog']): Promise<LH.Artifacts['LinkElements']>;
     /**
      * This needs to be in the constructor.
      * https://github.com/GoogleChrome/lighthouse/issues/12134
@@ -18,25 +18,13 @@ declare class LinkElements extends FRGatherer {
      */
     meta: LH.Gatherer.GathererMeta<'DevtoolsLog'>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
-     * @param {LH.Artifacts['DevtoolsLog']} devtoolsLog
-     * @return {Promise<LH.Artifacts['LinkElements']>}
-     */
-    _getArtifact(context: LH.Gatherer.FRTransitionalContext, devtoolsLog: LH.Artifacts['DevtoolsLog']): Promise<LH.Artifacts['LinkElements']>;
-    /**
-     * @param {LH.Gatherer.PassContext} context
-     * @param {LH.Gatherer.LoadData} loadData
-     * @return {Promise<LH.Artifacts['LinkElements']>}
-     */
-    afterPass(context: LH.Gatherer.PassContext, loadData: LH.Gatherer.LoadData): Promise<LH.Artifacts['LinkElements']>;
-    /**
-     * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
+     * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
      * @return {Promise<LH.Artifacts['LinkElements']>}
      */
-    getArtifact(context: LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>): Promise<LH.Artifacts['LinkElements']>;
+    getArtifact(context: LH.Gatherer.Context<'DevtoolsLog'>): Promise<LH.Artifacts['LinkElements']>;
 }
 export namespace UIStrings {
     const headerParseWarning: string;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=link-elements.d.ts.map

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

@@ -6,7 +6,7 @@
 
 import LinkHeader from 'http-link-header';
 
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 import DevtoolsLog from './devtools-log.js';
 import {MainResource} from '../../computed/main-resource.js';
@@ -93,7 +93,7 @@ function getLinkElementsInDOM() {
 }
 /* c8 ignore stop */
 
-class LinkElements extends FRGatherer {
+class LinkElements extends BaseGatherer {
   constructor() {
     super();
     /**
@@ -108,7 +108,7 @@ class LinkElements extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    * @return {Promise<LH.Artifacts['LinkElements']>}
    */
   static getLinkElementsInDOM(context) {
@@ -125,7 +125,7 @@ class LinkElements extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
+   * @param {LH.Gatherer.Context} context
    * @param {LH.Artifacts['DevtoolsLog']} devtoolsLog
    * @return {Promise<LH.Artifacts['LinkElements']>}
    */
@@ -172,11 +172,11 @@ class LinkElements extends FRGatherer {
   }
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
-   * @param {LH.Artifacts['DevtoolsLog']} devtoolsLog
+   * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
    * @return {Promise<LH.Artifacts['LinkElements']>}
    */
-  async _getArtifact(context, devtoolsLog) {
+  async getArtifact(context) {
+    const devtoolsLog = context.dependencies.DevtoolsLog;
     const fromDOM = await LinkElements.getLinkElementsInDOM(context);
     const fromHeaders = await LinkElements.getLinkElementsInHeaders(context, devtoolsLog);
     const linkElements = fromDOM.concat(fromHeaders);
@@ -188,23 +188,6 @@ class LinkElements extends FRGatherer {
 
     return linkElements;
   }
-
-  /**
-   * @param {LH.Gatherer.PassContext} context
-   * @param {LH.Gatherer.LoadData} loadData
-   * @return {Promise<LH.Artifacts['LinkElements']>}
-   */
-  async afterPass(context, loadData) {
-    return this._getArtifact({...context, dependencies: {}}, loadData.devtoolsLog);
-  }
-
-  /**
-   * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
-   * @return {Promise<LH.Artifacts['LinkElements']>}
-   */
-  async getArtifact(context) {
-    return this._getArtifact(context, context.dependencies.DevtoolsLog);
-  }
 }
 
 export default LinkElements;

package/core/gather/gatherers/main-document-content.d.ts

@@ -2,26 +2,14 @@ export default MainDocumentContent;
 /**
  * Collects the content of the main html document.
  */
-declare class MainDocumentContent extends FRGatherer {
+declare class MainDocumentContent extends BaseGatherer {
     /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
     meta: LH.Gatherer.GathererMeta<'DevtoolsLog'>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext} context
-     * @param {LH.Artifacts['DevtoolsLog']} devtoolsLog
+     * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
      * @return {Promise<LH.Artifacts['MainDocumentContent']>}
      */
-    _getArtifact(context: LH.Gatherer.FRTransitionalContext, devtoolsLog: LH.Artifacts['DevtoolsLog']): Promise<LH.Artifacts['MainDocumentContent']>;
-    /**
-     * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
-     * @return {Promise<LH.Artifacts['MainDocumentContent']>}
-     */
-    getArtifact(context: LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>): Promise<LH.Artifacts['MainDocumentContent']>;
-    /**
-     * @param {LH.Gatherer.PassContext} passContext
-     * @param {LH.Gatherer.LoadData} loadData
-     * @return {Promise<LH.Artifacts['MainDocumentContent']>}
-     */
-    afterPass(passContext: LH.Gatherer.PassContext, loadData: LH.Gatherer.LoadData): Promise<LH.Artifacts['MainDocumentContent']>;
+    getArtifact(context: LH.Gatherer.Context<'DevtoolsLog'>): Promise<LH.Artifacts['MainDocumentContent']>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=main-document-content.d.ts.map

package/core/gather/gatherers/main-document-content.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';
 import DevtoolsLog from './devtools-log.js';
 import {fetchResponseBodyFromCache} from '../driver/network.js';
 import {MainResource} from '../../computed/main-resource.js';
@@ -12,7 +12,7 @@ import {MainResource} from '../../computed/main-resource.js';
 /**
  * Collects the content of the main html document.
  */
-class MainDocumentContent extends FRGatherer {
+class MainDocumentContent extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
   meta = {
     supportedModes: ['navigation'],
@@ -20,34 +20,16 @@ class MainDocumentContent extends FRGatherer {
   };
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} context
-   * @param {LH.Artifacts['DevtoolsLog']} devtoolsLog
+   * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
    * @return {Promise<LH.Artifacts['MainDocumentContent']>}
    */
-  async _getArtifact(context, devtoolsLog) {
+  async getArtifact(context) {
+    const devtoolsLog = context.dependencies.DevtoolsLog;
     const mainResource =
       await MainResource.request({devtoolsLog, URL: context.baseArtifacts.URL}, context);
     const session = context.driver.defaultSession;
     return fetchResponseBodyFromCache(session, mainResource.requestId);
   }
-
-  /**
-   * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
-   * @return {Promise<LH.Artifacts['MainDocumentContent']>}
-   */
-  async getArtifact(context) {
-    const devtoolsLog = context.dependencies.DevtoolsLog;
-    return this._getArtifact(context, devtoolsLog);
-  }
-
-  /**
-   * @param {LH.Gatherer.PassContext} passContext
-   * @param {LH.Gatherer.LoadData} loadData
-   * @return {Promise<LH.Artifacts['MainDocumentContent']>}
-   */
-  async afterPass(passContext, loadData) {
-    return this._getArtifact({...passContext, dependencies: {}}, loadData.devtoolsLog);
-  }
 }
 
 export default MainDocumentContent;

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

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

package/core/gather/gatherers/meta-elements.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';
 import {pageFunctions} from '../../lib/page-functions.js';
 
 /* globals getElementsInDocument getNodeDetails */
@@ -38,14 +38,14 @@ function collectMetaElements() {
 }
 /* c8 ignore stop */
 
-class MetaElements extends FRGatherer {
+class MetaElements extends BaseGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
     supportedModes: ['snapshot', 'navigation'],
   };
 
   /**
-   * @param {LH.Gatherer.FRTransitionalContext} passContext
+   * @param {LH.Gatherer.Context} passContext
    * @return {Promise<LH.Artifacts['MetaElements']>}
    */
   getArtifact(passContext) {

package/core/gather/gatherers/network-user-agent.d.ts

@@ -1,6 +1,6 @@
 export default NetworkUserAgent;
-/** @implements {LH.Gatherer.FRGathererInstance<'DevtoolsLog'>} */
-declare class NetworkUserAgent extends FRGatherer implements LH.Gatherer.FRGathererInstance<'DevtoolsLog'> {
+/** @implements {LH.Gatherer.GathererInstance<'DevtoolsLog'>} */
+declare class NetworkUserAgent extends BaseGatherer implements LH.Gatherer.GathererInstance<'DevtoolsLog'> {
     /**
      * @param {LH.Artifacts['DevtoolsLog']} devtoolsLog
      * @return {string}
@@ -9,10 +9,10 @@ declare class NetworkUserAgent extends FRGatherer implements LH.Gatherer.FRGathe
     /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
     meta: LH.Gatherer.GathererMeta<'DevtoolsLog'>;
     /**
-     * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
+     * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
      * @return {Promise<LH.Artifacts['NetworkUserAgent']>}
      */
-    getArtifact(context: LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>): Promise<LH.Artifacts['NetworkUserAgent']>;
+    getArtifact(context: LH.Gatherer.Context<'DevtoolsLog'>): Promise<LH.Artifacts['NetworkUserAgent']>;
 }
-import FRGatherer from '../base-gatherer.js';
+import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=network-user-agent.d.ts.map