lighthouse 11.6.0-dev.20240303 → 11.6.0-dev.20240304

package/core/audits/byte-efficiency/byte-efficiency-audit.d.ts

@@ -1,5 +1,5 @@
-export type Simulator = import('../../lib/dependency-graph/simulator/simulator').Simulator;
-export type Node = import('../../lib/dependency-graph/base-node.js').Node;
+export type Simulator = import('../../lib/lantern/simulator/simulator.js').Simulator;
+export type Node = import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
 export type ByteEfficiencyProduct = {
     items: Array<LH.Audit.ByteEfficiencyItem>;
     wastedBytesByUrl?: Map<string, number> | undefined;

package/core/audits/byte-efficiency/byte-efficiency-audit.js

@@ -16,8 +16,8 @@ import {LCPImageRecord} from '../../computed/lcp-image-record.js';
 
 const str_ = i18n.createIcuMessageFn(import.meta.url, {});
 
-/** @typedef {import('../../lib/dependency-graph/simulator/simulator').Simulator} Simulator */
-/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
+/** @typedef {import('../../lib/lantern/simulator/simulator.js').Simulator} Simulator */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
 
 // Parameters for log-normal distribution scoring. These values were determined by fitting the
 // log-normal cumulative distribution function curve to the former method of linear interpolation
@@ -125,10 +125,10 @@ class ByteEfficiencyAudit extends Audit {
       const wastedBytes = wastedBytesByUrl.get(node.record.url);
       if (!wastedBytes) return;
 
-      const original = node.record.transferSize;
-      originalTransferSizes.set(node.record.requestId, original);
+      const original = node.request.transferSize;
+      originalTransferSizes.set(node.request.requestId, original);
 
-      node.record.transferSize = Math.max(original - wastedBytes, 0);
+      node.request.transferSize = Math.max(original - wastedBytes, 0);
     });
 
     const simulationAfterChanges = simulator.simulate(graph, {label: afterLabel});
