lighthouse 9.6.7 → 10.0.0

package/tsconfig.json

@@ -1,9 +1,6 @@
 {
   "extends": "./tsconfig-base.json",
   "compilerOptions": {
-    "outDir": ".tmp/tsbuildinfo/",
-
-    // TODO(esmodules): included to support require('file.json'). Remove on the switch to ES Modules.
     "resolveJsonModule": true,
   },
   "references": [
@@ -11,108 +8,105 @@
     {"path": "./report/"},
     {"path": "./report/generator/"},
     {"path": "./shared/"},
+    {"path": "./treemap/"},
   ],
   "include": [
     "root.js",
-    "lighthouse-cli/**/*.js",
-    "lighthouse-core/**/*.js",
+    "esm-utils.js",
+    "cli/**/*.js",
+    "core/**/*.js",
+    "core/index.cjs",
     "clients/**/*.js",
     "build/**/*.js",
     "./types/**/*.d.ts",
-    "eslint-local-rules.js",
+    "eslint-local-rules.cjs",
     "third-party/axe/valid-langs.js",
 
-    // TODO(esmodules): JSON files included via resolveJsonModule. Removable on the switch to ES Modules.
-    "package.json",
-    "lighthouse-core/test/results/sample_v2.json",
-    "lighthouse-core/lib/sd-validation/assets/*.json",
-    "lighthouse-core/test/fixtures/unresolved-perflog.json",
-    "lighthouse-core/test/fixtures/traces/lcp-m78.devtools.log.json",
-    "third-party/snyk/snapshot.json",
-    "lighthouse-core/audits/byte-efficiency/polyfill-graph-data.json",
+    "core/test/results/sample_v2.json",
+    "core/test/fixtures/unresolved-perflog.json",
+    "core/test/fixtures/traces/lcp-m78.devtools.log.json",
+    "core/audits/byte-efficiency/polyfill-graph-data.json",
     "shared/localization/locales/en-US.json",
   ],
   "exclude": [
-    "lighthouse-core/test/audits/**/*.js",
-    "lighthouse-core/test/fixtures/**/*.js",
-    "lighthouse-core/test/computed/**/*.js",
+    "core/test/audits/**/*.js",
+    "core/test/fixtures/**/*.js",
+    "core/test/computed/**/*.js",
     "clients/test/**/*.js",
-    "lighthouse-cli/test/fixtures/**/*.js",
-    "lighthouse-core/scripts/legacy-javascript/variants",
-    "lighthouse-core/test/chromium-web-tests/webtests",
+    "cli/test/fixtures/**/*.js",
+    "core/scripts/legacy-javascript/variants",
     // These test files require further changes before they can be type checked.
-    "lighthouse-core/test/config/budget-test.js",
-    "lighthouse-core/test/config/config-helpers-test.js",
-    "lighthouse-core/test/config/config-plugin-test.js",
-    "lighthouse-core/test/config/config-test.js",
-    "lighthouse-core/test/config/default-config-test.js",
-    "lighthouse-core/test/create-test-trace.js",
-    "lighthouse-core/test/gather/devtools-log-test.js",
-    "lighthouse-core/test/gather/driver/wait-for-condition-test.js",
-    "lighthouse-core/test/gather/gatherers/accessibility-test.js",
-    "lighthouse-core/test/gather/gatherers/cache-contents-test.js",
-    "lighthouse-core/test/gather/gatherers/console-messages-test.js",
-    "lighthouse-core/test/gather/gatherers/dobetterweb/optimized-images-test.js",
-    "lighthouse-core/test/gather/gatherers/dobetterweb/password-inputs-with-prevented-paste-test.js",
-    "lighthouse-core/test/gather/gatherers/dobetterweb/response-compression-test.js",
-    "lighthouse-core/test/gather/gatherers/dobetterweb/tags-blocking-first-paint-test.js",
-    "lighthouse-core/test/gather/gatherers/full-page-screenshot-test.js",
-    "lighthouse-core/test/gather/gatherers/global-listeners-test.js",
-    "lighthouse-core/test/gather/gatherers/html-without-javascript-test.js",
-    "lighthouse-core/test/gather/gatherers/js-usage-test.js",
-    "lighthouse-core/test/gather/gatherers/link-elements-test.js",
-    "lighthouse-core/test/gather/gatherers/offline-test.js",
-    "lighthouse-core/test/gather/gatherers/runtime-exceptions-test.js",
-    "lighthouse-core/test/gather/gatherers/seo/font-size-test.js",
-    "lighthouse-core/test/gather/gatherers/service-worker-test.js",
-    "lighthouse-core/test/gather/gatherers/source-maps-test.js",
-    "lighthouse-core/test/gather/gatherers/stack-collector-test.js",
-    "lighthouse-core/test/gather/gatherers/start-url-test.js",
-    "lighthouse-core/test/gather/gatherers/trace-elements-test.js",
-    "lighthouse-core/test/gather/gatherers/viewport-dimensions-test.js",
-    "lighthouse-core/test/index-test.js",
-    "lighthouse-core/test/lib/arbitrary-equality-map-test.js",
-    "lighthouse-core/test/lib/asset-saver-test.js",
-    "lighthouse-core/test/lib/dependency-graph/base-node-test.js",
-    "lighthouse-core/test/lib/dependency-graph/simulator/connection-pool-test.js",
-    "lighthouse-core/test/lib/dependency-graph/simulator/dns-cache-test.js",
-    "lighthouse-core/test/lib/dependency-graph/simulator/network-analyzer-test.js",
-    "lighthouse-core/test/lib/dependency-graph/simulator/simulator-test.js",
-    "lighthouse-core/test/lib/emulation-test.js",
-    "lighthouse-core/test/lib/i18n/i18n-test.js",
-    "lighthouse-core/test/lib/icons-test.js",
-    "lighthouse-core/test/lib/lh-element-test.js",
-    "lighthouse-core/test/lib/manifest-parser-test.js",
-    "lighthouse-core/test/lib/median-run-test.js",
-    "lighthouse-core/test/lib/minification-estimator-test.js",
-    "lighthouse-core/test/lib/minify-devtoolslog-test.js",
-    "lighthouse-core/test/lib/minify-trace-test.js",
-    "lighthouse-core/test/lib/network-recorder-test.js",
-    "lighthouse-core/test/lib/network-request-test.js",
-    "lighthouse-core/test/lib/page-functions-test.js",
-    "lighthouse-core/test/lib/proto-preprocessor-test.js",
-    "lighthouse-core/test/lib/rect-helpers-test.js",
-    "lighthouse-core/test/lib/sd-validation-test.js",
-    "lighthouse-core/test/lib/sentry-test.js",
-    "lighthouse-core/test/lib/stack-packs-test.js",
-    "lighthouse-core/test/lib/statistics-test.js",
-    "lighthouse-core/test/lib/timing-trace-saver-test.js",
-    "lighthouse-core/test/lib/tracehouse/cpu-profile-model-test.js",
-    "lighthouse-core/test/lib/tracehouse/main-thread-tasks-test.js",
-    "lighthouse-core/test/lib/tracehouse/task-summary-test.js",
-    "lighthouse-core/test/lib/tracehouse/trace-processor-test.js",
-    "lighthouse-core/test/lib/traces/pwmetrics-events-test.js",
-    "lighthouse-core/test/lib/url-shim-test.js",
-    "lighthouse-core/test/network-records-to-devtools-log-test.js",
-    "lighthouse-core/test/runner-test.js",
-    "lighthouse-core/test/scoring-test.js",
-    "lighthouse-core/test/scripts/i18n/bake-ctc-to-lhl-test.js",
-    "lighthouse-core/test/scripts/i18n/collect-strings-test.js",
+    "core/test/config/budget-test.js",
+    "core/test/config/config-helpers-test.js",
+    "core/test/config/config-plugin-test.js",
+    "core/test/legacy/config/config-test.js",
+    "core/test/config/default-config-test.js",
+    "core/test/create-test-trace.js",
+    "core/test/gather/driver/wait-for-condition-test.js",
+    "core/test/gather/gatherers/accessibility-test.js",
+    "core/test/gather/gatherers/cache-contents-test.js",
+    "core/test/gather/gatherers/console-messages-test.js",
+    "core/test/gather/gatherers/devtools-log-test.js",
+    "core/test/gather/gatherers/dobetterweb/optimized-images-test.js",
+    "core/test/gather/gatherers/dobetterweb/response-compression-test.js",
+    "core/test/gather/gatherers/dobetterweb/tags-blocking-first-paint-test.js",
+    "core/test/gather/gatherers/full-page-screenshot-test.js",
+    "core/test/gather/gatherers/global-listeners-test.js",
+    "core/test/gather/gatherers/html-without-javascript-test.js",
+    "core/test/gather/gatherers/js-usage-test.js",
+    "core/test/gather/gatherers/link-elements-test.js",
+    "core/test/gather/gatherers/offline-test.js",
+    "core/test/gather/gatherers/runtime-exceptions-test.js",
+    "core/test/gather/gatherers/seo/font-size-test.js",
+    "core/test/gather/gatherers/service-worker-test.js",
+    "core/test/gather/gatherers/source-maps-test.js",
+    "core/test/gather/gatherers/stack-collector-test.js",
+    "core/test/gather/gatherers/start-url-test.js",
+    "core/test/gather/gatherers/trace-elements-test.js",
+    "core/test/gather/gatherers/viewport-dimensions-test.js",
+    "core/test/index-test.js",
+    "core/test/lib/arbitrary-equality-map-test.js",
+    "core/test/lib/asset-saver-test.js",
+    "core/test/lib/dependency-graph/base-node-test.js",
+    "core/test/lib/dependency-graph/simulator/connection-pool-test.js",
+    "core/test/lib/dependency-graph/simulator/dns-cache-test.js",
+    "core/test/lib/dependency-graph/simulator/network-analyzer-test.js",
+    "core/test/lib/dependency-graph/simulator/simulator-test.js",
+    "core/test/lib/emulation-test.js",
+    "core/test/lib/i18n/i18n-test.js",
+    "core/test/lib/icons-test.js",
+    "core/test/lib/lh-element-test.js",
+    "core/test/lib/lighthouse-compatibility-test.js",
+    "core/test/lib/manifest-parser-test.js",
+    "core/test/lib/median-run-test.js",
+    "core/test/lib/minification-estimator-test.js",
+    "core/test/lib/minify-devtoolslog-test.js",
+    "core/test/lib/network-recorder-test.js",
+    "core/test/lib/network-request-test.js",
+    "core/test/lib/page-functions-test.js",
+    "core/test/lib/proto-preprocessor-test.js",
+    "core/test/lib/rect-helpers-test.js",
+    "core/test/lib/sentry-test.js",
+    "core/test/lib/stack-packs-test.js",
+    "core/test/lib/statistics-test.js",
+    "core/test/lib/timing-trace-saver-test.js",
+    "core/test/lib/tracehouse/cpu-profile-model-test.js",
+    "core/test/lib/tracehouse/main-thread-tasks-test.js",
+    "core/test/lib/tracehouse/task-summary-test.js",
+    "core/test/lib/tracehouse/trace-processor-test.js",
+    "core/test/lib/traces/metrics-trace-events-test.js",
+    "core/test/lib/url-utils-test.js",
+    "core/test/network-records-to-devtools-log-test.js",
+    "core/test/runner-test.js",
+    "core/test/scoring-test.js",
+    "core/test/scripts/i18n/bake-ctc-to-lhl-test.js",
   ],
   "files": [
     // Opt-in to typechecking for some core tests and test-support files.
-    "lighthouse-core/test/audits/script-treemap-data-test.js",
-    "lighthouse-cli/test/fixtures/static-server.js",
-    "lighthouse-core/test/fixtures/config-plugins/lighthouse-plugin-simple/plugin-simple.js",
+    "cli/test/fixtures/static-server.js",
+    "core/test/audits/bf-cache-test.js",
+    "core/test/audits/script-treemap-data-test.js",
+    "core/test/computed/metrics/interactive-test.js",
+    "core/test/fixtures/config-plugins/lighthouse-plugin-simple/plugin-simple.js",
   ],
 }

