lighthouse 9.5.0-dev.20220906 → 9.5.0-dev.20220908

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

@@ -5,10 +5,10 @@
  */
 
 import {makeComputedArtifact} from '../computed-artifact.js';
-import LanternMetric from './lantern-metric.js';
+import {LanternMetric} from './lantern-metric.js';
 import {BaseNode} from '../../lib/dependency-graph/base-node.js';
-import LanternFirstContentfulPaint from './lantern-first-contentful-paint.js';
-import LanternInteractive from './lantern-interactive.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 */
@@ -119,7 +119,8 @@ class LanternTotalBlockingTime extends LanternMetric {
   }
 }
 
-export default makeComputedArtifact(
+const LanternTotalBlockingTimeComputed = makeComputedArtifact(
   LanternTotalBlockingTime,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
+export {LanternTotalBlockingTimeComputed as LanternTotalBlockingTime};

package/core/computed/metrics/largest-contentful-paint-all-frames.js

@@ -9,7 +9,7 @@
  */
 
 import {makeComputedArtifact} from '../computed-artifact.js';
-import NavigationMetric from './navigation-metric.js';
+import {NavigationMetric} from './navigation-metric.js';
 import {LighthouseError} from '../../lib/lh-error.js';
 
 class LargestContentfulPaintAllFrames extends NavigationMetric {
@@ -38,7 +38,8 @@ class LargestContentfulPaintAllFrames extends NavigationMetric {
   }
 }
 
-export default makeComputedArtifact(
+const LargestContentfulPaintAllFramesComputed = makeComputedArtifact(
   LargestContentfulPaintAllFrames,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
+export {LargestContentfulPaintAllFramesComputed as LargestContentfulPaintAllFrames};

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

@@ -13,9 +13,9 @@
  */
 
 import {makeComputedArtifact} from '../computed-artifact.js';
-import NavigationMetric from './navigation-metric.js';
+import {NavigationMetric} from './navigation-metric.js';
 import {LighthouseError} from '../../lib/lh-error.js';
-import LanternLargestContentfulPaint from './lantern-largest-contentful-paint.js';
+import {LanternLargestContentfulPaint} from './lantern-largest-contentful-paint.js';
 
 class LargestContentfulPaint extends NavigationMetric {
   /**
@@ -45,7 +45,8 @@ class LargestContentfulPaint extends NavigationMetric {
   }
 }
 
-export default makeComputedArtifact(
+const LargestContentfulPaintComputed = makeComputedArtifact(
   LargestContentfulPaint,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
+export {LargestContentfulPaintComputed as LargestContentfulPaint};

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

@@ -5,8 +5,8 @@
  */
 
 import {makeComputedArtifact} from '../computed-artifact.js';
-import NavigationMetric from './navigation-metric.js';
-import LanternMaxPotentialFID from './lantern-max-potential-fid.js';
+import {NavigationMetric} from './navigation-metric.js';
+import {LanternMaxPotentialFID} from './lantern-max-potential-fid.js';
 import {TraceProcessor} from '../../lib/tracehouse/trace-processor.js';
 
 class MaxPotentialFID extends NavigationMetric {
@@ -38,7 +38,8 @@ class MaxPotentialFID extends NavigationMetric {
   }
 }
 
-export default makeComputedArtifact(
+const MaxPotentialFIDComputed = makeComputedArtifact(
   MaxPotentialFID,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
+export {MaxPotentialFIDComputed as MaxPotentialFID};

package/core/computed/metrics/metric.js

@@ -5,9 +5,9 @@
  */
 
 import {TraceProcessor} from '../../lib/tracehouse/trace-processor.js';
-import ProcessedTrace from '../processed-trace.js';
-import ProcessedNavigation from '../processed-navigation.js';
-import NetworkRecords from '../network-records.js';
+import {ProcessedTrace} from '../processed-trace.js';
+import {ProcessedNavigation} from '../processed-navigation.js';
+import {NetworkRecords} from '../network-records.js';
 
 /**
  * @fileOverview Encapsulates logic for choosing the correct metric computation method based on the

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

@@ -4,11 +4,12 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 
-import Metric from './metric.js';
-
 /**
  * @fileOverview Enforces that a metric can only be computed on navigations.
  */
+
+import Metric from './metric.js';
+
 class NavigationMetric extends Metric {
   /**
    * @param {LH.Artifacts.NavigationMetricComputationData} data
@@ -42,4 +43,4 @@ class NavigationMetric extends Metric {
   }
 }
 
-export default NavigationMetric;
+export {NavigationMetric};

package/core/computed/metrics/responsiveness.js

@@ -30,7 +30,7 @@
  * @typedef {{name: 'FallbackTiming', duration: number}} FallbackTimingEvent
  */
 
-import ProcessedTrace from '../processed-trace.js';
+import {ProcessedTrace} from '../processed-trace.js';
 import {makeComputedArtifact} from '../computed-artifact.js';
 
 const KEYBOARD_EVENTS = new Set(['keydown', 'keypress', 'keyup']);
@@ -150,7 +150,8 @@ class Responsiveness {
   }
 }
 
-export default makeComputedArtifact(Responsiveness, [
+const ResponsivenessComputed = makeComputedArtifact(Responsiveness, [
   'trace',
   'settings',
 ]);
+export {ResponsivenessComputed as Responsiveness};

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

@@ -5,9 +5,9 @@
  */
 
 import {makeComputedArtifact} from '../computed-artifact.js';
-import NavigationMetric from './navigation-metric.js';
-import LanternSpeedIndex from './lantern-speed-index.js';
-import Speedline from '../speedline.js';
+import {NavigationMetric} from './navigation-metric.js';
+import {LanternSpeedIndex} from './lantern-speed-index.js';
+import {Speedline} from '../speedline.js';
 
 class SpeedIndex extends NavigationMetric {
   /**
@@ -33,7 +33,8 @@ class SpeedIndex extends NavigationMetric {
   }
 }
 
-export default makeComputedArtifact(
+const SpeedIndexComputed = makeComputedArtifact(
   SpeedIndex,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
+export {SpeedIndexComputed as SpeedIndex};

package/core/computed/metrics/timing-summary.js

@@ -4,19 +4,19 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 
-import ProcessedTrace from '../processed-trace.js';
-import ProcessedNavigation from '../processed-navigation.js';
-import Speedline from '../speedline.js';
-import FirstContentfulPaint from './first-contentful-paint.js';
-import FirstContentfulPaintAllFrames from './first-contentful-paint-all-frames.js';
-import FirstMeaningfulPaint from './first-meaningful-paint.js';
-import LargestContentfulPaint from './largest-contentful-paint.js';
-import LargestContentfulPaintAllFrames from './largest-contentful-paint-all-frames.js';
-import Interactive from './interactive.js';
-import CumulativeLayoutShift from './cumulative-layout-shift.js';
-import SpeedIndex from './speed-index.js';
-import MaxPotentialFID from './max-potential-fid.js';
-import TotalBlockingTime from './total-blocking-time.js';
+import {ProcessedTrace} from '../processed-trace.js';
+import {ProcessedNavigation} from '../processed-navigation.js';
+import {Speedline} from '../speedline.js';
+import {FirstContentfulPaint} from './first-contentful-paint.js';
+import {FirstContentfulPaintAllFrames} from './first-contentful-paint-all-frames.js';
+import {FirstMeaningfulPaint} from './first-meaningful-paint.js';
+import {LargestContentfulPaint} from './largest-contentful-paint.js';
+import {LargestContentfulPaintAllFrames} from './largest-contentful-paint-all-frames.js';
+import {Interactive} from './interactive.js';
+import {CumulativeLayoutShift} from './cumulative-layout-shift.js';
+import {SpeedIndex} from './speed-index.js';
+import {MaxPotentialFID} from './max-potential-fid.js';
+import {TotalBlockingTime} from './total-blocking-time.js';
 import {makeComputedArtifact} from '../computed-artifact.js';
 
 class TimingSummary {
@@ -150,7 +150,8 @@ class TimingSummary {
   }
 }
 
-export default makeComputedArtifact(
+const TimingSummaryComputed = makeComputedArtifact(
   TimingSummary,
   ['devtoolsLog', 'gatherContext', 'settings', 'trace', 'URL']
 );
+export {TimingSummaryComputed as TimingSummary};

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

@@ -7,8 +7,8 @@
 import {makeComputedArtifact} from '../computed-artifact.js';
 import ComputedMetric from './metric.js';
 import {TraceProcessor} from '../../lib/tracehouse/trace-processor.js';
-import LanternTotalBlockingTime from './lantern-total-blocking-time.js';
-import TimetoInteractive from './interactive.js';
+import {LanternTotalBlockingTime} from './lantern-total-blocking-time.js';
+import {Interactive} from './interactive.js';
 import {calculateSumOfBlockingTime} from './tbt-utils.js';
 
 /**
@@ -46,7 +46,7 @@ class TotalBlockingTime extends ComputedMetric {
     if (data.processedNavigation) {
       const {firstContentfulPaint} = data.processedNavigation.timings;
       const metricData = ComputedMetric.getMetricComputationInput(data);
-      const interactiveTimeMs = (await TimetoInteractive.request(metricData, context)).timing;
+      const interactiveTimeMs = (await Interactive.request(metricData, context)).timing;
 
       return {
         timing: calculateSumOfBlockingTime(
@@ -67,7 +67,8 @@ class TotalBlockingTime extends ComputedMetric {
   }
 }
 
-export default makeComputedArtifact(
+const TotalBlockingTimeComputed = makeComputedArtifact(
   TotalBlockingTime,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
+export {TotalBlockingTimeComputed as TotalBlockingTime};

package/core/computed/module-duplication.js

@@ -5,7 +5,7 @@
  */
 
 import {makeComputedArtifact} from './computed-artifact.js';
-import JsBundles from './js-bundles.js';
+import {JSBundles} from './js-bundles.js';
 
 const RELATIVE_SIZE_THRESHOLD = 0.1;
 const ABSOLUTE_SIZE_THRESHOLD_BYTES = 1024 * 0.5;
@@ -77,7 +77,7 @@ class ModuleDuplication {
    * @param {LH.Artifacts.ComputedContext} context
    */
   static async compute_(artifacts, context) {
-    const bundles = await JsBundles.request(artifacts, context);
+    const bundles = await JSBundles.request(artifacts, context);
 
     /**
      * @typedef SourceData
@@ -133,4 +133,6 @@ class ModuleDuplication {
   }
 }
 
-export default makeComputedArtifact(ModuleDuplication, ['Scripts', 'SourceMaps']);
+const ModuleDuplicationComputed =
+  makeComputedArtifact(ModuleDuplication, ['Scripts', 'SourceMaps']);
+export {ModuleDuplicationComputed as ModuleDuplication};

package/core/computed/network-analysis.js

@@ -6,7 +6,7 @@
 
 import {makeComputedArtifact} from './computed-artifact.js';
 import {NetworkAnalyzer} from '../lib/dependency-graph/simulator/network-analyzer.js';
-import NetworkRecords from './network-records.js';
+import {NetworkRecords} from './network-records.js';
 
 class NetworkAnalysis {
   /**
@@ -60,4 +60,5 @@ class NetworkAnalysis {
   }
 }
 
-export default makeComputedArtifact(NetworkAnalysis, null);
+const NetworkAnalysisComputed = makeComputedArtifact(NetworkAnalysis, null);
+export {NetworkAnalysisComputed as NetworkAnalysis};

package/core/computed/network-records.js

@@ -17,4 +17,5 @@ class NetworkRecords {
   }
 }
 
-export default makeComputedArtifact(NetworkRecords, null);
+const NetworkRecordsComputed = makeComputedArtifact(NetworkRecords, null);
+export {NetworkRecordsComputed as NetworkRecords};

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

@@ -9,13 +9,21 @@ import {NetworkNode} from '../lib/dependency-graph/network-node.js';
 import {CPUNode} from '../lib/dependency-graph/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 {ProcessedTrace} from './processed-trace.js';
+import {NetworkRecords} from './network-records.js';
 import {NetworkAnalyzer} from '../lib/dependency-graph/simulator/network-analyzer.js';
 
 /** @typedef {import('../lib/dependency-graph/base-node.js').Node} Node */
 /** @typedef {Omit<LH.Artifacts['URL'], 'initialUrl'|'finalUrl'>} 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
+ */
+
 // Shorter tasks have negligible impact on simulation results.
 const SIGNIFICANT_DUR_THRESHOLD_MS = 10;
 
@@ -503,12 +511,6 @@ class PageDependencyGraph {
   }
 }
 
-export default makeComputedArtifact(PageDependencyGraph, ['devtoolsLog', 'trace', 'URL']);
-
-/**
- * @typedef {Object} NetworkNodeOutput
- * @property {Array<NetworkNode>} nodes
- * @property {Map<string, NetworkNode>} idToNodeMap
- * @property {Map<string, Array<NetworkNode>>} urlToNodeMap
- * @property {Map<string, NetworkNode|null>} frameIdToNodeMap
- */
+const PageDependencyGraphComputed =
+  makeComputedArtifact(PageDependencyGraph, ['devtoolsLog', 'trace', 'URL']);
+export {PageDependencyGraphComputed as PageDependencyGraph};

package/core/computed/processed-navigation.js

@@ -17,4 +17,5 @@ class ProcessedNavigation {
   }
 }
 
-export default makeComputedArtifact(ProcessedNavigation, null);
+const ProcessedNavigationComputed = makeComputedArtifact(ProcessedNavigation, null);
+export {ProcessedNavigationComputed as ProcessedNavigation};

package/core/computed/processed-trace.js

@@ -17,4 +17,5 @@ class ProcessedTrace {
   }
 }
 
-export default makeComputedArtifact(ProcessedTrace, null);
+const ProcessedTraceComputed = makeComputedArtifact(ProcessedTrace, null);
+export {ProcessedTraceComputed as ProcessedTrace};

package/core/computed/resource-summary.js

@@ -5,8 +5,7 @@
  */
 
 import {makeComputedArtifact} from './computed-artifact.js';
-import NetworkRecords from './network-records.js';
-import URL from '../lib/url-shim.js';
+import {NetworkRecords} from './network-records.js';
 import {NetworkRequest} from '../lib/network-request.js';
 import {Budget} from '../config/budget.js';
 import {Util} from '../util.cjs';
@@ -110,4 +109,6 @@ class ResourceSummary {
   }
 }
 
-export default makeComputedArtifact(ResourceSummary, ['URL', 'devtoolsLog', 'budgets']);
+const ResourceSummaryComputed =
+  makeComputedArtifact(ResourceSummary, ['URL', 'devtoolsLog', 'budgets']);
+export {ResourceSummaryComputed as ResourceSummary};

package/core/computed/screenshots.js

@@ -25,4 +25,5 @@ class Screenshots {
   }
 }
 
-export default makeComputedArtifact(Screenshots, null);
+const ScreenshotsComputed = makeComputedArtifact(Screenshots, null);
+export {ScreenshotsComputed as Screenshots};

package/core/computed/speedline.js

@@ -8,7 +8,7 @@ import speedline from 'speedline-core';
 
 import {makeComputedArtifact} from './computed-artifact.js';
 import {LighthouseError} from '../lib/lh-error.js';
-import ProcessedTrace from './processed-trace.js';
+import {ProcessedTrace} from './processed-trace.js';
 
 class Speedline {
   /**
@@ -51,4 +51,5 @@ class Speedline {
   }
 }
 
-export default makeComputedArtifact(Speedline, null);
+const SpeedlineComputed = makeComputedArtifact(Speedline, null);
+export {SpeedlineComputed as Speedline};

package/core/computed/unused-css.js

@@ -6,7 +6,7 @@
 
 import {makeComputedArtifact} from './computed-artifact.js';
 import {ByteEfficiencyAudit} from '../audits/byte-efficiency/byte-efficiency-audit.js';
-import NetworkRecords from './network-records.js';
+import {NetworkRecords} from './network-records.js';
 
 const PREVIEW_LENGTH = 100;
 
@@ -149,4 +149,5 @@ class UnusedCSS {
   }
 }
 
-export default makeComputedArtifact(UnusedCSS, ['CSSUsage', 'devtoolsLog']);
+const UnusedCSSComputed = makeComputedArtifact(UnusedCSS, ['CSSUsage', 'devtoolsLog']);
+export {UnusedCSSComputed as UnusedCSS};

package/core/computed/unused-javascript-summary.js

@@ -148,7 +148,8 @@ class UnusedJavascriptSummary {
   }
 }
 
-export default makeComputedArtifact(
+const UnusedJavascriptSummaryComputed = makeComputedArtifact(
   UnusedJavascriptSummary,
   ['bundle', 'scriptCoverage', 'scriptId']
 );
+export {UnusedJavascriptSummaryComputed as UnusedJavascriptSummary};

package/core/computed/user-timings.js

@@ -5,7 +5,7 @@
  */
 
 import {makeComputedArtifact} from './computed-artifact.js';
-import ProcessedTrace from './processed-trace.js';
+import {ProcessedTrace} from './processed-trace.js';
 
 /** @typedef {{name: string, isMark: true, args: LH.TraceEvent['args'], startTime: number}} MarkEvent */
 /** @typedef {{name: string, isMark: false, args: LH.TraceEvent['args'], startTime: number, endTime: number, duration: number}} MeasureEvent */
@@ -79,4 +79,5 @@ class UserTimings {
   }
 }
 
-export default makeComputedArtifact(UserTimings, null);
+const UserTimingsComputed = makeComputedArtifact(UserTimings, null);
+export {UserTimingsComputed as UserTimings};

package/core/computed/viewport-meta.js

@@ -45,7 +45,8 @@ class ViewportMeta {
   }
 }
 
-export default makeComputedArtifact(ViewportMeta, null);
+const ViewportMetaComputed = makeComputedArtifact(ViewportMeta, null);
+export {ViewportMetaComputed as ViewportMeta};
 
 /**
  * @typedef {object} ViewportMetaResult

package/core/fraggle-rock/gather/navigation-runner.js

@@ -19,11 +19,11 @@ import {initializeConfig} from '../config/config.js';
 import {getBaseArtifacts, finalizeArtifacts} from './base-artifacts.js';
 import * as format from '../../../shared/localization/format.js';
 import {LighthouseError} from '../../lib/lh-error.js';
-import URL from '../../lib/url-shim.js';
+import UrlUtils from '../../lib/url-utils.js';
 import {getPageLoadError} from '../../lib/navigation-error.js';
 import Trace from '../../gather/gatherers/trace.js';
 import DevtoolsLog from '../../gather/gatherers/devtools-log.js';
-import NetworkRecords from '../../computed/network-records.js';
+import {NetworkRecords} from '../../computed/network-records.js';
 
 /**
  * @typedef NavigationContext
@@ -319,7 +319,7 @@ async function navigationGather(requestor, options) {
   const artifacts = await Runner.gather(
     async () => {
       let {page} = options;
-      const normalizedRequestor = isCallback ? requestor : URL.normalizeUrl(requestor);
+      const normalizedRequestor = isCallback ? requestor : UrlUtils.normalizeUrl(requestor);
 
       // For navigation mode, we shouldn't connect to a browser in audit mode,
       // therefore we connect to the browser in the gatherFn callback.

package/core/gather/driver/navigation.js

@@ -10,7 +10,7 @@ import {NetworkMonitor} from './network-monitor.js';
 import {waitForFullyLoaded, waitForFrameNavigated, waitForUserToContinue} from './wait-for-condition.js'; // eslint-disable-line max-len
 import * as constants from '../../config/constants.js';
 import * as i18n from '../../lib/i18n/i18n.js';
-import URL from '../../lib/url-shim.js';
+import UrlUtils from '../../lib/url-utils.js';
 
 const UIStrings = {
   /**
@@ -130,7 +130,7 @@ async function gotoURL(driver, requestor, options) {
 
   let requestedUrl = navigationUrls.requestedUrl;
   if (typeof requestor === 'string') {
-    if (requestedUrl && !URL.equalWithExcludedFragments(requestor, requestedUrl)) {
+    if (requestedUrl && !UrlUtils.equalWithExcludedFragments(requestor, requestedUrl)) {
       log.error(
         'Navigation',
         `Provided URL (${requestor}) did not match initial navigation URL (${requestedUrl})`
@@ -169,7 +169,7 @@ function getNavigationWarnings(navigation) {
 
   if (navigation.timedOut) warnings.push(str_(UIStrings.warningTimeout));
 
-  if (!URL.equalWithExcludedFragments(requestedUrl, mainDocumentUrl)) {
+  if (!UrlUtils.equalWithExcludedFragments(requestedUrl, mainDocumentUrl)) {
     warnings.push(str_(UIStrings.warningRedirected, {
       requested: requestedUrl,
       final: mainDocumentUrl,

package/core/gather/driver/network-monitor.js

@@ -15,7 +15,7 @@ import log from 'lighthouse-logger';
 
 import {NetworkRecorder} from '../../lib/network-recorder.js';
 import {NetworkRequest} from '../../lib/network-request.js';
-import URL from '../../lib/url-shim.js';
+import UrlUtils from '../../lib/url-utils.js';
 
 /** @typedef {import('../../lib/network-recorder.js').NetworkRecorderEventMap} NetworkRecorderEventMap */
 /** @typedef {'network-2-idle'|'network-critical-idle'|'networkidle'|'networkbusy'|'network-critical-busy'|'network-2-busy'} NetworkMonitorEvent_ */
@@ -214,7 +214,7 @@ class NetworkMonitor extends NetworkMonitorEventEmitter {
     /** @type {Array<{time: number, isStart: boolean}>} */
     let timeBoundaries = [];
     requests.forEach(request => {
-      if (URL.isNonNetworkProtocol(request.protocol)) return;
+      if (UrlUtils.isNonNetworkProtocol(request.protocol)) return;
       if (request.protocol === 'ws' || request.protocol === 'wss') return;
 
       // convert the network timestamp to ms

package/core/gather/gather-runner.js

@@ -6,7 +6,7 @@
 
 import log from 'lighthouse-logger';
 
-import NetworkRecords from '../computed/network-records.js';
+import {NetworkRecords} from '../computed/network-records.js';
 import {getPageLoadError} from '../lib/navigation-error.js';
 import * as emulation from '../lib/emulation.js';
 import * as constants from '../config/constants.js';
@@ -21,7 +21,7 @@ import InstallabilityErrors from './gatherers/installability-errors.js';
 import NetworkUserAgent from './gatherers/network-user-agent.js';
 import Stacks from './gatherers/stacks.js';
 import {finalizeArtifacts} from '../fraggle-rock/gather/base-artifacts.js';
-import URLShim from '../lib/url-shim.js';
+import UrlUtils from '../lib/url-utils.js';
 
 /** @typedef {import('../gather/driver.js').Driver} Driver */
 /** @typedef {import('../lib/arbitrary-equality-map.js').ArbitraryEqualityMap} ArbitraryEqualityMap */
@@ -494,7 +494,7 @@ class GatherRunner {
 
       // Hack for running benchmarkIndex extra times.
       // Add a `bidx=20` query param, eg: https://www.example.com/?bidx=50
-      const parsedUrl = URLShim.isValid(options.requestedUrl) && new URL(options.requestedUrl);
+      const parsedUrl = UrlUtils.isValid(options.requestedUrl) && new URL(options.requestedUrl);
       if (options.settings.channel === 'lr' && parsedUrl && parsedUrl.searchParams.has('bidx')) {
         const bidxRunCount = parsedUrl.searchParams.get('bidx') || 0;
         // Add the first bidx into the new set

package/core/gather/gatherers/dobetterweb/optimized-images.js

@@ -13,10 +13,10 @@
 import log from 'lighthouse-logger';
 
 import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
-import URL from '../../../lib/url-shim.js';
+import UrlUtils from '../../../lib/url-utils.js';
 import {NetworkRequest} from '../../../lib/network-request.js';
 import {Sentry} from '../../../lib/sentry.js';
-import NetworkRecords from '../../../computed/network-records.js';
+import {NetworkRecords} from '../../../computed/network-records.js';
 import DevtoolsLog from '../devtools-log.js';
 
 // Image encoding can be slow and we don't want to spend forever on it.
@@ -139,7 +139,7 @@ class OptimizedImages extends FRGatherer {
         // want to tank the entire run due to a single image.
         Sentry.captureException(err, {
           tags: {gatherer: 'OptimizedImages'},
-          extra: {imageUrl: URL.elideDataURI(record.url)},
+          extra: {imageUrl: UrlUtils.elideDataURI(record.url)},
           level: 'warning',
         });
 

package/core/gather/gatherers/dobetterweb/response-compression.js

@@ -14,12 +14,12 @@ import {Buffer} from 'buffer';
 import {gzip} from 'zlib';
 
 import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
-import URL from '../../../lib/url-shim.js';
+import UrlUtils from '../../../lib/url-utils.js';
 import {Sentry} from '../../../lib/sentry.js';
 import {NetworkRequest} from '../../../lib/network-request.js';
 import DevtoolsLog from '../devtools-log.js';
 import {fetchResponseBodyFromCache} from '../../driver/network.js';
-import NetworkRecords from '../../../computed/network-records.js';
+import {NetworkRecords} from '../../../computed/network-records.js';
 
 const CHROME_EXTENSION_PROTOCOL = 'chrome-extension:';
 const compressionHeaders = [
@@ -122,7 +122,7 @@ class ResponseCompression extends FRGatherer {
       }).catch(err => {
         Sentry.captureException(err, {
           tags: {gatherer: 'ResponseCompression'},
-          extra: {url: URL.elideDataURI(record.url)},
+          extra: {url: UrlUtils.elideDataURI(record.url)},
           level: 'warning',
         });
 

package/core/gather/gatherers/dobetterweb/tags-blocking-first-paint.js

@@ -17,7 +17,7 @@
  */
 
 
-import NetworkRecords from '../../../computed/network-records.js';
+import {NetworkRecords} from '../../../computed/network-records.js';
 import DevtoolsLog from '../devtools-log.js';
 import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
 

package/core/gather/gatherers/inspector-issues.js

@@ -10,7 +10,7 @@
 
 
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
-import NetworkRecords from '../../computed/network-records.js';
+import {NetworkRecords} from '../../computed/network-records.js';
 import DevtoolsLog from './devtools-log.js';
 
 class InspectorIssues extends FRGatherer {

package/core/gather/gatherers/link-elements.js

@@ -7,10 +7,9 @@
 import LinkHeader from 'http-link-header';
 
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
-import URL from '../../lib/url-shim.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 import DevtoolsLog from './devtools-log.js';
-import MainResource from '../../computed/main-resource.js';
+import {MainResource} from '../../computed/main-resource.js';
 
 /* globals HTMLLinkElement getNodeDetails */
 

package/core/gather/gatherers/main-document-content.js

@@ -7,7 +7,7 @@
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 import DevtoolsLog from './devtools-log.js';
 import {fetchResponseBodyFromCache} from '../driver/network.js';
-import MainResource from '../../computed/main-resource.js';
+import {MainResource} from '../../computed/main-resource.js';
 
 /**
  * Collects the content of the main html document.