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

package/core/audits/image-aspect-ratio.js

@@ -12,7 +12,7 @@
 
 
 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';
 
 const UIStrings = {
@@ -54,7 +54,7 @@ class ImageAspectRatio extends Audit {
    * @return {{url: string, node: LH.Audit.Details.NodeValue, displayedAspectRatio: string, actualAspectRatio: string, doRatiosMatch: boolean}}
    */
   static computeAspectRatios(image) {
-    const url = URL.elideDataURI(image.src);
+    const url = UrlUtils.elideDataURI(image.src);
     const actualAspectRatio = image.naturalDimensions.width / image.naturalDimensions.height;
     const displayedAspectRatio = image.displayedWidth / image.displayedHeight;
 
@@ -89,7 +89,7 @@ class ImageAspectRatio extends Audit {
       // - filter all svgs as they have no natural dimensions to audit
       // - filter out images that have falsy naturalWidth or naturalHeight
       return !image.isCss &&
-        URL.guessMimeType(image.src) !== 'image/svg+xml' &&
+        UrlUtils.guessMimeType(image.src) !== 'image/svg+xml' &&
         image.naturalDimensions &&
         image.naturalDimensions.height > 5 &&
         image.naturalDimensions.width > 5 &&

package/core/audits/image-size-responsive.js

@@ -11,7 +11,7 @@
 
 
 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';
 
 /** @typedef {LH.Artifacts.ImageElement & Required<Pick<LH.Artifacts.ImageElement, 'naturalDimensions'>>} ImageWithNaturalDimensions */
@@ -96,7 +96,7 @@ function isCandidate(image) {
   ) {
     return false;
   }
-  if (URL.guessMimeType(image.src) === 'image/svg+xml') {
+  if (UrlUtils.guessMimeType(image.src) === 'image/svg+xml') {
     return false;
   }
   if (image.isCss) {
@@ -147,7 +147,7 @@ function getResult(image, DPR) {
   const [expectedWidth, expectedHeight] =
       expectedImageSize(image.displayedWidth, image.displayedHeight, DPR);
   return {
-    url: URL.elideDataURI(image.src),
+    url: UrlUtils.elideDataURI(image.src),
     node: Audit.makeNodeItem(image.node),
     displayedSize: `${image.displayedWidth} x ${image.displayedHeight}`,
     actualSize: `${image.naturalDimensions.width} x ${image.naturalDimensions.height}`,

package/core/audits/installable-manifest.js

@@ -6,7 +6,7 @@
 
 import {Audit} from './audit.js';
 import * as i18n from '../lib/i18n/i18n.js';
-import ManifestValues from '../computed/manifest-values.js';
+import {ManifestValues} from '../computed/manifest-values.js';
 
 /* eslint-disable max-len */
 const UIStrings = {

package/core/audits/is-on-https.js

@@ -5,9 +5,9 @@
  */
 
 import {Audit} from './audit.js';
-import URL from '../lib/url-shim.js';
+import UrlUtils from '../lib/url-utils.js';
 import {NetworkRequest} from '../lib/network-request.js';
-import NetworkRecords from '../computed/network-records.js';
+import {NetworkRecords} from '../computed/network-records.js';
 import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
@@ -75,7 +75,7 @@ class HTTPS extends Audit {
     return NetworkRecords.request(devtoolsLogs, context).then(networkRecords => {
       const insecureURLs = networkRecords
           .filter(record => !NetworkRequest.isSecureRequest(record))
-          .map(record => URL.elideDataURI(record.url));
+          .map(record => UrlUtils.elideDataURI(record.url));
 
       /** @type {Array<{url: string, resolution?: LH.IcuMessage|string}>}  */
       const items = Array.from(new Set(insecureURLs)).map(url => ({url, resolution: undefined}));

package/core/audits/long-tasks.js

@@ -5,11 +5,11 @@
  */
 
 import {Audit} from './audit.js';
-import NetworkRecords from '../computed/network-records.js';
+import {NetworkRecords} from '../computed/network-records.js';
 import * as i18n from '../lib/i18n/i18n.js';
-import MainThreadTasks from '../computed/main-thread-tasks.js';
-import PageDependencyGraph from '../computed/page-dependency-graph.js';
-import LoadSimulator from '../computed/load-simulator.js';
+import {MainThreadTasks} from '../computed/main-thread-tasks.js';
+import {PageDependencyGraph} from '../computed/page-dependency-graph.js';
+import {LoadSimulator} from '../computed/load-simulator.js';
 import {getJavaScriptURLs, getAttributableURLForTask} from '../lib/tracehouse/task-summary.js';
 
 /** We don't always have timing data for short tasks, if we're missing timing data. Treat it as though it were 0ms. */

package/core/audits/main-thread-tasks.js

@@ -5,7 +5,7 @@
  */
 
 import {Audit} from './audit.js';
-import MainThreadTasksComputed from '../computed/main-thread-tasks.js';
+import {MainThreadTasks as MainThreadTasksComputed} from '../computed/main-thread-tasks.js';
 
 class MainThreadTasks extends Audit {
   /**

package/core/audits/mainthread-work-breakdown.js

@@ -12,7 +12,7 @@
 import {Audit} from './audit.js';
 import {taskGroups} from '../lib/tracehouse/task-groups.js';
 import * as i18n from '../lib/i18n/i18n.js';
-import MainThreadTasks from '../computed/main-thread-tasks.js';
+import {MainThreadTasks} from '../computed/main-thread-tasks.js';
 
 const UIStrings = {
   /** Title of a diagnostic audit that provides detail on the main thread work the browser did to load the page. This descriptive title is shown to users when the amount is acceptable and no user action is required. */

package/core/audits/maskable-icon.js

@@ -5,7 +5,7 @@
  */
 
 import {Audit} from './audit.js';
-import ManifestValues from '../computed/manifest-values.js';
+import {ManifestValues} from '../computed/manifest-values.js';
 import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {

package/core/audits/metrics/cumulative-layout-shift.js

@@ -5,7 +5,7 @@
  */
 
 import {Audit} from '../audit.js';
-import ComputedCLS from '../../computed/metrics/cumulative-layout-shift.js';
+import {CumulativeLayoutShift as ComputedCLS} from '../../computed/metrics/cumulative-layout-shift.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {

package/core/audits/metrics/experimental-interaction-to-next-paint.js

@@ -5,7 +5,7 @@
  */
 
 import {Audit} from '../audit.js';
-import ComputedResponsivenes from '../../computed/metrics/responsiveness.js';
+import {Responsiveness as ComputedResponsivenes} from '../../computed/metrics/responsiveness.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {

package/core/audits/metrics/first-contentful-paint-3g.js

@@ -5,7 +5,7 @@
  */
 
 import {Audit} from '../audit.js';
-import ComputedFcp from '../../computed/metrics/first-contentful-paint.js';
+import {FirstContentfulPaint as ComputedFcp} from '../../computed/metrics/first-contentful-paint.js';
 import * as constants from '../../config/constants.js';
 
 const regular3G = constants.throttling.mobileRegular3G;

package/core/audits/metrics/first-contentful-paint.js

@@ -6,7 +6,7 @@
 
 import {Audit} from '../audit.js';
 import * as i18n from '../../lib/i18n/i18n.js';
-import ComputedFcp from '../../computed/metrics/first-contentful-paint.js';
+import {FirstContentfulPaint as ComputedFcp} from '../../computed/metrics/first-contentful-paint.js';
 
 const UIStrings = {
   /** Description of the First Contentful Paint (FCP) metric, which marks the time at which the first text or image is painted by the browser. This is displayed within a tooltip when the user hovers on the metric name to see more. No character length limits. 'Learn More' becomes link text to additional documentation. */

package/core/audits/metrics/first-meaningful-paint.js

@@ -6,7 +6,7 @@
 
 import {Audit} from '../audit.js';
 import * as i18n from '../../lib/i18n/i18n.js';
-import ComputedFmp from '../../computed/metrics/first-meaningful-paint.js';
+import {FirstMeaningfulPaint as ComputedFmp} from '../../computed/metrics/first-meaningful-paint.js';
 
 const UIStrings = {
   /** Description of the First Meaningful Paint (FMP) metric, which marks the time at which a majority of the content has been painted by the browser. This is displayed within a tooltip when the user hovers on the metric name to see more. No character length limits. 'Learn More' becomes link text to additional documentation. */

package/core/audits/metrics/interactive.js

@@ -6,7 +6,7 @@
 
 import {Audit} from '../audit.js';
 import * as i18n from '../../lib/i18n/i18n.js';
-import Interactive from '../../computed/metrics/interactive.js';
+import {Interactive} from '../../computed/metrics/interactive.js';
 
 const UIStrings = {
   /** Description of the Time to Interactive (TTI) metric, which evaluates when a page has completed its primary network activity and main thread work. This is displayed within a tooltip when the user hovers on the metric name to see more. No character length limits. 'Learn More' becomes link text to additional documentation. */

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

@@ -6,7 +6,7 @@
 
 import {Audit} from '../audit.js';
 import * as i18n from '../../lib/i18n/i18n.js';
-import ComputedLcp from '../../computed/metrics/largest-contentful-paint.js';
+import {LargestContentfulPaint as ComputedLcp} from '../../computed/metrics/largest-contentful-paint.js';
 
 const UIStrings = {
   /** Description of the Largest Contentful Paint (LCP) metric, which marks the time at which the largest text or image is painted by the browser. This is displayed within a tooltip when the user hovers on the metric name to see more. No character length limits. 'Learn More' becomes link text to additional documentation. */

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

@@ -5,7 +5,7 @@
  */
 
 import {Audit} from '../audit.js';
-import ComputedFid from '../../computed/metrics/max-potential-fid.js';
+import {MaxPotentialFID as ComputedFid} from '../../computed/metrics/max-potential-fid.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {

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

@@ -6,7 +6,7 @@
 
 import {Audit} from '../audit.js';
 import * as i18n from '../../lib/i18n/i18n.js';
-import ComputedSi from '../../computed/metrics/speed-index.js';
+import {SpeedIndex as ComputedSi} from '../../computed/metrics/speed-index.js';
 
 const UIStrings = {
   /** Description of the Speed Index metric, which summarizes how quickly the page looked visually complete. This is displayed within a tooltip when the user hovers on the metric name to see more. No character length limits. 'Learn More' becomes link text to additional documentation. */

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

@@ -5,7 +5,7 @@
  */
 
 import {Audit} from '../audit.js';
-import ComputedTBT from '../../computed/metrics/total-blocking-time.js';
+import {TotalBlockingTime as ComputedTBT} from '../../computed/metrics/total-blocking-time.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {

package/core/audits/metrics.js

@@ -5,7 +5,7 @@
  */
 
 import {Audit} from './audit.js';
-import ComputedTimingSummary from '../computed/metrics/timing-summary.js';
+import {TimingSummary} from '../computed/metrics/timing-summary.js';
 
 /** @type {Set<keyof LH.Artifacts.TimingSummary>} */
 const DECIMAL_METRIC_KEYS = new Set([
@@ -42,7 +42,7 @@ class Metrics extends Audit {
     const trace = artifacts.traces[Audit.DEFAULT_PASS];
     const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
     const URL = artifacts.URL;
-    const summary = await ComputedTimingSummary
+    const summary = await TimingSummary
       .request({trace, devtoolsLog, gatherContext, settings: context.settings, URL}, context);
     const metrics = summary.metrics;
     const debugInfo = summary.debugInfo;

package/core/audits/network-requests.js

@@ -5,9 +5,9 @@
  */
 
 import {Audit} from './audit.js';
-import URL from '../lib/url-shim.js';
-import NetworkRecords from '../computed/network-records.js';
-import MainResource from '../computed/main-resource.js';
+import UrlUtils from '../lib/url-utils.js';
+import {NetworkRecords} from '../computed/network-records.js';
+import {MainResource} from '../computed/main-resource.js';
 
 class NetworkRequests extends Audit {
   /**
@@ -62,7 +62,7 @@ class NetworkRequests extends Audit {
         undefined;
 
       return {
-        url: URL.elideDataURI(record.url),
+        url: UrlUtils.elideDataURI(record.url),
         protocol: record.protocol,
         startTime: timeToMs(record.startTime),
         endTime: timeToMs(record.endTime),

package/core/audits/network-rtt.js

@@ -6,8 +6,8 @@
 
 import {Audit} from './audit.js';
 import * as i18n from '../lib/i18n/i18n.js';
-import NetworkRecords from '../computed/network-records.js';
-import NetworkAnalysisComputed from '../computed/network-analysis.js';
+import {NetworkRecords} from '../computed/network-records.js';
+import {NetworkAnalysis} from '../computed/network-analysis.js';
 
 const UIStrings = {
   /** Descriptive title of a Lighthouse audit that tells the user the round trip times to each origin the page connected to. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -49,7 +49,7 @@ class NetworkRTT extends Audit {
       };
     }
 
-    const analysis = await NetworkAnalysisComputed.request(devtoolsLog, context);
+    const analysis = await NetworkAnalysis.request(devtoolsLog, context);
 
     /** @type {number} */
     let maxRtt = 0;

package/core/audits/network-server-latency.js

@@ -6,8 +6,8 @@
 
 import {Audit} from './audit.js';
 import * as i18n from '../lib/i18n/i18n.js';
-import NetworkRecords from '../computed/network-records.js';
-import NetworkAnalysisComputed from '../computed/network-analysis.js';
+import {NetworkRecords} from '../computed/network-records.js';
+import {NetworkAnalysis} from '../computed/network-analysis.js';
 
 const UIStrings = {
   /** Descriptive title of a Lighthouse audit that tells the user the server latencies observed from each origin the page connected to. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -49,7 +49,7 @@ class NetworkServerLatency extends Audit {
       };
     }
 
-    const analysis = await NetworkAnalysisComputed.request(devtoolsLog, context);
+    const analysis = await NetworkAnalysis.request(devtoolsLog, context);
 
     /** @type {number} */
     let maxLatency = 0;

package/core/audits/no-unload-listeners.js

@@ -5,7 +5,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';
 
 const UIStrings = {
@@ -46,7 +46,7 @@ class NoUnloadListeners extends Audit {
       };
     }
 
-    const bundles = await JsBundles.request(artifacts, context);
+    const bundles = await JSBundles.request(artifacts, context);
 
     /** @type {LH.Audit.Details.Table['headings']} */
     const headings = [

package/core/audits/performance-budget.js

@@ -5,8 +5,8 @@
  */
 
 import {Audit} from './audit.js';
-import ResourceSummary from '../computed/resource-summary.js';
-import MainResource from '../computed/main-resource.js';
+import {ResourceSummary} from '../computed/resource-summary.js';
+import {MainResource} from '../computed/main-resource.js';
 import {Budget} from '../config/budget.js';
 import * as i18n from '../lib/i18n/i18n.js';
 

package/core/audits/predictive-perf.js

@@ -6,11 +6,11 @@
 
 import {Audit} from './audit.js';
 import * as i18n from '../lib/i18n/i18n.js';
-import LanternFcp from '../computed/metrics/lantern-first-contentful-paint.js';
-import LanternFmp from '../computed/metrics/lantern-first-meaningful-paint.js';
-import LanternInteractive from '../computed/metrics/lantern-interactive.js';
-import LanternSpeedIndex from '../computed/metrics/lantern-speed-index.js';
-import LanternLcp from '../computed/metrics/lantern-largest-contentful-paint.js';
+import {LanternFirstContentfulPaint} from '../computed/metrics/lantern-first-contentful-paint.js';
+import {LanternFirstMeaningfulPaint} from '../computed/metrics/lantern-first-meaningful-paint.js';
+import {LanternInteractive} from '../computed/metrics/lantern-interactive.js';
+import {LanternSpeedIndex} from '../computed/metrics/lantern-speed-index.js';
+import {LanternLargestContentfulPaint} from '../computed/metrics/lantern-largest-contentful-paint.js';
 
 // Parameters (in ms) for log-normal CDF scoring. To see the curve:
 //   https://www.desmos.com/calculator/bksgkihhj8
@@ -50,11 +50,11 @@ class PredictivePerf extends Audit {
     // @ts-expect-error - TODO(bckenny): allow optional `throttling` settings
     const settings = {}; // Use default settings.
     const computationData = {trace, devtoolsLog, gatherContext, settings, URL};
-    const fcp = await LanternFcp.request(computationData, context);
-    const fmp = await LanternFmp.request(computationData, context);
+    const fcp = await LanternFirstContentfulPaint.request(computationData, context);
+    const fmp = await LanternFirstMeaningfulPaint.request(computationData, context);
     const tti = await LanternInteractive.request(computationData, context);
     const si = await LanternSpeedIndex.request(computationData, context);
-    const lcp = await LanternLcp.request(computationData, context);
+    const lcp = await LanternLargestContentfulPaint.request(computationData, context);
 
     const values = {
       roughEstimateOfFCP: fcp.timing,

package/core/audits/preload-fonts.js

@@ -13,7 +13,7 @@ import {Audit} from './audit.js';
 import * as i18n from './../lib/i18n/i18n.js';
 import FontDisplay from './../audits/font-display.js';
 const PASSING_FONT_DISPLAY_REGEX = /^(optional)$/;
-import NetworkRecords from '../computed/network-records.js';
+import {NetworkRecords} from '../computed/network-records.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on whether fonts that used `font-display: optional` were preloaded. This descriptive title is shown to users when all fonts that used `font-display: optional` were preloaded. */

package/core/audits/preload-lcp-image.js

@@ -7,9 +7,9 @@
 import {Audit} from './audit.js';
 import * as i18n from '../lib/i18n/i18n.js';
 import {NetworkRequest} from '../lib/network-request.js';
-import MainResource from '../computed/main-resource.js';
-import LanternLCP from '../computed/metrics/lantern-largest-contentful-paint.js';
-import LoadSimulator from '../computed/load-simulator.js';
+import {MainResource} from '../computed/main-resource.js';
+import {LanternLargestContentfulPaint} from '../computed/metrics/lantern-largest-contentful-paint.js';
+import {LoadSimulator} from '../computed/load-simulator.js';
 import {ByteEfficiencyAudit} from './byte-efficiency/byte-efficiency-audit.js';
 
 const UIStrings = {
@@ -225,7 +225,7 @@ class PreloadLCPImageAudit extends Audit {
 
     const [mainResource, lanternLCP, simulator] = await Promise.all([
       MainResource.request({devtoolsLog, URL}, context),
-      LanternLCP.request(metricData, context),
+      LanternLargestContentfulPaint.request(metricData, context),
       LoadSimulator.request({devtoolsLog, settings: context.settings}, context),
     ]);
 

package/core/audits/redirects.js

@@ -7,10 +7,10 @@
 import {Audit} from './audit.js';
 import {ByteEfficiencyAudit} from './byte-efficiency/byte-efficiency-audit.js';
 import * as i18n from '../lib/i18n/i18n.js';
-import ProcessedTrace from '../computed/processed-trace.js';
-import NetworkRecords from '../computed/network-records.js';
-import MainResource from '../computed/main-resource.js';
-import LanternInteractive from '../computed/metrics/lantern-interactive.js';
+import {ProcessedTrace} from '../computed/processed-trace.js';
+import {NetworkRecords} from '../computed/network-records.js';
+import {MainResource} from '../computed/main-resource.js';
+import {LanternInteractive} from '../computed/metrics/lantern-interactive.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to eliminate the redirects taken through multiple URLs to load the page. This is shown in a list of audits that Lighthouse generates. */

package/core/audits/resource-summary.js

@@ -5,7 +5,7 @@
  */
 
 import {Audit} from './audit.js';
-import ComputedResourceSummary from '../computed/resource-summary.js';
+import {ResourceSummary as ComputedResourceSummary} from '../computed/resource-summary.js';
 import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {

package/core/audits/screenshot-thumbnails.js

@@ -8,7 +8,7 @@ import jpeg from 'jpeg-js';
 
 import {Audit} from './audit.js';
 import {LighthouseError} from '../lib/lh-error.js';
-import Speedline from '../computed/speedline.js';
+import {Speedline} from '../computed/speedline.js';
 
 const NUMBER_OF_THUMBNAILS = 10;
 const THUMBNAIL_WIDTH = 120;

package/core/audits/script-treemap-data.js

@@ -15,9 +15,9 @@
  */
 
 import {Audit} from './audit.js';
-import JsBundles from '../computed/js-bundles.js';
-import UnusedJavaScriptSummary from '../computed/unused-javascript-summary.js';
-import ModuleDuplication from '../computed/module-duplication.js';
+import {JSBundles} from '../computed/js-bundles.js';
+import {UnusedJavascriptSummary} from '../computed/unused-javascript-summary.js';
+import {ModuleDuplication} from '../computed/module-duplication.js';
 import {isInline} from '../lib/script-helpers.js';
 
 class ScriptTreemapDataAudit extends Audit {
@@ -167,7 +167,7 @@ class ScriptTreemapDataAudit extends Audit {
     const nodes = [];
     /** @type {Map<string, LH.Treemap.Node>} */
     const htmlNodesByFrameId = new Map();
-    const bundles = await JsBundles.request(artifacts, context);
+    const bundles = await JSBundles.request(artifacts, context);
     const duplicationByPath = await ModuleDuplication.request(artifacts, context);
 
     for (const script of artifacts.Scripts) {
@@ -178,7 +178,7 @@ class ScriptTreemapDataAudit extends Audit {
       const scriptCoverage = /** @type {LH.Artifacts['JsUsage'][string] | undefined} */
         (artifacts.JsUsage[script.scriptId]);
       const unusedJavascriptSummary = scriptCoverage ?
-        await UnusedJavaScriptSummary.request(
+        await UnusedJavascriptSummary.request(
           {scriptId: script.scriptId, scriptCoverage, bundle}, context) :
         undefined;
 

package/core/audits/seo/canonical.js

@@ -5,8 +5,8 @@
  */
 
 import {Audit} from '../audit.js';
-import URL from '../../lib/url-shim.js';
-import MainResource from '../../computed/main-resource.js';
+import UrlUtils from '../../lib/url-utils.js';
+import {MainResource} from '../../computed/main-resource.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
@@ -93,7 +93,7 @@ class Canonical extends Audit {
         // Links that had an hrefRaw but didn't have a valid href were invalid, flag them
         if (!link.href) invalidCanonicalLink = link;
         // Links that had a valid href but didn't have a valid hrefRaw must have been relatively resolved, flag them
-        else if (!URL.isValid(link.hrefRaw)) relativeCanonicallink = link;
+        else if (!UrlUtils.isValid(link.hrefRaw)) relativeCanonicallink = link;
         // Otherwise, it was a valid canonical URL
         else uniqueCanonicalURLs.add(link.href);
       } else if (link.rel === 'alternate') {

package/core/audits/seo/font-size.js

@@ -8,7 +8,7 @@
 
 import * as i18n from '../../lib/i18n/i18n.js';
 import {Audit} from '../audit.js';
-import ComputedViewportMeta from '../../computed/viewport-meta.js';
+import {ViewportMeta} from '../../computed/viewport-meta.js';
 
 const MINIMAL_PERCENTAGE_OF_LEGIBLE_TEXT = 60;
 
@@ -256,7 +256,7 @@ class FontSize extends Audit {
       };
     }
 
-    const viewportMeta = await ComputedViewportMeta.request(artifacts.MetaElements, context);
+    const viewportMeta = await ViewportMeta.request(artifacts.MetaElements, context);
     if (!viewportMeta.isMobileOptimized) {
       return {
         score: 0,

package/core/audits/seo/http-status-code.js

@@ -6,7 +6,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 HTTP_UNSUCCESSFUL_CODE_LOW = 400;
 const HTTP_UNSUCCESSFUL_CODE_HIGH = 599;

package/core/audits/seo/is-crawlable.js

@@ -7,8 +7,7 @@
 import robotsParser from 'robots-parser';
 
 import {Audit} from '../audit.js';
-import URL from '../../lib/url-shim.js';
-import MainResource from '../../computed/main-resource.js';
+import {MainResource} from '../../computed/main-resource.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 
 const BLOCKLIST = new Set([

package/core/audits/seo/link-text.js

@@ -5,7 +5,7 @@
  */
 
 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';
 
 const BLOCKLIST = new Set([
@@ -121,7 +121,7 @@ class LinkText extends Audit {
           href.startsWith('mailto:') ||
           // This line prevents the audit from flagging anchor links.
           // In this case it is better to use `finalUrl` than `mainDocumentUrl`.
-          URL.equalWithExcludedFragments(link.href, artifacts.URL.finalUrl)
+          UrlUtils.equalWithExcludedFragments(link.href, artifacts.URL.finalUrl)
         ) {
           return false;
         }

package/core/audits/seo/plugins.js

@@ -5,7 +5,6 @@
  */
 
 import {Audit} from '../audit.js';
-import URL from '../../lib/url-shim.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 
 const JAVA_APPLET_TYPE = 'application/x-java-applet';

package/core/audits/seo/robots-txt.js

@@ -12,7 +12,6 @@
  */
 
 import {Audit} from '../audit.js';
-import URL from '../../lib/url-shim.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 
 const HTTP_CLIENT_ERROR_CODE_LOW = 400;

package/core/audits/seo/tap-targets.js

@@ -10,7 +10,7 @@
  */
 
 import {Audit} from '../audit.js';
-import ComputedViewportMeta from '../../computed/viewport-meta.js';
+import {ViewportMeta} from '../../computed/viewport-meta.js';
 import {
   rectsTouchOrOverlap,
   getRectOverlapArea,
@@ -268,7 +268,7 @@ class TapTargets extends Audit {
       };
     }
 
-    const viewportMeta = await ComputedViewportMeta.request(artifacts.MetaElements, context);
+    const viewportMeta = await ViewportMeta.request(artifacts.MetaElements, context);
     if (!viewportMeta.isMobileOptimized) {
       return {
         score: 0,

package/core/audits/server-response-time.js

@@ -6,7 +6,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 diagnostic audit that provides detail on how long it took from starting a request to when the server started responding. This descriptive title is shown to users when the amount is acceptable and no user action is required. */

package/core/audits/service-worker.js

@@ -4,7 +4,6 @@
  * 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 URL from '../lib/url-shim.js';
 import {Audit} from './audit.js';
 import * as i18n from '../lib/i18n/i18n.js';