package/types/artifacts.d.ts

@@ -4,26 +4,29 @@
  * 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 parseManifest = require('../lighthouse-core/lib/manifest-parser.js');
-import LanternSimulator = require('../lighthouse-core/lib/dependency-graph/simulator/simulator.js');
-import LighthouseError = require('../lighthouse-core/lib/lh-error.js');
-import _NetworkRequest = require('../lighthouse-core/lib/network-request.js');
-import speedline = require('speedline-core');
-import TextSourceMap = require('../lighthouse-core/lib/cdt/generated/SourceMap.js');
-import ArbitraryEqualityMap = require('../lighthouse-core/lib/arbitrary-equality-map.js');
-
-type _TaskNode = import('../lighthouse-core/lib/tracehouse/main-thread-tasks.js').TaskNode;
-
-import AuditDetails from './lhr/audit-details'
-import Config from './config';
-import Gatherer from './gatherer';
-import {IcuMessage} from './lhr/i18n';
-import LHResult from './lhr/lhr'
-import Protocol from './protocol';
+import {Protocol as Crdp} from 'devtools-protocol/types/protocol.js';
+
+import {parseManifest} from '../core/lib/manifest-parser.js';
+import {Simulator} from '../core/lib/dependency-graph/simulator/simulator.js';
+import {LighthouseError} from '../core/lib/lh-error.js';
+import {NetworkRequest as _NetworkRequest} from '../core/lib/network-request.js';
+import speedline from 'speedline-core';
+import TextSourceMap from '../core/lib/cdt/generated/SourceMap.js';
+import {ArbitraryEqualityMap} from '../core/lib/arbitrary-equality-map.js';
+import type { TaskNode as _TaskNode } from '../core/lib/tracehouse/main-thread-tasks.js';
+import AuditDetails from './lhr/audit-details.js'
+import Config from './config.js';
+import Gatherer from './gatherer.js';
+import {IEntity} from 'third-party-web';
+import {IcuMessage} from './lhr/i18n.js';
+import LHResult from './lhr/lhr.js'
+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 = StrictOmit<Artifacts,
+export type FRArtifacts = Util.StrictOmit<Artifacts,
   | 'Fonts'
   | 'Manifest'
   | 'MixedContent'
