lighthouse 12.1.0-dev.20240630 → 12.1.0-dev.20240702

package/core/computed/metrics/lantern-largest-contentful-paint.js

@@ -9,13 +9,11 @@ import {makeComputedArtifact} from '../computed-artifact.js';
 import {getComputationDataParams, lanternErrorAdapter} from './lantern-metric.js';
 import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js';
 
-/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
-
 class LanternLargestContentfulPaint extends Lantern.Metrics.LargestContentfulPaint {
   /**
    * @param {LH.Artifacts.MetricComputationDataInput} data
    * @param {LH.Artifacts.ComputedContext} context
-   * @param {Omit<Extras, 'optimistic'>=} extras
+   * @param {Omit<Lantern.Metrics.Extras, 'optimistic'>=} extras
    * @return {Promise<LH.Artifacts.LanternMetric>}
    */
   static async computeMetricWithGraphs(data, context, extras) {

package/core/computed/metrics/lantern-max-potential-fid.d.ts

@@ -1,19 +1,17 @@
 export { LanternMaxPotentialFIDComputed as LanternMaxPotentialFID };
-export type Extras = import('../../lib/lantern/Metric.js').Extras;
 declare const LanternMaxPotentialFIDComputed: typeof LanternMaxPotentialFID & {
     request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: import("../../../types/utility-types.js").default.ImmutableObject<{
         computedCache: Map<string, import("../../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
     }>) => Promise<import("../../index.js").Artifacts.LanternMetric>;
 };
-/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
 declare class LanternMaxPotentialFID extends Lantern.Metrics.MaxPotentialFID {
     /**
      * @param {LH.Artifacts.MetricComputationDataInput} data
      * @param {LH.Artifacts.ComputedContext} context
-     * @param {Omit<Extras, 'optimistic'>=} extras
+     * @param {Omit<Lantern.Metrics.Extras, 'optimistic'>=} extras
      * @return {Promise<LH.Artifacts.LanternMetric>}
      */
-    static computeMetricWithGraphs(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext, extras?: Omit<Extras, 'optimistic'> | undefined): Promise<LH.Artifacts.LanternMetric>;
+    static computeMetricWithGraphs(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext, extras?: Omit<Lantern.Metrics.Extras, 'optimistic'> | undefined): Promise<LH.Artifacts.LanternMetric>;
     /**
      * @param {LH.Artifacts.MetricComputationDataInput} data
      * @param {LH.Artifacts.ComputedContext} context

package/core/computed/metrics/lantern-max-potential-fid.js

@@ -9,13 +9,11 @@ import {makeComputedArtifact} from '../computed-artifact.js';
 import {getComputationDataParams, lanternErrorAdapter} from './lantern-metric.js';
 import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js';
 
-/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
-
 class LanternMaxPotentialFID extends Lantern.Metrics.MaxPotentialFID {
   /**
    * @param {LH.Artifacts.MetricComputationDataInput} data
    * @param {LH.Artifacts.ComputedContext} context
-   * @param {Omit<Extras, 'optimistic'>=} extras
+   * @param {Omit<Lantern.Metrics.Extras, 'optimistic'>=} extras
    * @return {Promise<LH.Artifacts.LanternMetric>}
    */
   static async computeMetricWithGraphs(data, context, extras) {

package/core/computed/metrics/lantern-metric.d.ts

@@ -3,17 +3,17 @@
  * @param {LH.Artifacts.ComputedContext} context
  */
 export function getComputationDataParamsFromTrace(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext): Promise<{
-    simulator: Lantern.Simulation.Simulator<any>;
-    graph: import("../page-dependency-graph.js").Node;
-    processedNavigation: import("../../lib/lantern/types/lantern.js").Simulation.ProcessedNavigation;
+    simulator: import("../../../types/gatherer.js").default.Simulation.Simulator;
+    graph: import("../../../types/gatherer.js").default.Simulation.GraphNode;
+    processedNavigation: Lantern.Types.Simulation.ProcessedNavigation;
 }>;
 /**
  * @param {LH.Artifacts.MetricComputationDataInput} data
  * @param {LH.Artifacts.ComputedContext} context
  */
 export function getComputationDataParamsFromDevtoolsLog(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext): Promise<{
-    simulator: Lantern.Simulation.Simulator<any>;
-    graph: import("../page-dependency-graph.js").Node;
+    simulator: import("../../../types/gatherer.js").default.Simulation.Simulator;
+    graph: import("../../../types/gatherer.js").default.Simulation.GraphNode;
     processedNavigation: import("../../index.js").Artifacts.ProcessedNavigation;
 }>;
 /**
@@ -21,9 +21,9 @@ export function getComputationDataParamsFromDevtoolsLog(data: LH.Artifacts.Metri
  * @param {LH.Artifacts.ComputedContext} context
  */
 export function getComputationDataParams(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext): Promise<{
-    simulator: Lantern.Simulation.Simulator<any>;
-    graph: import("../page-dependency-graph.js").Node;
-    processedNavigation: import("../../lib/lantern/types/lantern.js").Simulation.ProcessedNavigation;
+    simulator: import("../../../types/gatherer.js").default.Simulation.Simulator;
+    graph: import("../../../types/gatherer.js").default.Simulation.GraphNode;
+    processedNavigation: Lantern.Types.Simulation.ProcessedNavigation;
 }>;
 /**
  * @param {unknown} err

package/core/computed/metrics/lantern-metric.js

@@ -50,7 +50,7 @@ async function getComputationDataParamsFromTrace(data, context) {
  * @return {never}
  */
 function lanternErrorAdapter(err) {
-  if (!(err instanceof Lantern.Error)) {
+  if (!(err instanceof Lantern.Core.LanternError)) {
     throw err;
   }
 

package/core/computed/metrics/lantern-speed-index.d.ts

@@ -1,19 +1,17 @@
 export { LanternSpeedIndexComputed as LanternSpeedIndex };
-export type Extras = import('../../lib/lantern/Metric.js').Extras;
 declare const LanternSpeedIndexComputed: typeof LanternSpeedIndex & {
     request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: import("../../../types/utility-types.js").default.ImmutableObject<{
         computedCache: Map<string, import("../../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
     }>) => Promise<import("../../index.js").Artifacts.LanternMetric>;
 };
-/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
 declare class LanternSpeedIndex extends Lantern.Metrics.SpeedIndex {
     /**
      * @param {LH.Artifacts.MetricComputationDataInput} data
      * @param {LH.Artifacts.ComputedContext} context
-     * @param {Omit<Extras, 'optimistic'>=} extras
+     * @param {Omit<Lantern.Metrics.Extras, 'optimistic'>=} extras
      * @return {Promise<LH.Artifacts.LanternMetric>}
      */
-    static computeMetricWithGraphs(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext, extras?: Omit<Extras, 'optimistic'> | undefined): Promise<LH.Artifacts.LanternMetric>;
+    static computeMetricWithGraphs(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext, extras?: Omit<Lantern.Metrics.Extras, 'optimistic'> | undefined): Promise<LH.Artifacts.LanternMetric>;
     /**
      * @param {LH.Artifacts.MetricComputationDataInput} data
      * @param {LH.Artifacts.ComputedContext} context

package/core/computed/metrics/lantern-speed-index.js

@@ -10,13 +10,11 @@ import {getComputationDataParams, lanternErrorAdapter} from './lantern-metric.js
 import {Speedline} from '../speedline.js';
 import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js';
 
-/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
-
 class LanternSpeedIndex extends Lantern.Metrics.SpeedIndex {
   /**
    * @param {LH.Artifacts.MetricComputationDataInput} data
    * @param {LH.Artifacts.ComputedContext} context
-   * @param {Omit<Extras, 'optimistic'>=} extras
+   * @param {Omit<Lantern.Metrics.Extras, 'optimistic'>=} extras
    * @return {Promise<LH.Artifacts.LanternMetric>}
    */
   static async computeMetricWithGraphs(data, context, extras) {

package/core/computed/metrics/lantern-total-blocking-time.d.ts

@@ -1,19 +1,17 @@
 export { LanternTotalBlockingTimeComputed as LanternTotalBlockingTime };
-export type Extras = import('../../lib/lantern/Metric.js').Extras;
 declare const LanternTotalBlockingTimeComputed: typeof LanternTotalBlockingTime & {
     request: (dependencies: import("../../index.js").Artifacts.MetricComputationDataInput, context: import("../../../types/utility-types.js").default.ImmutableObject<{
         computedCache: Map<string, import("../../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
     }>) => Promise<import("../../index.js").Artifacts.LanternMetric>;
 };
-/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
 declare class LanternTotalBlockingTime extends Lantern.Metrics.TotalBlockingTime {
     /**
      * @param {LH.Artifacts.MetricComputationDataInput} data
      * @param {LH.Artifacts.ComputedContext} context
-     * @param {Omit<Extras, 'optimistic'>=} extras
+     * @param {Omit<Lantern.Metrics.Extras, 'optimistic'>=} extras
      * @return {Promise<LH.Artifacts.LanternMetric>}
      */
-    static computeMetricWithGraphs(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext, extras?: Omit<Extras, 'optimistic'> | undefined): Promise<LH.Artifacts.LanternMetric>;
+    static computeMetricWithGraphs(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext, extras?: Omit<Lantern.Metrics.Extras, 'optimistic'> | undefined): Promise<LH.Artifacts.LanternMetric>;
     /**
      * @param {LH.Artifacts.MetricComputationDataInput} data
      * @param {LH.Artifacts.ComputedContext} context

package/core/computed/metrics/lantern-total-blocking-time.js

@@ -10,13 +10,11 @@ import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js';
 import {LanternInteractive} from './lantern-interactive.js';
 import {getComputationDataParams} from './lantern-metric.js';
 
-/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */
-
 class LanternTotalBlockingTime extends Lantern.Metrics.TotalBlockingTime {
   /**
    * @param {LH.Artifacts.MetricComputationDataInput} data
    * @param {LH.Artifacts.ComputedContext} context
-   * @param {Omit<Extras, 'optimistic'>=} extras
+   * @param {Omit<Lantern.Metrics.Extras, 'optimistic'>=} extras
    * @return {Promise<LH.Artifacts.LanternMetric>}
    */
   static async computeMetricWithGraphs(data, context, extras) {

package/core/computed/metrics/total-blocking-time.js

@@ -11,7 +11,7 @@ import {TraceProcessor} from '../../lib/tracehouse/trace-processor.js';
 import {LanternTotalBlockingTime} from './lantern-total-blocking-time.js';
 import {Interactive} from './interactive.js';
 
-const {calculateSumOfBlockingTime} = Lantern.TBTUtils;
+const {calculateSumOfBlockingTime} = Lantern.Metrics.TBTUtils;
 
 /**
  * @fileoverview This audit determines Total Blocking Time.

package/core/computed/network-analysis.js

@@ -16,7 +16,7 @@ class NetworkAnalysis {
    */
   static async compute_(devtoolsLog, context) {
     const records = await NetworkRecords.request(devtoolsLog, context);
-    return Lantern.Simulation.NetworkAnalyzer.analyze(records);
+    return Lantern.Core.NetworkAnalyzer.analyze(records);
   }
 }
 

package/core/computed/page-dependency-graph.d.ts

@@ -1,5 +1,4 @@
 export { PageDependencyGraphComputed as PageDependencyGraph };
-export type Node = import('../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>;
 declare const PageDependencyGraphComputed: typeof PageDependencyGraph & {
     request: (dependencies: {
         trace: LH.Trace;
@@ -8,21 +7,19 @@ declare const PageDependencyGraphComputed: typeof PageDependencyGraph & {
         fromTrace?: boolean | undefined;
     }, context: import("../../types/utility-types.js").default.ImmutableObject<{
         computedCache: Map<string, import("../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<Node>;
+    }>) => Promise<import("../../types/gatherer.js").default.Simulation.GraphNode>;
 };
-import { NetworkRequest } from '../lib/network-request.js';
-/** @typedef {import('../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>} Node */
 declare class PageDependencyGraph {
     /**
      * @param {{trace: LH.Trace, devtoolsLog: LH.DevtoolsLog, URL: LH.Artifacts['URL'], fromTrace?: boolean}} data
      * @param {LH.Artifacts.ComputedContext} context
-     * @return {Promise<Node>}
+     * @return {Promise<LH.Gatherer.Simulation.GraphNode>}
      */
     static compute_(data: {
         trace: LH.Trace;
         devtoolsLog: import("../index.js").DevtoolsLog;
         URL: LH.Artifacts['URL'];
         fromTrace?: boolean | undefined;
-    }, context: LH.Artifacts.ComputedContext): Promise<Node>;
+    }, context: LH.Artifacts.ComputedContext): Promise<LH.Gatherer.Simulation.GraphNode>;
 }
 //# sourceMappingURL=page-dependency-graph.d.ts.map

package/core/computed/page-dependency-graph.js

@@ -11,13 +11,11 @@ import {ProcessedTrace} from './processed-trace.js';
 import {NetworkRecords} from './network-records.js';
 import {TraceEngineResult} from './trace-engine-result.js';
 
-/** @typedef {import('../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>} Node */
-
 class PageDependencyGraph {
   /**
    * @param {{trace: LH.Trace, devtoolsLog: LH.DevtoolsLog, URL: LH.Artifacts['URL'], fromTrace?: boolean}} data
    * @param {LH.Artifacts.ComputedContext} context
-   * @return {Promise<Node>}
+   * @return {Promise<LH.Gatherer.Simulation.GraphNode>}
    */
   static async compute_(data, context) {
     const {trace, devtoolsLog, URL} = data;
@@ -33,11 +31,12 @@ class PageDependencyGraph {
         Lantern.TraceEngineComputationData.createNetworkRequests(trace, traceEngineData);
       const graph =
         Lantern.TraceEngineComputationData.createGraph(requests, trace, traceEngineData, URL);
+      // @ts-expect-error for now, ignore that this is a SyntheticNetworkEvent instead of LH's NetworkEvent.
       return graph;
     }
 
     const lanternRequests = networkRecords.map(NetworkRequest.asLanternNetworkRequest);
-    return Lantern.PageDependencyGraph.createGraph(mainThreadEvents, lanternRequests, URL);
+    return Lantern.Graph.PageDependencyGraph.createGraph(mainThreadEvents, lanternRequests, URL);
   }
 }
 

package/core/computed/tbt-impact-tasks.js

@@ -12,7 +12,7 @@ import {Interactive} from './metrics/interactive.js';
 import {TotalBlockingTime} from './metrics/total-blocking-time.js';
 import {ProcessedTrace} from './processed-trace.js';
 
-const {calculateTbtImpactForEvent} = Lantern.TBTUtils;
+const {calculateTbtImpactForEvent} = Lantern.Metrics.TBTUtils;
 
 class TBTImpactTasks {
   /**
@@ -134,7 +134,7 @@ class TBTImpactTasks {
     /** @type {Map<LH.Artifacts.TaskNode, {start: number, end: number, duration: number}>} */
     const topLevelTaskToEvent = new Map();
 
-    /** @type {Map<Lantern.TraceEvent, LH.Artifacts.TaskNode>} */
+    /** @type {Map<Lantern.Types.TraceEvent, LH.Artifacts.TaskNode>} */
     const traceEventToTask = new Map();
     for (const task of tasks) {
       traceEventToTask.set(task.event, task);

package/core/lib/asset-saver.js

@@ -449,7 +449,7 @@ function saveDevtoolsLog(devtoolsLog, devtoolLogFilename, options = {}) {
 async function saveLanternDebugTraces(pathWithBasename) {
   if (!process.env.LANTERN_DEBUG) return;
 
-  for (const [label, nodeTimings] of Lantern.Simulation.Simulator.ALL_NODE_TIMINGS) {
+  for (const [label, nodeTimings] of Lantern.Simulation.Simulator.allNodeTimings) {
     if (lanternTraceSaver.simulationNamesToIgnore.includes(label)) continue;
 
     const traceFilename = `${pathWithBasename}-${label}${traceSuffix}`;

package/core/lib/lantern/lantern.d.ts

@@ -1,20 +1,3 @@
-export { BaseNode } from "./BaseNode.js";
-export { CPUNode } from "./CpuNode.js";
-export { LanternError as Error } from "./LanternError.js";
-export { Metric } from "./Metric.js";
-export { NetworkNode } from "./NetworkNode.js";
-export { PageDependencyGraph } from "./PageDependencyGraph.js";
-export * as Metrics from "./metrics/metrics.js";
-export * as Simulation from "./simulation/simulation.js";
-export * as TBTUtils from "./TBTUtils.js";
-export * as TraceEngineComputationData from "./TraceEngineComputationData.js";
-export type NetworkRequest<T = any> = Lantern.NetworkRequest<T>;
-export type ResourcePriority = Lantern.ResourcePriority;
-export type ResourceTiming = Lantern.ResourceTiming;
-export type ResourceType = Lantern.ResourceType;
-export type Trace = Lantern.Trace;
-export type TraceEvent = Lantern.TraceEvent;
-/** @type {Lantern.Util.SelfMap<Lantern.ResourceType>} */
-export const NetworkRequestTypes: Lantern.Util.SelfMap<Lantern.ResourceType>;
-import * as Lantern from './types/lantern.js';
+export * from "@paulirish/trace_engine/models/trace/lantern/lantern.js";
+export { LanternComputationData as TraceEngineComputationData } from "@paulirish/trace_engine";
 //# sourceMappingURL=lantern.d.ts.map

package/core/lib/lantern/lantern.js

@@ -4,48 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as Lantern from './types/lantern.js';
-
-/** @type {Lantern.Util.SelfMap<Lantern.ResourceType>} */
-const NetworkRequestTypes = {
-  XHR: 'XHR',
-  Fetch: 'Fetch',
-  EventSource: 'EventSource',
-  Script: 'Script',
-  Stylesheet: 'Stylesheet',
-  Image: 'Image',
-  Media: 'Media',
-  Font: 'Font',
-  Document: 'Document',
-  TextTrack: 'TextTrack',
-  WebSocket: 'WebSocket',
-  Other: 'Other',
-  Manifest: 'Manifest',
-  SignedExchange: 'SignedExchange',
-  Ping: 'Ping',
-  Preflight: 'Preflight',
-  CSPViolationReport: 'CSPViolationReport',
-  Prefetch: 'Prefetch',
-};
-
-export {BaseNode} from './BaseNode.js';
-export {CPUNode} from './CpuNode.js';
-export {LanternError as Error} from './LanternError.js';
-export {Metric} from './Metric.js';
-export {NetworkNode} from './NetworkNode.js';
-export {PageDependencyGraph} from './PageDependencyGraph.js';
-export * as Metrics from './metrics/metrics.js';
-export * as Simulation from './simulation/simulation.js';
-export * as TBTUtils from './TBTUtils.js';
-export * as TraceEngineComputationData from './TraceEngineComputationData.js';
-
-/** @template [T=any] @typedef {Lantern.NetworkRequest<T>} NetworkRequest */
-/** @typedef {Lantern.ResourcePriority} ResourcePriority */
-/** @typedef {Lantern.ResourceTiming} ResourceTiming */
-/** @typedef {Lantern.ResourceType} ResourceType */
-/** @typedef {Lantern.Trace} Trace */
-/** @typedef {Lantern.TraceEvent} TraceEvent */
-
-export {
-  NetworkRequestTypes,
-};
+export * from '@paulirish/trace_engine/models/trace/lantern/lantern.js';
+export {LanternComputationData as TraceEngineComputationData} from '@paulirish/trace_engine';

package/core/lib/lantern-trace-saver.d.ts

@@ -3,18 +3,16 @@ declare namespace _default {
     export { convertNodeTimingsToTrace };
 }
 export default _default;
-export type Node = import('./lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>;
-export type CompleteNodeTiming = import('./lantern/simulation/Simulator.js').CompleteNodeTiming;
+export type CompleteNodeTiming = import('./lantern/lantern.js').Simulation.CompleteNodeTiming;
 /**
  * @license
  * Copyright 2018 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-/** @typedef {import('./lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>} Node */
-/** @typedef {import('./lantern/simulation/Simulator.js').CompleteNodeTiming} CompleteNodeTiming */
+/** @typedef {import('./lantern/lantern.js').Simulation.CompleteNodeTiming} CompleteNodeTiming */
 /**
- * @param {Map<Node, CompleteNodeTiming>} nodeTimings
+ * @param {Map<LH.Gatherer.Simulation.GraphNode, CompleteNodeTiming>} nodeTimings
  * @return {LH.Trace}
  */
-declare function convertNodeTimingsToTrace(nodeTimings: Map<Node, CompleteNodeTiming>): LH.Trace;
+declare function convertNodeTimingsToTrace(nodeTimings: Map<LH.Gatherer.Simulation.GraphNode, CompleteNodeTiming>): LH.Trace;
 //# sourceMappingURL=lantern-trace-saver.d.ts.map

package/core/lib/lantern-trace-saver.js

@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/** @typedef {import('./lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>} Node */
-/** @typedef {import('./lantern/simulation/Simulator.js').CompleteNodeTiming} CompleteNodeTiming */
+/** @typedef {import('./lantern/lantern.js').Simulation.CompleteNodeTiming} CompleteNodeTiming */
 
 /**
- * @param {Map<Node, CompleteNodeTiming>} nodeTimings
+ * @param {Map<LH.Gatherer.Simulation.GraphNode, CompleteNodeTiming>} nodeTimings
  * @return {LH.Trace}
  */
 function convertNodeTimingsToTrace(nodeTimings) {

package/core/lib/navigation-error.js

@@ -131,7 +131,7 @@ function getNonHtmlError(finalRecord) {
 function getPageLoadError(navigationError, context) {
   const {url, networkRecords} = context;
   /** @type {LH.Artifacts.NetworkRequest|undefined} */
-  let mainRecord = Lantern.Simulation.NetworkAnalyzer.findResourceForUrl(networkRecords, url);
+  let mainRecord = Lantern.Core.NetworkAnalyzer.findResourceForUrl(networkRecords, url);
 
   // If the url doesn't give us a network request, it's possible we landed on a chrome-error:// page
   // In this case, just get the first document request.
@@ -149,7 +149,7 @@ function getPageLoadError(navigationError, context) {
   // MIME Type is only set on the final redirected document request. Use this for the HTML check instead of root.
   let finalRecord;
   if (mainRecord) {
-    finalRecord = Lantern.Simulation.NetworkAnalyzer.resolveRedirects(mainRecord);
+    finalRecord = Lantern.Core.NetworkAnalyzer.resolveRedirects(mainRecord);
   } else {
     // We have no network requests to process, use the navError
     return navigationError;

package/core/lib/network-recorder.js

@@ -253,7 +253,7 @@ class NetworkRecorder extends RequestEventEmitter {
       return record.redirectSource;
     }
 
-    const initiatorURL = Lantern.PageDependencyGraph.getNetworkInitiators(record)[0];
+    const initiatorURL = Lantern.Graph.PageDependencyGraph.getNetworkInitiators(record)[0];
     let candidates = recordsByURL.get(initiatorURL) || [];
     // The (valid) initiator must come before the initiated request.
     candidates = candidates.filter(c => {

package/core/lib/network-request.d.ts

@@ -49,14 +49,14 @@ export class NetworkRequest {
     static get TYPES(): LH.Util.SelfMap<LH.Crdp.Network.ResourceType>;
     /**
      * @param {NetworkRequest} record
-     * @return {Lantern.NetworkRequest<NetworkRequest>}
+     * @return {Lantern.Types.NetworkRequest<NetworkRequest>}
      */
-    static asLanternNetworkRequest(record: NetworkRequest): Lantern.NetworkRequest<NetworkRequest>;
+    static asLanternNetworkRequest(record: NetworkRequest): Lantern.Types.NetworkRequest<NetworkRequest>;
     /**
-     * @param {NetworkRequest} record
+     * @param {Pick<NetworkRequest, 'protocol'|'parsedURL'>} record
      * @return {boolean}
      */
-    static isNonNetworkRequest(record: NetworkRequest): boolean;
+    static isNonNetworkRequest(record: Pick<NetworkRequest, 'protocol' | 'parsedURL'>): boolean;
     /**
      * Technically there's not alignment on URLs that create "secure connections" vs "secure contexts"
      * https://github.com/GoogleChrome/lighthouse/pull/11766#discussion_r582340683

package/core/lib/network-request.js

@@ -577,7 +577,7 @@ class NetworkRequest {
 
   /**
    * @param {NetworkRequest} record
-   * @return {Lantern.NetworkRequest<NetworkRequest>}
+   * @return {Lantern.Types.NetworkRequest<NetworkRequest>}
    */
   static asLanternNetworkRequest(record) {
     // In LR, network records are missing connection timing, but we've smuggled it in via headers.
@@ -616,7 +616,7 @@ class NetworkRequest {
   }
 
   /**
-   * @param {NetworkRequest} record
+   * @param {Pick<NetworkRequest, 'protocol'|'parsedURL'>} record
    * @return {boolean}
    */
   static isNonNetworkRequest(record) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lighthouse",
   "type": "module",
-  "version": "12.1.0-dev.20240630",
+  "version": "12.1.0-dev.20240702",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./core/index.js",
   "bin": {
@@ -181,7 +181,7 @@
     "webtreemap-cdt": "^3.2.1"
   },
   "dependencies": {
-    "@paulirish/trace_engine": "^0.0.23",
+    "@paulirish/trace_engine": "0.0.28",
     "@sentry/node": "^6.17.4",
     "axe-core": "^4.9.1",
     "chrome-launcher": "^1.1.2",

package/tsconfig.json

@@ -17,7 +17,6 @@
     "clients/**/*.js",
     "build/**/*.js",
     "./types/**/*.d.ts",
-    "./core/lib/lantern/types/**/*.d.ts",
     "eslint-local-rules.cjs",
     "third-party/axe/valid-langs.js",
     "third-party/esbuild-plugins-polyfills/esbuild-polyfills.js",
@@ -67,15 +66,6 @@
     "core/test/lib/emulation-test.js",
     "core/test/lib/i18n/i18n-test.js",
     "core/test/lib/icons-test.js",
-    // TODO(15841): remove when importing Lantern from npm
-    "core/lib/lantern/BaseNode.test.js",
-    "core/lib/lantern/metrics/*.test.js",
-    "core/lib/lantern/PageDependencyGraph.test.js",
-    "core/lib/lantern/simulation/ConnectionPool.test.js",
-    "core/lib/lantern/simulation/DNSCache.test.js",
-    "core/lib/lantern/simulation/NetworkAnalyzer.test.js",
-    "core/lib/lantern/simulation/Simulator.test.js",
-    // ------ done TODO
     "core/test/lib/lh-element-test.js",
     "core/test/lib/lighthouse-compatibility-test.js",
     "core/test/lib/manifest-parser-test.js",
@@ -112,6 +102,5 @@
     "core/test/computed/metrics/interactive-test.js",
     "core/test/computed/tbt-impact-tasks-test.js",
     "core/test/fixtures/config-plugins/lighthouse-plugin-simple/plugin-simple.js",
-    "core/lib/lantern/metrics/MetricTestUtils.js",
   ],
 }

package/types/artifacts.d.ts

@@ -565,7 +565,7 @@ declare module Artifacts {
     trace: Trace;
     settings: Audit.Context['settings'];
     gatherContext: Artifacts['GatherContext'];
-    simulator?: InstanceType<typeof Lantern.Simulation.Simulator>;
+    simulator?: Gatherer.Simulation.Simulator;
     URL: Artifacts['URL'];
   }
 
@@ -591,7 +591,7 @@ declare module Artifacts {
     throughput: number;
   }
 
-  type LanternMetric = Lantern.Metrics.Result<Artifacts.NetworkRequest>;
+  type LanternMetric = Lantern.Metrics.MetricResult<Artifacts.NetworkRequest>;
 
   type Speedline = speedline.Output<'speedIndex'>;
 

package/types/gatherer.d.ts

@@ -133,12 +133,11 @@ declare module Gatherer {
   type AnyGathererInstance = GathererInstanceExpander<Gatherer.DependencyKey>
 
   namespace Simulation {
-    type GraphNode = Lantern.Simulation.GraphNode<Artifacts.NetworkRequest>;
-    type GraphNetworkNode = Lantern.Simulation.GraphNetworkNode<Artifacts.NetworkRequest>;
-    type GraphCPUNode = Lantern.Simulation.GraphCPUNode;
+    type GraphNode = Lantern.Graph.Node<Artifacts.NetworkRequest>;
+    type GraphNetworkNode = Lantern.Graph.NetworkNode<Artifacts.NetworkRequest>;
+    type GraphCPUNode = Lantern.Graph.CPUNode<Artifacts.NetworkRequest>;
     type Simulator = Lantern.Simulation.Simulator<Artifacts.NetworkRequest>;
-    type NodeTiming = Lantern.Simulation.NodeTiming;
-    type MetricCoefficients = Lantern.Simulation.MetricCoefficients;
+    type NodeTiming = Lantern.Types.Simulation.NodeTiming;
     type Result = Lantern.Simulation.Result<Artifacts.NetworkRequest>;
   }
 }