lighthouse 8.6.0-dev.20211028 → 8.6.0-dev.20211101

package/lighthouse-core/computed/image-records.js

@@ -5,6 +5,7 @@
  */
 'use strict';
 
+const URL = require('../lib/url-shim.js');
 const makeComputedArtifact = require('./computed-artifact.js');
 
 class ImageRecords {
@@ -28,12 +29,12 @@ class ImageRecords {
 
   /**
    * @param {{ImageElements: LH.Artifacts['ImageElements'], networkRecords: LH.Artifacts.NetworkRequest[]}} data
-   * @return {Promise<LH.Artifacts.ImageElement[]>}
+   * @return {Promise<LH.Artifacts.ImageElementRecord[]>}
    */
   static async compute_(data) {
     const indexedNetworkRecords = ImageRecords.indexNetworkRecords(data.networkRecords);
 
-    /** @type {LH.Artifacts.ImageElement[]} */
+    /** @type {LH.Artifacts.ImageElementRecord[]} */
     const imageRecords = [];
 
     for (const element of data.ImageElements) {
@@ -43,7 +44,7 @@ class ImageRecords {
       // Don't change the guessed mime type if no mime type was found.
       imageRecords.push({
         ...element,
-        mimeType: mimeType ? mimeType : element.mimeType,
+        mimeType: mimeType ? mimeType : URL.guessMimeType(element.src),
       });
     }
 

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

@@ -10,6 +10,7 @@ const LanternMetric = require('./lantern-metric.js');
 const BaseNode = require('../../lib/dependency-graph/base-node.js');
 const LanternFirstContentfulPaint = require('./lantern-first-contentful-paint.js');
 const LanternInteractive = require('./lantern-interactive.js');
+const {BLOCKING_TIME_THRESHOLD, calculateSumOfBlockingTime} = require('./tbt-utils.js');
 
 /** @typedef {BaseNode.Node} Node */
 
@@ -66,9 +67,7 @@ class LanternTotalBlockingTime extends LanternMetric {
       ? extras.interactiveResult.optimisticEstimate.timeInMs
       : extras.interactiveResult.pessimisticEstimate.timeInMs;
 
-    // Require here to resolve circular dependency.
-    const TotalBlockingTime = require('./total-blocking-time.js');
-    const minDurationMs = TotalBlockingTime.BLOCKING_TIME_THRESHOLD;
+    const minDurationMs = BLOCKING_TIME_THRESHOLD;
 
     const events = LanternTotalBlockingTime.getTopLevelEvents(
       simulation.nodeTimings,
@@ -76,7 +75,7 @@ class LanternTotalBlockingTime extends LanternMetric {
     );
 
     return {
-      timeInMs: TotalBlockingTime.calculateSumOfBlockingTime(
+      timeInMs: calculateSumOfBlockingTime(
         events,
         fcpTimeInMs,
         interactiveTimeMs

package/lighthouse-core/computed/metrics/tbt-utils.js

@@ -0,0 +1,57 @@
+/**
+ * @license Copyright 2021 The Lighthouse Authors. All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ */
+'use strict';
+
+const BLOCKING_TIME_THRESHOLD = 50;
+
+/**
+ * @param {Array<{start: number, end: number, duration: number}>} topLevelEvents
+ * @param {number} startTimeMs
+ * @param {number} endTimeMs
+ * @return {number}
+ */
+function calculateSumOfBlockingTime(topLevelEvents, startTimeMs, endTimeMs) {
+  if (endTimeMs <= startTimeMs) return 0;
+
+  const threshold = BLOCKING_TIME_THRESHOLD;
+  let sumBlockingTime = 0;
+  for (const event of topLevelEvents) {
+    // Early exit for small tasks, which should far outnumber long tasks.
+    if (event.duration < threshold) continue;
+
+    // We only want to consider tasks that fall in our time range (FCP and TTI for navigations).
+    // FCP is picked as the lower bound because there is little risk of user input happening
+    // before FCP so Long Queuing Qelay regions do not harm user experience. Developers should be
+    // optimizing to reach FCP as fast as possible without having to worry about task lengths.
+    if (event.end < startTimeMs) continue;
+
+    // TTI is picked as the upper bound because we want a well defined end point for page load.
+    if (event.start > endTimeMs) continue;
+
+    // We first perform the clipping, and then calculate Blocking Region. So if we have a 150ms
+    // task [0, 150] and FCP happens midway at 50ms, we first clip the task to [50, 150], and then
+    // calculate the Blocking Region to be [100, 150]. The rational here is that tasks before FCP
+    // are unimportant, so we care whether the main thread is busy more than 50ms at a time only
+    // after FCP.
+    const clippedStart = Math.max(event.start, startTimeMs);
+    const clippedEnd = Math.min(event.end, endTimeMs);
+    const clippedDuration = clippedEnd - clippedStart;
+    if (clippedDuration < threshold) continue;
+
+    // The duration of the task beyond 50ms at the beginning is considered the Blocking Region.
+    // Example:
+    //   [              250ms Task                   ]
+    //   | First 50ms |   Blocking Region (200ms)    |
+    sumBlockingTime += clippedDuration - threshold;
+  }
+
+  return sumBlockingTime;
+}
+
+module.exports = {
+  BLOCKING_TIME_THRESHOLD,
+  calculateSumOfBlockingTime,
+};

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

@@ -10,6 +10,7 @@ const ComputedMetric = require('./metric.js');
 const TraceProcessor = require('../../lib/tracehouse/trace-processor.js');
 const LanternTotalBlockingTime = require('./lantern-total-blocking-time.js');
 const TimetoInteractive = require('./interactive.js');
+const {calculateSumOfBlockingTime} = require('./tbt-utils.js');
 
 /**
  * @fileoverview This audit determines Total Blocking Time.
@@ -25,57 +26,6 @@ const TimetoInteractive = require('./interactive.js');
  * to smaller improvements to main thread responsiveness.
  */
 class TotalBlockingTime extends ComputedMetric {
-  /**
-   * @return {number}
-   */
-  static get BLOCKING_TIME_THRESHOLD() {
-    return 50;
-  }
-
-  /**
-   * @param {Array<{start: number, end: number, duration: number}>} topLevelEvents
-   * @param {number} startTimeMs
-   * @param {number} endTimeMs
-   * @return {number}
-   */
-  static calculateSumOfBlockingTime(topLevelEvents, startTimeMs, endTimeMs) {
-    if (endTimeMs <= startTimeMs) return 0;
-
-    const threshold = TotalBlockingTime.BLOCKING_TIME_THRESHOLD;
-    let sumBlockingTime = 0;
-    for (const event of topLevelEvents) {
-      // Early exit for small tasks, which should far outnumber long tasks.
-      if (event.duration < threshold) continue;
-
-      // We only want to consider tasks that fall in our time range (FCP and TTI for navigations).
-      // FCP is picked as the lower bound because there is little risk of user input happening
-      // before FCP so Long Queuing Qelay regions do not harm user experience. Developers should be
-      // optimizing to reach FCP as fast as possible without having to worry about task lengths.
-      if (event.end < startTimeMs) continue;
-
-      // TTI is picked as the upper bound because we want a well defined end point for page load.
-      if (event.start > endTimeMs) continue;
-
-      // We first perform the clipping, and then calculate Blocking Region. So if we have a 150ms
-      // task [0, 150] and FCP happens midway at 50ms, we first clip the task to [50, 150], and then
-      // calculate the Blocking Region to be [100, 150]. The rational here is that tasks before FCP
-      // are unimportant, so we care whether the main thread is busy more than 50ms at a time only
-      // after FCP.
-      const clippedStart = Math.max(event.start, startTimeMs);
-      const clippedEnd = Math.min(event.end, endTimeMs);
-      const clippedDuration = clippedEnd - clippedStart;
-      if (clippedDuration < threshold) continue;
-
-      // The duration of the task beyond 50ms at the beginning is considered the Blocking Region.
-      // Example:
-      //   [              250ms Task                   ]
-      //   | First 50ms |   Blocking Region (200ms)    |
-      sumBlockingTime += clippedDuration - threshold;
-    }
-
-    return sumBlockingTime;
-  }
-
   /**
    * @param {LH.Artifacts.MetricComputationData} data
    * @param {LH.Artifacts.ComputedContext} context
@@ -100,7 +50,7 @@ class TotalBlockingTime extends ComputedMetric {
       const interactiveTimeMs = (await TimetoInteractive.request(metricData, context)).timing;
 
       return {
-        timing: TotalBlockingTime.calculateSumOfBlockingTime(
+        timing: calculateSumOfBlockingTime(
           events,
           firstContentfulPaint,
           interactiveTimeMs
@@ -108,7 +58,7 @@ class TotalBlockingTime extends ComputedMetric {
       };
     } else {
       return {
-        timing: TotalBlockingTime.calculateSumOfBlockingTime(
+        timing: calculateSumOfBlockingTime(
           events,
           0,
           data.processedTrace.timestamps.traceEnd

package/lighthouse-core/config/config-helpers.js

@@ -203,6 +203,18 @@ function expandAuditShorthand(audit) {
   }
 }
 
+/** @type {Map<string, any>} */
+const bundledModules = new Map(/* BUILD_REPLACE_BUNDLED_MODULES */);
+
+/**
+ * Wraps `require` with an entrypoint for bundled dynamic modules.
+ * See build-bundle.js
+ * @param {string} requirePath
+ */
+function requireWrapper(requirePath) {
+  return bundledModules.get(requirePath) || require(requirePath);
+}
+
 /**
  * @param {string} gathererPath
  * @param {Array<string>} coreGathererList
@@ -218,7 +230,7 @@ function requireGatherer(gathererPath, coreGathererList, configDir) {
     requirePath = resolveModulePath(gathererPath, configDir, 'gatherer');
   }
 
-  const GathererClass = /** @type {GathererConstructor} */ (require(requirePath));
+  const GathererClass = /** @type {GathererConstructor} */ (requireWrapper(requirePath));
 
   return {
     instance: new GathererClass(),
@@ -228,14 +240,13 @@ function requireGatherer(gathererPath, coreGathererList, configDir) {
 }
 
 /**
- *
  * @param {string} auditPath
  * @param {Array<string>} coreAuditList
  * @param {string=} configDir
  * @return {LH.Config.AuditDefn['implementation']}
  */
 function requireAudit(auditPath, coreAuditList, configDir) {
-// See if the audit is a Lighthouse core audit.
+  // See if the audit is a Lighthouse core audit.
   const auditPathJs = `${auditPath}.js`;
   const coreAudit = coreAuditList.find(a => a === auditPathJs);
   let requirePath = `../audits/${auditPath}`;
@@ -244,14 +255,14 @@ function requireAudit(auditPath, coreAuditList, configDir) {
       // This is for pubads bundling.
       requirePath = auditPath;
     } else {
-    // Otherwise, attempt to find it elsewhere. This throws if not found.
+      // Otherwise, attempt to find it elsewhere. This throws if not found.
       const absolutePath = resolveModulePath(auditPath, configDir, 'audit');
       // Use a relative path so bundler can easily expose it.
       requirePath = path.relative(__dirname, absolutePath);
     }
   }
 
-  return require(requirePath);
+  return requireWrapper(requirePath);
 }
 
 /**
@@ -313,7 +324,6 @@ function resolveSettings(settingsJson = {}, overrides = undefined) {
   return settingsWithFlags;
 }
 
-
 /**
  * @param {LH.Config.Json} configJSON
  * @param {string | undefined} configDir
@@ -332,7 +342,7 @@ function mergePlugins(configJSON, configDir, flags) {
     const pluginPath = isBundledEnvironment() ?
         pluginName :
         resolveModulePath(pluginName, configDir, 'plugin');
-    const rawPluginJson = require(pluginPath);
+    const rawPluginJson = requireWrapper(pluginPath);
     const pluginJson = ConfigPlugin.parsePlugin(rawPluginJson, pluginName);
 
     configJSON = mergeConfigFragment(configJSON, pluginJson);
@@ -569,12 +579,12 @@ function deepCloneConfigJson(json) {
 module.exports = {
   deepClone,
   deepCloneConfigJson,
-  mergeOptionsOfItems,
   mergeConfigFragment,
   mergeConfigFragmentArrayByKey,
+  mergeOptionsOfItems,
   mergePlugins,
-  resolveSettings,
-  resolveGathererToDefn,
   resolveAuditsToDefns,
+  resolveGathererToDefn,
   resolveModulePath,
+  resolveSettings,
 };

package/lighthouse-core/config/default-config.js

@@ -96,7 +96,7 @@ const UIStrings = {
   /** Description of the navigation section within the Search Engine Optimization (SEO) category. Within this section are audits with descriptive titles that highlight ways to make a website accessible to search engine crawlers. */
   seoCrawlingGroupDescription: 'To appear in search results, crawlers need access to your app.',
   /** Title of the Progressive Web Application (PWA) category of audits. This is displayed at the top of a list of audits focused on topics related to whether or not a site is a progressive web app, e.g. responds offline, uses a service worker, is on https, etc. Also used as a label of a score gauge. */
-  pwaCategoryTitle: 'Progressive Web App',
+  pwaCategoryTitle: 'PWA',
   /** Description of the Progressive Web Application (PWA) category. This is displayed at the top of a list of audits focused on topics related to whether or not a site is a progressive web app, e.g. responds offline, uses a service worker, is on https, etc. No character length limits. 'Learn More' becomes link text to additional documentation. */
   pwaCategoryDescription: 'These checks validate the aspects of a Progressive Web App. ' +
   '[Learn more](https://developers.google.com/web/progressive-web-apps/checklist).',
@@ -147,7 +147,6 @@ const defaultConfig = {
       'form-elements',
       'main-document-content',
       'global-listeners',
-      'dobetterweb/appcache',
       'dobetterweb/doctype',
       'dobetterweb/domstats',
       'dobetterweb/optimized-images',
@@ -301,7 +300,6 @@ const defaultConfig = {
     'byte-efficiency/efficient-animated-content',
     'byte-efficiency/duplicated-javascript',
     'byte-efficiency/legacy-javascript',
-    'dobetterweb/appcache-manifest',
     'dobetterweb/doctype',
     'dobetterweb/charset',
     'dobetterweb/dom-size',
@@ -407,6 +405,8 @@ const defaultConfig = {
     'best-practices-general': {
       title: str_(UIStrings.bestPracticesGeneralGroupTitle),
     },
+    // Group for audits that should not be displayed.
+    'hidden': {title: ''},
   },
   categories: {
     'performance': {
@@ -420,61 +420,65 @@ const defaultConfig = {
         {id: 'total-blocking-time', weight: 30, group: 'metrics', acronym: 'TBT', relevantAudits: m2a.tbtRelevantAudits},
         {id: 'cumulative-layout-shift', weight: 15, group: 'metrics', acronym: 'CLS', relevantAudits: m2a.clsRelevantAudits},
 
-        // These are our "invisible" metrics. Not displayed, but still in the LHR
-        {id: 'max-potential-fid', weight: 0},
-        {id: 'first-meaningful-paint', weight: 0, acronym: 'FMP'},
+        // These are our "invisible" metrics. Not displayed, but still in the LHR.
+        {id: 'max-potential-fid', weight: 0, group: 'hidden'},
+        {id: 'first-meaningful-paint', weight: 0, acronym: 'FMP', group: 'hidden'},
 
-        {id: 'render-blocking-resources', weight: 0, group: 'load-opportunities'},
-        {id: 'uses-responsive-images', weight: 0, group: 'load-opportunities'},
-        {id: 'offscreen-images', weight: 0, group: 'load-opportunities'},
-        {id: 'unminified-css', weight: 0, group: 'load-opportunities'},
-        {id: 'unminified-javascript', weight: 0, group: 'load-opportunities'},
-        {id: 'unused-css-rules', weight: 0, group: 'load-opportunities'},
-        {id: 'unused-javascript', weight: 0, group: 'load-opportunities'},
-        {id: 'uses-optimized-images', weight: 0, group: 'load-opportunities'},
-        {id: 'modern-image-formats', weight: 0, group: 'load-opportunities'},
-        {id: 'uses-text-compression', weight: 0, group: 'load-opportunities'},
-        {id: 'uses-rel-preconnect', weight: 0, group: 'load-opportunities'},
-        {id: 'server-response-time', weight: 0, group: 'load-opportunities'},
-        {id: 'redirects', weight: 0, group: 'load-opportunities'},
-        {id: 'uses-rel-preload', weight: 0, group: 'load-opportunities'},
-        {id: 'uses-http2', weight: 0, group: 'load-opportunities'},
-        {id: 'efficient-animated-content', weight: 0, group: 'load-opportunities'},
-        {id: 'duplicated-javascript', weight: 0, group: 'load-opportunities'},
-        {id: 'legacy-javascript', weight: 0, group: 'load-opportunities'},
-        {id: 'preload-lcp-image', weight: 0, group: 'load-opportunities'},
-        {id: 'total-byte-weight', weight: 0, group: 'diagnostics'},
-        {id: 'uses-long-cache-ttl', weight: 0, group: 'diagnostics'},
-        {id: 'dom-size', weight: 0, group: 'diagnostics'},
-        {id: 'critical-request-chains', weight: 0, group: 'diagnostics'},
-        {id: 'user-timings', weight: 0, group: 'diagnostics'},
-        {id: 'bootup-time', weight: 0, group: 'diagnostics'},
-        {id: 'mainthread-work-breakdown', weight: 0, group: 'diagnostics'},
-        {id: 'font-display', weight: 0, group: 'diagnostics'},
+        // These audits will be put in "load-opportunities" or "diagnostics" based on their details type.
+        {id: 'render-blocking-resources', weight: 0},
+        {id: 'uses-responsive-images', weight: 0},
+        {id: 'offscreen-images', weight: 0},
+        {id: 'unminified-css', weight: 0},
+        {id: 'unminified-javascript', weight: 0},
+        {id: 'unused-css-rules', weight: 0},
+        {id: 'unused-javascript', weight: 0},
+        {id: 'uses-optimized-images', weight: 0},
+        {id: 'modern-image-formats', weight: 0},
+        {id: 'uses-text-compression', weight: 0},
+        {id: 'uses-rel-preconnect', weight: 0},
+        {id: 'server-response-time', weight: 0},
+        {id: 'redirects', weight: 0},
+        {id: 'uses-rel-preload', weight: 0},
+        {id: 'uses-http2', weight: 0},
+        {id: 'efficient-animated-content', weight: 0},
+        {id: 'duplicated-javascript', weight: 0},
+        {id: 'legacy-javascript', weight: 0},
+        {id: 'preload-lcp-image', weight: 0},
+        {id: 'total-byte-weight', weight: 0},
+        {id: 'uses-long-cache-ttl', weight: 0},
+        {id: 'dom-size', weight: 0},
+        {id: 'critical-request-chains', weight: 0},
+        {id: 'user-timings', weight: 0},
+        {id: 'bootup-time', weight: 0},
+        {id: 'mainthread-work-breakdown', weight: 0},
+        {id: 'font-display', weight: 0},
+        {id: 'resource-summary', weight: 0},
+        {id: 'third-party-summary', weight: 0},
+        {id: 'third-party-facades', weight: 0},
+        {id: 'largest-contentful-paint-element', weight: 0},
+        {id: 'lcp-lazy-loaded', weight: 0},
+        {id: 'layout-shift-elements', weight: 0},
+        {id: 'uses-passive-event-listeners', weight: 0},
+        {id: 'no-document-write', weight: 0},
+        {id: 'long-tasks', weight: 0},
+        {id: 'non-composited-animations', weight: 0},
+        {id: 'unsized-images', weight: 0},
+        {id: 'viewport', weight: 0},
+
+        // Budget audits.
         {id: 'performance-budget', weight: 0, group: 'budgets'},
         {id: 'timing-budget', weight: 0, group: 'budgets'},
-        {id: 'resource-summary', weight: 0, group: 'diagnostics'},
-        {id: 'third-party-summary', weight: 0, group: 'diagnostics'},
-        {id: 'third-party-facades', weight: 0, group: 'diagnostics'},
-        {id: 'largest-contentful-paint-element', weight: 0, group: 'diagnostics'},
-        {id: 'lcp-lazy-loaded', weight: 0, group: 'diagnostics'},
-        {id: 'layout-shift-elements', weight: 0, group: 'diagnostics'},
-        {id: 'uses-passive-event-listeners', weight: 0, group: 'diagnostics'},
-        {id: 'no-document-write', weight: 0, group: 'diagnostics'},
-        {id: 'long-tasks', weight: 0, group: 'diagnostics'},
-        {id: 'non-composited-animations', weight: 0, group: 'diagnostics'},
-        {id: 'unsized-images', weight: 0, group: 'diagnostics'},
-        {id: 'viewport', weight: 0, group: 'diagnostics'},
-        // Audits past this point don't belong to a group and will not be shown automatically
-        {id: 'network-requests', weight: 0},
-        {id: 'network-rtt', weight: 0},
-        {id: 'network-server-latency', weight: 0},
-        {id: 'main-thread-tasks', weight: 0},
-        {id: 'diagnostics', weight: 0},
-        {id: 'metrics', weight: 0},
-        {id: 'screenshot-thumbnails', weight: 0},
-        {id: 'final-screenshot', weight: 0},
-        {id: 'script-treemap-data', weight: 0},
+
+        // Audits past this point contain useful data but are not displayed with other audits.
+        {id: 'network-requests', weight: 0, group: 'hidden'},
+        {id: 'network-rtt', weight: 0, group: 'hidden'},
+        {id: 'network-server-latency', weight: 0, group: 'hidden'},
+        {id: 'main-thread-tasks', weight: 0, group: 'hidden'},
+        {id: 'diagnostics', weight: 0, group: 'hidden'},
+        {id: 'metrics', weight: 0, group: 'hidden'},
+        {id: 'screenshot-thumbnails', weight: 0, group: 'hidden'},
+        {id: 'final-screenshot', weight: 0, group: 'hidden'},
+        {id: 'script-treemap-data', weight: 0, group: 'hidden'},
       ],
     },
     'accessibility': {
@@ -565,7 +569,6 @@ const defaultConfig = {
         {id: 'charset', weight: 1, group: 'best-practices-browser-compat'},
         // General Group
         {id: 'no-unload-listeners', weight: 1, group: 'best-practices-general'},
-        {id: 'appcache-manifest', weight: 1, group: 'best-practices-general'},
         {id: 'js-libraries', weight: 0, group: 'best-practices-general'},
         {id: 'deprecations', weight: 1, group: 'best-practices-general'},
         {id: 'errors-in-console', weight: 1, group: 'best-practices-general'},

package/lighthouse-core/fraggle-rock/config/default-config.js

@@ -15,7 +15,7 @@ const frAudits = [
 /** @type {Record<string, LH.Config.AuditRefJson[]>} */
 const frCategoryAuditRefExtensions = {
   'performance': [
-    {id: 'uses-responsive-images-snapshot', weight: 0, group: 'diagnostics'},
+    {id: 'uses-responsive-images-snapshot', weight: 0},
   ],
 };
 
@@ -37,7 +37,6 @@ const artifacts = {
   Trace: '',
   Accessibility: '',
   AnchorElements: '',
-  AppCacheManifest: '',
   CacheContents: '',
   ConsoleMessages: '',
   CSSUsage: '',
@@ -88,7 +87,6 @@ const defaultConfig = {
     /* eslint-disable max-len */
     {id: artifacts.Accessibility, gatherer: 'accessibility'},
     {id: artifacts.AnchorElements, gatherer: 'anchor-elements'},
-    {id: artifacts.AppCacheManifest, gatherer: 'dobetterweb/appcache'},
     {id: artifacts.CacheContents, gatherer: 'cache-contents'},
     {id: artifacts.ConsoleMessages, gatherer: 'console-messages'},
     {id: artifacts.CSSUsage, gatherer: 'css-usage'},
@@ -141,7 +139,6 @@ const defaultConfig = {
 
         artifacts.Accessibility,
         artifacts.AnchorElements,
-        artifacts.AppCacheManifest,
         artifacts.CacheContents,
         artifacts.ConsoleMessages,
         artifacts.CSSUsage,

package/lighthouse-core/fraggle-rock/gather/base-gatherer.js

@@ -62,8 +62,13 @@ class FRGatherer {
    * @return {keyof LH.GathererArtifacts}
    */
   get name() {
+    let name = this.constructor.name;
+    // Rollup will mangle class names in an known way–just trim until `$`.
+    if (name.includes('$')) {
+      name = name.substr(0, name.indexOf('$'));
+    }
     // @ts-expect-error - assume that class name has been added to LH.GathererArtifacts.
-    return this.constructor.name;
+    return name;
   }
 
   /**

package/lighthouse-core/gather/driver/storage.js

@@ -43,7 +43,6 @@ async function clearDataForOrigin(session, url) {
   // indexeddb, websql, and localstorage are not cleared to prevent loss of potentially important data.
   //   https://chromedevtools.github.io/debugger-protocol-viewer/tot/Storage/#type-StorageType
   const typesToClear = [
-    'appcache',
     // 'cookies',
     'file_systems',
     'shader_cache',

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

@@ -10,6 +10,7 @@
   */
 'use strict';
 
+const {Buffer} = require('buffer');
 const FRGatherer = require('../../../fraggle-rock/gather/base-gatherer.js');
 const URL = require('../../../lib/url-shim.js');
 const Sentry = require('../../../lib/sentry.js');

package/lighthouse-core/gather/gatherers/image-elements.js

@@ -12,7 +12,6 @@
 const log = require('lighthouse-logger');
 const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
 const pageFunctions = require('../../lib/page-functions.js');
-const URL = require('../../lib/url-shim.js');
 const FontSize = require('./seo/font-size.js');
 
 /* global window, getElementsInDocument, Image, getNodeDetails, ShadowRoot */
@@ -310,8 +309,6 @@ class ImageElements extends FRGatherer {
     let skippedCount = 0;
 
     for (const element of elements) {
-      element.mimeType = URL.guessMimeType(element.src);
-
       if (reachedGatheringBudget) {
         skippedCount++;
         continue;

package/lighthouse-core/lib/asset-saver.js

@@ -16,7 +16,10 @@ const Metrics = require('./traces/pwmetrics-events.js');
 const NetworkAnalysisComputed = require('../computed/network-analysis.js');
 const LoadSimulatorComputed = require('../computed/load-simulator.js');
 const LHError = require('../lib/lh-error.js');
-const pipeline = promisify(stream.pipeline);
+// TODO(esmodules): Rollup does not support `promisfy` or `stream.pipeline`. Bundled files
+// don't need anything in this file except for `stringifyReplacer`, so a check for
+// truthiness before using is enough.
+const pipeline = promisify && promisify(stream.pipeline);
 
 const artifactsFilename = 'artifacts.json';
 const traceSuffix = '.trace.json';

package/lighthouse-core/lib/lh-env.js

@@ -5,6 +5,8 @@
  */
 'use strict';
 
+const process = require('process');
+
 module.exports = {
   // NODE_ENV is set to test by jest and by smokehouse CLI runner
   // CI as a catchall for everything we do in GitHub Actions

package/lighthouse-core/lib/tappable-rects.js

@@ -5,14 +5,7 @@
  */
 'use strict';
 
-const {
-  filterOutRectsContainedByOthers,
-  filterOutTinyRects,
-  rectsTouchOrOverlap,
-  rectContainsPoint,
-  getBoundingRect,
-  getRectCenterPoint,
-} = require('./rect-helpers.js');
+const RectHelpers = require('./rect-helpers.js');
 
 /**
  * Merge client rects together and remove small ones. This may result in a larger overall
@@ -23,8 +16,8 @@ const {
 function getTappableRectsFromClientRects(clientRects) {
   // 1x1px rect shouldn't be reason to treat the rect as something the user should tap on.
   // Often they're made invisble in some obscure way anyway, and only exist for e.g. accessibiliity.
-  clientRects = filterOutTinyRects(clientRects);
-  clientRects = filterOutRectsContainedByOthers(clientRects);
+  clientRects = RectHelpers.filterOutTinyRects(clientRects);
+  clientRects = RectHelpers.filterOutRectsContainedByOthers(clientRects);
   clientRects = mergeTouchingClientRects(clientRects);
   return clientRects;
 }
@@ -68,17 +61,17 @@ function mergeTouchingClientRects(clientRects) {
       const rectsLineUpVertically =
         almostEqual(crA.left, crB.left) || almostEqual(crA.right, crB.right);
       const canMerge =
-        rectsTouchOrOverlap(crA, crB) &&
+        RectHelpers.rectsTouchOrOverlap(crA, crB) &&
         (rectsLineUpHorizontally || rectsLineUpVertically);
 
       if (canMerge) {
-        const replacementClientRect = getBoundingRect([crA, crB]);
-        const mergedRectCenter = getRectCenterPoint(replacementClientRect);
+        const replacementClientRect = RectHelpers.getBoundingRect([crA, crB]);
+        const mergedRectCenter = RectHelpers.getRectCenterPoint(replacementClientRect);
 
         if (
           !(
-            rectContainsPoint(crA, mergedRectCenter) ||
-            rectContainsPoint(crB, mergedRectCenter)
+            RectHelpers.rectContainsPoint(crA, mergedRectCenter) ||
+            RectHelpers.rectContainsPoint(crB, mergedRectCenter)
           )
         ) {
           // Don't merge because the new shape is too different from the

package/lighthouse-core/runner.js

@@ -20,6 +20,7 @@ const URL = require('./lib/url-shim.js');
 const Sentry = require('./lib/sentry.js');
 const generateReport = require('../report/generator/report-generator.js').generateReport;
 const LHError = require('./lib/lh-error.js');
+const {version: lighthouseVersion} = require('../package.json');
 
 /** @typedef {import('./gather/connections/connection.js')} Connection */
 /** @typedef {import('./lib/arbitrary-equality-map.js')} ArbitraryEqualityMap */
@@ -112,7 +113,6 @@ class Runner {
       }
 
       // Entering: conclusion of the lighthouse result object
-      const lighthouseVersion = require('../package.json').version;
 
       // Use version from gathering stage.
       // If accessibility gatherer didn't run or errored, it won't be in credits.

package/lighthouse-core/util-commonjs.js

@@ -519,10 +519,9 @@ class Util {
     let totalWeight = 0;
     for (const auditRef of category.auditRefs) {
       const auditPassed = Util.showAsPassed(auditRef.result);
-      const notDisplayed = !auditRef.group && category.id === 'performance';
 
       // Don't count the audit if it's manual, N/A, or isn't displayed.
-      if (notDisplayed ||
+      if (auditRef.group === 'hidden' ||
           auditRef.result.scoreDisplayMode === 'manual' ||
           auditRef.result.scoreDisplayMode === 'notApplicable') {
         continue;