@@ -49,6 +52,8 @@ interface UniversalBaseArtifacts {
   LighthouseRunWarnings: Array<string | IcuMessage>;
   /** The benchmark index that indicates rough device class. */
   BenchmarkIndex: number;
+  /** Many benchmark indexes. Many. */
+  BenchmarkIndexes?: number[];
   /** An object containing information about the testing configuration used by Lighthouse. */
   settings: Config.Settings;
   /** The timing instrumentation of the gather portion of a run. */
@@ -66,7 +71,7 @@ interface UniversalBaseArtifacts {
  */
 interface ContextualBaseArtifacts {
   /** The URL initially requested and the post-redirects URL that was actually loaded. */
-  URL: {requestedUrl: string, finalUrl: string};
+  URL: Artifacts.URL;
   /** If loading the page failed, value is the error that caused it. Otherwise null. */
   PageLoadError: LighthouseError | null;
 }
@@ -77,12 +82,6 @@ interface ContextualBaseArtifacts {
 interface LegacyBaseArtifacts {
   /** The user agent string that Lighthouse used to load the page. Set to the empty string if unknown. */
   NetworkUserAgent: string;
-  /** Information on detected tech stacks (e.g. JS libraries) used by the page. */
-  Stacks: Artifacts.DetectedStack[];
-  /** Parsed version of the page's Web App Manifest, or null if none found. This moved to a regular artifact in Fraggle Rock. */
-  WebAppManifest: Artifacts.Manifest | null;
-  /** Errors preventing page being installable as PWA. This moved to a regular artifact in Fraggle Rock. */
-  InstallabilityErrors: Artifacts.InstallabilityErrors;
   /** A set of page-load traces, keyed by passName. */
   traces: {[passName: string]: Trace};
   /** A set of DevTools debugger protocol records, keyed by passName. */
@@ -122,10 +121,12 @@ export interface GathererArtifacts extends PublicGathererArtifacts,LegacyBaseArt
   Accessibility: Artifacts.Accessibility;
   /** Array of all anchors on the page. */
   AnchorElements: Artifacts.AnchorElement[];
+  /** Errors when attempting to use the back/forward cache. */
+  BFCacheFailures: Artifacts.BFCacheFailure[];
   /** Array of all URLs cached in CacheStorage. */
   CacheContents: string[];
   /** CSS coverage information for styles used by page's final state. */
-  CSSUsage: {rules: LH.Crdp.CSS.RuleUsage[], stylesheets: Artifacts.CSSStyleSheetInfo[]};
+  CSSUsage: {rules: Crdp.CSS.RuleUsage[], stylesheets: Artifacts.CSSStyleSheetInfo[]};
   /** The primary log of devtools protocol activity. Used in Fraggle Rock gathering. */
   DevtoolsLog: DevtoolsLog;
   /** Information on the document's doctype(or null if not present), specifically the name, publicId, and systemId.
@@ -142,29 +143,34 @@ export interface GathererArtifacts extends PublicGathererArtifacts,LegacyBaseArt
   /** All the input elements, including associated form and label elements. */
   Inputs: {inputs: Artifacts.InputElement[]; forms: Artifacts.FormElement[]; labels: Artifacts.LabelElement[]};
   /** Screenshot of the entire page (rather than just the above the fold content). */
-  FullPageScreenshot: Artifacts.FullPageScreenshot | null;
+  FullPageScreenshot: LHResult.FullPageScreenshot | null;
   /** Information about event listeners registered on the global object. */
   GlobalListeners: Array<Artifacts.GlobalListener>;
   /** The issues surfaced in the devtools Issues panel */
   InspectorIssues: Artifacts.InspectorIssues;
-  /** JS coverage information for code used during page load. Keyed by network URL. */
-  JsUsage: Record<string, Array<Omit<LH.Crdp.Profiler.ScriptCoverage, 'url'>>>;
+  /** Errors preventing page being installable as PWA. */
+  InstallabilityErrors: Artifacts.InstallabilityErrors;
+  /** JS coverage information for code used during audit. Keyed by script id. */
+  // 'url' is excluded because it can be overriden 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};
   /** Size and compression opportunity information for all the images in the page. */
   OptimizedImages: Array<Artifacts.OptimizedImage | Artifacts.OptimizedImageError>;
-  /** HTML snippets and node paths from any password inputs that prevent pasting. */
-  PasswordInputsWithPreventedPaste: Artifacts.PasswordInputsWithPreventedPaste[];
   /** Size info of all network records sent without compression and their size after gzipping. */
   ResponseCompression: {requestId: string, url: string, mimeType: string, transferSize: number, resourceSize: number, gzipSize?: number}[];
   /** Information on fetching and the content of the /robots.txt file. */
   RobotsTxt: {status: number|null, content: string|null, errorMessage?: string};
+  /** Information on all scripts in the page. */
+  Scripts: Artifacts.Script[];
   /** Version information for all ServiceWorkers active after the first page load. */
-  ServiceWorker: {versions: LH.Crdp.ServiceWorker.ServiceWorkerVersion[], registrations: LH.Crdp.ServiceWorker.ServiceWorkerRegistration[]};
+  ServiceWorker: {versions: Crdp.ServiceWorker.ServiceWorkerVersion[], registrations: Crdp.ServiceWorker.ServiceWorkerRegistration[]};
   /** Source maps of scripts executed in the page. */
   SourceMaps: Array<Artifacts.SourceMap>;
+  /** Information on detected tech stacks (e.g. JS libraries) used by the page. */
+  Stacks: Artifacts.DetectedStack[];
   /** Information on <script> and <link> tags blocking first paint. */
   TagsBlockingFirstPaint: Artifacts.TagBlockingFirstPaint[];
   /** Information about tap targets including their position and size. */
@@ -173,10 +179,12 @@ export interface GathererArtifacts extends PublicGathererArtifacts,LegacyBaseArt
   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;
 }
 
 declare module Artifacts {
-  type ComputedContext = Immutable<{
+  type ComputedContext = Util.Immutable<{
     computedCache: Map<string, ArbitraryEqualityMap>;
   }>;
 
@@ -184,6 +192,21 @@ declare module Artifacts {
   type TaskNode = _TaskNode;
   type MetaElement = Artifacts['MetaElements'][0];
 
+  interface URL {
+    /**
+     * URL of the initially requested URL during a Lighthouse navigation.
+     * Will be `undefined` in timespan/snapshot.
+     */
+    requestedUrl?: string;
+    /**
+     * URL of the last document request during a Lighthouse navigation.
+     * Will be `undefined` in timespan/snapshot.
+     */
+    mainDocumentUrl?: string;
+    /** URL displayed on the page after Lighthouse finishes. */
+    finalDisplayedUrl: string;
+  }
+
   interface NodeDetails {
     lhId: string,
     devtoolsNodePath: string,
@@ -214,12 +237,13 @@ declare module Artifacts {
   interface Accessibility {
     violations: Array<AxeRuleResult>;
     notApplicable: Array<Pick<AxeRuleResult, 'id'>>;
+    passes: Array<Pick<AxeRuleResult, 'id'>>;
     incomplete: Array<AxeRuleResult>;
     version: string;
   }
 
   interface CSSStyleSheetInfo {
-    header: LH.Crdp.CSS.CSSStyleSheetHeader;
+    header: Crdp.CSS.CSSStyleSheetHeader;
     content: string;
   }
 
@@ -227,6 +251,7 @@ declare module Artifacts {
     name: string;
     publicId: string;
     systemId: string;
+    documentCompatMode: string;
   }
 
   interface DOMStats {
@@ -285,7 +310,15 @@ declare module Artifacts {
     node: NodeDetails | null
   }
 
-  interface PasswordInputsWithPreventedPaste {node: NodeDetails}
+  interface Script extends Omit<Crdp.Debugger.ScriptParsedEvent, 'url'|'embedderName'> {
+    /**
+     * Set by a sourceURL= magic comment if present, otherwise this is the same as the URL.
+     * Use this field for presentational purposes only.
+     */
+    name: string;
+    url: string;
+    content?: string;
+  }
 
   interface ScriptElement {
     type: string | null
@@ -298,10 +331,6 @@ declare module Artifacts {
     node: NodeDetails | null
     /** Where the script was discovered, either in the head, the body, or network records. */
     source: 'head'|'body'|'network'
-    /** The content of the inline script or the network record with the matching URL, null if the script had a src and no network record could be found. */
-    content: string | null
-    /** The ID of the network request that matched the URL of the src or the main document if inline, null if no request could be found. */
-    requestId: string | null
   }
 
   /** @see https://sourcemaps.info/spec.html#h.qz3o9nc69um5 */
@@ -333,6 +362,8 @@ declare module Artifacts {
    * parsing the map, errorMessage will be defined instead of map.
    */
   type SourceMap = {
+    /** The DevTools protocol script identifier. */
+    scriptId: string;
     /** URL of code that source map applies to. */
     scriptUrl: string
     /** URL of the source map. undefined if from data URL. */
@@ -340,6 +371,8 @@ declare module Artifacts {
     /** Source map data structure. */
     map: RawSourceMap
   } | {
+    /** The DevTools protocol script identifier. */
+    scriptId: string;
     /** URL of code that source map applies to. */
     scriptUrl: string
     /** URL of the source map. undefined if from data URL. */
@@ -352,7 +385,7 @@ declare module Artifacts {
 
   interface Bundle {
     rawMap: RawSourceMap;
-    script: ScriptElement;
+    script: Artifacts.Script;
     map: TextSourceMap;
     sizes: {
       // TODO(cjamcl): Rename to `sources`.
@@ -376,10 +409,20 @@ declare module Artifacts {
     node: NodeDetails
     onclick: string
     listeners?: Array<{
-      type: LH.Crdp.DOMDebugger.EventListener['type']
+      type: Crdp.DOMDebugger.EventListener['type']
     }>
   }
 
+  type BFCacheReasonMap = {
+    [key in Crdp.Page.BackForwardCacheNotRestoredReason]?: string[];
+  };
+
+  type BFCacheNotRestoredReasonsTree = Record<Crdp.Page.BackForwardCacheNotRestoredReasonType, BFCacheReasonMap>;
+
+  interface BFCacheFailure {
+    notRestoredReasonsTree: BFCacheNotRestoredReasonsTree;
+  }
+
   interface Font {
     display: string;
     family: string;
@@ -415,10 +458,10 @@ declare module Artifacts {
       cssRule?: {
         type: 'Regular' | 'Inline' | 'Attributes';
         range?: {startLine: number, startColumn: number};
-        parentRule?: {origin: LH.Crdp.CSS.StyleSheetOrigin, selectors: {text: string}[]};
+        parentRule?: {origin: Crdp.CSS.StyleSheetOrigin, selectors: {text: string}[]};
         styleSheetId?: string;
-        stylesheet?: LH.Crdp.CSS.CSSStyleSheetHeader;
-        cssProperties?: Array<LH.Crdp.CSS.CSSProperty>;
+        stylesheet?: Crdp.CSS.CSSStyleSheetHeader;
+        cssProperties?: Array<Crdp.CSS.CSSProperty>;
       }
     }>
   }
@@ -427,7 +470,7 @@ declare module Artifacts {
   type Manifest = ReturnType<typeof parseManifest>;
 
   interface InstallabilityErrors {
-    errors: LH.Crdp.Page.InstallabilityError[];
+    errors: Crdp.Page.InstallabilityError[];
   }
 
   interface ImageElement {
@@ -554,22 +597,22 @@ declare module Artifacts {
   }
 
   interface InspectorIssues {
-    attributionReportingIssue: LH.Crdp.Audits.AttributionReportingIssueDetails[];
-    blockedByResponseIssue: LH.Crdp.Audits.BlockedByResponseIssueDetails[];
-    clientHintIssue: LH.Crdp.Audits.ClientHintIssueDetails[];
-    contentSecurityPolicyIssue: LH.Crdp.Audits.ContentSecurityPolicyIssueDetails[];
-    corsIssue: LH.Crdp.Audits.CorsIssueDetails[];
-    deprecationIssue: LH.Crdp.Audits.DeprecationIssueDetails[];
-    federatedAuthRequestIssue: LH.Crdp.Audits.FederatedAuthRequestIssueDetails[],
-    genericIssue: LH.Crdp.Audits.GenericIssueDetails[];
-    heavyAdIssue: LH.Crdp.Audits.HeavyAdIssueDetails[];
-    lowTextContrastIssue: LH.Crdp.Audits.LowTextContrastIssueDetails[];
-    mixedContentIssue: LH.Crdp.Audits.MixedContentIssueDetails[];
-    navigatorUserAgentIssue: LH.Crdp.Audits.NavigatorUserAgentIssueDetails[];
-    quirksModeIssue: LH.Crdp.Audits.QuirksModeIssueDetails[];
-    cookieIssue: LH.Crdp.Audits.CookieIssueDetails[];
-    sharedArrayBufferIssue: LH.Crdp.Audits.SharedArrayBufferIssueDetails[];
-    twaQualityEnforcement: LH.Crdp.Audits.TrustedWebActivityIssueDetails[];
+    attributionReportingIssue: Crdp.Audits.AttributionReportingIssueDetails[];
+    blockedByResponseIssue: Crdp.Audits.BlockedByResponseIssueDetails[];
+    clientHintIssue: Crdp.Audits.ClientHintIssueDetails[];
+    contentSecurityPolicyIssue: Crdp.Audits.ContentSecurityPolicyIssueDetails[];
+    corsIssue: Crdp.Audits.CorsIssueDetails[];
+    deprecationIssue: Crdp.Audits.DeprecationIssueDetails[];
+    federatedAuthRequestIssue: Crdp.Audits.FederatedAuthRequestIssueDetails[],
+    genericIssue: Crdp.Audits.GenericIssueDetails[];
+    heavyAdIssue: Crdp.Audits.HeavyAdIssueDetails[];
+    lowTextContrastIssue: Crdp.Audits.LowTextContrastIssueDetails[];
+    mixedContentIssue: Crdp.Audits.MixedContentIssueDetails[];
+    navigatorUserAgentIssue: Crdp.Audits.NavigatorUserAgentIssueDetails[];
+    quirksModeIssue: Crdp.Audits.QuirksModeIssueDetails[];
+    cookieIssue: Crdp.Audits.CookieIssueDetails[];
+    sharedArrayBufferIssue: Crdp.Audits.SharedArrayBufferIssueDetails[];
+    twaQualityEnforcement: Crdp.Audits.TrustedWebActivityIssueDetails[];
   }
 
   // Computed artifact types below.
@@ -604,9 +647,10 @@ declare module Artifacts {
   interface MetricComputationDataInput {
     devtoolsLog: DevtoolsLog;
     trace: Trace;
-    settings: Immutable<Config.Settings>;
+    settings: Audit.Context['settings'];
     gatherContext: Artifacts['GatherContext'];
-    simulator?: InstanceType<typeof LanternSimulator>;
+    simulator?: InstanceType<typeof Simulator>;
+    URL: Artifacts['URL'];
   }
 
   interface MetricComputationData extends MetricComputationDataInput {
@@ -673,12 +717,16 @@ declare module Artifacts {
     frameEvents: Array<TraceEvent>;
     /** The subset of trace events from the main frame and any child frames, sorted by timestamp. */
     frameTreeEvents: Array<TraceEvent>;
-    /** IDs for the trace's main frame, process, and thread. */
-    mainFrameIds: {pid: number, tid: number, frameId: string};
+    /** IDs for the trace's main frame, and process. The startingPid is the initial process id, however cross-origin navigations may incur changes to the pid while the frame ID remains identical. */
+    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. */
     timeOriginEvt: TraceEvent;
+    /** All received trace events subsetted to important categories. */
+    _keyEvents: Array<TraceEvent>;
+    /** Map where keys are process IDs and their values are thread IDs */
+    _rendererPidToTid: Map<number, number>;
   }
 
   interface ProcessedNavigation {
@@ -725,16 +773,6 @@ declare module Artifacts {
     npm?: string;
   }
 
-  interface FullPageScreenshot {
-    screenshot: {
-      /** Base64 image data URL. */
-      data: string;
-      width: number;
-      height: number;
-    };
-    nodes: Record<string, Rect>;
-  }
-
   interface TimingSummary {
     firstContentfulPaint: number | undefined;
     firstContentfulPaintTs: number | undefined;
@@ -809,7 +847,8 @@ declare module Artifacts {
       property: string;
       attribute: string | null;
       prediction: string | null;
-    }
+    };
+    preventsPaste?: boolean;
     node: NodeDetails;
   }
 
@@ -846,9 +885,11 @@ declare module Artifacts {
     /** Time of the console log in milliseconds since epoch. */
     timestamp: number;
     /** The stack trace of the log/exception, if known. */
-    stackTrace?: LH.Crdp.Runtime.StackTrace;
+    stackTrace?: Crdp.Runtime.StackTrace;
     /** The URL of the log/exception, if known. */
     url?: string;
+    /** The script id of the log/exception, if known. */
+    scriptId?: string;
     /** Line number in the script (0-indexed), if known. */
     lineNumber?: number;
     /** Column number in the script (0-indexed), if known. */
@@ -875,8 +916,8 @@ declare module Artifacts {
    * deprecations, violations, and more.
    */
   interface ConsoleProtocolLog extends BaseConsoleMessage {
-    source: LH.Crdp.Log.LogEntry['source'],
-    level: LH.Crdp.Log.LogEntry['level'],
+    source: Crdp.Log.LogEntry['source'],
+    level: Crdp.Log.LogEntry['level'],
     eventType: 'protocolLog';
   }
 
@@ -886,6 +927,19 @@ declare module Artifacts {
     /** The MIME type of the underlying image file. */
     mimeType?: string;
   }
+
+  interface Entity extends IEntity {
+    isUnrecognized?: boolean;
+  }
+
+  interface EntityClassification {
+    urlsByEntity: Map<Entity, Set<string>>;
+    entityByUrl: Map<string, Entity>;
+    firstParty?: Entity;
+
+    // Convenience methods.
+    isFirstParty: (url: string) => boolean;
+  }
 }
 
 export interface Trace {
@@ -920,6 +974,7 @@ export interface TraceEvent {
     };
     data?: {
       frame?: string;
+      processId?: number;
       isLoadingMainFrame?: boolean;
       documentLoaderURL?: string;
       frames?: {
@@ -950,6 +1005,8 @@ export interface TraceEvent {
       cumulative_score?: number;
       id?: string;
       nodeId?: number;
+      DOMNodeId?: number;
+      imageUrl?: string;
       impacted_nodes?: Array<{
         node_id: number,
         old_rect?: Array<number>,