lighthouse 8.6.0 → 9.0.0-dev.20211118

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/computed/resource-summary.js

@@ -10,7 +10,7 @@ const NetworkRecords = require('./network-records.js');
 const URL = require('../lib/url-shim.js');
 const NetworkRequest = require('../lib/network-request.js');
 const Budget = require('../config/budget.js');
-const Util = require('../util-commonjs.js');
+const {Util} = require('../util-commonjs.js');
 
 /** @typedef {{count: number, resourceSize: number, transferSize: number}} ResourceEntry */
 

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);
 }
 
 /**
@@ -283,6 +294,7 @@ function resolveSettings(settingsJson = {}, overrides = undefined) {
   // If a locale is requested in flags or settings, use it. A typical CLI run will not have one,
   // however `lookupLocale` will always determine which of our supported locales to use (falling
   // back if necessary).
+  // TODO: could do more work to sniff out the user's locale
   const locale = i18n.lookupLocale((overrides && overrides.locale) || settingsJson.locale);
 
   // Fill in missing settings with defaults
@@ -312,7 +324,6 @@ function resolveSettings(settingsJson = {}, overrides = undefined) {
   return settingsWithFlags;
 }
 
-
 /**
  * @param {LH.Config.Json} configJSON
  * @param {string | undefined} configDir
@@ -331,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);
@@ -568,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/constants.js

@@ -81,10 +81,9 @@ const screenEmulationMetrics = {
   desktop: DESKTOP_EMULATION_METRICS,
 };
 
-// eslint-disable-next-line max-len
-const MOTOG4_USERAGENT = 'Mozilla/5.0 (Linux; Android 7.0; Moto G (4)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4590.2 Mobile Safari/537.36 Chrome-Lighthouse';
-// eslint-disable-next-line max-len
-const DESKTOP_USERAGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4590.2 Safari/537.36 Chrome-Lighthouse';
+
+const MOTOG4_USERAGENT = 'Mozilla/5.0 (Linux; Android 7.0; Moto G (4)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4695.0 Mobile Safari/537.36 Chrome-Lighthouse'; // eslint-disable-line max-len
+const DESKTOP_USERAGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4695.0 Safari/537.36 Chrome-Lighthouse'; // eslint-disable-line max-len
 
 const userAgents = {
   mobile: MOTOG4_USERAGENT,

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',
@@ -171,19 +170,9 @@ const defaultConfig = {
     gatherers: [
       'service-worker',
     ],
-  },
-  {
-    passName: 'redirectPass',
-    loadFailureMode: 'warn',
-    // Speed up the redirect pass by blocking stylesheets, fonts, and images
-    blockedUrlPatterns: ['*.css', '*.jpg', '*.jpeg', '*.png', '*.gif', '*.svg', '*.ttf', '*.woff', '*.woff2'],
-    gatherers: [
-      'http-redirect',
-    ],
   }],
   audits: [
     'is-on-https',
-    'redirects-http',
     'service-worker',
     'viewport',
     'metrics/first-contentful-paint',
@@ -311,11 +300,9 @@ 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',
-    'dobetterweb/external-anchors-use-rel-noopener',
     'dobetterweb/geolocation-on-start',
     'dobetterweb/inspector-issues',
     'dobetterweb/no-document-write',
@@ -417,6 +404,8 @@ const defaultConfig = {
     'best-practices-general': {
       title: str_(UIStrings.bestPracticesGeneralGroupTitle),
     },
+    // Group for audits that should not be displayed.
+    'hidden': {title: ''},
   },
   categories: {
     'performance': {
@@ -424,67 +413,71 @@ const defaultConfig = {
       supportedModes: ['navigation', 'timespan', 'snapshot'],
       auditRefs: [
         {id: 'first-contentful-paint', weight: 10, group: 'metrics', acronym: 'FCP', relevantAudits: m2a.fcpRelevantAudits},
-        {id: 'speed-index', weight: 10, group: 'metrics', acronym: 'SI'},
-        {id: 'largest-contentful-paint', weight: 25, group: 'metrics', acronym: 'LCP', relevantAudits: m2a.lcpRelevantAudits},
         {id: 'interactive', weight: 10, group: 'metrics', acronym: 'TTI'},
+        {id: 'speed-index', weight: 10, group: 'metrics', acronym: 'SI'},
         {id: 'total-blocking-time', weight: 30, group: 'metrics', acronym: 'TBT', relevantAudits: m2a.tbtRelevantAudits},
+        {id: 'largest-contentful-paint', weight: 25, group: 'metrics', acronym: 'LCP', relevantAudits: m2a.lcpRelevantAudits},
         {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': {
@@ -560,7 +553,6 @@ const defaultConfig = {
       auditRefs: [
         // Trust & Safety
         {id: 'is-on-https', weight: 1, group: 'best-practices-trust-safety'},
-        {id: 'external-anchors-use-rel-noopener', weight: 1, group: 'best-practices-trust-safety'},
         {id: 'geolocation-on-start', weight: 1, group: 'best-practices-trust-safety'},
         {id: 'notification-on-start', weight: 1, group: 'best-practices-trust-safety'},
         {id: 'no-vulnerable-libraries', weight: 1, group: 'best-practices-trust-safety'},
@@ -575,7 +567,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'},
@@ -617,7 +608,6 @@ const defaultConfig = {
         {id: 'installable-manifest', weight: 2, group: 'pwa-installable'},
         // PWA Optimized
         {id: 'service-worker', weight: 1, group: 'pwa-optimized'},
-        {id: 'redirects-http', weight: 2, group: 'pwa-optimized'},
         {id: 'splash-screen', weight: 1, group: 'pwa-optimized'},
         {id: 'themed-omnibox', weight: 1, group: 'pwa-optimized'},
         {id: 'content-width', weight: 1, group: 'pwa-optimized'},

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

@@ -140,7 +140,7 @@ function resolveArtifactsToDefns(artifacts, configDir) {
 
     const gatherer = resolveGathererToDefn(gathererJson, coreGathererList, configDir);
     if (!isFRGathererDefn(gatherer)) {
-      throw new Error(`${gatherer.instance.name} gatherer does not support Fraggle Rock`);
+      throw new Error(`${gatherer.instance.name} gatherer does not have a Fraggle Rock meta obj`);
     }
 
     /** @type {LH.Config.AnyArtifactDefn} */

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

