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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lighthouse",
   "type": "module",
-  "version": "10.4.0-dev.20230713",
+  "version": "10.4.0-dev.20230715",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./core/index.js",
   "bin": {
@@ -41,7 +41,7 @@
     "start": "yarn build-report --standalone && node ./cli/index.js",
     "mocha": "node --loader=testdouble core/test/scripts/run-mocha-tests.js",
     "test": "yarn diff:sample-json && yarn lint --quiet && yarn unit && yarn type-check",
-    "test-bundle": "yarn smoke --runner bundle --retries=2",
+    "test-bundle": "yarn smoke --runner bundle",
     "test-clients": "yarn mocha --testMatch clients/**/*-test.js && yarn mocha --testMatch clients/**/*-test-pptr.js",
     "test-viewer": "yarn unit-viewer && yarn mocha --testMatch viewer/**/*-test-pptr.js --timeout 35000",
     "test-treemap": "yarn unit-treemap && yarn mocha --testMatch treemap/**/*-test-pptr.js --timeout 35000",
@@ -99,14 +99,8 @@
   "devDependencies": {
     "@build-tracker/cli": "^1.0.0-beta.15",
     "@esbuild-kit/esm-loader": "^2.1.1",
+    "@esbuild-plugins/node-modules-polyfill": "^0.1.4",
     "@jest/fake-timers": "^28.1.0",
-    "@rollup/plugin-alias": "^3.1.2",
-    "@rollup/plugin-commonjs": "^20.0.0",
-    "@rollup/plugin-dynamic-import-vars": "^1.1.1",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.0.4",
-    "@rollup/plugin-typescript": "^8.2.5",
-    "@stadtlandnetz/rollup-plugin-postprocess": "^1.1.0",
     "@testing-library/preact": "^3.1.1",
     "@testing-library/preact-hooks": "^1.1.0",
     "@types/archiver": "^2.1.2",
@@ -125,6 +119,7 @@
     "@types/node": "*",
     "@types/pako": "^1.0.1",
     "@types/resize-observer-browser": "^0.1.1",
+    "@types/resolve": "^1.20.2",
     "@types/semver": "^5.5.0",
     "@types/tabulator-tables": "^4.9.1",
     "@types/ws": "^7.0.0",
@@ -135,6 +130,7 @@
     "acorn": "^8.5.0",
     "angular": "^1.7.4",
     "archiver": "^3.0.0",
+    "builtin-modules": "^3.3.0",
     "c8": "^7.11.3",
     "chalk": "^2.4.1",
     "chrome-devtools-frontend": "1.0.1153166",
@@ -144,6 +140,7 @@
     "cross-env": "^7.0.2",
     "csv-validator": "^0.0.3",
     "es-main": "^1.2.0",
+    "esbuild": "^0.18.11",
     "eslint": "^8.4.1",
     "eslint-config-google": "^0.14.0",
     "eslint-formatter-codeframe": "^7.32.1",
@@ -170,15 +167,11 @@
     "preact": "^10.7.2",
     "pretty-json-stringify": "^0.0.2",
     "puppeteer": "^20.8.0",
-    "resolve": "^1.20.0",
+    "resolve": "^1.22.1",
     "rollup": "^2.52.7",
-    "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-polyfill-node": "^0.12.0",
-    "rollup-plugin-replace": "^2.2.0",
-    "rollup-plugin-shim": "^1.0.0",
-    "rollup-plugin-terser": "^7.0.2",
     "tabulator-tables": "^4.9.3",
-    "terser": "^5.3.8",
+    "terser": "^5.18.2",
     "testdouble": "^3.17.2",
     "typed-query-selector": "^2.6.1",
     "typescript": "^5.0.4",

package/third-party/esbuild-plugins-polyfills/LICENSE

@@ -0,0 +1,3 @@
+MIT
+
+https://github.com/remorses/esbuild-plugins/blob/d757c3bf5dff37a754d254168d4a3d88611e8175/package.json#L37

package/third-party/esbuild-plugins-polyfills/README.md

@@ -0,0 +1,7 @@
+# @esbuild-plugins/node-modules-polyfill
+
+This is `@esbuild-plugins/node-modules-polyfill`, with the following changes:
+
+- using a better library for polyfills as proposed by this PR ... https://github.com/remorses/esbuild-plugins/pull/19
+- ...but there are a couple correctness changes on top of the above PR, as described here: https://github.com/remorses/esbuild-plugins/pull/19#discussion_r990493080 (the PR has landed but is still broken for our use case)
+- File converted from TS to JS

package/third-party/esbuild-plugins-polyfills/esbuild-polyfills.d.ts

@@ -0,0 +1,9 @@
+export function nodeModulesPolyfillPlugin(options?: {}): {
+    name: any;
+    setup: ({ onLoad, onResolve, initialOptions }: {
+        onLoad: any;
+        onResolve: any;
+        initialOptions: any;
+    }) => void;
+};
+//# sourceMappingURL=esbuild-polyfills.d.ts.map

package/third-party/esbuild-plugins-polyfills/esbuild-polyfills.js

@@ -0,0 +1,129 @@
+// @ts-nocheck
+/* eslint-disable */
+
+import path from 'path';
+
+import escapeStringRegexp from 'escape-string-regexp';
+import {getModules as builtinsPolyfills} from 'rollup-plugin-polyfill-node/dist/modules.js';
+import polyfillLib from 'rollup-plugin-polyfill-node/dist/polyfills.js';
+
+const NAME = 'node-modules-polyfills';
+const NAMESPACE = NAME;
+
+function removeEndingSlash(importee) {
+  if (importee && importee.slice(-1) === '/') {
+    importee = importee.slice(0, -1);
+  }
+  return importee;
+}
+
+function nodeModulesPolyfillPlugin(
+  options = {}
+) {
+  const {namespace = NAMESPACE, name = NAME} = options;
+  if (namespace.endsWith('commonjs')) {
+    throw new Error(`namespace ${namespace} must not end with commonjs`);
+  }
+  // this namespace is needed to make ES modules expose their default export to require: require('assert') will give you import('assert').default
+  const commonjsNamespace = namespace + '-commonjs';
+  const polyfilledBuiltins = builtinsPolyfills();
+  const polyfilledBuiltinsNames = [...polyfilledBuiltins.keys()];
+
+  return {
+    name,
+    setup: function setup({onLoad, onResolve, initialOptions}) {
+      // polyfills contain global keyword, it must be defined
+      if (initialOptions?.define && !initialOptions.define?.global) {
+        initialOptions.define['global'] = 'globalThis';
+      } else if (!initialOptions?.define) {
+        initialOptions.define = {global: 'globalThis'};
+      }
+
+      // TODO these polyfill module cannot import anything, is that ok?
+      async function loader(
+        args
+      ) {
+        try {
+          const isCommonjs = args.namespace.endsWith('commonjs');
+          
+          const key = removeEndingSlash(args.path);
+          const contents = polyfilledBuiltins.get(key) || polyfillLib[key + '.js'];
+          const resolveDir = path.dirname(key);
+
+          if (isCommonjs) {
+            return {
+              loader: 'js',
+              contents: commonJsTemplate({
+                importPath: args.path,
+              }),
+              resolveDir,
+            };
+          }
+          return {
+            loader: 'js',
+            contents,
+            resolveDir,
+          };
+        } catch (e) {
+          console.error('node-modules-polyfill', e);
+          return {
+            contents: `export {}`,
+            loader: 'js',
+          };
+        }
+      }
+      onLoad({filter: /.*/, namespace}, loader);
+      onLoad({filter: /.*/, namespace: commonjsNamespace}, loader);
+      const filter = new RegExp(
+                polyfilledBuiltinsNames.map(escapeStringRegexp).join('|') // TODO builtins could end with slash, keep in mind in regex
+      );
+      async function resolver(args) {
+        const ignoreRequire = args.namespace === commonjsNamespace;
+
+        let key;
+        if (args.path.startsWith('\0polyfill-node.')) {
+          key = args.path.replace('\0polyfill-node.', '');
+        } else {
+          if (args.path.startsWith('.')) {
+            key = path.join(path.dirname(args.importer), args.path);
+          } else {
+            key = args.path;
+          }
+        }
+
+        if (!polyfilledBuiltins.has(key) && !polyfillLib[key + '.js']) {
+          return;
+        }
+
+        const isCommonjs =
+                    !ignoreRequire && args.kind === 'require-call';
+
+        return {
+          namespace: isCommonjs ? commonjsNamespace : namespace,
+          path: key,
+        };
+      }
+      onResolve({filter}, resolver);
+      onResolve({filter: /.*/, namespace}, resolver);
+    },
+  };
+}
+
+function commonJsTemplate({importPath}) {
+  return `
+const polyfill = require('${importPath}')
+
+if (polyfill && polyfill.default) {
+    module.exports = polyfill.default
+    for (let k in polyfill) {
+        module.exports[k] = polyfill[k]
+    }
+} else if (polyfill)  {
+    module.exports = polyfill
+}
+
+
+`;
+}
+
+export {nodeModulesPolyfillPlugin};

package/tsconfig.json

@@ -21,6 +21,7 @@
     "./types/**/*.d.ts",
     "eslint-local-rules.cjs",
     "third-party/axe/valid-langs.js",
+    "third-party/esbuild-plugins-polyfills/esbuild-polyfills.js",
 
     "core/test/results/sample_v2.json",
     "core/test/fixtures/unresolved-perflog.json",

package/types/artifacts.d.ts

@@ -24,23 +24,14 @@ import Protocol from './protocol.js';
 import Util from './utility-types.js';
 import Audit from './audit.js';
 
-export interface Artifacts extends BaseArtifacts, GathererArtifacts {}
-
-export type FRArtifacts = Util.StrictOmit<Artifacts,
-  | 'Fonts'
-  | 'Manifest'
-  | 'MixedContent'
-  | keyof FRBaseArtifacts
->;
+export type Artifacts = BaseArtifacts & GathererArtifacts;
 
 /**
  * Artifacts always created by gathering. These artifacts are available to Lighthouse plugins.
  * NOTE: any breaking changes here are considered breaking Lighthouse changes that must be done
  * on a major version bump.
  */
-export type BaseArtifacts = UniversalBaseArtifacts & ContextualBaseArtifacts & LegacyBaseArtifacts
-
-export type FRBaseArtifacts = UniversalBaseArtifacts & ContextualBaseArtifacts;
+export type BaseArtifacts = UniversalBaseArtifacts & ContextualBaseArtifacts;
 
 /**
  * The set of base artifacts that are available in every mode of Lighthouse operation.
@@ -76,18 +67,6 @@ interface ContextualBaseArtifacts {
   PageLoadError: LighthouseError | null;
 }
 
-/**
- * The set of base artifacts that were replaced by standard gatherers in Fraggle Rock.
- */
-interface LegacyBaseArtifacts {
-  /** The user agent string that Lighthouse used to load the page. Set to the empty string if unknown. */
-  NetworkUserAgent: string;
-  /** A set of page-load traces, keyed by passName. */
-  traces: {[passName: string]: Trace};
-  /** A set of DevTools debugger protocol records, keyed by passName. */
-  devtoolsLogs: {[passName: string]: DevtoolsLog};
-}
-
 /**
  * Artifacts provided by the default gatherers that are exposed to plugins with a hardended API.
  * NOTE: any breaking changes here are considered breaking Lighthouse changes that must be done
@@ -116,7 +95,7 @@ interface PublicGathererArtifacts {
  * Artifacts provided by the default gatherers. Augment this interface when adding additional
  * gatherers. Changes to these artifacts are not considered a breaking Lighthouse change.
  */
-export interface GathererArtifacts extends PublicGathererArtifacts,LegacyBaseArtifacts {
+export interface GathererArtifacts extends PublicGathererArtifacts {
   /** The results of running the aXe accessibility tests on the page. */
   Accessibility: Artifacts.Accessibility;
   /** Array of all anchors on the page. */
@@ -127,7 +106,7 @@ export interface GathererArtifacts extends PublicGathererArtifacts,LegacyBaseArt
   CacheContents: string[];
   /** CSS coverage information for styles used by page's final state. */
   CSSUsage: {rules: Crdp.CSS.RuleUsage[], stylesheets: Artifacts.CSSStyleSheetInfo[]};
-  /** The primary log of devtools protocol activity. Used in Fraggle Rock gathering. */
+  /** The primary log of devtools protocol activity. */
   DevtoolsLog: DevtoolsLog;
   /** Information on the document's doctype(or null if not present), specifically the name, publicId, and systemId.
       All properties default to an empty string if not present */
@@ -136,8 +115,6 @@ export interface GathererArtifacts extends PublicGathererArtifacts,LegacyBaseArt
   DOMStats: Artifacts.DOMStats;
   /** Relevant attributes and child properties of all <object>s, <embed>s and <applet>s in the page. */
   EmbeddedContent: Artifacts.EmbeddedContentInfo[];
-  /** Information for font faces used in the page. */
-  Fonts: Artifacts.Font[];
   /** Information on poorly sized font usage and the text affected by it. */
   FontSize: Artifacts.FontSize;
   /** All the input elements, including associated form and label elements. */
@@ -153,10 +130,8 @@ export interface GathererArtifacts extends PublicGathererArtifacts,LegacyBaseArt
   /** JS coverage information for code used during audit. Keyed by script id. */
   // 'url' is excluded because it can be overridden by a magic sourceURL= comment, which makes keeping it a dangerous footgun!
   JsUsage: Record<string, Omit<Crdp.Profiler.ScriptCoverage, 'url'>>;
-  /** Parsed version of the page's Web App Manifest, or null if none found. */
-  Manifest: Artifacts.Manifest | null;
-  /** The URL loaded with interception */
-  MixedContent: {url: string};
+  /** The user agent string that Lighthouse used to load the page. Set to the empty string if unknown. */
+  NetworkUserAgent: string;
   /** Size and compression opportunity information for all the images in the page. */
   OptimizedImages: Array<Artifacts.OptimizedImage | Artifacts.OptimizedImageError>;
   /** Size info of all network records sent without compression and their size after gzipping. */
@@ -175,12 +150,16 @@ export interface GathererArtifacts extends PublicGathererArtifacts,LegacyBaseArt
   TagsBlockingFirstPaint: Artifacts.TagBlockingFirstPaint[];
   /** Information about tap targets including their position and size. */
   TapTargets: Artifacts.TapTarget[];
-  /** The primary log of devtools protocol activity. Used in Fraggle Rock gathering. */
+  /** The primary trace taken over the entire run. */
   Trace: Trace;
   /** Elements associated with metrics (ie: Largest Contentful Paint element). */
   TraceElements: Artifacts.TraceElement[];
   /** Parsed version of the page's Web App Manifest, or null if none found. */
   WebAppManifest: Artifacts.Manifest | null;
+  /** COMPAT: A set of traces, keyed by passName. */
+  traces: {[passName: string]: Trace};
+  /** COMPAT: A set of DevTools debugger protocol records, keyed by passName. */
+  devtoolsLogs: {[passName: string]: DevtoolsLog};
 }
 
 declare module Artifacts {
@@ -426,18 +405,6 @@ declare module Artifacts {
     notRestoredReasonsTree: BFCacheNotRestoredReasonsTree;
   }
 
-  interface Font {
-    display: string;
-    family: string;
-    featureSettings: string;
-    stretch: string;
-    style: string;
-    unicodeRange: string;
-    variant: string;
-    weight: string;
-    src?: string[];
-  }
-
   interface FontSize {
     totalTextLength: number;
     failingTextLength: number;
@@ -728,7 +695,7 @@ declare module Artifacts {
     mainFrameInfo: {startingPid: number, frameId: string};
     /** The list of frames committed in the trace. */
     frames: Array<{id: string, url: string}>;
-    /** The trace event marking the time at which the run should consider to have begun. Typically the same as the navigationStart but might differ due to SPA navigations, client-side redirects, etc. In the FR timespan case, this event is injected by Lighthouse itself. */
+    /** The trace event marking the time at which the run should consider to have begun. Typically the same as the navigationStart but might differ due to SPA navigations, client-side redirects, etc. In the timespan case, this event is injected by Lighthouse itself. */
     timeOriginEvt: TraceEvent;
     /** All received trace events subsetted to important categories. */
     _keyEvents: Array<TraceEvent>;

package/types/config.d.ts

@@ -20,30 +20,14 @@ interface ClassOf<T> {
 interface Config {
   extends?: 'lighthouse:default' | string;
   settings?: SharedFlagsSettings;
+  artifacts?: Config.ArtifactJson[] | null;
   audits?: Config.AuditJson[] | null;
   categories?: Record<string, Config.CategoryJson> | null;
   groups?: Record<string, Config.GroupJson> | null;
   plugins?: Array<string>;
-
-  // Fraggle Rock Only
-  artifacts?: Config.ArtifactJson[] | null;
-
-  // Legacy Only
-  passes?: Config.PassJson[] | null;
 }
 
 declare module Config {
-  /**
-   * The normalized and fully resolved legacy config.
-   */
-  interface LegacyResolvedConfig {
-    settings: Settings;
-    passes: Pass[] | null;
-    audits: AuditDefn[] | null;
-    categories: Record<string, Category> | null;
-    groups: Record<string, Group> | null;
-  }
-
   /**
    * The normalized and fully resolved config.
    */
@@ -78,17 +62,6 @@ declare module Config {
     blankPage?: string;
   }
 
-  interface PassJson extends SharedPassNavigationJson {
-    /** The identifier for the pass. Config extension will deduplicate passes with the same passName. */
-    passName: string;
-    /** Whether a trace and devtoolsLog should be recorded for the pass. */
-    recordTrace?: boolean;
-    /** Whether throttling settings should be used for the pass. */
-    useThrottling?: boolean;
-    /** The array of gatherers to run during the pass. */
-    gatherers?: GathererJson[];
-  }
-
   interface NavigationJson extends SharedPassNavigationJson {
     /** The identifier for the navigation. Config extension will deduplicate navigations with the same id. */
     id: string;
@@ -102,22 +75,17 @@ declare module Config {
 
   interface ArtifactJson {
     id: string;
-    gatherer: FRGathererJson;
+    gatherer: GathererJson;
   }
 
   type GathererJson = {
     path: string;
-    options?: {};
   } | {
     implementation: ClassOf<Gatherer.GathererInstance>;
-    options?: {};
   } | {
     instance: Gatherer.GathererInstance;
-    options?: {};
   } | Gatherer.GathererInstance | ClassOf<Gatherer.GathererInstance> | string;
 
-  type FRGathererJson = string | {instance: Gatherer.FRGathererInstance}
-
   interface CategoryJson {
     title: string | IcuMessage;
     auditRefs: AuditRefJson[];
@@ -153,17 +121,13 @@ declare module Config {
 
   type Settings = ConfigSettings;
 
-  interface Pass extends Required<PassJson> {
-    gatherers: GathererDefn[];
-  }
-
   interface NavigationDefn extends Omit<Required<NavigationJson>, 'artifacts'> {
     artifacts: AnyArtifactDefn[];
   }
 
   interface ArtifactDefn<TDependencies extends Gatherer.DependencyKey = Gatherer.DependencyKey> {
     id: string;
-    gatherer: FRGathererDefn<TDependencies>;
+    gatherer: GathererDefn<TDependencies>;
     dependencies?: TDependencies extends Gatherer.DefaultDependenciesKey ?
       undefined :
       Record<Exclude<TDependencies, Gatherer.DefaultDependenciesKey>, {id: string}>;
@@ -176,24 +140,18 @@ declare module Config {
       ArtifactDefn<TDependencies>
   type AnyArtifactDefn = ArtifactDefnExpander<Gatherer.DefaultDependenciesKey>|ArtifactDefnExpander<Gatherer.DependencyKey>
 
-  interface FRGathererDefn<TDependencies extends Gatherer.DependencyKey = Gatherer.DependencyKey> {
-    implementation?: ClassOf<Gatherer.FRGathererInstance<TDependencies>>;
-    instance: Gatherer.FRGathererInstance<TDependencies>;
+  interface GathererDefn<TDependencies extends Gatherer.DependencyKey = Gatherer.DependencyKey> {
+    implementation?: ClassOf<Gatherer.GathererInstance<TDependencies>>;
+    instance: Gatherer.GathererInstance<TDependencies>;
     path?: string;
   }
 
-  type FRGathererDefnExpander<TDependencies extends Gatherer.DependencyKey> =
+  type GathererDefnExpander<TDependencies extends Gatherer.DependencyKey> =
     // Lack of brackets intentional here to convert to the union of all individual dependencies.
     TDependencies extends Gatherer.DefaultDependenciesKey ?
-      FRGathererDefn<Gatherer.DefaultDependenciesKey> :
-      FRGathererDefn<TDependencies>
-  type AnyFRGathererDefn = FRGathererDefnExpander<Gatherer.DefaultDependenciesKey>|FRGathererDefnExpander<Gatherer.DependencyKey>
-
-  interface GathererDefn {
-    implementation?: ClassOf<Gatherer.GathererInstance>;
-    instance: Gatherer.GathererInstance;
-    path?: string;
-  }
+      GathererDefn<Gatherer.DefaultDependenciesKey> :
+      GathererDefn<TDependencies>
+  type AnyGathererDefn = GathererDefnExpander<Gatherer.DefaultDependenciesKey>|GathererDefnExpander<Gatherer.DependencyKey>
 
   interface AuditDefn {
     implementation: typeof Audit;

package/types/externs.d.ts

@@ -53,8 +53,6 @@ export interface CliFlags extends Flags {
   verbose: boolean;
   /** A flag to enable logLevel 'silent'. */
   quiet: boolean;
-  /** Use the legacy navigation runner to gather CLI results. */
-  legacyNavigation: boolean;
   /** Path to the file where precomputed lantern data should be read from. */
   precomputedLanternDataPath?: string;
   /** Path to the file where precomputed lantern data should be written to. */

package/types/gatherer.d.ts

@@ -10,14 +10,12 @@ import {ProtocolMapping as CrdpMappings} from 'devtools-protocol/types/protocol-
 import {NetworkNode as _NetworkNode} from '../core/lib/dependency-graph/network-node.js';
 import {CPUNode as _CPUNode} from '../core/lib/dependency-graph/cpu-node.js';
 import {Simulator as _Simulator} from '../core/lib/dependency-graph/simulator/simulator.js';
-import {Driver} from '../core/legacy/gather/driver.js';
 import {ExecutionContext} from '../core/gather/driver/execution-context.js';
 import {Fetcher} from '../core/gather/fetcher.js';
 import {ArbitraryEqualityMap} from '../core/lib/arbitrary-equality-map.js';
 
-import {Artifacts, BaseArtifacts, FRBaseArtifacts, GathererArtifacts, DevtoolsLog, Trace} from './artifacts.js';
+import {Artifacts, BaseArtifacts, GathererArtifacts, DevtoolsLog, Trace} from './artifacts.js';
 import Config from './config.js';
-import {IcuMessage} from './lhr/i18n.js';
 import Result from './lhr/lhr.js';
 import Protocol from './protocol.js';
 import Puppeteer from './puppeteer.js';
@@ -27,7 +25,7 @@ type CrdpCommands = CrdpMappings.Commands;
 
 declare module Gatherer {
   /** The Lighthouse wrapper around a raw CDP session. */
-  interface FRProtocolSession {
+  interface ProtocolSession {
     setTargetInfo(targetInfo: Crdp.Target.TargetInfo): void;
     hasNextProtocolTimeout(): boolean;
     getNextProtocolTimeout(): number;
@@ -39,30 +37,28 @@ declare module Gatherer {
     dispose(): Promise<void>;
   }
 
-  /** The limited driver interface shared between pre and post Fraggle Rock Lighthouse. */
-  interface FRTransitionalDriver {
-    defaultSession: FRProtocolSession;
+  interface Driver {
+    defaultSession: ProtocolSession;
     executionContext: ExecutionContext;
     fetcher: Fetcher;
     url: () => Promise<string>;
     targetManager: {
-      rootSession(): FRProtocolSession;
+      rootSession(): ProtocolSession;
       mainFrameExecutionContexts(): Array<Crdp.Runtime.ExecutionContextDescription>;
       on(event: 'protocolevent', callback: (payload: Protocol.RawEventMessage) => void): void
       off(event: 'protocolevent', callback: (payload: Protocol.RawEventMessage) => void): void
     };
   }
 
-  /** The limited context interface shared between pre and post Fraggle Rock Lighthouse. */
-  interface FRTransitionalContext<TDependencies extends DependencyKey = DefaultDependenciesKey> {
+  interface Context<TDependencies extends DependencyKey = DefaultDependenciesKey> {
     /** The gather mode Lighthouse is currently in. */
     gatherMode: GatherMode;
     /** The connection to the page being analyzed. */
-    driver: FRTransitionalDriver;
+    driver: Driver;
     /** The Puppeteer page handle. Will be undefined in legacy navigation mode. */
     page?: Puppeteer.Page;
     /** The set of base artifacts that are always collected. */
-    baseArtifacts: FRBaseArtifacts;
+    baseArtifacts: BaseArtifacts;
     /** The cached results of computed artifacts. */
     computedCache: Map<string, ArbitraryEqualityMap>;
     /** The set of available dependencies requested by the current gatherer. */
@@ -71,7 +67,7 @@ declare module Gatherer {
     settings: Config.Settings;
   }
 
-  interface FRGatherResult {
+  interface GatherResult {
     artifacts: Artifacts;
     runnerOptions: {
       resolvedConfig: Config.ResolvedConfig;
@@ -79,19 +75,6 @@ declare module Gatherer {
     }
   }
 
-  interface PassContext {
-    gatherMode: 'navigation';
-    /** The url of the currently loaded page. If the main document redirects, this will be updated to keep track. */
-    url: string;
-    driver: Driver;
-    passConfig: Config.Pass
-    settings: Config.Settings;
-    computedCache: Map<string, ArbitraryEqualityMap>
-    /** Gatherers can push to this array to add top-level warnings to the LHR. */
-    LighthouseRunWarnings: Array<string | IcuMessage>;
-    baseArtifacts: BaseArtifacts;
-  }
-
   interface LoadData {
     networkRecords: Array<Artifacts.NetworkRequest>;
     devtoolsLog: DevtoolsLog;
@@ -129,31 +112,23 @@ declare module Gatherer {
       GathererMetaNoDependencies :
       GathererMetaWithDependencies<Exclude<TDependencies, DefaultDependenciesKey>>;
 
-  interface GathererInstance {
-    name: keyof GathererArtifacts;
-    beforePass(context: Gatherer.PassContext): PhaseResult;
-    pass(context: Gatherer.PassContext): PhaseResult;
-    afterPass(context: Gatherer.PassContext, loadData: Gatherer.LoadData): PhaseResult;
-  }
-
-  type FRGatherPhase = keyof Omit<Gatherer.FRGathererInstance, 'name'|'meta'>
+  type GatherPhase = keyof Omit<Gatherer.GathererInstance, 'name'|'meta'>
 
-  interface FRGathererInstance<TDependencies extends DependencyKey = DefaultDependenciesKey> {
-    name: keyof GathererArtifacts; // temporary COMPAT measure until artifact config support is available
+  interface GathererInstance<TDependencies extends DependencyKey = DefaultDependenciesKey> {
     meta: GathererMeta<TDependencies>;
-    startInstrumentation(context: FRTransitionalContext<DefaultDependenciesKey>): Promise<void>|void;
-    startSensitiveInstrumentation(context: FRTransitionalContext<DefaultDependenciesKey>): Promise<void>|void;
-    stopSensitiveInstrumentation(context: FRTransitionalContext<DefaultDependenciesKey>): Promise<void>|void;
-    stopInstrumentation(context: FRTransitionalContext<DefaultDependenciesKey>): Promise<void>|void;
-    getArtifact(context: FRTransitionalContext<TDependencies>): PhaseResult;
+    startInstrumentation(context: Context<DefaultDependenciesKey>): Promise<void>|void;
+    startSensitiveInstrumentation(context: Context<DefaultDependenciesKey>): Promise<void>|void;
+    stopSensitiveInstrumentation(context: Context<DefaultDependenciesKey>): Promise<void>|void;
+    stopInstrumentation(context: Context<DefaultDependenciesKey>): Promise<void>|void;
+    getArtifact(context: Context<TDependencies>): PhaseResult;
   }
 
-  type FRGathererInstanceExpander<TDependencies extends Gatherer.DependencyKey> =
+  type GathererInstanceExpander<TDependencies extends Gatherer.DependencyKey> =
     // Lack of brackets intentional here to convert to the union of all individual dependencies.
     TDependencies extends Gatherer.DefaultDependenciesKey ?
-      FRGathererInstance<Gatherer.DefaultDependenciesKey> :
-      FRGathererInstance<Exclude<TDependencies, DefaultDependenciesKey>>
-  type AnyFRGathererInstance = FRGathererInstanceExpander<Gatherer.DependencyKey>
+      GathererInstance<Gatherer.DefaultDependenciesKey> :
+      GathererInstance<Exclude<TDependencies, DefaultDependenciesKey>>
+  type AnyGathererInstance = GathererInstanceExpander<Gatherer.DependencyKey>
 
   namespace Simulation {
     type GraphNode = import('../core/lib/dependency-graph/base-node.js').Node;

package/types/lh.d.ts

@@ -35,8 +35,6 @@ export import Puppeteer = Puppeteer_;
 // artifacts.d.ts
 export import Artifacts = Artifacts_.Artifacts;
 export import BaseArtifacts = Artifacts_.BaseArtifacts;
-export import FRArtifacts = Artifacts_.FRArtifacts;
-export import FRBaseArtifacts = Artifacts_.FRBaseArtifacts;
 export import GathererArtifacts = Artifacts_.GathererArtifacts;
 export import DevtoolsLog = Artifacts_.DevtoolsLog;
 export import Trace = Artifacts_.Trace;