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

package/cli/cli-flags.js

@@ -7,6 +7,7 @@
 /* eslint-disable max-len */
 
 import fs from 'fs';
+import path from 'path';
 
 import yargs from 'yargs';
 import * as yargsHelpers from 'yargs/helpers';
@@ -227,6 +228,7 @@ function getYargsParser(manualArgv) {
       },
       'output-path': {
         type: 'string',
+        coerce: coerceOutputPath,
         describe: `The file path to output the results. Use 'stdout' to write to stdout.
 If using JSON output, default is stdout.
 If using HTML or CSV output, default is a file in the working directory with a name based on the test URL and date.
@@ -408,6 +410,21 @@ function coerceOutput(values) {
   return validValues;
 }
 
+/**
+ * Verifies outputPath is something we can actually write to.
+ * @param {unknown=} value
+ * @return {string=}
+ */
+function coerceOutputPath(value) {
+  if (value === undefined) return;
+
+  if (typeof value !== 'string' || !value || !fs.existsSync(path.dirname(value))) {
+    throw new Error(`--output-path (${value}) cannot be written to`);
+  }
+
+  return value;
+}
+
 /**
  * Verifies value is a string, then coerces type to LH.Locale for convenience. However, don't
  * allowlist specific locales. Why? So we can support the user who requests 'es-MX' (unsupported)

package/cli/run.js

@@ -19,7 +19,7 @@ import * as Printer from './printer.js';
 import lighthouse, {legacyNavigation} from '../core/index.js';
 import {getLhrFilenamePrefix} from '../report/generator/file-namer.js';
 import * as assetSaver from '../core/lib/asset-saver.js';
-import URL from '../core/lib/url-shim.js';
+import UrlUtils from '../core/lib/url-utils.js';
 
 /** @typedef {Error & {code: string, friendlyMessage?: string}} ExitError */
 
@@ -232,7 +232,7 @@ async function runLighthouse(url, flags, config) {
     }
 
     const shouldGather = flags.gatherMode || flags.gatherMode === flags.auditMode;
-    const shouldUseLocalChrome = URL.isLikeLocalhost(flags.hostname);
+    const shouldUseLocalChrome = UrlUtils.isLikeLocalhost(flags.hostname);
     if (shouldGather && shouldUseLocalChrome) {
       launchedChrome = await getDebuggableChrome(flags);
       flags.port = launchedChrome.port;

package/cli/test/smokehouse/core-tests.js

@@ -42,7 +42,7 @@ import perfFonts from './test-definitions/perf-fonts.js';
 import perfFrameMetrics from './test-definitions/perf-frame-metrics.js';
 import perfPreload from './test-definitions/perf-preload.js';
 import perfTraceElements from './test-definitions/perf-trace-elements.js';
-// import pubads from './test-definitions/pubads.js';
+import pubads from './test-definitions/pubads.js';
 import pwaAirhorner from './test-definitions/pwa-airhorner.js';
 import pwaCaltrain from './test-definitions/pwa-caltrain.js';
 import pwaChromestatus from './test-definitions/pwa-chromestatus.js';
@@ -103,8 +103,7 @@ const smokeTests = [
   perfFrameMetrics,
   perfPreload,
   perfTraceElements,
-  // TODO(esmodules): enable when pubads is bundled again
-  // pubads,
+  pubads,
   pwaAirhorner,
   pwaChromestatus,
   pwaSvgomg,

package/cli/test/smokehouse/report-assert.js

@@ -259,10 +259,6 @@ function pruneExpectations(localConsole, lhr, expected, reportOptions) {
    * @param {*} obj
    */
   function failsChromeVersionCheck(obj) {
-    // LHR never actually run, so we can't know. Better to not prune
-    // things than to fail loudly when accessing lhr.environment.
-    if (!lhr.environment) return false;
-
     return !chromiumVersionCheck({
       version: getChromeVersionString(),
       min: obj._minChromiumVersion,

package/cli/test/smokehouse/smokehouse.js

@@ -195,6 +195,12 @@ async function runSmokeTest(smokeTestDefn, testOptions) {
         ...await lighthouseRunner(requestedUrl, configJson, {isDebug, useLegacyNavigation}),
         networkRequests: takeNetworkRequestUrls ? takeNetworkRequestUrls() : undefined,
       };
+
+      if (!result.lhr?.audits || !result.artifacts) {
+        // Something went really wrong and the runner didn't catch it.
+        throw new Error('lighthouse runner returned a bad result. got lhr:\n' +
+          JSON.stringify(result.lhr, null, 2));
+      }
     } catch (e) {
       // Clear the network requests so that when we retry, we don't see duplicates.
       if (takeNetworkRequestUrls) takeNetworkRequestUrls();

package/core/audits/bootup-time.js

@@ -7,8 +7,8 @@
 import {Audit} from './audit.js';
 import {taskGroups} from '../lib/tracehouse/task-groups.js';
 import * as i18n from '../lib/i18n/i18n.js';
-import NetworkRecords from '../computed/network-records.js';
-import MainThreadTasks from '../computed/main-thread-tasks.js';
+import {NetworkRecords} from '../computed/network-records.js';
+import {MainThreadTasks} from '../computed/main-thread-tasks.js';
 import {getExecutionTimingsByURL} from '../lib/tracehouse/task-summary.js';
 
 const UIStrings = {

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

@@ -6,11 +6,11 @@
 
 import {Audit} from '../audit.js';
 import {linearInterpolation} from '../../lib/statistics.js';
-import Interactive from '../../computed/metrics/lantern-interactive.js';
+import {LanternInteractive} from '../../computed/metrics/lantern-interactive.js';
 import * as i18n from '../../lib/i18n/i18n.js';
-import NetworkRecords from '../../computed/network-records.js';
-import LoadSimulator from '../../computed/load-simulator.js';
-import PageDependencyGraph from '../../computed/page-dependency-graph.js';
+import {NetworkRecords} from '../../computed/network-records.js';
+import {LoadSimulator} from '../../computed/load-simulator.js';
+import {PageDependencyGraph} from '../../computed/page-dependency-graph.js';
 
 const str_ = i18n.createIcuMessageFn(import.meta.url, {});
 
@@ -190,8 +190,9 @@ class ByteEfficiencyAudit extends Audit {
     });
 
     const savingsOnOverallLoad = simulationBeforeChanges.timeInMs - simulationAfterChanges.timeInMs;
-    const savingsOnTTI = Interactive.getLastLongTaskEndTime(simulationBeforeChanges.nodeTimings) -
-      Interactive.getLastLongTaskEndTime(simulationAfterChanges.nodeTimings);
+    const savingsOnTTI =
+      LanternInteractive.getLastLongTaskEndTime(simulationBeforeChanges.nodeTimings) -
+      LanternInteractive.getLastLongTaskEndTime(simulationAfterChanges.nodeTimings);
 
     let savings = savingsOnTTI;
     if (options.includeLoad) savings = Math.max(savings, savingsOnOverallLoad);

package/core/audits/byte-efficiency/duplicated-javascript.js

@@ -9,7 +9,7 @@
 /** @typedef {{url: string, sourceTransferBytes?: number}} SubItem */
 
 import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
-import ModuleDuplication from '../../computed/module-duplication.js';
+import {ModuleDuplication} from '../../computed/module-duplication.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 import {getRequestForScript} from '../../lib/script-helpers.js';
 

package/core/audits/byte-efficiency/legacy-javascript.js

@@ -20,7 +20,7 @@
 import fs from 'fs';
 
 import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
-import JsBundles from '../../computed/js-bundles.js';
+import {JSBundles} from '../../computed/js-bundles.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 import thirdPartyWeb from '../../lib/third-party-web.js';
 import {getRequestForScript} from '../../lib/script-helpers.js';
@@ -402,7 +402,7 @@ class LegacyJavascript extends ByteEfficiencyAudit {
    */
   static async audit_(artifacts, networkRecords, context) {
     const mainDocumentEntity = thirdPartyWeb.getEntity(artifacts.URL.finalUrl);
-    const bundles = await JsBundles.request(artifacts, context);
+    const bundles = await JSBundles.request(artifacts, context);
 
     /** @type {Item[]} */
     const items = [];

package/core/audits/byte-efficiency/modern-image-formats.js

@@ -9,7 +9,7 @@
 
 
 import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
-import URL from '../../lib/url-shim.js';
+import UrlUtils from '../../lib/url-utils.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
@@ -106,7 +106,7 @@ class ModernImageFormats extends ByteEfficiencyAudit {
       const imageElement = imageElementsByURL.get(image.url);
 
       if (image.failed) {
-        warnings.push(`Unable to decode ${URL.getURLDisplayName(image.url)}`);
+        warnings.push(`Unable to decode ${UrlUtils.getURLDisplayName(image.url)}`);
         continue;
       }
 
@@ -123,7 +123,7 @@ class ModernImageFormats extends ByteEfficiencyAudit {
 
       if (typeof webpSize === 'undefined') {
         if (!imageElement) {
-          warnings.push(`Unable to locate resource ${URL.getURLDisplayName(image.url)}`);
+          warnings.push(`Unable to locate resource ${UrlUtils.getURLDisplayName(image.url)}`);
           continue;
         }
 
@@ -152,8 +152,8 @@ class ModernImageFormats extends ByteEfficiencyAudit {
       const wastedBytes = image.originalSize - avifSize;
       if (wastedBytes < IGNORE_THRESHOLD_IN_BYTES) continue;
 
-      const url = URL.elideDataURI(image.url);
-      const isCrossOrigin = !URL.originsMatch(pageURL, image.url);
+      const url = UrlUtils.elideDataURI(image.url);
+      const isCrossOrigin = !UrlUtils.originsMatch(pageURL, image.url);
 
       items.push({
         node: imageElement ? ByteEfficiencyAudit.makeNodeItem(imageElement.node) : undefined,

package/core/audits/byte-efficiency/offscreen-images.js

@@ -12,10 +12,10 @@
 import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
 import {NetworkRequest} from '../../lib/network-request.js';
 import {Sentry} from '../../lib/sentry.js';
-import URL from '../../lib/url-shim.js';
+import UrlUtils from '../../lib/url-utils.js';
 import * as i18n from '../../lib/i18n/i18n.js';
-import Interactive from '../../computed/metrics/interactive.js';
-import ProcessedTrace from '../../computed/processed-trace.js';
+import {Interactive} from '../../computed/metrics/interactive.js';
+import {ProcessedTrace} from '../../computed/processed-trace.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to defer loading offscreen images. Offscreen images are images located outside of the visible browser viewport. As they are unseen by the user and slow down page load, they should be loaded later, closer to when the user is going to see them. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -87,7 +87,7 @@ class OffscreenImages extends ByteEfficiencyAudit {
     // If the image had its loading behavior explicitly controlled already, treat it as passed.
     if (image.loading === 'lazy' || image.loading === 'eager') return null;
 
-    const url = URL.elideDataURI(image.src);
+    const url = UrlUtils.elideDataURI(image.src);
     const totalPixels = image.displayedWidth * image.displayedHeight;
     const visiblePixels = this.computeVisiblePixels(image.clientRect, viewportDimensions);
     // Treat images with 0 area as if they're offscreen. See https://github.com/GoogleChrome/lighthouse/issues/1914

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

@@ -13,12 +13,12 @@ import {Audit} from '../audit.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 import {BaseNode} from '../../lib/dependency-graph/base-node.js';
 import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
-import UnusedCSS from '../../computed/unused-css.js';
+import {UnusedCSS} from '../../computed/unused-css.js';
 import {NetworkRequest} from '../../lib/network-request.js';
-import ProcessedTrace from '../../computed/processed-trace.js';
-import ProcessedNavigation from '../../computed/processed-navigation.js';
-import LoadSimulator from '../../computed/load-simulator.js';
-import FirstContentfulPaint from '../../computed/metrics/first-contentful-paint.js';
+import {ProcessedTrace} from '../../computed/processed-trace.js';
+import {ProcessedNavigation} from '../../computed/processed-navigation.js';
+import {LoadSimulator} from '../../computed/load-simulator.js';
+import {FirstContentfulPaint} from '../../computed/metrics/first-contentful-paint.js';
 
 /** @typedef {import('../../lib/dependency-graph/simulator/simulator').Simulator} Simulator */
 /** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */

package/core/audits/byte-efficiency/total-byte-weight.js

@@ -7,7 +7,7 @@
 import {Audit} from '../audit.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 import {NetworkRequest} from '../../lib/network-request.js';
-import NetworkRecords from '../../computed/network-records.js';
+import {NetworkRecords} from '../../computed/network-records.js';
 
 const UIStrings = {
   /** Title of a diagnostic audit that provides detail on large network resources required during page load. 'Payloads' is roughly equivalent to 'resources'. This descriptive title is shown to users when the amount is acceptable and no user action is required. */

package/core/audits/byte-efficiency/unminified-css.js

@@ -5,7 +5,7 @@
  */
 
 import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
-import UnusedCSS from '../../computed/unused-css.js';
+import {UnusedCSS} from '../../computed/unused-css.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 import {computeCSSTokenLength as computeTokenLength} from '../../lib/minification-estimator.js';
 

package/core/audits/byte-efficiency/unused-css-rules.js

@@ -5,7 +5,7 @@
  */
 
 import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
-import UnusedCSS from '../../computed/unused-css.js';
+import {UnusedCSS} from '../../computed/unused-css.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {

package/core/audits/byte-efficiency/unused-javascript.js

@@ -5,8 +5,8 @@
  */
 
 import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
-import UnusedJavaScriptSummary from '../../computed/unused-javascript-summary.js';
-import JsBundles from '../../computed/js-bundles.js';
+import {UnusedJavascriptSummary} from '../../computed/unused-javascript-summary.js';
+import {JSBundles} from '../../computed/js-bundles.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 import {getRequestForScript} from '../../lib/script-helpers.js';
 
@@ -79,7 +79,7 @@ class UnusedJavaScript extends ByteEfficiencyAudit {
    * @return {Promise<import('./byte-efficiency-audit.js').ByteEfficiencyProduct>}
    */
   static async audit_(artifacts, networkRecords, context) {
-    const bundles = await JsBundles.request(artifacts, context);
+    const bundles = await JSBundles.request(artifacts, context);
     const {
       unusedThreshold = UNUSED_BYTES_IGNORE_THRESHOLD,
       bundleSourceUnusedThreshold = UNUSED_BYTES_IGNORE_BUNDLE_SOURCE_THRESHOLD,
@@ -95,7 +95,7 @@ class UnusedJavaScript extends ByteEfficiencyAudit {
 
       const bundle = bundles.find(b => b.script.scriptId === scriptId);
       const unusedJsSummary =
-        await UnusedJavaScriptSummary.request({scriptId, scriptCoverage, bundle}, context);
+        await UnusedJavascriptSummary.request({scriptId, scriptCoverage, bundle}, context);
       if (unusedJsSummary.wastedBytes === 0 || unusedJsSummary.totalBytes === 0) continue;
 
       const transfer = ByteEfficiencyAudit

package/core/audits/byte-efficiency/uses-long-cache-ttl.js

@@ -8,10 +8,10 @@ import parseCacheControl from 'parse-cache-control';
 
 import {Audit} from '../audit.js';
 import {NetworkRequest} from '../../lib/network-request.js';
-import URL from '../../lib/url-shim.js';
+import UrlUtils from '../../lib/url-utils.js';
 import {linearInterpolation} from '../../lib/statistics.js';
 import * as i18n from '../../lib/i18n/i18n.js';
-import NetworkRecords from '../../computed/network-records.js';
+import {NetworkRecords} from '../../computed/network-records.js';
 
 const UIStrings = {
   /** Title of a diagnostic audit that provides detail on the cache policy applies to the page's static assets. Cache refers to browser disk cache, which keeps old versions of network resources around for future use. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -233,7 +233,7 @@ class CacheHeaders extends Audit {
         const cacheHitProbability = CacheHeaders.getCacheHitProbability(cacheLifetimeInSeconds);
         if (cacheHitProbability > IGNORE_THRESHOLD_IN_PERCENT) continue;
 
-        const url = URL.elideDataURI(record.url);
+        const url = UrlUtils.elideDataURI(record.url);
         const totalBytes = record.transferSize || 0;
         const wastedBytes = (1 - cacheHitProbability) * totalBytes;
 

package/core/audits/byte-efficiency/uses-optimized-images.js

@@ -10,7 +10,7 @@
 
 
 import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
-import URL from '../../lib/url-shim.js';
+import UrlUtils from '../../lib/url-utils.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
@@ -83,7 +83,7 @@ class UsesOptimizedImages extends ByteEfficiencyAudit {
       const imageElement = imageElementsByURL.get(image.url);
 
       if (image.failed) {
-        warnings.push(`Unable to decode ${URL.getURLDisplayName(image.url)}`);
+        warnings.push(`Unable to decode ${UrlUtils.getURLDisplayName(image.url)}`);
         continue;
       } else if (/(jpeg|bmp)/.test(image.mimeType) === false) {
         continue;
@@ -94,7 +94,7 @@ class UsesOptimizedImages extends ByteEfficiencyAudit {
 
       if (typeof jpegSize === 'undefined') {
         if (!imageElement) {
-          warnings.push(`Unable to locate resource ${URL.getURLDisplayName(image.url)}`);
+          warnings.push(`Unable to locate resource ${UrlUtils.getURLDisplayName(image.url)}`);
           continue;
         }
 
@@ -111,8 +111,8 @@ class UsesOptimizedImages extends ByteEfficiencyAudit {
 
       if (image.originalSize < jpegSize + IGNORE_THRESHOLD_IN_BYTES) continue;
 
-      const url = URL.elideDataURI(image.url);
-      const isCrossOrigin = !URL.originsMatch(pageURL, image.url);
+      const url = UrlUtils.elideDataURI(image.url);
+      const isCrossOrigin = !UrlUtils.originsMatch(pageURL, image.url);
       const jpegSavings = UsesOptimizedImages.computeSavings({...image, jpegSize});
 
       items.push({

package/core/audits/byte-efficiency/uses-responsive-images-snapshot.js

@@ -13,7 +13,7 @@
 
 import {Audit} from '../audit.js';
 import * as UsesResponsiveImages from './uses-responsive-images.js';
-import URL from '../../lib/url-shim.js';
+import UrlUtils from '../../lib/url-utils.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
@@ -71,7 +71,7 @@ class UsesResponsiveImagesSnapshot extends Audit {
 
       items.push({
         node: Audit.makeNodeItem(image.node),
-        url: URL.elideDataURI(image.src),
+        url: UrlUtils.elideDataURI(image.src),
         displayedDimensions: `${displayed.width}x${displayed.height}`,
         actualDimensions: `${actual.width}x${actual.height}`,
       });

package/core/audits/byte-efficiency/uses-responsive-images.js

@@ -15,8 +15,8 @@
 
 import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
 import {NetworkRequest} from '../../lib/network-request.js';
-import ImageRecords from '../../computed/image-records.js';
-import URL from '../../lib/url-shim.js';
+import {ImageRecords} from '../../computed/image-records.js';
+import UrlUtils from '../../lib/url-utils.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
@@ -100,7 +100,7 @@ class UsesResponsiveImages extends ByteEfficiencyAudit {
     const displayed = this.getDisplayedDimensions(image, ViewportDimensions);
     const usedPixels = displayed.width * displayed.height;
 
-    const url = URL.elideDataURI(image.src);
+    const url = UrlUtils.elideDataURI(image.src);
     const actualPixels = image.naturalWidth * image.naturalHeight;
     const wastedRatio = 1 - (usedPixels / actualPixels);
     const totalBytes = NetworkRequest.getResourceSizeOnNetwork(networkRecord);

package/core/audits/byte-efficiency/uses-text-compression.js

@@ -10,7 +10,7 @@
 
 
 import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
-import URL from '../../lib/url-shim.js';
+import UrlUtils from '../../lib/url-utils.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
@@ -68,7 +68,7 @@ class ResponsesAreCompressed extends ByteEfficiencyAudit {
       }
 
       // remove duplicates
-      const url = URL.elideDataURI(record.url);
+      const url = UrlUtils.elideDataURI(record.url);
       const isDuplicate = items.find(item => item.url === url &&
         item.totalBytes === record.resourceSize);
       if (isDuplicate) {

package/core/audits/critical-request-chains.js

@@ -6,7 +6,7 @@
 
 import {Audit} from './audit.js';
 import * as i18n from '../lib/i18n/i18n.js';
-import ComputedChains from '../computed/critical-request-chains.js';
+import {CriticalRequestChains as ComputedChains} from '../computed/critical-request-chains.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to reduce the depth of critical network requests to enhance initial load of a page. Critical request chains are series of dependent network requests that are important for page rendering. For example, here's a 4-request-deep chain: The biglogo.jpg image is required, but is requested via the styles.css style code, which is requested by the initialize.js javascript, which is requested by the page's HTML. This is displayed in a list of audit titles that Lighthouse generates. */

package/core/audits/csp-xss.js

@@ -5,7 +5,7 @@
  */
 
 import {Audit} from './audit.js';
-import MainResource from '../computed/main-resource.js';
+import {MainResource} from '../computed/main-resource.js';
 import * as i18n from '../lib/i18n/i18n.js';
 import {evaluateRawCspsForXss, getTranslatedDescription} from '../lib/csp-evaluator.js';
 

package/core/audits/deprecations.js

@@ -9,7 +9,7 @@
  */
 
 import {Audit} from './audit.js';
-import JsBundles from '../computed/js-bundles.js';
+import {JSBundles} from '../computed/js-bundles.js';
 import * as i18n from '../lib/i18n/i18n.js';
 import {getIssueDetailDescription} from '../lib/deprecations-strings.js';
 
@@ -56,7 +56,7 @@ class Deprecations extends Audit {
    * @return {Promise<LH.Audit.Product>}
    */
   static async audit(artifacts, context) {
-    const bundles = await JsBundles.request(artifacts, context);
+    const bundles = await JSBundles.request(artifacts, context);
 
     const deprecations = artifacts.InspectorIssues.deprecationIssue
       .map(deprecation => {

package/core/audits/diagnostics.js

@@ -5,10 +5,10 @@
  */
 
 import {Audit} from './audit.js';
-import MainThreadTasksComputed from '../computed/main-thread-tasks.js';
-import NetworkRecordsComputed from '../computed/network-records.js';
-import NetworkAnalysisComputed from '../computed/network-analysis.js';
-import MainResource from '../computed/main-resource.js';
+import {MainThreadTasks} from '../computed/main-thread-tasks.js';
+import {NetworkRecords} from '../computed/network-records.js';
+import {NetworkAnalysis} from '../computed/network-analysis.js';
+import {MainResource} from '../computed/main-resource.js';
 
 class Diagnostics extends Audit {
   /**
@@ -33,9 +33,9 @@ class Diagnostics extends Audit {
   static async audit(artifacts, context) {
     const trace = artifacts.traces[Audit.DEFAULT_PASS];
     const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
-    const tasks = await MainThreadTasksComputed.request(trace, context);
-    const records = await NetworkRecordsComputed.request(devtoolsLog, context);
-    const analysis = await NetworkAnalysisComputed.request(devtoolsLog, context);
+    const tasks = await MainThreadTasks.request(trace, context);
+    const records = await NetworkRecords.request(devtoolsLog, context);
+    const analysis = await NetworkAnalysis.request(devtoolsLog, context);
     const mainResource = await MainResource.request({devtoolsLog, URL: artifacts.URL}, context);
 
     const toplevelTasks = tasks.filter(t => !t.parent);

package/core/audits/dobetterweb/charset.js

@@ -14,7 +14,7 @@
 
 import {Audit} from '../audit.js';
 import * as i18n from '../../lib/i18n/i18n.js';
-import MainResource from '../../computed/main-resource.js';
+import {MainResource} from '../../computed/main-resource.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on if the charset is set properly for a page. This title is shown when the charset is defined correctly. Charset defines the character encoding (eg UTF-8) of the page content. */

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

@@ -14,13 +14,13 @@
 
 import {Audit} from '../audit.js';
 import ThirdParty from '../../lib/third-party-web.js';
-import URL from '../../lib/url-shim.js';
+import UrlUtils from '../../lib/url-utils.js';
 import {ByteEfficiencyAudit} from '../byte-efficiency/byte-efficiency-audit.js';
-import Interactive from '../../computed/metrics/lantern-interactive.js';
+import {LanternInteractive} from '../../computed/metrics/lantern-interactive.js';
 import {NetworkRequest} from '../../lib/network-request.js';
-import NetworkRecords from '../../computed/network-records.js';
-import LoadSimulator from '../../computed/load-simulator.js';
-import PageDependencyGraph from '../../computed/page-dependency-graph.js';
+import {NetworkRecords} from '../../computed/network-records.js';
+import {LoadSimulator} from '../../computed/load-simulator.js';
+import {PageDependencyGraph} from '../../computed/page-dependency-graph.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
@@ -106,8 +106,8 @@ class UsesHTTP2Audit extends Audit {
     });
 
     const savingsOnOverallLoad = simulationBefore.timeInMs - simulationAfter.timeInMs;
-    const savingsOnTTI = Interactive.getLastLongTaskEndTime(simulationBefore.nodeTimings) -
-      Interactive.getLastLongTaskEndTime(simulationAfter.nodeTimings);
+    const savingsOnTTI = LanternInteractive.getLastLongTaskEndTime(simulationBefore.nodeTimings) -
+      LanternInteractive.getLastLongTaskEndTime(simulationAfter.nodeTimings);
     const savings = Math.max(savingsOnTTI, savingsOnOverallLoad);
 
     // Round waste to nearest 10ms
@@ -167,7 +167,7 @@ class UsesHTTP2Audit extends Audit {
     const groupedByOrigin = new Map();
     for (const record of networkRecords) {
       if (!UsesHTTP2Audit.isStaticAsset(record)) continue;
-      if (URL.isLikeLocalhost(record.parsedURL.host)) continue;
+      if (UrlUtils.isLikeLocalhost(record.parsedURL.host)) continue;
       const existing = groupedByOrigin.get(record.parsedURL.securityOrigin) || [];
       existing.push(record);
       groupedByOrigin.set(record.parsedURL.securityOrigin, existing);

package/core/audits/errors-in-console.js

@@ -12,7 +12,7 @@
 import log from 'lighthouse-logger';
 
 import {Audit} from './audit.js';
-import JsBundles from '../computed/js-bundles.js';
+import {JSBundles} from '../computed/js-bundles.js';
 import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
@@ -81,7 +81,7 @@ class ErrorLogs extends Audit {
   static async audit(artifacts, context) {
     /** @type {AuditOptions} */
     const auditOptions = context.options;
-    const bundles = await JsBundles.request(artifacts, context);
+    const bundles = await JSBundles.request(artifacts, context);
 
     /** @type {Array<{source: string, description: string|undefined, sourceLocation: LH.Audit.Details.SourceLocationValue|undefined}>} */
     const consoleRows = artifacts.ConsoleMessages

package/core/audits/final-screenshot.js

@@ -6,8 +6,8 @@
 
 import {Audit} from './audit.js';
 import {LighthouseError} from '../lib/lh-error.js';
-import ProcessedTrace from '../computed/processed-trace.js';
-import Screenshots from '../computed/screenshots.js';
+import {ProcessedTrace} from '../computed/processed-trace.js';
+import {Screenshots} from '../computed/screenshots.js';
 
 class FinalScreenshot extends Audit {
   /**

package/core/audits/font-display.js

@@ -5,13 +5,14 @@
  */
 
 import {Audit} from './audit.js';
-import URL from '../lib/url-shim.js';
+import UrlUtils from '../lib/url-utils.js';
+import * as i18n from '../lib/i18n/i18n.js';
+import {Sentry} from '../lib/sentry.js';
+import {NetworkRecords} from '../computed/network-records.js';
+
 const PASSING_FONT_DISPLAY_REGEX = /^(block|fallback|optional|swap)$/;
 const CSS_URL_REGEX = /url\((.*?)\)/;
 const CSS_URL_GLOBAL_REGEX = new RegExp(CSS_URL_REGEX, 'g');
-import * as i18n from '../lib/i18n/i18n.js';
-import {Sentry} from '../lib/sentry.js';
-import NetworkRecords from '../computed/network-records.js';
 
 const UIStrings = {
   /** Title of a diagnostic audit that provides detail on if all the text on a webpage was visible while the page was loading its webfonts. This descriptive title is shown to users when the amount is acceptable and no user action is required. */
@@ -98,7 +99,7 @@ class FontDisplay extends Audit {
         // Convert the relative CSS URL to an absolute URL and add it to the target set.
         for (const relativeURL of relativeURLs) {
           try {
-            const relativeRoot = URL.isValid(stylesheet.header.sourceURL) ?
+            const relativeRoot = UrlUtils.isValid(stylesheet.header.sourceURL) ?
               stylesheet.header.sourceURL : artifacts.URL.finalUrl;
             const absoluteURL = new URL(relativeURL, relativeRoot);
             targetURLSet.add(absoluteURL.href);
@@ -121,7 +122,7 @@ class FontDisplay extends Audit {
     /** @type {Map<string, number>} */
     const warningCountByOrigin = new Map();
     for (const warningUrl of warningUrls) {
-      const origin = URL.getOrigin(warningUrl);
+      const origin = UrlUtils.getOrigin(warningUrl);
       if (!origin) continue;
 
       const count = warningCountByOrigin.get(origin) || 0;