@@ -6,6 +6,7 @@
 'use strict';
 
 const legacyDefaultConfig = require('../../config/default-config.js');
+const {deepClone} = require('../../config/config-helpers.js');
 
 /** @type {LH.Config.AuditJson[]} */
 const frAudits = [
@@ -15,14 +16,15 @@ 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},
   ],
 };
 
 /** @return {LH.Config.Json['categories']} */
 function mergeCategories() {
   if (!legacyDefaultConfig.categories) return {};
-  const categories = legacyDefaultConfig.categories;
+  // Don't modify original default config.
+  const categories = deepClone(legacyDefaultConfig.categories);
   for (const key of Object.keys(frCategoryAuditRefExtensions)) {
     if (!categories[key]) continue;
     categories[key].auditRefs.push(...frCategoryAuditRefExtensions[key]);
@@ -37,7 +39,6 @@ const artifacts = {
   Trace: '',
   Accessibility: '',
   AnchorElements: '',
-  AppCacheManifest: '',
   CacheContents: '',
   ConsoleMessages: '',
   CSSUsage: '',
@@ -88,7 +89,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 +141,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/fraggle-rock/gather/session.js

@@ -150,10 +150,9 @@ class ProtocolSession {
     const timeoutPromise = new Promise((resolve, reject) => {
       if (timeoutMs === Infinity) return;
 
-      timeout = setTimeout((() => {
-        const err = new LHError(LHError.errors.PROTOCOL_TIMEOUT, {protocolMethod: method});
-        reject(err);
-      }), timeoutMs);
+      timeout = setTimeout(reject, timeoutMs, new LHError(LHError.errors.PROTOCOL_TIMEOUT, {
+        protocolMethod: method,
+      }));
     });
 
     const resultPromise = this._session.send(method, ...params);

package/lighthouse-core/gather/connections/cri.js

@@ -11,7 +11,7 @@ const http = require('http');
 const log = require('lighthouse-logger');
 const LighthouseError = require('../../lib/lh-error.js');
 
-const DEFAULT_HOSTNAME = 'localhost';
+const DEFAULT_HOSTNAME = '127.0.0.1';
 const CONNECT_TIMEOUT = 10000;
 const DEFAULT_PORT = 9222;
 

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/driver.js

@@ -338,13 +338,9 @@ class Driver {
     let asyncTimeout;
     const timeoutPromise = new Promise((resolve, reject) => {
       if (timeout === Infinity) return;
-      asyncTimeout = setTimeout((() => {
-        const err = new LHError(
-          LHError.errors.PROTOCOL_TIMEOUT,
-          {protocolMethod: method}
-        );
-        reject(err);
-      }), timeout);
+      asyncTimeout = setTimeout(reject, timeout, new LHError(LHError.errors.PROTOCOL_TIMEOUT, {
+        protocolMethod: method,
+      }));
     });
 
     return Promise.race([

package/lighthouse-core/gather/fetcher.js

@@ -195,9 +195,7 @@ class Fetcher {
     /** @type {NodeJS.Timeout} */
     let timeoutHandle;
     const timeoutPromise = new Promise((_, reject) => {
-      timeoutHandle = setTimeout(() => {
-        reject(new Error('Timed out fetching resource'));
-      }, options.timeout);
+      timeoutHandle = setTimeout(reject, options.timeout, new Error('Timed out fetching resource'));
     });
 
     const responsePromise = this._loadNetworkResource(url);
@@ -283,17 +281,16 @@ class Fetcher {
     /* c8 ignore stop */
 
     /** @type {NodeJS.Timeout} */
-    let timeoutHandle;
+    let asyncTimeout;
     /** @type {Promise<never>} */
     const timeoutPromise = new Promise((_, reject) => {
-      const errorMessage = 'Timed out fetching resource.';
-      timeoutHandle = setTimeout(() => reject(new Error(errorMessage)), options.timeout);
+      asyncTimeout = setTimeout(reject, options.timeout, new Error('Timed out fetching resource.'));
     });
 
     const racePromise = Promise.race([
       timeoutPromise,
       requestInterceptionPromise,
-    ]).finally(() => clearTimeout(timeoutHandle));
+    ]).finally(() => clearTimeout(asyncTimeout));
 
     // Temporarily disable auto-attaching for this iframe.
     await this.session.sendCommand('Target.setAutoAttach', {

package/lighthouse-core/gather/gather-runner.js

@@ -422,21 +422,44 @@ class GatherRunner {
   static async populateBaseArtifacts(passContext) {
     const status = {msg: 'Populate base artifacts', id: 'lh:gather:populateBaseArtifacts'};
     log.time(status);
+
     const baseArtifacts = passContext.baseArtifacts;
 
     // Copy redirected URL to artifact.
     baseArtifacts.URL.finalUrl = passContext.url;
 
     // Fetch the manifest, if it exists.
-    baseArtifacts.WebAppManifest = await WebAppManifest.getWebAppManifest(
-      passContext.driver.defaultSession, passContext.url);
+    try {
+      baseArtifacts.WebAppManifest = await WebAppManifest.getWebAppManifest(
+        passContext.driver.defaultSession, passContext.url);
+    } catch (err) {
+      log.error('GatherRunner WebAppManifest', err);
+      baseArtifacts.WebAppManifest = null;
+    }
 
-    if (baseArtifacts.WebAppManifest) {
-      baseArtifacts.InstallabilityErrors = await InstallabilityErrors.getInstallabilityErrors(
-        passContext.driver.defaultSession);
+    try {
+      if (baseArtifacts.WebAppManifest) {
+        baseArtifacts.InstallabilityErrors = await InstallabilityErrors.getInstallabilityErrors(
+          passContext.driver.defaultSession);
+      }
+    } catch (err) {
+      log.error('GatherRunner InstallabilityErrors', err);
+      baseArtifacts.InstallabilityErrors = {
+        errors: [
+          {
+            errorId: 'protocol-timeout',
+            errorArguments: [],
+          },
+        ],
+      };
     }
 
-    baseArtifacts.Stacks = await Stacks.collectStacks(passContext.driver.executionContext);
+    try {
+      baseArtifacts.Stacks = await Stacks.collectStacks(passContext.driver.executionContext);
+    } catch (err) {
+      log.error('GatherRunner Stacks', err);
+      baseArtifacts.Stacks = [];
+    }
 
     // Find the NetworkUserAgent actually used in the devtoolsLogs.
     const devtoolsLog = baseArtifacts.devtoolsLogs[passContext.passConfig.passName];