@@ -136,9 +136,9 @@ class ByteEfficiencyAudit extends Audit {
     // Restore the original transfer size after we've done our simulation
     graph.traverse(node => {
       if (node.type !== 'network') return;
-      const originalTransferSize = originalTransferSizes.get(node.record.requestId);
+      const originalTransferSize = originalTransferSizes.get(node.request.requestId);
       if (originalTransferSize === undefined) return;
-      node.record.transferSize = originalTransferSize;
+      node.request.transferSize = originalTransferSize;
     });
 
     const savings = simulationBeforeChanges.timeInMs - simulationAfterChanges.timeInMs;

package/core/audits/byte-efficiency/render-blocking-resources.d.ts

@@ -1,7 +1,7 @@
 export default RenderBlockingResources;
-export type Simulator = import('../../lib/dependency-graph/simulator/simulator').Simulator;
-export type Node = import('../../lib/dependency-graph/base-node.js').Node;
-export type NetworkNode = typeof import("../../lib/dependency-graph/network-node.js");
+export type Simulator = import('../../lib/lantern/simulator/simulator.js').Simulator;
+export type Node = import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
+export type NetworkNode = import('../../lib/lantern/network-node.js').NetworkNode<LH.Artifacts.NetworkRequest>;
 declare class RenderBlockingResources extends Audit {
     /**
      * @param {LH.Artifacts} artifacts
@@ -52,5 +52,6 @@ export namespace UIStrings {
     const title: string;
     const description: string;
 }
+import { NetworkRequest } from '../../lib/network-request.js';
 import { Audit } from '../audit.js';
 //# sourceMappingURL=render-blocking-resources.d.ts.map

package/core/audits/byte-efficiency/render-blocking-resources.js

@@ -11,7 +11,7 @@
 
 import {Audit} from '../audit.js';
 import * as i18n from '../../lib/i18n/i18n.js';
-import {BaseNode} from '../../lib/dependency-graph/base-node.js';
+import {BaseNode} from '../../lib/lantern/base-node.js';
 import {UnusedCSS} from '../../computed/unused-css.js';
 import {NetworkRequest} from '../../lib/network-request.js';
 import {ProcessedNavigation} from '../../computed/processed-navigation.js';
@@ -20,9 +20,9 @@ import {FirstContentfulPaint} from '../../computed/metrics/first-contentful-pain
 import {LCPImageRecord} from '../../computed/lcp-image-record.js';
 
 
-/** @typedef {import('../../lib/dependency-graph/simulator/simulator').Simulator} Simulator */
-/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
-/** @typedef {import('../../lib/dependency-graph/network-node.js')} NetworkNode */
+/** @typedef {import('../../lib/lantern/simulator/simulator.js').Simulator} Simulator */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
+/** @typedef {import('../../lib/lantern/network-node.js').NetworkNode<LH.Artifacts.NetworkRequest>} NetworkNode */
 
 // Because of the way we detect blocking stylesheets, asynchronously loaded
 // CSS with link[rel=preload] and an onload handler (see https://github.com/filamentgroup/loadCSS)
@@ -249,9 +249,9 @@ class RenderBlockingResources extends Audit {
     // Add the inlined bytes to the HTML response
     const originalTransferSize = minimalFCPGraph.record.transferSize;
     const safeTransferSize = originalTransferSize || 0;
-    minimalFCPGraph.record.transferSize = safeTransferSize + totalChildNetworkBytes;
+    minimalFCPGraph.request.transferSize = safeTransferSize + totalChildNetworkBytes;
     const estimateAfterInline = simulator.simulate(minimalFCPGraph).timeInMs;
-    minimalFCPGraph.record.transferSize = originalTransferSize;
+    minimalFCPGraph.request.transferSize = originalTransferSize;
     return Math.round(Math.max(estimateBeforeInline - estimateAfterInline, 0));
   }
 

package/core/audits/dobetterweb/uses-http2.d.ts

@@ -1,6 +1,6 @@
 export default UsesHTTP2Audit;
-export type Simulator = import('../../lib/dependency-graph/simulator/simulator').Simulator;
-export type Node = import('../../lib/dependency-graph/base-node.js').Node;
+export type Simulator = import('../../lib/lantern/simulator/simulator.js').Simulator;
+export type Node = import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
 declare class UsesHTTP2Audit extends Audit {
     /**
      * Computes the estimated effect of all results being converted to http/2 on the provided graph.
@@ -83,7 +83,7 @@ export namespace UIStrings {
     const displayValue: string;
     const columnProtocol: string;
 }
-import { Audit } from '../audit.js';
 import { NetworkRequest } from '../../lib/network-request.js';
+import { Audit } from '../audit.js';
 import { EntityClassification } from '../../computed/entity-classification.js';
 //# sourceMappingURL=uses-http2.d.ts.map

package/core/audits/dobetterweb/uses-http2.js

@@ -9,8 +9,8 @@
  * origin are over the http/2 protocol.
  */
 
-/** @typedef {import('../../lib/dependency-graph/simulator/simulator').Simulator} Simulator */
-/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
+/** @typedef {import('../../lib/lantern/simulator/simulator.js').Simulator} Simulator */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
 
 import {Audit} from '../audit.js';
 import {EntityClassification} from '../../computed/entity-classification.js';
@@ -94,7 +94,7 @@ class UsesHTTP2Audit extends Audit {
       if (!urlsToChange.has(node.record.url)) return;
 
       originalProtocols.set(node.record.requestId, node.record.protocol);
-      node.record.protocol = 'h2';
+      node.request.protocol = 'h2';
     });
 
     const simulationAfter = simulator.simulate(graph, {label: afterLabel, flexibleOrdering});
@@ -104,7 +104,7 @@ class UsesHTTP2Audit extends Audit {
       if (node.type !== 'network') return;
       const originalProtocol = originalProtocols.get(node.record.requestId);
       if (originalProtocol === undefined) return;
-      node.record.protocol = originalProtocol;
+      node.request.protocol = originalProtocol;
     });
 
     const savings = simulationBefore.timeInMs - simulationAfter.timeInMs;

package/core/audits/installable-manifest.d.ts

@@ -59,6 +59,8 @@ export const UIStrings: {
     'manifest-display-not-supported': string;
     /** Error message explaining that the manifest could not be fetched, might be empty, or could not be parsed. */
     'manifest-empty': string;
+    /** Error message explaining that the manifest could not be fetched, might be empty, or could not be parsed. */
+    'manifest-parsing-or-network-error': string;
     /**
      * @description Error message explaining that the manifest does not contain a suitable icon.
      * @example {192} value0

package/core/audits/installable-manifest.js

@@ -44,6 +44,8 @@ const UIStrings = {
   'manifest-display-not-supported': 'Manifest `display` property must be one of `standalone`, `fullscreen`, or `minimal-ui`',
   /** Error message explaining that the manifest could not be fetched, might be empty, or could not be parsed. */
   'manifest-empty': `Manifest could not be fetched, is empty, or could not be parsed`,
+  /** Error message explaining that the manifest could not be fetched, might be empty, or could not be parsed. */
+  'manifest-parsing-or-network-error': 'Manifest could not be fetched, is empty, or could not be parsed',
   /**
    * @description Error message explaining that the manifest does not contain a suitable icon.
    * @example {192} value0

package/core/audits/prioritize-lcp-image.d.ts

@@ -39,7 +39,7 @@ declare class PrioritizeLcpImage extends Audit {
      * @return {{lcpNodeToPreload?: LH.Gatherer.Simulation.GraphNetworkNode, initiatorPath?: InitiatorPath}}
      */
     static getLCPNodeToPreload(mainResource: LH.Artifacts.NetworkRequest, graph: LH.Gatherer.Simulation.GraphNode, lcpRecord: NetworkRequest | undefined): {
-        lcpNodeToPreload?: import("../lib/dependency-graph/network-node.js").NetworkNode | undefined;
+        lcpNodeToPreload?: import("../../types/gatherer.js").default.Simulation.GraphNetworkNode | undefined;
         initiatorPath?: InitiatorPath | undefined;
     };
     /**

package/core/computed/document-urls.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {NetworkAnalyzer} from '../lib/dependency-graph/simulator/network-analyzer.js';
+import {NetworkAnalyzer} from '../lib/lantern/simulator/network-analyzer.js';
 import {makeComputedArtifact} from './computed-artifact.js';
 import {NetworkRecords} from './network-records.js';
 import {ProcessedTrace} from './processed-trace.js';

package/core/computed/load-simulator.d.ts

@@ -23,6 +23,6 @@ declare class LoadSimulator {
      */
     static convertAnalysisToSaveableLanternData(networkAnalysis: LH.Artifacts.NetworkAnalysis): LH.PrecomputedLanternData;
 }
-import { Simulator } from '../lib/dependency-graph/simulator/simulator.js';
+import { Simulator } from '../lib/lantern/simulator/simulator.js';
 import { NetworkAnalysis } from './network-analysis.js';
 //# sourceMappingURL=load-simulator.d.ts.map

package/core/computed/load-simulator.js

@@ -6,7 +6,7 @@
 
 import {makeComputedArtifact} from './computed-artifact.js';
 import * as constants from '../config/constants.js';
-import {Simulator} from '../lib/dependency-graph/simulator/simulator.js';
+import {Simulator} from '../lib/lantern/simulator/simulator.js';
 import {NetworkAnalysis} from './network-analysis.js';
 
 class LoadSimulator {

package/core/computed/main-resource.js

@@ -6,7 +6,7 @@
 
 import {makeComputedArtifact} from './computed-artifact.js';
 import {NetworkRecords} from './network-records.js';
-import {NetworkAnalyzer} from '../lib/dependency-graph/simulator/network-analyzer.js';
+import {NetworkAnalyzer} from '../lib/lantern/simulator/network-analyzer.js';
 
 /**
  * @fileoverview This artifact identifies the main resource on the page. Current solution assumes

package/core/computed/metrics/lantern-first-contentful-paint.d.ts

@@ -1,15 +1,15 @@
 export { LanternFirstContentfulPaintComputed as LanternFirstContentfulPaint };
-export type Node = import('../../lib/dependency-graph/base-node.js').Node;
-export type CPUNode = import('../../lib/dependency-graph/cpu-node').CPUNode;
-export type NetworkNode = import('../../lib/dependency-graph/network-node').NetworkNode;
+export type Node = import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
+export type CPUNode = import('../../lib/lantern/cpu-node.js').CPUNode<LH.Artifacts.NetworkRequest>;
+export type NetworkNode = import('../../lib/lantern/network-node.js').NetworkNode<LH.Artifacts.NetworkRequest>;
 declare const LanternFirstContentfulPaintComputed: typeof LanternFirstContentfulPaint & {
     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/dependency-graph/base-node.js').Node} Node */
-/** @typedef {import('../../lib/dependency-graph/cpu-node').CPUNode} CPUNode */
-/** @typedef {import('../../lib/dependency-graph/network-node').NetworkNode} NetworkNode */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
+/** @typedef {import('../../lib/lantern/cpu-node.js').CPUNode<LH.Artifacts.NetworkRequest>} CPUNode */
+/** @typedef {import('../../lib/lantern/network-node.js').NetworkNode<LH.Artifacts.NetworkRequest>} NetworkNode */
 declare class LanternFirstContentfulPaint extends LanternMetric {
     /**
      * @typedef FirstPaintBasedGraphOpts

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

@@ -6,11 +6,11 @@
 
 import {makeComputedArtifact} from '../computed-artifact.js';
 import {LanternMetric} from './lantern-metric.js';
-import {BaseNode} from '../../lib/dependency-graph/base-node.js';
+import {BaseNode} from '../../lib/lantern/base-node.js';
 
-/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
-/** @typedef {import('../../lib/dependency-graph/cpu-node').CPUNode} CPUNode */
-/** @typedef {import('../../lib/dependency-graph/network-node').NetworkNode} NetworkNode */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
+/** @typedef {import('../../lib/lantern/cpu-node.js').CPUNode<LH.Artifacts.NetworkRequest>} CPUNode */
+/** @typedef {import('../../lib/lantern/network-node.js').NetworkNode<LH.Artifacts.NetworkRequest>} NetworkNode */
 
 class LanternFirstContentfulPaint extends LanternMetric {
   /**

package/core/computed/metrics/lantern-first-meaningful-paint.d.ts

@@ -1,11 +1,11 @@
 export { LanternFirstMeaningfulPaintComputed as LanternFirstMeaningfulPaint };
-export type Node = import('../../lib/dependency-graph/base-node.js').Node;
+export type Node = import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
 declare const LanternFirstMeaningfulPaintComputed: typeof LanternFirstMeaningfulPaint & {
     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/dependency-graph/base-node.js').Node} Node */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
 declare class LanternFirstMeaningfulPaint extends LanternMetric {
 }
 import { LanternMetric } from './lantern-metric.js';

package/core/computed/metrics/lantern-first-meaningful-paint.js

@@ -9,7 +9,7 @@ import {LanternMetric} from './lantern-metric.js';
 import {LighthouseError} from '../../lib/lh-error.js';
 import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js';
 
-/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
 
 class LanternFirstMeaningfulPaint extends LanternMetric {
   /**

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

@@ -1,15 +1,11 @@
 export { LanternInteractiveComputed as LanternInteractive };
-export type Node = import('../../lib/dependency-graph/base-node.js').Node;
+export type Node = import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
 declare const LanternInteractiveComputed: typeof LanternInteractive & {
-    /**
-     * @param {LH.Artifacts.MetricComputationDataInput} data
-     * @param {LH.Artifacts.ComputedContext} context
-     * @return {Promise<LH.Artifacts.LanternMetric>}
-     */
     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>;
 };
+import { NetworkRequest } from '../../lib/network-request.js';
 declare class LanternInteractive extends LanternMetric {
     /**
      * @param {Node} dependencyGraph

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

@@ -6,11 +6,11 @@
 
 import {makeComputedArtifact} from '../computed-artifact.js';
 import {LanternMetric} from './lantern-metric.js';
-import {BaseNode} from '../../lib/dependency-graph/base-node.js';
+import {BaseNode} from '../../lib/lantern/base-node.js';
 import {NetworkRequest} from '../../lib/network-request.js';
 import {LanternFirstMeaningfulPaint} from './lantern-first-meaningful-paint.js';
 
-/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
 
 // Any CPU task of 20 ms or more will end up being a critical long task on mobile
 const CRITICAL_LONG_TASK_THRESHOLD = 20;

package/core/computed/metrics/lantern-largest-contentful-paint.d.ts

@@ -1,11 +1,11 @@
 export { LanternLargestContentfulPaintComputed as LanternLargestContentfulPaint };
-export type Node = import('../../lib/dependency-graph/base-node.js').Node;
+export type Node = import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
 declare const LanternLargestContentfulPaintComputed: typeof LanternLargestContentfulPaint & {
     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/dependency-graph/base-node.js').Node} Node */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
 declare class LanternLargestContentfulPaint extends LanternMetric {
     /**
      * Low priority image nodes are usually offscreen and very unlikely to be the

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

@@ -9,7 +9,7 @@ import {LanternMetric} from './lantern-metric.js';
 import {LighthouseError} from '../../lib/lh-error.js';
 import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js';
 
-/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
 
 class LanternLargestContentfulPaint extends LanternMetric {
   /**

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

@@ -1,11 +1,11 @@
 export { LanternMaxPotentialFIDComputed as LanternMaxPotentialFID };
-export type Node = import('../../lib/dependency-graph/base-node.js').Node;
+export type Node = import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
 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/dependency-graph/base-node.js').Node} Node */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
 declare class LanternMaxPotentialFID extends LanternMetric {
     /**
      * @param {Node} dependencyGraph

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

@@ -6,10 +6,10 @@
 
 import {makeComputedArtifact} from '../computed-artifact.js';
 import {LanternMetric} from './lantern-metric.js';
-import {BaseNode} from '../../lib/dependency-graph/base-node.js';
+import {BaseNode} from '../../lib/lantern/base-node.js';
 import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js';
 
-/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
 
 class LanternMaxPotentialFID extends LanternMetric {
   /**

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

@@ -1,6 +1,6 @@
-export type Node = import('../../lib/dependency-graph/base-node.js').Node;
-export type NetworkNode = import('../../lib/dependency-graph/network-node').NetworkNode;
-export type Simulator = import('../../lib/dependency-graph/simulator/simulator').Simulator;
+export type Node = import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
+export type NetworkNode = import('../../lib/lantern/network-node.js').NetworkNode<LH.Artifacts.NetworkRequest>;
+export type Simulator = import('../../lib/lantern/simulator/simulator.js').Simulator;
 export type Extras = {
     optimistic: boolean;
     fcpResult?: LH.Artifacts.LanternMetric | undefined;
@@ -10,9 +10,9 @@ export type Extras = {
         speedIndex: number;
     } | undefined;
 };
-/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
-/** @typedef {import('../../lib/dependency-graph/network-node').NetworkNode} NetworkNode */
-/** @typedef {import('../../lib/dependency-graph/simulator/simulator').Simulator} Simulator */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
+/** @typedef {import('../../lib/lantern/network-node.js').NetworkNode<LH.Artifacts.NetworkRequest>} NetworkNode */
+/** @typedef {import('../../lib/lantern/simulator/simulator.js').Simulator} Simulator */
 /**
  * @typedef Extras
  * @property {boolean} optimistic
@@ -74,5 +74,6 @@ export class LanternMetric {
      */
     static compute_(data: LH.Artifacts.MetricComputationDataInput, context: LH.Artifacts.ComputedContext): Promise<LH.Artifacts.LanternMetric>;
 }
+import { NetworkRequest } from '../../lib/network-request.js';
 import { ProcessedNavigation } from '../processed-navigation.js';
 //# sourceMappingURL=lantern-metric.d.ts.map

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

@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {BaseNode} from '../../lib/dependency-graph/base-node.js';
+import {BaseNode} from '../../lib/lantern/base-node.js';
 import {NetworkRequest} from '../../lib/network-request.js';
 import {ProcessedNavigation} from '../processed-navigation.js';
 import {PageDependencyGraph} from '../page-dependency-graph.js';
 import {LoadSimulator} from '../load-simulator.js';
 
-/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
-/** @typedef {import('../../lib/dependency-graph/network-node').NetworkNode} NetworkNode */
-/** @typedef {import('../../lib/dependency-graph/simulator/simulator').Simulator} Simulator */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
+/** @typedef {import('../../lib/lantern/network-node.js').NetworkNode<LH.Artifacts.NetworkRequest>} NetworkNode */
+/** @typedef {import('../../lib/lantern/simulator/simulator.js').Simulator} Simulator */
 
 /**
  * @typedef Extras

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

@@ -1,11 +1,11 @@
 export { LanternSpeedIndexComputed as LanternSpeedIndex };
-export type Node = import('../../lib/dependency-graph/base-node.js').Node;
+export type Node = import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
 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/dependency-graph/base-node.js').Node} Node */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
 declare class LanternSpeedIndex extends LanternMetric {
     /**
      * @param {Node} dependencyGraph

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

@@ -6,12 +6,12 @@
 
 import {makeComputedArtifact} from '../computed-artifact.js';
 import {LanternMetric} from './lantern-metric.js';
-import {BaseNode} from '../../lib/dependency-graph/base-node.js';
+import {BaseNode} from '../../lib/lantern/base-node.js';
 import {Speedline} from '../speedline.js';
 import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js';
 import {throttling as defaultThrottling} from '../../config/constants.js';
 
-/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
 
 class LanternSpeedIndex extends LanternMetric {
   /**

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

@@ -1,11 +1,11 @@
 export { LanternTotalBlockingTimeComputed as LanternTotalBlockingTime };
-export type Node = import('../../lib/dependency-graph/base-node.js').Node;
+export type Node = import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
 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/dependency-graph/base-node.js').Node} Node */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
 declare class LanternTotalBlockingTime extends LanternMetric {
     /**
      * @param {Node} dependencyGraph

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

@@ -6,12 +6,12 @@
 
 import {makeComputedArtifact} from '../computed-artifact.js';
 import {LanternMetric} from './lantern-metric.js';
-import {BaseNode} from '../../lib/dependency-graph/base-node.js';
+import {BaseNode} from '../../lib/lantern/base-node.js';
 import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js';
 import {LanternInteractive} from './lantern-interactive.js';
 import {BLOCKING_TIME_THRESHOLD, calculateSumOfBlockingTime} from './tbt-utils.js';
 
-/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
+/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
 
 class LanternTotalBlockingTime extends LanternMetric {
   /**

package/core/computed/network-analysis.js

@@ -5,7 +5,7 @@
  */
 
 import {makeComputedArtifact} from './computed-artifact.js';
-import {NetworkAnalyzer} from '../lib/dependency-graph/simulator/network-analyzer.js';
+import {NetworkAnalyzer} from '../lib/lantern/simulator/network-analyzer.js';
 import {NetworkRecords} from './network-records.js';
 
 class NetworkAnalysis {

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

@@ -1,11 +1,11 @@
 export { PageDependencyGraphComputed as PageDependencyGraph };
-export type Node = import('../lib/dependency-graph/base-node.js').Node;
+export type Node = import('../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
 export type URLArtifact = Omit<LH.Artifacts['URL'], 'finalDisplayedUrl'>;
 export type NetworkNodeOutput = {
-    nodes: Array<NetworkNode>;
-    idToNodeMap: Map<string, NetworkNode>;
-    urlToNodeMap: Map<string, Array<NetworkNode>>;
-    frameIdToNodeMap: Map<string, NetworkNode | null>;
+    nodes: Array<NetworkNode<LH.Artifacts.NetworkRequest>>;
+    idToNodeMap: Map<string, NetworkNode<LH.Artifacts.NetworkRequest>>;
+    urlToNodeMap: Map<string, Array<NetworkNode<LH.Artifacts.NetworkRequest>>>;
+    frameIdToNodeMap: Map<string, NetworkNode<LH.Artifacts.NetworkRequest> | null>;
 };
 declare const PageDependencyGraphComputed: typeof PageDependencyGraph & {
     request: (dependencies: {
@@ -14,9 +14,10 @@ declare const PageDependencyGraphComputed: typeof PageDependencyGraph & {
         URL: LH.Artifacts['URL'];
     }, context: import("../../types/utility-types.js").default.ImmutableObject<{
         computedCache: Map<string, import("../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<import("../lib/dependency-graph/base-node.js").Node>;
+    }>) => Promise<Node>;
 };
-import { NetworkNode } from '../lib/dependency-graph/network-node.js';
+import { NetworkRequest } from '../lib/network-request.js';
+import { NetworkNode } from '../lib/lantern/network-node.js';
 declare class PageDependencyGraph {
     /**
      * @param {LH.Artifacts.NetworkRequest} record
@@ -73,7 +74,6 @@ declare class PageDependencyGraph {
         URL: LH.Artifacts['URL'];
     }, context: LH.Artifacts.ComputedContext): Promise<Node>;
 }
-import { NetworkRequest } from '../lib/network-request.js';
 import { ProcessedTrace } from './processed-trace.js';
-import { CPUNode } from '../lib/dependency-graph/cpu-node.js';
+import { CPUNode } from '../lib/lantern/cpu-node.js';
 //# sourceMappingURL=page-dependency-graph.d.ts.map

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

@@ -5,24 +5,24 @@
  */
 
 import {makeComputedArtifact} from './computed-artifact.js';
-import {NetworkNode} from '../lib/dependency-graph/network-node.js';
-import {CPUNode} from '../lib/dependency-graph/cpu-node.js';
+import {NetworkNode} from '../lib/lantern/network-node.js';
+import {CPUNode} from '../lib/lantern/cpu-node.js';
 import {TraceProcessor} from '../lib/tracehouse/trace-processor.js';
 import {NetworkRequest} from '../lib/network-request.js';
 import {ProcessedTrace} from './processed-trace.js';
 import {NetworkRecords} from './network-records.js';
-import {NetworkAnalyzer} from '../lib/dependency-graph/simulator/network-analyzer.js';
+import {NetworkAnalyzer} from '../lib/lantern/simulator/network-analyzer.js';
 import {DocumentUrls} from './document-urls.js';
 
-/** @typedef {import('../lib/dependency-graph/base-node.js').Node} Node */
+/** @typedef {import('../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
 /** @typedef {Omit<LH.Artifacts['URL'], 'finalDisplayedUrl'>} URLArtifact */
 
 /**
  * @typedef {Object} NetworkNodeOutput
- * @property {Array<NetworkNode>} nodes
- * @property {Map<string, NetworkNode>} idToNodeMap
- * @property {Map<string, Array<NetworkNode>>} urlToNodeMap
- * @property {Map<string, NetworkNode|null>} frameIdToNodeMap
+ * @property {Array<NetworkNode<LH.Artifacts.NetworkRequest>>} nodes
+ * @property {Map<string, NetworkNode<LH.Artifacts.NetworkRequest>>} idToNodeMap
+ * @property {Map<string, Array<NetworkNode<LH.Artifacts.NetworkRequest>>>} urlToNodeMap
+ * @property {Map<string, NetworkNode<LH.Artifacts.NetworkRequest>|null>} frameIdToNodeMap
  */
 
 // Shorter tasks have negligible impact on simulation results.
@@ -88,7 +88,7 @@ class PageDependencyGraph {
         record.requestId += ':duplicate';
       }
 
-      const node = new NetworkNode(record);
+      const node = new NetworkNode(NetworkRequest.asLanternNetworkRequest(record));
       nodes.push(node);
 
       const urlList = urlToNodeMap.get(record.url) || [];

package/core/lib/asset-saver.js

@@ -11,7 +11,7 @@ import url from 'url';
 
 import log from 'lighthouse-logger';
 
-import {Simulator} from './dependency-graph/simulator/simulator.js';
+import {Simulator} from './lantern/simulator/simulator.js';
 import lanternTraceSaver from './lantern-trace-saver.js';
 import {MetricTraceEvents} from './traces/metric-trace-events.js';
 import {NetworkAnalysis} from '../computed/network-analysis.js';