From e0457d8e96cb7545c1557b710a5eb871c179d9bd Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Wed, 12 Jun 2024 11:02:35 -0700 Subject: [PATCH] core(lantern): rename files to PascalCase (#16068) --- .../byte-efficiency/byte-efficiency-audit.js | 4 ++-- .../render-blocking-resources.js | 8 ++++---- core/audits/dobetterweb/uses-http2.js | 4 ++-- core/computed/document-urls.js | 2 +- core/computed/load-simulator.js | 2 +- core/computed/main-resource.js | 2 +- .../metrics/lantern-first-contentful-paint.js | 4 ++-- core/computed/metrics/lantern-interactive.js | 4 ++-- .../lantern-largest-contentful-paint.js | 4 ++-- .../metrics/lantern-max-potential-fid.js | 4 ++-- core/computed/metrics/lantern-metric.js | 4 ++-- core/computed/metrics/lantern-speed-index.js | 4 ++-- .../metrics/lantern-total-blocking-time.js | 4 ++-- core/computed/metrics/total-blocking-time.js | 2 +- core/computed/network-analysis.js | 2 +- core/computed/page-dependency-graph.js | 6 +++--- core/computed/tbt-impact-tasks.js | 2 +- core/lib/asset-saver.js | 2 +- core/lib/lantern-trace-saver.js | 4 ++-- .../lib/lantern/{base-node.js => BaseNode.js} | 2 +- core/lib/lantern/{cpu-node.js => CpuNode.js} | 2 +- .../{lantern-error.js => LanternError.js} | 0 core/lib/lantern/{metric.js => Metric.js} | 8 ++++---- .../{network-node.js => NetworkNode.js} | 2 +- ...ndency-graph.js => PageDependencyGraph.js} | 8 ++++---- .../lib/lantern/{tbt-utils.js => TBTUtils.js} | 0 ...-data.js => TraceEngineComputationData.js} | 2 +- ...ntful-paint.js => FirstContentfulPaint.js} | 10 +++++----- .../{interactive.js => Interactive.js} | 10 +++++----- ...ful-paint.js => LargestContentfulPaint.js} | 10 +++++----- ...ax-potential-fid.js => MaxPotentialFID.js} | 10 +++++----- .../metrics/{speed-index.js => SpeedIndex.js} | 10 +++++----- ...-blocking-time.js => TotalBlockingTime.js} | 12 +++++------ .../{connection-pool.js => ConnectionPool.js} | 4 ++-- .../simulator/{dns-cache.js => DNSCache.js} | 0 ...network-analyzer.js => NetworkAnalyzer.js} | 0 ...r-timing-map.js => SimulationTimingMap.js} | 8 ++++---- .../simulator/{simulator.js => Simulator.js} | 20 +++++++++---------- .../{tcp-connection.js => TcpConnection.js} | 2 +- core/lib/lantern/types/lantern.d.ts | 8 ++++---- core/lib/navigation-error.js | 2 +- core/lib/network-recorder.js | 2 +- core/scripts/lantern/run-once.js | 2 +- .../byte-efficiency-audit-test.js | 2 +- .../render-blocking-resources-test.js | 6 +++--- core/test/computed/load-simulator-test.js | 2 +- .../computed/page-dependency-graph-test.js | 2 +- core/test/lib/lantern/base-node-test.js | 4 ++-- ...etric-test-utils.js => MetricTestUtils.js} | 6 +++--- .../metrics/first-contentful-paint-test.js | 4 ++-- .../lib/lantern/metrics/interactive-test.js | 8 ++++---- .../lantern-largest-contentful-paint-test.js | 6 +++--- .../lib/lantern/metrics/speed-index-test.js | 6 +++--- .../lib/lantern/page-dependency-graph-test.js | 2 +- .../lantern/simulator/connection-pool-test.js | 2 +- .../lib/lantern/simulator/dns-cache-test.js | 2 +- .../simulator/network-analyzer-test.js | 6 +++--- .../lib/lantern/simulator/simulator-test.js | 14 ++++++------- .../lantern/simulator/tcp-connection-test.js | 2 +- core/test/lib/lantern/tbt-utils-test.js | 2 +- tsconfig.json | 2 +- types/artifacts.d.ts | 2 +- 62 files changed, 141 insertions(+), 141 deletions(-) rename core/lib/lantern/{base-node.js => BaseNode.js} (99%) rename core/lib/lantern/{cpu-node.js => CpuNode.js} (97%) rename core/lib/lantern/{lantern-error.js => LanternError.js} (100%) rename core/lib/lantern/{metric.js => Metric.js} (94%) rename core/lib/lantern/{network-node.js => NetworkNode.js} (98%) rename core/lib/lantern/{page-dependency-graph.js => PageDependencyGraph.js} (99%) rename core/lib/lantern/{tbt-utils.js => TBTUtils.js} (100%) rename core/lib/lantern/{trace-engine-computation-data.js => TraceEngineComputationData.js} (99%) rename core/lib/lantern/metrics/{first-contentful-paint.js => FirstContentfulPaint.js} (96%) rename core/lib/lantern/metrics/{interactive.js => Interactive.js} (92%) rename core/lib/lantern/metrics/{largest-contentful-paint.js => LargestContentfulPaint.js} (91%) rename core/lib/lantern/metrics/{max-potential-fid.js => MaxPotentialFID.js} (90%) rename core/lib/lantern/metrics/{speed-index.js => SpeedIndex.js} (95%) rename core/lib/lantern/metrics/{total-blocking-time.js => TotalBlockingTime.js} (92%) rename core/lib/lantern/simulator/{connection-pool.js => ConnectionPool.js} (97%) rename core/lib/lantern/simulator/{dns-cache.js => DNSCache.js} (100%) rename core/lib/lantern/simulator/{network-analyzer.js => NetworkAnalyzer.js} (100%) rename core/lib/lantern/simulator/{simulator-timing-map.js => SimulationTimingMap.js} (96%) rename core/lib/lantern/simulator/{simulator.js => Simulator.js} (96%) rename core/lib/lantern/simulator/{tcp-connection.js => TcpConnection.js} (98%) rename core/test/lib/lantern/metrics/{metric-test-utils.js => MetricTestUtils.js} (93%) diff --git a/core/audits/byte-efficiency/byte-efficiency-audit.js b/core/audits/byte-efficiency/byte-efficiency-audit.js index 84efbcfd29ed..70e9fd92bb23 100644 --- a/core/audits/byte-efficiency/byte-efficiency-audit.js +++ b/core/audits/byte-efficiency/byte-efficiency-audit.js @@ -14,8 +14,8 @@ import {LCPImageRecord} from '../../computed/lcp-image-record.js'; const str_ = i18n.createIcuMessageFn(import.meta.url, {}); -/** @typedef {import('../../lib/lantern/simulator/simulator.js').Simulator} Simulator */ -/** @typedef {import('../../lib/lantern/base-node.js').Node} Node */ +/** @typedef {import('../../lib/lantern/simulator/Simulator.js').Simulator} Simulator */ +/** @typedef {import('../../lib/lantern/BaseNode.js').Node} 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 diff --git a/core/audits/byte-efficiency/render-blocking-resources.js b/core/audits/byte-efficiency/render-blocking-resources.js index e0ba123e6a50..c69e646a8347 100644 --- a/core/audits/byte-efficiency/render-blocking-resources.js +++ b/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/lantern/base-node.js'; +import {BaseNode} from '../../lib/lantern/BaseNode.js'; import {UnusedCSS} from '../../computed/unused-css.js'; import {NetworkRequest} from '../../lib/network-request.js'; import {LoadSimulator} from '../../computed/load-simulator.js'; @@ -20,9 +20,9 @@ import {LCPImageRecord} from '../../computed/lcp-image-record.js'; import {NavigationInsights} from '../../computed/navigation-insights.js'; -/** @typedef {import('../../lib/lantern/simulator/simulator.js').Simulator} Simulator */ -/** @typedef {import('../../lib/lantern/base-node.js').Node} Node */ -/** @typedef {import('../../lib/lantern/network-node.js').NetworkNode} NetworkNode */ +/** @typedef {import('../../lib/lantern/simulator/Simulator.js').Simulator} Simulator */ +/** @typedef {import('../../lib/lantern/BaseNode.js').Node} Node */ +/** @typedef {import('../../lib/lantern/NetworkNode.js').NetworkNode} 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) diff --git a/core/audits/dobetterweb/uses-http2.js b/core/audits/dobetterweb/uses-http2.js index a06eced68420..4c44473e76c2 100644 --- a/core/audits/dobetterweb/uses-http2.js +++ b/core/audits/dobetterweb/uses-http2.js @@ -9,8 +9,8 @@ * origin are over the http/2 protocol. */ -/** @typedef {import('../../lib/lantern/simulator/simulator.js').Simulator} Simulator */ -/** @typedef {import('../../lib/lantern/base-node.js').Node} Node */ +/** @typedef {import('../../lib/lantern/simulator/Simulator.js').Simulator} Simulator */ +/** @typedef {import('../../lib/lantern/BaseNode.js').Node} Node */ import {Audit} from '../audit.js'; import {EntityClassification} from '../../computed/entity-classification.js'; diff --git a/core/computed/document-urls.js b/core/computed/document-urls.js index 0562aaf98b67..b003148f7422 100644 --- a/core/computed/document-urls.js +++ b/core/computed/document-urls.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {NetworkAnalyzer} from '../lib/lantern/simulator/network-analyzer.js'; +import {NetworkAnalyzer} from '../lib/lantern/simulator/NetworkAnalyzer.js'; import {makeComputedArtifact} from './computed-artifact.js'; import {NetworkRecords} from './network-records.js'; import {ProcessedTrace} from './processed-trace.js'; diff --git a/core/computed/load-simulator.js b/core/computed/load-simulator.js index 2075c14f005c..c53bf1c57292 100644 --- a/core/computed/load-simulator.js +++ b/core/computed/load-simulator.js @@ -5,7 +5,7 @@ */ import {makeComputedArtifact} from './computed-artifact.js'; -import {Simulator} from '../lib/lantern/simulator/simulator.js'; +import {Simulator} from '../lib/lantern/simulator/Simulator.js'; import {NetworkAnalysis} from './network-analysis.js'; class LoadSimulator { diff --git a/core/computed/main-resource.js b/core/computed/main-resource.js index 0dc4fab48cae..2c2c777e20ab 100644 --- a/core/computed/main-resource.js +++ b/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/lantern/simulator/network-analyzer.js'; +import {NetworkAnalyzer} from '../lib/lantern/simulator/NetworkAnalyzer.js'; /** * @fileoverview This artifact identifies the main resource on the page. Current solution assumes diff --git a/core/computed/metrics/lantern-first-contentful-paint.js b/core/computed/metrics/lantern-first-contentful-paint.js index cbb2d2a68e30..0604b4a4acec 100644 --- a/core/computed/metrics/lantern-first-contentful-paint.js +++ b/core/computed/metrics/lantern-first-contentful-paint.js @@ -6,9 +6,9 @@ import {makeComputedArtifact} from '../computed-artifact.js'; import {getComputationDataParams, lanternErrorAdapter} from './lantern-metric.js'; -import {FirstContentfulPaint} from '../../lib/lantern/metrics/first-contentful-paint.js'; +import {FirstContentfulPaint} from '../../lib/lantern/metrics/FirstContentfulPaint.js'; -/** @typedef {import('../../lib/lantern/metric.js').Extras} Extras */ +/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */ class LanternFirstContentfulPaint extends FirstContentfulPaint { /** diff --git a/core/computed/metrics/lantern-interactive.js b/core/computed/metrics/lantern-interactive.js index e9636ecb875b..e42d574621b2 100644 --- a/core/computed/metrics/lantern-interactive.js +++ b/core/computed/metrics/lantern-interactive.js @@ -6,10 +6,10 @@ import {makeComputedArtifact} from '../computed-artifact.js'; import {LanternLargestContentfulPaint} from './lantern-largest-contentful-paint.js'; -import {Interactive} from '../../lib/lantern/metrics/interactive.js'; +import {Interactive} from '../../lib/lantern/metrics/Interactive.js'; import {getComputationDataParams, lanternErrorAdapter} from './lantern-metric.js'; -/** @typedef {import('../../lib/lantern/metric.js').Extras} Extras */ +/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */ class LanternInteractive extends Interactive { /** diff --git a/core/computed/metrics/lantern-largest-contentful-paint.js b/core/computed/metrics/lantern-largest-contentful-paint.js index 4afb9d86d08f..0ad96b7074b3 100644 --- a/core/computed/metrics/lantern-largest-contentful-paint.js +++ b/core/computed/metrics/lantern-largest-contentful-paint.js @@ -5,11 +5,11 @@ */ import {makeComputedArtifact} from '../computed-artifact.js'; -import {LargestContentfulPaint} from '../../lib/lantern/metrics/largest-contentful-paint.js'; +import {LargestContentfulPaint} from '../../lib/lantern/metrics/LargestContentfulPaint.js'; import {getComputationDataParams, lanternErrorAdapter} from './lantern-metric.js'; import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js'; -/** @typedef {import('../../lib/lantern/metric.js').Extras} Extras */ +/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */ class LanternLargestContentfulPaint extends LargestContentfulPaint { /** diff --git a/core/computed/metrics/lantern-max-potential-fid.js b/core/computed/metrics/lantern-max-potential-fid.js index 4772a95471fa..14bd8ea26705 100644 --- a/core/computed/metrics/lantern-max-potential-fid.js +++ b/core/computed/metrics/lantern-max-potential-fid.js @@ -5,11 +5,11 @@ */ import {makeComputedArtifact} from '../computed-artifact.js'; -import {MaxPotentialFID} from '../../lib/lantern/metrics/max-potential-fid.js'; +import {MaxPotentialFID} from '../../lib/lantern/metrics/MaxPotentialFID.js'; import {getComputationDataParams, lanternErrorAdapter} from './lantern-metric.js'; import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js'; -/** @typedef {import('../../lib/lantern/metric.js').Extras} Extras */ +/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */ class LanternMaxPotentialFID extends MaxPotentialFID { /** diff --git a/core/computed/metrics/lantern-metric.js b/core/computed/metrics/lantern-metric.js index f71e1819d1f3..bcd9a08f1984 100644 --- a/core/computed/metrics/lantern-metric.js +++ b/core/computed/metrics/lantern-metric.js @@ -4,13 +4,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {LanternError} from '../../lib/lantern/lantern-error.js'; +import {LanternError} from '../../lib/lantern/LanternError.js'; import {LighthouseError} from '../../lib/lh-error.js'; import {LoadSimulator} from '../load-simulator.js'; import {ProcessedNavigation} from '../processed-navigation.js'; import {PageDependencyGraph} from '../page-dependency-graph.js'; import {TraceEngineResult} from '../trace-engine-result.js'; -import {createProcessedNavigation} from '../../lib/lantern/trace-engine-computation-data.js'; +import {createProcessedNavigation} from '../../lib/lantern/TraceEngineComputationData.js'; /** * @param {LH.Artifacts.MetricComputationDataInput} data diff --git a/core/computed/metrics/lantern-speed-index.js b/core/computed/metrics/lantern-speed-index.js index afd2f1555413..a9cb9c2577ab 100644 --- a/core/computed/metrics/lantern-speed-index.js +++ b/core/computed/metrics/lantern-speed-index.js @@ -8,9 +8,9 @@ import {makeComputedArtifact} from '../computed-artifact.js'; import {getComputationDataParams, lanternErrorAdapter} from './lantern-metric.js'; import {Speedline} from '../speedline.js'; import {LanternFirstContentfulPaint} from './lantern-first-contentful-paint.js'; -import {SpeedIndex} from '../../lib/lantern/metrics/speed-index.js'; +import {SpeedIndex} from '../../lib/lantern/metrics/SpeedIndex.js'; -/** @typedef {import('../../lib/lantern/metric.js').Extras} Extras */ +/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */ class LanternSpeedIndex extends SpeedIndex { /** diff --git a/core/computed/metrics/lantern-total-blocking-time.js b/core/computed/metrics/lantern-total-blocking-time.js index d9dc4afc5728..8beec3225f03 100644 --- a/core/computed/metrics/lantern-total-blocking-time.js +++ b/core/computed/metrics/lantern-total-blocking-time.js @@ -4,13 +4,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {TotalBlockingTime} from '../../lib/lantern/metrics/total-blocking-time.js'; +import {TotalBlockingTime} from '../../lib/lantern/metrics/TotalBlockingTime.js'; import {makeComputedArtifact} from '../computed-artifact.js'; 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 */ +/** @typedef {import('../../lib/lantern/Metric.js').Extras} Extras */ class LanternTotalBlockingTime extends TotalBlockingTime { /** diff --git a/core/computed/metrics/total-blocking-time.js b/core/computed/metrics/total-blocking-time.js index c06a37a968a6..b138aab9d5fd 100644 --- a/core/computed/metrics/total-blocking-time.js +++ b/core/computed/metrics/total-blocking-time.js @@ -9,7 +9,7 @@ import ComputedMetric from './metric.js'; import {TraceProcessor} from '../../lib/tracehouse/trace-processor.js'; import {LanternTotalBlockingTime} from './lantern-total-blocking-time.js'; import {Interactive} from './interactive.js'; -import {calculateSumOfBlockingTime} from '../../lib/lantern/tbt-utils.js'; +import {calculateSumOfBlockingTime} from '../../lib/lantern/TBTUtils.js'; /** * @fileoverview This audit determines Total Blocking Time. diff --git a/core/computed/network-analysis.js b/core/computed/network-analysis.js index bebcd0d47638..aee4577383ea 100644 --- a/core/computed/network-analysis.js +++ b/core/computed/network-analysis.js @@ -5,7 +5,7 @@ */ import {makeComputedArtifact} from './computed-artifact.js'; -import {NetworkAnalyzer} from '../lib/lantern/simulator/network-analyzer.js'; +import {NetworkAnalyzer} from '../lib/lantern/simulator/NetworkAnalyzer.js'; import {NetworkRecords} from './network-records.js'; class NetworkAnalysis { diff --git a/core/computed/page-dependency-graph.js b/core/computed/page-dependency-graph.js index f6a38fda02da..87dc7eaa87f1 100644 --- a/core/computed/page-dependency-graph.js +++ b/core/computed/page-dependency-graph.js @@ -5,14 +5,14 @@ */ import {makeComputedArtifact} from './computed-artifact.js'; -import {PageDependencyGraph as LanternPageDependencyGraph} from '../lib/lantern/page-dependency-graph.js'; +import {PageDependencyGraph as LanternPageDependencyGraph} from '../lib/lantern/PageDependencyGraph.js'; import {NetworkRequest} from '../lib/network-request.js'; import {ProcessedTrace} from './processed-trace.js'; import {NetworkRecords} from './network-records.js'; import {TraceEngineResult} from './trace-engine-result.js'; -import * as TraceEngineComputationData from '../lib/lantern/trace-engine-computation-data.js'; +import * as TraceEngineComputationData from '../lib/lantern/TraceEngineComputationData.js'; -/** @typedef {import('../lib/lantern/base-node.js').Node} Node */ +/** @typedef {import('../lib/lantern/BaseNode.js').Node} Node */ class PageDependencyGraph { /** diff --git a/core/computed/tbt-impact-tasks.js b/core/computed/tbt-impact-tasks.js index bea336fafdce..8310f82430d9 100644 --- a/core/computed/tbt-impact-tasks.js +++ b/core/computed/tbt-impact-tasks.js @@ -11,7 +11,7 @@ import {FirstContentfulPaint} from './metrics/first-contentful-paint.js'; import {Interactive} from './metrics/interactive.js'; import {TotalBlockingTime} from './metrics/total-blocking-time.js'; import {ProcessedTrace} from './processed-trace.js'; -import {calculateTbtImpactForEvent} from '../lib/lantern/tbt-utils.js'; +import {calculateTbtImpactForEvent} from '../lib/lantern/TBTUtils.js'; class TBTImpactTasks { /** diff --git a/core/lib/asset-saver.js b/core/lib/asset-saver.js index f11c0cc54960..ddbc480a3294 100644 --- a/core/lib/asset-saver.js +++ b/core/lib/asset-saver.js @@ -12,7 +12,7 @@ import {createGzip, gunzipSync} from 'zlib'; import log from 'lighthouse-logger'; -import {Simulator} from './lantern/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'; diff --git a/core/lib/lantern-trace-saver.js b/core/lib/lantern-trace-saver.js index 6f172bf7e4f9..4f469d038d22 100644 --- a/core/lib/lantern-trace-saver.js +++ b/core/lib/lantern-trace-saver.js @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -/** @typedef {import('./lantern/base-node.js').Node} Node */ -/** @typedef {import('./lantern/simulator/simulator.js').CompleteNodeTiming} CompleteNodeTiming */ +/** @typedef {import('./lantern/BaseNode.js').Node} Node */ +/** @typedef {import('./lantern/simulator/Simulator.js').CompleteNodeTiming} CompleteNodeTiming */ /** * @param {Map} nodeTimings diff --git a/core/lib/lantern/base-node.js b/core/lib/lantern/BaseNode.js similarity index 99% rename from core/lib/lantern/base-node.js rename to core/lib/lantern/BaseNode.js index c9fe3c8a6cb4..e2f8beb4ef9d 100644 --- a/core/lib/lantern/base-node.js +++ b/core/lib/lantern/BaseNode.js @@ -8,7 +8,7 @@ * A union of all types derived from BaseNode, allowing type check discrimination * based on `node.type`. If a new node type is created, it should be added here. * @template [T=any] - * @typedef {import('./cpu-node.js').CPUNode | import('./network-node.js').NetworkNode} Node + * @typedef {import('./CpuNode.js').CPUNode | import('./NetworkNode.js').NetworkNode} Node */ /** diff --git a/core/lib/lantern/cpu-node.js b/core/lib/lantern/CpuNode.js similarity index 97% rename from core/lib/lantern/cpu-node.js rename to core/lib/lantern/CpuNode.js index 9bb381bdf229..9148c1cb7395 100644 --- a/core/lib/lantern/cpu-node.js +++ b/core/lib/lantern/CpuNode.js @@ -5,7 +5,7 @@ */ import * as Lantern from './types/lantern.js'; -import {BaseNode} from './base-node.js'; +import {BaseNode} from './BaseNode.js'; /** * @template [T=any] diff --git a/core/lib/lantern/lantern-error.js b/core/lib/lantern/LanternError.js similarity index 100% rename from core/lib/lantern/lantern-error.js rename to core/lib/lantern/LanternError.js diff --git a/core/lib/lantern/metric.js b/core/lib/lantern/Metric.js similarity index 94% rename from core/lib/lantern/metric.js rename to core/lib/lantern/Metric.js index 020d0d50abf8..dcb3d5ab5780 100644 --- a/core/lib/lantern/metric.js +++ b/core/lib/lantern/Metric.js @@ -5,12 +5,12 @@ */ import * as Lantern from './types/lantern.js'; -import {BaseNode} from './base-node.js'; +import {BaseNode} from './BaseNode.js'; import {RESOURCE_TYPES} from '../network-request.js'; -/** @typedef {import('./base-node.js').Node} Node */ -/** @typedef {import('./network-node.js').NetworkNode} NetworkNode */ -/** @typedef {import('./simulator/simulator.js').Simulator} Simulator */ +/** @typedef {import('./BaseNode.js').Node} Node */ +/** @typedef {import('./NetworkNode.js').NetworkNode} NetworkNode */ +/** @typedef {import('./simulator/Simulator.js').Simulator} Simulator */ /** * @typedef Extras diff --git a/core/lib/lantern/network-node.js b/core/lib/lantern/NetworkNode.js similarity index 98% rename from core/lib/lantern/network-node.js rename to core/lib/lantern/NetworkNode.js index a95bb73f98ea..d7064d658284 100644 --- a/core/lib/lantern/network-node.js +++ b/core/lib/lantern/NetworkNode.js @@ -6,7 +6,7 @@ import * as Lantern from './types/lantern.js'; import {NetworkRequestTypes} from './lantern.js'; -import {BaseNode} from './base-node.js'; +import {BaseNode} from './BaseNode.js'; const NON_NETWORK_SCHEMES = [ 'blob', // @see https://developer.mozilla.org/en-US/docs/Web/API/URL/createObjectURL diff --git a/core/lib/lantern/page-dependency-graph.js b/core/lib/lantern/PageDependencyGraph.js similarity index 99% rename from core/lib/lantern/page-dependency-graph.js rename to core/lib/lantern/PageDependencyGraph.js index a3def68f32af..f7673cb18b54 100644 --- a/core/lib/lantern/page-dependency-graph.js +++ b/core/lib/lantern/PageDependencyGraph.js @@ -6,9 +6,9 @@ import * as Lantern from './types/lantern.js'; import {NetworkRequestTypes} from './lantern.js'; -import {NetworkNode} from './network-node.js'; -import {CPUNode} from './cpu-node.js'; -import {NetworkAnalyzer} from './simulator/network-analyzer.js'; +import {NetworkNode} from './NetworkNode.js'; +import {CPUNode} from './CpuNode.js'; +import {NetworkAnalyzer} from './simulator/NetworkAnalyzer.js'; // COMPAT: m71+ We added RunTask to `disabled-by-default-lighthouse` const SCHEDULABLE_TASK_TITLE_LH = 'RunTask'; @@ -19,7 +19,7 @@ const SCHEDULABLE_TASK_TITLE_ALT2 = 'ThreadControllerImpl::DoWork'; // m65 and earlier const SCHEDULABLE_TASK_TITLE_ALT3 = 'TaskQueueManager::ProcessTaskFromWorkQueue'; -/** @typedef {import('./base-node.js').Node} Node */ +/** @typedef {import('./BaseNode.js').Node} Node */ /** * @typedef {Object} NetworkNodeOutput diff --git a/core/lib/lantern/tbt-utils.js b/core/lib/lantern/TBTUtils.js similarity index 100% rename from core/lib/lantern/tbt-utils.js rename to core/lib/lantern/TBTUtils.js diff --git a/core/lib/lantern/trace-engine-computation-data.js b/core/lib/lantern/TraceEngineComputationData.js similarity index 99% rename from core/lib/lantern/trace-engine-computation-data.js rename to core/lib/lantern/TraceEngineComputationData.js index f827fea50710..ebbec88f7451 100644 --- a/core/lib/lantern/trace-engine-computation-data.js +++ b/core/lib/lantern/TraceEngineComputationData.js @@ -8,7 +8,7 @@ import * as TraceEngine from '@paulirish/trace_engine'; import * as Protocol from '@paulirish/trace_engine/generated/protocol.js'; import * as Lantern from './types/lantern.js'; -import {PageDependencyGraph} from './page-dependency-graph.js'; +import {PageDependencyGraph} from './PageDependencyGraph.js'; import {RESOURCE_TYPES} from '../network-request.js'; /** @typedef {import('@paulirish/trace_engine/models/trace/handlers/PageLoadMetricsHandler.js').MetricName} MetricName */ diff --git a/core/lib/lantern/metrics/first-contentful-paint.js b/core/lib/lantern/metrics/FirstContentfulPaint.js similarity index 96% rename from core/lib/lantern/metrics/first-contentful-paint.js rename to core/lib/lantern/metrics/FirstContentfulPaint.js index ef1c6a8e968a..b0aef22ba742 100644 --- a/core/lib/lantern/metrics/first-contentful-paint.js +++ b/core/lib/lantern/metrics/FirstContentfulPaint.js @@ -5,12 +5,12 @@ */ import * as Lantern from '../types/lantern.js'; -import {Metric} from '../metric.js'; -import {BaseNode} from '../base-node.js'; +import {Metric} from '../Metric.js'; +import {BaseNode} from '../BaseNode.js'; -/** @typedef {import('../base-node.js').Node} Node */ -/** @template T @typedef {import('../network-node.js').NetworkNode} NetworkNode */ -/** @typedef {import('../cpu-node.js').CPUNode} CpuNode */ +/** @typedef {import('../BaseNode.js').Node} Node */ +/** @template T @typedef {import('../NetworkNode.js').NetworkNode} NetworkNode */ +/** @typedef {import('../CpuNode.js').CPUNode} CpuNode */ class FirstContentfulPaint extends Metric { /** diff --git a/core/lib/lantern/metrics/interactive.js b/core/lib/lantern/metrics/Interactive.js similarity index 92% rename from core/lib/lantern/metrics/interactive.js rename to core/lib/lantern/metrics/Interactive.js index d2293f5181a9..e71f4b9e143d 100644 --- a/core/lib/lantern/metrics/interactive.js +++ b/core/lib/lantern/metrics/Interactive.js @@ -5,11 +5,11 @@ */ import * as Lantern from '../types/lantern.js'; -import {Metric} from '../metric.js'; -import {BaseNode} from '../base-node.js'; +import {Metric} from '../Metric.js'; +import {BaseNode} from '../BaseNode.js'; import {NetworkRequestTypes} from '../lantern.js'; -/** @typedef {import('../base-node.js').Node} Node */ +/** @typedef {import('../BaseNode.js').Node} 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; @@ -62,7 +62,7 @@ class Interactive extends Metric { /** * @param {Lantern.Simulation.Result} simulationResult - * @param {import('../metric.js').Extras} extras + * @param {import('../Metric.js').Extras} extras * @return {Lantern.Simulation.Result} */ static getEstimateFromSimulation(simulationResult, extras) { @@ -80,7 +80,7 @@ class Interactive extends Metric { /** * @param {Lantern.Simulation.MetricComputationDataInput} data - * @param {Omit=} extras + * @param {Omit=} extras * @return {Promise} */ static async compute(data, extras) { diff --git a/core/lib/lantern/metrics/largest-contentful-paint.js b/core/lib/lantern/metrics/LargestContentfulPaint.js similarity index 91% rename from core/lib/lantern/metrics/largest-contentful-paint.js rename to core/lib/lantern/metrics/LargestContentfulPaint.js index 096e40c3b2bf..061a5fd274a8 100644 --- a/core/lib/lantern/metrics/largest-contentful-paint.js +++ b/core/lib/lantern/metrics/LargestContentfulPaint.js @@ -5,11 +5,11 @@ */ import * as Lantern from '../types/lantern.js'; -import {Metric} from '../metric.js'; -import {FirstContentfulPaint} from './first-contentful-paint.js'; -import {LanternError} from '../lantern-error.js'; +import {Metric} from '../Metric.js'; +import {FirstContentfulPaint} from './FirstContentfulPaint.js'; +import {LanternError} from '../LanternError.js'; -/** @typedef {import('../base-node.js').Node} Node */ +/** @typedef {import('../BaseNode.js').Node} Node */ class LargestContentfulPaint extends Metric { /** @@ -90,7 +90,7 @@ class LargestContentfulPaint extends Metric { /** * @param {Lantern.Simulation.MetricComputationDataInput} data - * @param {Omit=} extras + * @param {Omit=} extras * @return {Promise} */ static async compute(data, extras) { diff --git a/core/lib/lantern/metrics/max-potential-fid.js b/core/lib/lantern/metrics/MaxPotentialFID.js similarity index 90% rename from core/lib/lantern/metrics/max-potential-fid.js rename to core/lib/lantern/metrics/MaxPotentialFID.js index fa977cc0a3c0..334ce434950a 100644 --- a/core/lib/lantern/metrics/max-potential-fid.js +++ b/core/lib/lantern/metrics/MaxPotentialFID.js @@ -5,10 +5,10 @@ */ import * as Lantern from '../types/lantern.js'; -import {Metric} from '../metric.js'; -import {BaseNode} from '../base-node.js'; +import {Metric} from '../Metric.js'; +import {BaseNode} from '../BaseNode.js'; -/** @typedef {import('../base-node.js').Node} Node */ +/** @typedef {import('../BaseNode.js').Node} Node */ class MaxPotentialFID extends Metric { /** @@ -40,7 +40,7 @@ class MaxPotentialFID extends Metric { /** * @param {Lantern.Simulation.Result} simulation - * @param {import('../metric.js').Extras} extras + * @param {import('../Metric.js').Extras} extras * @return {Lantern.Simulation.Result} */ static getEstimateFromSimulation(simulation, extras) { @@ -65,7 +65,7 @@ class MaxPotentialFID extends Metric { /** * @param {Lantern.Simulation.MetricComputationDataInput} data - * @param {Omit=} extras + * @param {Omit=} extras * @return {Promise} */ static compute(data, extras) { diff --git a/core/lib/lantern/metrics/speed-index.js b/core/lib/lantern/metrics/SpeedIndex.js similarity index 95% rename from core/lib/lantern/metrics/speed-index.js rename to core/lib/lantern/metrics/SpeedIndex.js index 7898913a7801..8a77c2a9937f 100644 --- a/core/lib/lantern/metrics/speed-index.js +++ b/core/lib/lantern/metrics/SpeedIndex.js @@ -5,12 +5,12 @@ */ import * as Lantern from '../types/lantern.js'; -import {Metric} from '../metric.js'; -import {BaseNode} from '../base-node.js'; +import {Metric} from '../Metric.js'; +import {BaseNode} from '../BaseNode.js'; const mobileSlow4GRtt = 150; -/** @typedef {import('../base-node.js').Node} Node */ +/** @typedef {import('../BaseNode.js').Node} Node */ class SpeedIndex extends Metric { /** @@ -71,7 +71,7 @@ class SpeedIndex extends Metric { /** * @param {Lantern.Simulation.Result} simulationResult - * @param {import('../metric.js').Extras} extras + * @param {import('../Metric.js').Extras} extras * @return {Lantern.Simulation.Result} */ static getEstimateFromSimulation(simulationResult, extras) { @@ -90,7 +90,7 @@ class SpeedIndex extends Metric { /** * @param {Lantern.Simulation.MetricComputationDataInput} data - * @param {Omit=} extras + * @param {Omit=} extras * @return {Promise} */ static async compute(data, extras) { diff --git a/core/lib/lantern/metrics/total-blocking-time.js b/core/lib/lantern/metrics/TotalBlockingTime.js similarity index 92% rename from core/lib/lantern/metrics/total-blocking-time.js rename to core/lib/lantern/metrics/TotalBlockingTime.js index 59309a2621b5..314a39863158 100644 --- a/core/lib/lantern/metrics/total-blocking-time.js +++ b/core/lib/lantern/metrics/TotalBlockingTime.js @@ -5,11 +5,11 @@ */ import * as Lantern from '../types/lantern.js'; -import {Metric} from '../metric.js'; -import {BaseNode} from '../base-node.js'; -import {BLOCKING_TIME_THRESHOLD, calculateSumOfBlockingTime} from '../tbt-utils.js'; +import {Metric} from '../Metric.js'; +import {BaseNode} from '../BaseNode.js'; +import {BLOCKING_TIME_THRESHOLD, calculateSumOfBlockingTime} from '../TBTUtils.js'; -/** @typedef {import('../base-node.js').Node} Node */ +/** @typedef {import('../BaseNode.js').Node} Node */ class TotalBlockingTime extends Metric { /** @@ -41,7 +41,7 @@ class TotalBlockingTime extends Metric { /** * @param {Lantern.Simulation.Result} simulation - * @param {import('../metric.js').Extras} extras + * @param {import('../Metric.js').Extras} extras * @return {Lantern.Simulation.Result} */ static getEstimateFromSimulation(simulation, extras) { @@ -83,7 +83,7 @@ class TotalBlockingTime extends Metric { /** * @param {Lantern.Simulation.MetricComputationDataInput} data - * @param {Omit=} extras + * @param {Omit=} extras * @return {Promise} */ static async compute(data, extras) { diff --git a/core/lib/lantern/simulator/connection-pool.js b/core/lib/lantern/simulator/ConnectionPool.js similarity index 97% rename from core/lib/lantern/simulator/connection-pool.js rename to core/lib/lantern/simulator/ConnectionPool.js index fd42af55e0c3..86b1134ec808 100644 --- a/core/lib/lantern/simulator/connection-pool.js +++ b/core/lib/lantern/simulator/ConnectionPool.js @@ -5,8 +5,8 @@ */ import * as Lantern from '../types/lantern.js'; -import {NetworkAnalyzer} from './network-analyzer.js'; -import {TcpConnection} from './tcp-connection.js'; +import {NetworkAnalyzer} from './NetworkAnalyzer.js'; +import {TcpConnection} from './TcpConnection.js'; const DEFAULT_SERVER_RESPONSE_TIME = 30; const TLS_SCHEMES = ['https', 'wss']; diff --git a/core/lib/lantern/simulator/dns-cache.js b/core/lib/lantern/simulator/DNSCache.js similarity index 100% rename from core/lib/lantern/simulator/dns-cache.js rename to core/lib/lantern/simulator/DNSCache.js diff --git a/core/lib/lantern/simulator/network-analyzer.js b/core/lib/lantern/simulator/NetworkAnalyzer.js similarity index 100% rename from core/lib/lantern/simulator/network-analyzer.js rename to core/lib/lantern/simulator/NetworkAnalyzer.js diff --git a/core/lib/lantern/simulator/simulator-timing-map.js b/core/lib/lantern/simulator/SimulationTimingMap.js similarity index 96% rename from core/lib/lantern/simulator/simulator-timing-map.js rename to core/lib/lantern/simulator/SimulationTimingMap.js index 984ace0c553c..3dea62ec7a1f 100644 --- a/core/lib/lantern/simulator/simulator-timing-map.js +++ b/core/lib/lantern/simulator/SimulationTimingMap.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {BaseNode} from '../base-node.js'; +import {BaseNode} from '../BaseNode.js'; /** * @fileoverview @@ -15,9 +15,9 @@ import {BaseNode} from '../base-node.js'; */ -/** @typedef {import('../base-node.js').Node} Node */ -/** @typedef {import('../network-node.js').NetworkNode} NetworkNode */ -/** @typedef {import('../cpu-node.js').CPUNode} CpuNode */ +/** @typedef {import('../BaseNode.js').Node} Node */ +/** @typedef {import('../NetworkNode.js').NetworkNode} NetworkNode */ +/** @typedef {import('../CpuNode.js').CPUNode} CpuNode */ /** * @typedef NodeTimingComplete diff --git a/core/lib/lantern/simulator/simulator.js b/core/lib/lantern/simulator/Simulator.js similarity index 96% rename from core/lib/lantern/simulator/simulator.js rename to core/lib/lantern/simulator/Simulator.js index 1329315a9c48..6b382a241e86 100644 --- a/core/lib/lantern/simulator/simulator.js +++ b/core/lib/lantern/simulator/Simulator.js @@ -5,20 +5,20 @@ */ import * as Lantern from '../types/lantern.js'; -import {BaseNode} from '../base-node.js'; -import {TcpConnection} from './tcp-connection.js'; -import {ConnectionPool} from './connection-pool.js'; -import {DNSCache} from './dns-cache.js'; -import {SimulatorTimingMap} from './simulator-timing-map.js'; +import {BaseNode} from '../BaseNode.js'; +import {TcpConnection} from './TcpConnection.js'; +import {ConnectionPool} from './ConnectionPool.js'; +import {DNSCache} from './DNSCache.js'; +import {SimulatorTimingMap} from './SimulationTimingMap.js'; import {constants} from '../lantern.js'; const defaultThrottling = constants.throttling.mobileSlow4G; -/** @typedef {import('../base-node.js').Node} Node */ -/** @typedef {import('../network-node.js').NetworkNode} NetworkNode */ -/** @typedef {import('../cpu-node.js').CPUNode} CpuNode */ -/** @typedef {import('./simulator-timing-map.js').CpuNodeTimingComplete | import('./simulator-timing-map.js').NetworkNodeTimingComplete} CompleteNodeTiming */ -/** @typedef {import('./simulator-timing-map.js').ConnectionTiming} ConnectionTiming */ +/** @typedef {import('../BaseNode.js').Node} Node */ +/** @typedef {import('../NetworkNode.js').NetworkNode} NetworkNode */ +/** @typedef {import('../CpuNode.js').CPUNode} CpuNode */ +/** @typedef {import('./SimulationTimingMap.js').CpuNodeTimingComplete | import('./SimulationTimingMap.js').NetworkNodeTimingComplete} CompleteNodeTiming */ +/** @typedef {import('./SimulationTimingMap.js').ConnectionTiming} ConnectionTiming */ // see https://cs.chromium.org/search/?q=kDefaultMaxNumDelayableRequestsPerClient&sq=package:chromium&type=cs const DEFAULT_MAXIMUM_CONCURRENT_REQUESTS = 10; diff --git a/core/lib/lantern/simulator/tcp-connection.js b/core/lib/lantern/simulator/TcpConnection.js similarity index 98% rename from core/lib/lantern/simulator/tcp-connection.js rename to core/lib/lantern/simulator/TcpConnection.js index 52d77f943e97..3d1ad29ccd00 100644 --- a/core/lib/lantern/simulator/tcp-connection.js +++ b/core/lib/lantern/simulator/TcpConnection.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -/** @typedef {import('./simulator-timing-map.js').ConnectionTiming} ConnectionTiming */ +/** @typedef {import('./SimulationTimingMap.js').ConnectionTiming} ConnectionTiming */ const INITIAL_CONGESTION_WINDOW = 10; const TCP_SEGMENT_SIZE = 1460; diff --git a/core/lib/lantern/types/lantern.d.ts b/core/lib/lantern/types/lantern.d.ts index 13159f6fb4ae..1e03650909b4 100644 --- a/core/lib/lantern/types/lantern.d.ts +++ b/core/lib/lantern/types/lantern.d.ts @@ -170,10 +170,10 @@ export namespace Simulation { mainDocumentUrl?: string; }; - type GraphNode = import('../base-node.js').Node; - type GraphNetworkNode = import('../network-node.js').NetworkNode; - type GraphCPUNode = import('../cpu-node.js').CPUNode; - type Simulator = import('../simulator/simulator.js').Simulator; + type GraphNode = import('../BaseNode.js').Node; + type GraphNetworkNode = import('../NetworkNode.js').NetworkNode; + type GraphCPUNode = import('../CpuNode.js').CPUNode; + type Simulator = import('../simulator/Simulator.js').Simulator; interface MetricCoefficients { intercept: number; diff --git a/core/lib/navigation-error.js b/core/lib/navigation-error.js index 69d4480fe5c0..90de19d8e744 100644 --- a/core/lib/navigation-error.js +++ b/core/lib/navigation-error.js @@ -5,7 +5,7 @@ */ import {LighthouseError} from './lh-error.js'; -import {NetworkAnalyzer} from './lantern/simulator/network-analyzer.js'; +import {NetworkAnalyzer} from './lantern/simulator/NetworkAnalyzer.js'; import {NetworkRequest} from './network-request.js'; import * as i18n from '../lib/i18n/i18n.js'; diff --git a/core/lib/network-recorder.js b/core/lib/network-recorder.js index ee424fdc1e64..99514e6ca583 100644 --- a/core/lib/network-recorder.js +++ b/core/lib/network-recorder.js @@ -10,7 +10,7 @@ import log from 'lighthouse-logger'; import * as LH from '../../types/lh.js'; import {NetworkRequest} from './network-request.js'; -import {PageDependencyGraph} from '../lib/lantern/page-dependency-graph.js'; +import {PageDependencyGraph} from './lantern/PageDependencyGraph.js'; /** * @typedef {{ diff --git a/core/scripts/lantern/run-once.js b/core/scripts/lantern/run-once.js index 3cc924bbf0d7..e7d872411c33 100755 --- a/core/scripts/lantern/run-once.js +++ b/core/scripts/lantern/run-once.js @@ -9,7 +9,7 @@ import fs from 'fs'; import path from 'path'; import PredictivePerf from '../../audits/predictive-perf.js'; -import {Simulator} from '../../lib/lantern/simulator/simulator.js'; +import {Simulator} from '../../lib/lantern/simulator/Simulator.js'; import traceSaver from '../../lib/lantern-trace-saver.js'; import {LH_ROOT} from '../../../shared/root.js'; import {readJson} from '../../test/test-utils.js'; diff --git a/core/test/audits/byte-efficiency/byte-efficiency-audit-test.js b/core/test/audits/byte-efficiency/byte-efficiency-audit-test.js index 361dfa272f85..f5fc71e19e79 100644 --- a/core/test/audits/byte-efficiency/byte-efficiency-audit-test.js +++ b/core/test/audits/byte-efficiency/byte-efficiency-audit-test.js @@ -7,7 +7,7 @@ import assert from 'assert/strict'; import {ByteEfficiencyAudit as ByteEfficiencyAudit_} from '../../../audits/byte-efficiency/byte-efficiency-audit.js'; -import {Simulator} from '../../../lib/lantern/simulator/simulator.js'; +import {Simulator} from '../../../lib/lantern/simulator/Simulator.js'; import {LoadSimulator} from '../../../computed/load-simulator.js'; import {getURLArtifactFromDevtoolsLog, readJson} from '../../test-utils.js'; import {networkRecordsToDevtoolsLog} from '../../network-records-to-devtools-log.js'; diff --git a/core/test/audits/byte-efficiency/render-blocking-resources-test.js b/core/test/audits/byte-efficiency/render-blocking-resources-test.js index 403a69ec5b83..54f2e3c3a823 100644 --- a/core/test/audits/byte-efficiency/render-blocking-resources-test.js +++ b/core/test/audits/byte-efficiency/render-blocking-resources-test.js @@ -8,9 +8,9 @@ import assert from 'assert/strict'; import RenderBlockingResourcesAudit from '../../../audits/byte-efficiency/render-blocking-resources.js'; // eslint-disable-line max-len import * as constants from '../../../config/constants.js'; -import {NetworkNode} from '../../../lib/lantern/network-node.js'; -import {CPUNode} from '../../../lib/lantern/cpu-node.js'; -import {Simulator} from '../../../lib/lantern/simulator/simulator.js'; +import {NetworkNode} from '../../../lib/lantern/NetworkNode.js'; +import {CPUNode} from '../../../lib/lantern/CpuNode.js'; +import {Simulator} from '../../../lib/lantern/simulator/Simulator.js'; import {NetworkRequest} from '../../../lib/network-request.js'; import {getURLArtifactFromDevtoolsLog, readJson} from '../../test-utils.js'; diff --git a/core/test/computed/load-simulator-test.js b/core/test/computed/load-simulator-test.js index c4234d26bdb4..683a0fdafeed 100644 --- a/core/test/computed/load-simulator-test.js +++ b/core/test/computed/load-simulator-test.js @@ -7,7 +7,7 @@ import assert from 'assert/strict'; import {LoadSimulator} from '../../computed/load-simulator.js'; -import {NetworkNode} from '../../lib/lantern/network-node.js'; +import {NetworkNode} from '../../lib/lantern/NetworkNode.js'; import {NetworkRequest} from '../../lib/network-request.js'; import {readJson} from '../test-utils.js'; diff --git a/core/test/computed/page-dependency-graph-test.js b/core/test/computed/page-dependency-graph-test.js index 820938accac3..247cc88a4fd3 100644 --- a/core/test/computed/page-dependency-graph-test.js +++ b/core/test/computed/page-dependency-graph-test.js @@ -7,7 +7,7 @@ import assert from 'assert/strict'; import {PageDependencyGraph} from '../../computed/page-dependency-graph.js'; -import {BaseNode} from '../../lib/lantern/base-node.js'; +import {BaseNode} from '../../lib/lantern/BaseNode.js'; import {getURLArtifactFromDevtoolsLog, readJson} from '../test-utils.js'; const sampleTrace = readJson('../fixtures/artifacts/iframe/trace.json', import.meta); diff --git a/core/test/lib/lantern/base-node-test.js b/core/test/lib/lantern/base-node-test.js index 884a6ab86b77..b903ce6256bf 100644 --- a/core/test/lib/lantern/base-node-test.js +++ b/core/test/lib/lantern/base-node-test.js @@ -6,8 +6,8 @@ import assert from 'assert/strict'; -import {BaseNode} from '../../../lib/lantern/base-node.js'; -import {NetworkNode} from '../../../lib/lantern/network-node.js'; +import {BaseNode} from '../../../lib/lantern/BaseNode.js'; +import {NetworkNode} from '../../../lib/lantern/NetworkNode.js'; function sortedById(nodeArray) { return nodeArray.sort((node1, node2) => node1.id.localeCompare(node2.id)); diff --git a/core/test/lib/lantern/metrics/metric-test-utils.js b/core/test/lib/lantern/metrics/MetricTestUtils.js similarity index 93% rename from core/test/lib/lantern/metrics/metric-test-utils.js rename to core/test/lib/lantern/metrics/MetricTestUtils.js index 93e1f11f7f4e..ac31797ec0fb 100644 --- a/core/test/lib/lantern/metrics/metric-test-utils.js +++ b/core/test/lib/lantern/metrics/MetricTestUtils.js @@ -7,9 +7,9 @@ import * as TraceEngine from '@paulirish/trace_engine'; import * as Lantern from '../../../../lib/lantern/types/lantern.js'; -import {NetworkAnalyzer} from '../../../../lib/lantern/simulator/network-analyzer.js'; -import {Simulator} from '../../../../lib/lantern/simulator/simulator.js'; -import * as TraceEngineComputationData from '../../../../lib/lantern/trace-engine-computation-data.js'; +import {NetworkAnalyzer} from '../../../../lib/lantern/simulator/NetworkAnalyzer.js'; +import {Simulator} from '../../../../lib/lantern/simulator/Simulator.js'; +import * as TraceEngineComputationData from '../../../../lib/lantern/TraceEngineComputationData.js'; import {polyfillDOMRect} from '../../../../lib/polyfill-dom-rect.js'; polyfillDOMRect(); diff --git a/core/test/lib/lantern/metrics/first-contentful-paint-test.js b/core/test/lib/lantern/metrics/first-contentful-paint-test.js index f16dec85203f..a8529bc38507 100644 --- a/core/test/lib/lantern/metrics/first-contentful-paint-test.js +++ b/core/test/lib/lantern/metrics/first-contentful-paint-test.js @@ -6,9 +6,9 @@ import assert from 'assert/strict'; -import {FirstContentfulPaint} from '../../../../lib/lantern/metrics/first-contentful-paint.js'; +import {FirstContentfulPaint} from '../../../../lib/lantern/metrics/FirstContentfulPaint.js'; import {readJson} from '../../../test-utils.js'; -import {getComputationDataFromFixture} from './metric-test-utils.js'; +import {getComputationDataFromFixture} from './MetricTestUtils.js'; const trace = readJson('../../../fixtures/artifacts/progressive-app/trace.json', import.meta); diff --git a/core/test/lib/lantern/metrics/interactive-test.js b/core/test/lib/lantern/metrics/interactive-test.js index 97ce903f481e..befc593db9c8 100644 --- a/core/test/lib/lantern/metrics/interactive-test.js +++ b/core/test/lib/lantern/metrics/interactive-test.js @@ -6,10 +6,10 @@ import assert from 'assert/strict'; -import {Interactive} from '../../../../lib/lantern/metrics/interactive.js'; -import {FirstContentfulPaint} from '../../../../lib/lantern/metrics/first-contentful-paint.js'; -import {LargestContentfulPaint} from '../../../../lib/lantern/metrics/largest-contentful-paint.js'; -import {getComputationDataFromFixture} from './metric-test-utils.js'; +import {Interactive} from '../../../../lib/lantern/metrics/Interactive.js'; +import {FirstContentfulPaint} from '../../../../lib/lantern/metrics/FirstContentfulPaint.js'; +import {LargestContentfulPaint} from '../../../../lib/lantern/metrics/LargestContentfulPaint.js'; +import {getComputationDataFromFixture} from './MetricTestUtils.js'; import {readJson} from '../../../test-utils.js'; const trace = readJson('../../../fixtures/artifacts/progressive-app/trace.json', import.meta); diff --git a/core/test/lib/lantern/metrics/lantern-largest-contentful-paint-test.js b/core/test/lib/lantern/metrics/lantern-largest-contentful-paint-test.js index 03d0f58aff0d..32dad6cf6172 100644 --- a/core/test/lib/lantern/metrics/lantern-largest-contentful-paint-test.js +++ b/core/test/lib/lantern/metrics/lantern-largest-contentful-paint-test.js @@ -6,9 +6,9 @@ import assert from 'assert/strict'; -import {LargestContentfulPaint} from '../../../../lib/lantern/metrics/largest-contentful-paint.js'; -import {FirstContentfulPaint} from '../../../../lib/lantern/metrics/first-contentful-paint.js'; -import {getComputationDataFromFixture} from './metric-test-utils.js'; +import {LargestContentfulPaint} from '../../../../lib/lantern/metrics/LargestContentfulPaint.js'; +import {FirstContentfulPaint} from '../../../../lib/lantern/metrics/FirstContentfulPaint.js'; +import {getComputationDataFromFixture} from './MetricTestUtils.js'; import {readJson} from '../../../test-utils.js'; const trace = readJson('../../../fixtures/artifacts/paul/trace.json', import.meta); diff --git a/core/test/lib/lantern/metrics/speed-index-test.js b/core/test/lib/lantern/metrics/speed-index-test.js index 30223d2a629a..c2c5465ac6f6 100644 --- a/core/test/lib/lantern/metrics/speed-index-test.js +++ b/core/test/lib/lantern/metrics/speed-index-test.js @@ -5,9 +5,9 @@ */ import {readJson} from '../../../test-utils.js'; -import {SpeedIndex} from '../../../../lib/lantern/metrics/speed-index.js'; -import {FirstContentfulPaint} from '../../../../lib/lantern/metrics/first-contentful-paint.js'; -import {getComputationDataFromFixture} from './metric-test-utils.js'; +import {SpeedIndex} from '../../../../lib/lantern/metrics/SpeedIndex.js'; +import {FirstContentfulPaint} from '../../../../lib/lantern/metrics/FirstContentfulPaint.js'; +import {getComputationDataFromFixture} from './MetricTestUtils.js'; import {constants} from '../../../../lib/lantern/lantern.js'; const trace = readJson('../../../fixtures/artifacts/progressive-app/trace.json', import.meta); diff --git a/core/test/lib/lantern/page-dependency-graph-test.js b/core/test/lib/lantern/page-dependency-graph-test.js index 35d393f5961b..9b2591e0faac 100644 --- a/core/test/lib/lantern/page-dependency-graph-test.js +++ b/core/test/lib/lantern/page-dependency-graph-test.js @@ -6,7 +6,7 @@ import assert from 'assert/strict'; -import {PageDependencyGraph} from '../../../lib/lantern/page-dependency-graph.js'; +import {PageDependencyGraph} from '../../../lib/lantern/PageDependencyGraph.js'; import {NetworkRequestTypes} from '../../../lib/lantern/lantern.js'; function createRequest( diff --git a/core/test/lib/lantern/simulator/connection-pool-test.js b/core/test/lib/lantern/simulator/connection-pool-test.js index 84d2e2136dc3..04ba5d4f1b99 100644 --- a/core/test/lib/lantern/simulator/connection-pool-test.js +++ b/core/test/lib/lantern/simulator/connection-pool-test.js @@ -7,7 +7,7 @@ import assert from 'assert/strict'; import {URL} from 'url'; -import {ConnectionPool} from '../../../../lib/lantern/simulator/connection-pool.js'; +import {ConnectionPool} from '../../../../lib/lantern/simulator/ConnectionPool.js'; describe('DependencyGraph/Simulator/ConnectionPool', () => { const rtt = 100; diff --git a/core/test/lib/lantern/simulator/dns-cache-test.js b/core/test/lib/lantern/simulator/dns-cache-test.js index 497d9a166621..bb0f87cf84cf 100644 --- a/core/test/lib/lantern/simulator/dns-cache-test.js +++ b/core/test/lib/lantern/simulator/dns-cache-test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {DNSCache} from '../../../../lib/lantern/simulator/dns-cache.js'; +import {DNSCache} from '../../../../lib/lantern/simulator/DNSCache.js'; const MULTIPLIER = DNSCache.RTT_MULTIPLIER; diff --git a/core/test/lib/lantern/simulator/network-analyzer-test.js b/core/test/lib/lantern/simulator/network-analyzer-test.js index 3be4457cb95e..48a120a1f005 100644 --- a/core/test/lib/lantern/simulator/network-analyzer-test.js +++ b/core/test/lib/lantern/simulator/network-analyzer-test.js @@ -7,10 +7,10 @@ import assert from 'assert/strict'; import * as Lantern from '../../../../lib/lantern/types/lantern.js'; -import {NetworkAnalyzer} from '../../../../lib/lantern/simulator/network-analyzer.js'; -import * as TraceEngineComputationData from '../../../../lib/lantern/trace-engine-computation-data.js'; +import {NetworkAnalyzer} from '../../../../lib/lantern/simulator/NetworkAnalyzer.js'; +import * as TraceEngineComputationData from '../../../../lib/lantern/TraceEngineComputationData.js'; import {readJson} from '../../../test-utils.js'; -import {runTraceEngine} from '../metrics/metric-test-utils.js'; +import {runTraceEngine} from '../metrics/MetricTestUtils.js'; const trace = readJson('../../../fixtures/artifacts/paul/trace.json', import.meta); const traceWithRedirect = readJson('../../../fixtures/artifacts/redirect/trace.json', import.meta); diff --git a/core/test/lib/lantern/simulator/simulator-test.js b/core/test/lib/lantern/simulator/simulator-test.js index 32812f3f5791..97d75cf80991 100644 --- a/core/test/lib/lantern/simulator/simulator-test.js +++ b/core/test/lib/lantern/simulator/simulator-test.js @@ -6,14 +6,14 @@ import assert from 'assert/strict'; -import * as Lantern from '../../../../lib/lantern/metric.js'; -import {NetworkNode} from '../../../../lib/lantern/network-node.js'; -import {CPUNode} from '../../../../lib/lantern/cpu-node.js'; -import {Simulator} from '../../../../lib/lantern/simulator/simulator.js'; -import {DNSCache} from '../../../../lib/lantern/simulator/dns-cache.js'; +import * as Lantern from '../../../../lib/lantern/Metric.js'; +import {NetworkNode} from '../../../../lib/lantern/NetworkNode.js'; +import {CPUNode} from '../../../../lib/lantern/CpuNode.js'; +import {Simulator} from '../../../../lib/lantern/simulator/Simulator.js'; +import {DNSCache} from '../../../../lib/lantern/simulator/DNSCache.js'; import {readJson} from '../../../test-utils.js'; -import * as TraceEngineComputationData from '../../../../lib/lantern/trace-engine-computation-data.js'; -import {runTraceEngine} from '../metrics/metric-test-utils.js'; +import * as TraceEngineComputationData from '../../../../lib/lantern/TraceEngineComputationData.js'; +import {runTraceEngine} from '../metrics/MetricTestUtils.js'; const pwaTrace = readJson('../../../fixtures/artifacts/progressive-app/trace.json', import.meta); diff --git a/core/test/lib/lantern/simulator/tcp-connection-test.js b/core/test/lib/lantern/simulator/tcp-connection-test.js index 61a75fc4221e..fbabb4bec7ae 100644 --- a/core/test/lib/lantern/simulator/tcp-connection-test.js +++ b/core/test/lib/lantern/simulator/tcp-connection-test.js @@ -6,7 +6,7 @@ import assert from 'assert/strict'; -import {TcpConnection} from '../../../../lib/lantern/simulator/tcp-connection.js'; +import {TcpConnection} from '../../../../lib/lantern/simulator/TcpConnection.js'; describe('DependencyGraph/Simulator/TcpConnection', () => { describe('#constructor', () => { diff --git a/core/test/lib/lantern/tbt-utils-test.js b/core/test/lib/lantern/tbt-utils-test.js index 94e09900eb17..05862e10488b 100644 --- a/core/test/lib/lantern/tbt-utils-test.js +++ b/core/test/lib/lantern/tbt-utils-test.js @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import {calculateSumOfBlockingTime} from '../../../lib/lantern/tbt-utils.js'; +import {calculateSumOfBlockingTime} from '../../../lib/lantern/TBTUtils.js'; describe('TotalBlockingTime utils', () => { it('reports 0 when no task is longer than 50ms', () => { diff --git a/tsconfig.json b/tsconfig.json index 5bd40e8408e7..974dd92c2cfc 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -109,6 +109,6 @@ "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/test/lib/lantern/metrics/metric-test-utils.js", + "core/test/lib/lantern/metrics/MetricTestUtils.js", ], } diff --git a/types/artifacts.d.ts b/types/artifacts.d.ts index 1565e51f1ae3..5ad1c731a638 100644 --- a/types/artifacts.d.ts +++ b/types/artifacts.d.ts @@ -10,7 +10,7 @@ import * as Lantern from '../core/lib/lantern/types/lantern.js'; import {LayoutShiftRootCausesData} from '@paulirish/trace_engine/models/trace/root-causes/LayoutShift.js'; import {parseManifest} from '../core/lib/manifest-parser.js'; -import {Simulator} from '../core/lib/lantern/simulator/simulator.js'; +import {Simulator} from '../core/lib/lantern/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';