From 6fef56a229e69dd543d2c551c86037ea1e113ae6 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Wed, 4 May 2022 16:02:20 -0700
Subject: [PATCH 01/96] wip

---
 .../audits/accessibility/accesskeys.js        |  9 ++--
 .../audits/accessibility/aria-allowed-attr.js |  9 ++--
 .../audits/accessibility/aria-command-name.js |  9 ++--
 .../audits/accessibility/aria-hidden-body.js  |  9 ++--
 .../audits/accessibility/aria-hidden-focus.js |  9 ++--
 .../accessibility/aria-input-field-name.js    |  9 ++--
 .../audits/accessibility/aria-meter-name.js   |  9 ++--
 .../accessibility/aria-progressbar-name.js    |  9 ++--
 .../accessibility/aria-required-attr.js       |  9 ++--
 .../accessibility/aria-required-children.js   |  9 ++--
 .../accessibility/aria-required-parent.js     |  9 ++--
 .../audits/accessibility/aria-roles.js        |  9 ++--
 .../accessibility/aria-toggle-field-name.js   |  9 ++--
 .../audits/accessibility/aria-tooltip-name.js |  9 ++--
 .../accessibility/aria-treeitem-name.js       |  9 ++--
 .../accessibility/aria-valid-attr-value.js    |  9 ++--
 .../audits/accessibility/aria-valid-attr.js   |  9 ++--
 .../audits/accessibility/axe-audit.js         |  9 ++--
 .../audits/accessibility/button-name.js       |  9 ++--
 .../audits/accessibility/bypass.js            |  9 ++--
 .../audits/accessibility/color-contrast.js    |  9 ++--
 .../audits/accessibility/definition-list.js   |  9 ++--
 .../audits/accessibility/dlitem.js            |  9 ++--
 .../audits/accessibility/document-title.js    |  9 ++--
 .../accessibility/duplicate-id-active.js      |  9 ++--
 .../audits/accessibility/duplicate-id-aria.js |  9 ++--
 .../form-field-multiple-labels.js             |  9 ++--
 .../audits/accessibility/frame-title.js       |  9 ++--
 .../audits/accessibility/heading-order.js     |  9 ++--
 .../audits/accessibility/html-has-lang.js     |  9 ++--
 .../audits/accessibility/html-lang-valid.js   |  9 ++--
 .../audits/accessibility/image-alt.js         |  9 ++--
 .../audits/accessibility/input-image-alt.js   |  9 ++--
 lighthouse-core/audits/accessibility/label.js |  9 ++--
 .../audits/accessibility/link-name.js         |  9 ++--
 lighthouse-core/audits/accessibility/list.js  |  9 ++--
 .../audits/accessibility/listitem.js          |  9 ++--
 .../manual/custom-controls-labels.js          |  4 +-
 .../manual/custom-controls-roles.js           |  4 +-
 .../accessibility/manual/focus-traps.js       |  4 +-
 .../manual/focusable-controls.js              |  4 +-
 .../manual/interactive-element-affordance.js  |  4 +-
 .../accessibility/manual/logical-tab-order.js |  4 +-
 .../accessibility/manual/managed-focus.js     |  4 +-
 .../manual/offscreen-content-hidden.js        |  4 +-
 .../accessibility/manual/use-landmarks.js     |  4 +-
 .../manual/visual-order-follows-dom.js        |  4 +-
 .../audits/accessibility/meta-refresh.js      |  9 ++--
 .../audits/accessibility/meta-viewport.js     |  9 ++--
 .../audits/accessibility/object-alt.js        |  9 ++--
 .../audits/accessibility/tabindex.js          |  9 ++--
 .../audits/accessibility/td-headers-attr.js   |  9 ++--
 .../audits/accessibility/th-has-data-cells.js |  9 ++--
 .../audits/accessibility/valid-lang.js        |  9 ++--
 .../audits/accessibility/video-caption.js     |  9 ++--
 lighthouse-core/audits/apple-touch-icon.js    |  8 +--
 lighthouse-core/audits/audit.js               |  8 +--
 lighthouse-core/audits/autocomplete.js        | 10 ++--
 lighthouse-core/audits/bootup-time.js         | 16 +++---
 .../byte-efficiency/byte-efficiency-audit.js  | 16 +++---
 .../byte-efficiency/duplicated-javascript.js  | 13 ++---
 .../efficient-animated-content.js             | 10 ++--
 .../byte-efficiency/legacy-javascript.js      | 15 +++---
 .../byte-efficiency/modern-image-formats.js   | 10 ++--
 .../byte-efficiency/offscreen-images.js       | 18 +++----
 .../render-blocking-resources.js              | 24 ++++-----
 .../byte-efficiency/total-byte-weight.js      | 12 ++---
 .../audits/byte-efficiency/unminified-css.js  | 12 ++---
 .../byte-efficiency/unminified-javascript.js  | 12 ++---
 .../byte-efficiency/unused-css-rules.js       | 10 ++--
 .../byte-efficiency/unused-javascript.js      | 14 +++---
 .../byte-efficiency/uses-long-cache-ttl.js    | 18 +++----
 .../byte-efficiency/uses-optimized-images.js  | 10 ++--
 .../uses-responsive-images-snapshot.js        | 12 ++---
 .../byte-efficiency/uses-responsive-images.js | 14 +++---
 .../byte-efficiency/uses-text-compression.js  | 10 ++--
 lighthouse-core/audits/content-width.js       |  8 +--
 .../audits/critical-request-chains.js         | 10 ++--
 lighthouse-core/audits/csp-xss.js             | 15 +++---
 lighthouse-core/audits/deprecations.js        | 11 ++--
 lighthouse-core/audits/diagnostics.js         | 12 ++---
 lighthouse-core/audits/dobetterweb/charset.js | 10 ++--
 lighthouse-core/audits/dobetterweb/doctype.js |  8 +--
 .../audits/dobetterweb/dom-size.js            |  8 +--
 .../dobetterweb/geolocation-on-start.js       |  8 +--
 .../audits/dobetterweb/inspector-issues.js    |  9 ++--
 .../audits/dobetterweb/js-libraries.js        |  8 +--
 .../audits/dobetterweb/no-document-write.js   |  8 +--
 .../dobetterweb/no-vulnerable-libraries.js    | 14 +++---
 .../dobetterweb/notification-on-start.js      |  8 +--
 .../password-inputs-can-be-pasted-into.js     |  8 +--
 .../audits/dobetterweb/uses-http2.js          | 25 +++++-----
 .../uses-passive-event-listeners.js           |  8 +--
 lighthouse-core/audits/errors-in-console.js   | 13 ++---
 lighthouse-core/audits/final-screenshot.js    | 10 ++--
 lighthouse-core/audits/font-display.js        | 14 +++---
 .../audits/full-page-screenshot.js            |  4 +-
 lighthouse-core/audits/image-aspect-ratio.js  | 10 ++--
 .../audits/image-size-responsive.js           | 10 ++--
 .../audits/installable-manifest.js            | 10 ++--
 lighthouse-core/audits/is-on-https.js         | 14 +++---
 .../largest-contentful-paint-element.js       |  8 +--
 .../audits/layout-shift-elements.js           |  8 +--
 lighthouse-core/audits/lcp-lazy-loaded.js     |  8 +--
 lighthouse-core/audits/long-tasks.js          | 18 +++----
 lighthouse-core/audits/main-thread-tasks.js   |  6 +--
 .../audits/mainthread-work-breakdown.js       | 12 ++---
 lighthouse-core/audits/manual/manual-audit.js |  4 +-
 .../audits/manual/pwa-cross-browser.js        |  8 +--
 .../audits/manual/pwa-each-page-has-url.js    |  8 +--
 .../audits/manual/pwa-page-transitions.js     |  8 +--
 lighthouse-core/audits/maskable-icon.js       | 10 ++--
 lighthouse-core/audits/metrics.js             |  6 +--
 .../audits/metrics/cumulative-layout-shift.js | 10 ++--
 .../experimental-interaction-to-next-paint.js | 10 ++--
 .../metrics/first-contentful-paint-3g.js      |  6 +--
 .../audits/metrics/first-contentful-paint.js  | 10 ++--
 .../audits/metrics/first-meaningful-paint.js  | 10 ++--
 lighthouse-core/audits/metrics/interactive.js | 10 ++--
 .../metrics/largest-contentful-paint.js       | 12 ++---
 .../audits/metrics/max-potential-fid.js       | 10 ++--
 lighthouse-core/audits/metrics/speed-index.js | 10 ++--
 .../audits/metrics/total-blocking-time.js     | 10 ++--
 lighthouse-core/audits/multi-check-audit.js   |  4 +-
 lighthouse-core/audits/network-requests.js    |  8 +--
 lighthouse-core/audits/network-rtt.js         | 12 ++---
 .../audits/network-server-latency.js          | 12 ++---
 lighthouse-core/audits/no-unload-listeners.js | 10 ++--
 .../audits/non-composited-animations.js       |  9 ++--
 .../audits/oopif-iframe-test-audit.js         |  2 +-
 lighthouse-core/audits/performance-budget.js  | 14 +++---
 lighthouse-core/audits/predictive-perf.js     | 17 +++----
 lighthouse-core/audits/preload-fonts.js       | 13 ++---
 lighthouse-core/audits/preload-lcp-image.js   | 18 +++----
 lighthouse-core/audits/redirects.js           | 18 +++----
 lighthouse-core/audits/resource-summary.js    | 10 ++--
 .../audits/screenshot-thumbnails.js           | 10 ++--
 .../audits/script-elements-test-audit.js      |  2 +-
 lighthouse-core/audits/script-treemap-data.js | 13 ++---
 lighthouse-core/audits/seo/canonical.js       | 12 ++---
 .../audits/seo/crawlable-anchors.js           |  8 +--
 lighthouse-core/audits/seo/font-size.js       | 11 ++--
 lighthouse-core/audits/seo/hreflang.js        | 11 ++--
 .../audits/seo/http-status-code.js            | 10 ++--
 lighthouse-core/audits/seo/is-crawlable.js    | 16 +++---
 lighthouse-core/audits/seo/link-text.js       | 10 ++--
 .../audits/seo/manual/structured-data.js      |  8 +--
 .../audits/seo/meta-description.js            |  8 +--
 lighthouse-core/audits/seo/plugins.js         | 10 ++--
 lighthouse-core/audits/seo/robots-txt.js      | 11 ++--
 lighthouse-core/audits/seo/tap-targets.js     | 19 ++++---
 .../audits/server-response-time.js            | 10 ++--
 lighthouse-core/audits/service-worker.js      | 10 ++--
 lighthouse-core/audits/splash-screen.js       | 10 ++--
 lighthouse-core/audits/themed-omnibox.js      | 12 ++---
 lighthouse-core/audits/third-party-facades.js | 19 +++----
 lighthouse-core/audits/third-party-summary.js | 16 +++---
 lighthouse-core/audits/timing-budget.js       | 14 +++---
 lighthouse-core/audits/unsized-images.js      | 10 ++--
 lighthouse-core/audits/user-timings.js        | 10 ++--
 lighthouse-core/audits/uses-rel-preconnect.js | 26 +++++-----
 lighthouse-core/audits/uses-rel-preload.js    | 22 ++++----
 lighthouse-core/audits/valid-source-maps.js   | 10 ++--
 lighthouse-core/audits/viewport.js            | 10 ++--
 lighthouse-core/audits/violation-audit.js     |  6 +--
 lighthouse-core/computed/computed-artifact.js |  6 +--
 .../computed/critical-request-chains.js       | 10 ++--
 lighthouse-core/computed/image-records.js     |  6 +--
 lighthouse-core/computed/js-bundles.js        |  8 +--
 lighthouse-core/computed/load-simulator.js    | 10 ++--
 lighthouse-core/computed/main-resource.js     |  8 +--
 lighthouse-core/computed/main-thread-tasks.js |  8 +--
 lighthouse-core/computed/manifest-values.js   |  6 +--
 .../metrics/cumulative-layout-shift.js        |  8 +--
 .../first-contentful-paint-all-frames.js      |  6 +--
 .../metrics/first-contentful-paint.js         |  8 +--
 .../metrics/first-meaningful-paint.js         | 10 ++--
 .../computed/metrics/interactive.js           | 15 +++---
 .../metrics/lantern-first-contentful-paint.js |  8 +--
 .../metrics/lantern-first-meaningful-paint.js | 10 ++--
 .../computed/metrics/lantern-interactive.js   | 12 ++---
 .../lantern-largest-contentful-paint.js       | 10 ++--
 .../metrics/lantern-max-potential-fid.js      | 10 ++--
 .../computed/metrics/lantern-metric.js        | 14 +++---
 .../computed/metrics/lantern-speed-index.js   | 14 +++---
 .../metrics/lantern-total-blocking-time.js    | 14 +++---
 .../largest-contentful-paint-all-frames.js    |  9 ++--
 .../metrics/largest-contentful-paint.js       | 11 ++--
 .../computed/metrics/max-potential-fid.js     | 10 ++--
 lighthouse-core/computed/metrics/metric.js    | 10 ++--
 .../computed/metrics/navigation-metric.js     |  4 +-
 .../computed/metrics/responsiveness.js        |  7 +--
 .../computed/metrics/speed-index.js           | 10 ++--
 lighthouse-core/computed/metrics/tbt-utils.js |  2 +-
 .../computed/metrics/timing-summary.js        | 30 +++++------
 .../computed/metrics/total-blocking-time.js   | 14 +++---
 .../computed/module-duplication.js            |  6 +--
 lighthouse-core/computed/network-analysis.js  |  8 +--
 lighthouse-core/computed/network-records.js   |  6 +--
 .../computed/page-dependency-graph.js         | 18 +++----
 .../computed/processed-navigation.js          |  6 +--
 lighthouse-core/computed/processed-trace.js   |  6 +--
 lighthouse-core/computed/resource-summary.js  | 14 +++---
 lighthouse-core/computed/screenshots.js       |  4 +-
 lighthouse-core/computed/speedline.js         | 10 ++--
 lighthouse-core/computed/trace-of-tab.js      | 11 ++--
 lighthouse-core/computed/unused-css.js        |  8 +--
 .../computed/unused-javascript-summary.js     |  4 +-
 lighthouse-core/computed/user-timings.js      |  6 +--
 lighthouse-core/computed/viewport-meta.js     |  7 ++-
 lighthouse-core/config/budget.js              |  2 +-
 lighthouse-core/config/config-helpers.js      | 24 ++++-----
 lighthouse-core/config/config-plugin.js       |  4 +-
 lighthouse-core/config/config.js              | 22 ++++----
 lighthouse-core/config/constants.js           |  2 +-
 lighthouse-core/config/default-config.js      |  9 ++--
 lighthouse-core/config/desktop-config.js      |  4 +-
 lighthouse-core/config/experimental-config.js |  2 +-
 lighthouse-core/config/full-config.js         |  2 +-
 lighthouse-core/config/lr-desktop-config.js   |  4 +-
 lighthouse-core/config/lr-mobile-config.js    |  2 +-
 lighthouse-core/config/metrics-to-audits.js   |  2 +-
 lighthouse-core/config/perf-config.js         |  2 +-
 lighthouse-core/fraggle-rock/api.js           | 14 +++---
 lighthouse-core/fraggle-rock/config/config.js | 26 ++++++----
 .../fraggle-rock/config/default-config.js     |  6 +--
 .../fraggle-rock/config/filters.js            |  7 ++-
 .../fraggle-rock/config/validation.js         |  8 +--
 .../fraggle-rock/gather/base-artifacts.js     | 14 +++---
 .../fraggle-rock/gather/base-gatherer.js      |  2 +-
 lighthouse-core/fraggle-rock/gather/driver.js | 10 ++--
 .../fraggle-rock/gather/navigation-runner.js  | 50 +++++++++----------
 .../fraggle-rock/gather/runner-helpers.js     |  4 +-
 .../fraggle-rock/gather/session.js            |  4 +-
 .../fraggle-rock/gather/snapshot-runner.js    | 18 +++----
 .../fraggle-rock/gather/timespan-runner.js    | 20 +++-----
 lighthouse-core/fraggle-rock/user-flow.js     | 14 +++---
 .../gather/connections/connection.js          |  8 +--
 lighthouse-core/gather/connections/cri.js     | 12 ++---
 lighthouse-core/gather/connections/raw.js     |  4 +-
 lighthouse-core/gather/devtools-log.js        |  2 +-
 lighthouse-core/gather/driver.js              | 27 ++++------
 lighthouse-core/gather/driver/dom.js          |  2 +-
 lighthouse-core/gather/driver/environment.js  | 10 ++--
 .../gather/driver/execution-context.js        |  4 +-
 lighthouse-core/gather/driver/navigation.js   | 14 +++---
 .../gather/driver/network-monitor.js          | 15 +++---
 lighthouse-core/gather/driver/network.js      |  4 +-
 lighthouse-core/gather/driver/prepare.js      | 10 ++--
 .../gather/driver/service-workers.js          |  2 +-
 lighthouse-core/gather/driver/storage.js      |  6 +--
 .../gather/driver/target-manager.js           |  4 +-
 .../gather/driver/wait-for-condition.js       | 11 ++--
 lighthouse-core/gather/fetcher.js             |  9 ++--
 lighthouse-core/gather/gather-runner.js       | 40 +++++++--------
 .../gather/gatherers/accessibility.js         |  9 ++--
 .../gather/gatherers/anchor-elements.js       | 11 ++--
 .../gather/gatherers/cache-contents.js        |  4 +-
 .../gather/gatherers/console-messages.js      |  4 +-
 lighthouse-core/gather/gatherers/css-usage.js |  4 +-
 .../gather/gatherers/devtools-log-compat.js   |  7 +--
 .../gather/gatherers/devtools-log.js          |  9 ++--
 .../gather/gatherers/dobetterweb/doctype.js   |  4 +-
 .../gather/gatherers/dobetterweb/domstats.js  |  6 +--
 .../gatherers/dobetterweb/optimized-images.js | 16 +++---
 .../password-inputs-with-prevented-paste.js   |  7 +--
 .../dobetterweb/response-compression.js       | 20 ++++----
 .../dobetterweb/tags-blocking-first-paint.js  |  8 +--
 .../gather/gatherers/full-page-screenshot.js  | 13 ++---
 lighthouse-core/gather/gatherers/gatherer.js  |  2 +-
 .../gather/gatherers/global-listeners.js      |  4 +-
 .../gather/gatherers/iframe-elements.js       |  7 +--
 .../gather/gatherers/image-elements.js        | 10 ++--
 lighthouse-core/gather/gatherers/inputs.js    |  9 ++--
 .../gather/gatherers/inspector-issues.js      |  8 +--
 .../gather/gatherers/installability-errors.js |  6 +--
 lighthouse-core/gather/gatherers/js-usage.js  |  4 +-
 .../gather/gatherers/link-elements.js         | 14 +++---
 .../gather/gatherers/main-document-content.js | 10 ++--
 .../gather/gatherers/meta-elements.js         |  6 +--
 .../gather/gatherers/network-user-agent.js    |  6 +--
 .../gather/gatherers/script-elements.js       | 12 ++---
 lighthouse-core/gather/gatherers/scripts.js   |  4 +-
 .../gather/gatherers/seo/embedded-content.js  |  7 +--
 .../gather/gatherers/seo/font-size.js         |  3 +-
 .../gather/gatherers/seo/robots-txt.js        |  4 +-
 .../gather/gatherers/seo/tap-targets.js       |  9 ++--
 .../gather/gatherers/service-worker.js        |  6 +--
 .../gather/gatherers/source-maps.js           |  6 +--
 lighthouse-core/gather/gatherers/stacks.js    |  9 ++--
 .../gather/gatherers/trace-compat.js          |  7 +--
 .../gather/gatherers/trace-elements.js        | 21 ++++----
 lighthouse-core/gather/gatherers/trace.js     |  7 +--
 .../gather/gatherers/viewport-dimensions.js   |  4 +-
 .../gather/gatherers/web-app-manifest.js      |  8 +--
 lighthouse-core/index.js                      | 21 ++++----
 lighthouse-core/lib/arbitrary-equality-map.js |  4 +-
 lighthouse-core/lib/asset-saver.js            | 24 ++++-----
 lighthouse-core/lib/axe.js                    |  4 +-
 lighthouse-core/lib/cdt/package.json          |  4 ++
 lighthouse-core/lib/csp-evaluator.js          | 22 ++++----
 .../lib/dependency-graph/base-node.js         |  4 +-
 .../lib/dependency-graph/cpu-node.js          |  4 +-
 .../lib/dependency-graph/network-node.js      |  6 +--
 .../simulator/connection-pool.js              |  8 +--
 .../dependency-graph/simulator/dns-cache.js   |  2 +-
 .../simulator/network-analyzer.js             |  4 +-
 .../simulator/simulator-timing-map.js         | 10 ++--
 .../dependency-graph/simulator/simulator.js   | 18 +++----
 .../simulator/tcp-connection.js               |  2 +-
 lighthouse-core/lib/emulation.js              |  4 +-
 lighthouse-core/lib/i18n/i18n.js              | 19 +++----
 lighthouse-core/lib/icons.js                  |  4 +-
 lighthouse-core/lib/lantern-trace-saver.js    |  2 +-
 lighthouse-core/lib/lh-env.js                 |  4 +-
 lighthouse-core/lib/lh-error.js               |  6 +--
 lighthouse-core/lib/lh-trace-processor.js     |  6 +--
 lighthouse-core/lib/manifest-parser.js        |  8 +--
 lighthouse-core/lib/median-run.js             |  2 +-
 lighthouse-core/lib/minification-estimator.js |  2 +-
 lighthouse-core/lib/minify-devtoolslog.js     |  2 +-
 lighthouse-core/lib/minify-trace.js           |  4 +-
 lighthouse-core/lib/navigation-error.js       |  8 +--
 lighthouse-core/lib/network-recorder.js       |  8 +--
 lighthouse-core/lib/network-request.js        |  4 +-
 lighthouse-core/lib/page-functions.js         |  2 +-
 lighthouse-core/lib/proto-preprocessor.js     |  4 +-
 lighthouse-core/lib/rect-helpers.js           |  2 +-
 lighthouse-core/lib/script-helpers.js         |  2 +-
 .../lib/sd-validation/helpers/walk-object.js  |  4 +-
 .../lib/sd-validation/json-expander.js        | 10 ++--
 .../lib/sd-validation/json-linter.js          |  6 +--
 .../sd-validation/jsonld-keyword-validator.js |  6 +--
 .../line-number-from-jsonld-path.js           |  2 +-
 .../lib/sd-validation/schema-validator.js     |  8 +--
 .../scripts/download-jsonldcontext.js         |  7 +--
 .../scripts/generate-schema-tree.js           |  7 +--
 .../lib/sd-validation/sd-validation.js        | 14 +++---
 lighthouse-core/lib/sentry.js                 |  4 +-
 lighthouse-core/lib/stack-packs.js            |  8 +--
 lighthouse-core/lib/statistics.js             |  2 +-
 lighthouse-core/lib/tappable-rects.js         |  4 +-
 lighthouse-core/lib/third-party-web.js        |  4 +-
 lighthouse-core/lib/timing-trace-saver.js     |  2 +-
 .../lib/tracehouse/cpu-profile-model.js       |  4 +-
 .../lib/tracehouse/main-thread-tasks.js       |  4 +-
 lighthouse-core/lib/tracehouse/task-groups.js |  2 +-
 .../lib/tracehouse/trace-processor.js         |  4 +-
 .../lib/traces/pwmetrics-events.js            |  6 +--
 lighthouse-core/lib/url-shim.js               |  7 +--
 lighthouse-core/runner.js                     | 40 +++++++--------
 lighthouse-core/scoring.js                    |  4 +-
 types/artifacts.d.ts                          | 18 +++----
 types/audit.d.ts                              |  4 +-
 types/config.d.ts                             |  2 +-
 types/gatherer.d.ts                           | 14 +++---
 types/global-lh.d.ts                          |  6 +--
 357 files changed, 1685 insertions(+), 1620 deletions(-)
 create mode 100644 lighthouse-core/lib/cdt/package.json

diff --git a/lighthouse-core/audits/accessibility/accesskeys.js b/lighthouse-core/audits/accessibility/accesskeys.js
index 0d35ab0ff2e2..75e9f9652a18 100644
--- a/lighthouse-core/audits/accessibility/accesskeys.js
+++ b/lighthouse-core/audits/accessibility/accesskeys.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the accesskey HTML attribute values are unique across all elements. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -41,5 +42,5 @@ class Accesskeys extends AxeAudit {
   }
 }
 
-module.exports = Accesskeys;
-module.exports.UIStrings = UIStrings;
+export default Accesskeys;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/aria-allowed-attr.js b/lighthouse-core/audits/accessibility/aria-allowed-attr.js
index 741e4f65df15..89d4fc7e70c1 100644
--- a/lighthouse-core/audits/accessibility/aria-allowed-attr.js
+++ b/lighthouse-core/audits/accessibility/aria-allowed-attr.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the ARIA HTML attributes are misaligned with the aria-role HTML attribute specificed on the element, such mismatches are invalid. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -41,5 +42,5 @@ class ARIAAllowedAttr extends AxeAudit {
   }
 }
 
-module.exports = ARIAAllowedAttr;
-module.exports.UIStrings = UIStrings;
+export default ARIAAllowedAttr;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/aria-command-name.js b/lighthouse-core/audits/accessibility/aria-command-name.js
index 49ed26963283..743324cdf416 100644
--- a/lighthouse-core/audits/accessibility/aria-command-name.js
+++ b/lighthouse-core/audits/accessibility/aria-command-name.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accessibility audit that evaluates if important HTML elements have an accessible name. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -39,5 +40,5 @@ class AriaCommandName extends AxeAudit {
   }
 }
 
-module.exports = AriaCommandName;
-module.exports.UIStrings = UIStrings;
+export default AriaCommandName;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/aria-hidden-body.js b/lighthouse-core/audits/accessibility/aria-hidden-body.js
index cc74c7f504f0..ac013411d847 100644
--- a/lighthouse-core/audits/accessibility/aria-hidden-body.js
+++ b/lighthouse-core/audits/accessibility/aria-hidden-body.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that checks if the html <body> element does not have an aria-hidden attribute set on it. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -39,5 +40,5 @@ class AriaHiddenBody extends AxeAudit {
   }
 }
 
-module.exports = AriaHiddenBody;
-module.exports.UIStrings = UIStrings;
+export default AriaHiddenBody;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/aria-hidden-focus.js b/lighthouse-core/audits/accessibility/aria-hidden-focus.js
index 8ec7b7729ca7..50353f10e080 100644
--- a/lighthouse-core/audits/accessibility/aria-hidden-focus.js
+++ b/lighthouse-core/audits/accessibility/aria-hidden-focus.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that checks if all elements that have an aria-hidden attribute do not contain focusable descendent elements. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -39,5 +40,5 @@ class AriaHiddenFocus extends AxeAudit {
   }
 }
 
-module.exports = AriaHiddenFocus;
-module.exports.UIStrings = UIStrings;
+export default AriaHiddenFocus;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/aria-input-field-name.js b/lighthouse-core/audits/accessibility/aria-input-field-name.js
index 98414877dea2..41b78b50fa1b 100644
--- a/lighthouse-core/audits/accessibility/aria-input-field-name.js
+++ b/lighthouse-core/audits/accessibility/aria-input-field-name.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that checks that all ARIA input fields have an accessible name. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -39,5 +40,5 @@ class AriaInputFieldName extends AxeAudit {
   }
 }
 
-module.exports = AriaInputFieldName;
-module.exports.UIStrings = UIStrings;
+export default AriaInputFieldName;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/aria-meter-name.js b/lighthouse-core/audits/accessibility/aria-meter-name.js
index 328317056784..6722397deb3b 100644
--- a/lighthouse-core/audits/accessibility/aria-meter-name.js
+++ b/lighthouse-core/audits/accessibility/aria-meter-name.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accessibility audit that evaluates if meter HTML elements have an accessible name. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -39,5 +40,5 @@ class AriaMeterName extends AxeAudit {
   }
 }
 
-module.exports = AriaMeterName;
-module.exports.UIStrings = UIStrings;
+export default AriaMeterName;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/aria-progressbar-name.js b/lighthouse-core/audits/accessibility/aria-progressbar-name.js
index 587cceff6dfa..8c97360aecdc 100644
--- a/lighthouse-core/audits/accessibility/aria-progressbar-name.js
+++ b/lighthouse-core/audits/accessibility/aria-progressbar-name.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accessibility audit that evaluates if progressbar HTML elements have an accessible name. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -39,5 +40,5 @@ class AriaProgressbarName extends AxeAudit {
   }
 }
 
-module.exports = AriaProgressbarName;
-module.exports.UIStrings = UIStrings;
+export default AriaProgressbarName;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/aria-required-attr.js b/lighthouse-core/audits/accessibility/aria-required-attr.js
index 1e0d71ec7894..2b512f246ffd 100644
--- a/lighthouse-core/audits/accessibility/aria-required-attr.js
+++ b/lighthouse-core/audits/accessibility/aria-required-attr.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all elements with the aria-role attribute have the other corresponding ARIA attributes set as well. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -40,5 +41,5 @@ class ARIARequiredAttr extends AxeAudit {
   }
 }
 
-module.exports = ARIARequiredAttr;
-module.exports.UIStrings = UIStrings;
+export default ARIARequiredAttr;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/aria-required-children.js b/lighthouse-core/audits/accessibility/aria-required-children.js
index dfd5a6d77293..b0c0172ad67b 100644
--- a/lighthouse-core/audits/accessibility/aria-required-children.js
+++ b/lighthouse-core/audits/accessibility/aria-required-children.js
@@ -11,8 +11,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the elements with an aria-role that require child elements have the required children. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -44,5 +45,5 @@ class AriaRequiredChildren extends AxeAudit {
   }
 }
 
-module.exports = AriaRequiredChildren;
-module.exports.UIStrings = UIStrings;
+export default AriaRequiredChildren;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/aria-required-parent.js b/lighthouse-core/audits/accessibility/aria-required-parent.js
index 14c0438ebfbb..f3e5e514a767 100644
--- a/lighthouse-core/audits/accessibility/aria-required-parent.js
+++ b/lighthouse-core/audits/accessibility/aria-required-parent.js
@@ -11,8 +11,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates valid aria-role usage. Some ARIA roles require that elements must be a child of specific parent element. This audit checks that when those roles are used, the element with the role is in fact a child of the required parent. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -42,5 +43,5 @@ class AriaRequiredParent extends AxeAudit {
   }
 }
 
-module.exports = AriaRequiredParent;
-module.exports.UIStrings = UIStrings;
+export default AriaRequiredParent;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/aria-roles.js b/lighthouse-core/audits/accessibility/aria-roles.js
index 9d85068032f4..75e67561ebf2 100644
--- a/lighthouse-core/audits/accessibility/aria-roles.js
+++ b/lighthouse-core/audits/accessibility/aria-roles.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all elements have valid aria-role HTML attributes. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -41,5 +42,5 @@ class AriaRoles extends AxeAudit {
   }
 }
 
-module.exports = AriaRoles;
-module.exports.UIStrings = UIStrings;
+export default AriaRoles;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/aria-toggle-field-name.js b/lighthouse-core/audits/accessibility/aria-toggle-field-name.js
index 0152f07bf92a..dc7112ecf32d 100644
--- a/lighthouse-core/audits/accessibility/aria-toggle-field-name.js
+++ b/lighthouse-core/audits/accessibility/aria-toggle-field-name.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that checks that all ARIA toggle fields have an accessible name. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -39,5 +40,5 @@ class AriaToggleFieldName extends AxeAudit {
   }
 }
 
-module.exports = AriaToggleFieldName;
-module.exports.UIStrings = UIStrings;
+export default AriaToggleFieldName;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/aria-tooltip-name.js b/lighthouse-core/audits/accessibility/aria-tooltip-name.js
index 5ba24c7b48ea..79c4b283bb2a 100644
--- a/lighthouse-core/audits/accessibility/aria-tooltip-name.js
+++ b/lighthouse-core/audits/accessibility/aria-tooltip-name.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accessibility audit that evaluates if tooltip HTML elements have an accessible name. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -39,5 +40,5 @@ class AriaTooltipName extends AxeAudit {
   }
 }
 
-module.exports = AriaTooltipName;
-module.exports.UIStrings = UIStrings;
+export default AriaTooltipName;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/aria-treeitem-name.js b/lighthouse-core/audits/accessibility/aria-treeitem-name.js
index 9b4863c1ac70..378eadf40e5d 100644
--- a/lighthouse-core/audits/accessibility/aria-treeitem-name.js
+++ b/lighthouse-core/audits/accessibility/aria-treeitem-name.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accessibility audit that evaluates if treeitem HTML elements have an accessible name. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -39,5 +40,5 @@ class AriaTreeitemName extends AxeAudit {
   }
 }
 
-module.exports = AriaTreeitemName;
-module.exports.UIStrings = UIStrings;
+export default AriaTreeitemName;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/aria-valid-attr-value.js b/lighthouse-core/audits/accessibility/aria-valid-attr-value.js
index 2d8f2bf76a03..5cfb9fa96716 100644
--- a/lighthouse-core/audits/accessibility/aria-valid-attr-value.js
+++ b/lighthouse-core/audits/accessibility/aria-valid-attr-value.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all elements that have an ARIA HTML attribute have a valid value for that attribute. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -41,5 +42,5 @@ class ARIAValidAttr extends AxeAudit {
   }
 }
 
-module.exports = ARIAValidAttr;
-module.exports.UIStrings = UIStrings;
+export default ARIAValidAttr;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/aria-valid-attr.js b/lighthouse-core/audits/accessibility/aria-valid-attr.js
index f0ef26b0c00c..97d7b82539a0 100644
--- a/lighthouse-core/audits/accessibility/aria-valid-attr.js
+++ b/lighthouse-core/audits/accessibility/aria-valid-attr.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all elements with ARIA HTML attributes have spelled the name of attribute correctly. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -41,5 +42,5 @@ class ARIAValidAttr extends AxeAudit {
   }
 }
 
-module.exports = ARIAValidAttr;
-module.exports.UIStrings = UIStrings;
+export default ARIAValidAttr;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/axe-audit.js b/lighthouse-core/audits/accessibility/axe-audit.js
index 0c701e16afee..61f8b63e51f6 100644
--- a/lighthouse-core/audits/accessibility/axe-audit.js
+++ b/lighthouse-core/audits/accessibility/axe-audit.js
@@ -10,8 +10,9 @@
  * generate audit results using aXe rule names.
  */
 
-const Audit = require('../audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import Audit from '../audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Label of a table column that identifies HTML elements that have failed an audit. */
@@ -110,5 +111,5 @@ class AxeAudit extends Audit {
   }
 }
 
-module.exports = AxeAudit;
-module.exports.UIStrings = UIStrings;
+export default AxeAudit;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/button-name.js b/lighthouse-core/audits/accessibility/button-name.js
index ad325476ac55..ee04929f82dd 100644
--- a/lighthouse-core/audits/accessibility/button-name.js
+++ b/lighthouse-core/audits/accessibility/button-name.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all button elements have names accessible to screen readers. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -41,5 +42,5 @@ class ButtonName extends AxeAudit {
   }
 }
 
-module.exports = ButtonName;
-module.exports.UIStrings = UIStrings;
+export default ButtonName;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/bypass.js b/lighthouse-core/audits/accessibility/bypass.js
index 98f7bb3afab8..62a79538b867 100644
--- a/lighthouse-core/audits/accessibility/bypass.js
+++ b/lighthouse-core/audits/accessibility/bypass.js
@@ -11,8 +11,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the page has elements that let screen reader users skip over repetitive content. `heading`, `skip link`, and `landmark region` are technical terms for the elements that enable quick page navigation. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -42,5 +43,5 @@ class Bypass extends AxeAudit {
   }
 }
 
-module.exports = Bypass;
-module.exports.UIStrings = UIStrings;
+export default Bypass;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/color-contrast.js b/lighthouse-core/audits/accessibility/color-contrast.js
index 10688a45176a..8cddfc4e2cd5 100644
--- a/lighthouse-core/audits/accessibility/color-contrast.js
+++ b/lighthouse-core/audits/accessibility/color-contrast.js
@@ -11,8 +11,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all foreground colors are distinct enough from their background colors to be legible for users. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -42,5 +43,5 @@ class ColorContrast extends AxeAudit {
   }
 }
 
-module.exports = ColorContrast;
-module.exports.UIStrings = UIStrings;
+export default ColorContrast;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/definition-list.js b/lighthouse-core/audits/accessibility/definition-list.js
index dfbe0546bc95..2bdccff7e59c 100644
--- a/lighthouse-core/audits/accessibility/definition-list.js
+++ b/lighthouse-core/audits/accessibility/definition-list.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all the definition list elements have valid markup for screen readers. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -43,5 +44,5 @@ class DefinitionList extends AxeAudit {
   }
 }
 
-module.exports = DefinitionList;
-module.exports.UIStrings = UIStrings;
+export default DefinitionList;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/dlitem.js b/lighthouse-core/audits/accessibility/dlitem.js
index 212af86fd2d8..425e63678197 100644
--- a/lighthouse-core/audits/accessibility/dlitem.js
+++ b/lighthouse-core/audits/accessibility/dlitem.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all definition list item elements (`<dt>`/`<dd>`) have a definition list parent element (`<dl>`). This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -41,5 +42,5 @@ class DLItem extends AxeAudit {
   }
 }
 
-module.exports = DLItem;
-module.exports.UIStrings = UIStrings;
+export default DLItem;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/document-title.js b/lighthouse-core/audits/accessibility/document-title.js
index 5e9378109027..0418af15493c 100644
--- a/lighthouse-core/audits/accessibility/document-title.js
+++ b/lighthouse-core/audits/accessibility/document-title.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the page has a <title> element that describes the page. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -41,5 +42,5 @@ class DocumentTitle extends AxeAudit {
   }
 }
 
-module.exports = DocumentTitle;
-module.exports.UIStrings = UIStrings;
+export default DocumentTitle;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/duplicate-id-active.js b/lighthouse-core/audits/accessibility/duplicate-id-active.js
index c1b7acca77d3..b1805a82e393 100644
--- a/lighthouse-core/audits/accessibility/duplicate-id-active.js
+++ b/lighthouse-core/audits/accessibility/duplicate-id-active.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that checks if there are any duplicate id HTML attributes on active, focusable elements. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -39,5 +40,5 @@ class DuplicateIdActive extends AxeAudit {
   }
 }
 
-module.exports = DuplicateIdActive;
-module.exports.UIStrings = UIStrings;
+export default DuplicateIdActive;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/duplicate-id-aria.js b/lighthouse-core/audits/accessibility/duplicate-id-aria.js
index c7e266517a42..b5a94332a1c2 100644
--- a/lighthouse-core/audits/accessibility/duplicate-id-aria.js
+++ b/lighthouse-core/audits/accessibility/duplicate-id-aria.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that checks if there are any duplicate ARIA IDs on the page. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -39,5 +40,5 @@ class DuplicateIdAria extends AxeAudit {
   }
 }
 
-module.exports = DuplicateIdAria;
-module.exports.UIStrings = UIStrings;
+export default DuplicateIdAria;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/form-field-multiple-labels.js b/lighthouse-core/audits/accessibility/form-field-multiple-labels.js
index bec83b6a2b67..645a884f1133 100644
--- a/lighthouse-core/audits/accessibility/form-field-multiple-labels.js
+++ b/lighthouse-core/audits/accessibility/form-field-multiple-labels.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that checks if any form fields have multiple label elements. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -40,5 +41,5 @@ class FormFieldMultipleLabels extends AxeAudit {
   }
 }
 
-module.exports = FormFieldMultipleLabels;
-module.exports.UIStrings = UIStrings;
+export default FormFieldMultipleLabels;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/frame-title.js b/lighthouse-core/audits/accessibility/frame-title.js
index c09fd851a6db..8b31bec491d8 100644
--- a/lighthouse-core/audits/accessibility/frame-title.js
+++ b/lighthouse-core/audits/accessibility/frame-title.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all `<frame>` and `<iframe>` elements on the page have a title HTML attribute to describe their contents. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -40,5 +41,5 @@ class FrameTitle extends AxeAudit {
   }
 }
 
-module.exports = FrameTitle;
-module.exports.UIStrings = UIStrings;
+export default FrameTitle;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/heading-order.js b/lighthouse-core/audits/accessibility/heading-order.js
index 89a44ca6c5e9..84a314f89598 100644
--- a/lighthouse-core/audits/accessibility/heading-order.js
+++ b/lighthouse-core/audits/accessibility/heading-order.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that checks if heading elements (<h1>, <h2>, etc) appear in numeric order and only ever increase in steps of 1. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -39,5 +40,5 @@ class HeadingOrder extends AxeAudit {
   }
 }
 
-module.exports = HeadingOrder;
-module.exports.UIStrings = UIStrings;
+export default HeadingOrder;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/html-has-lang.js b/lighthouse-core/audits/accessibility/html-has-lang.js
index 0a7db03b4aa2..0d4f83285063 100644
--- a/lighthouse-core/audits/accessibility/html-has-lang.js
+++ b/lighthouse-core/audits/accessibility/html-has-lang.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the root HTML tag has a lang attribute identifying the page's language. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -43,5 +44,5 @@ class HTMLHasLang extends AxeAudit {
   }
 }
 
-module.exports = HTMLHasLang;
-module.exports.UIStrings = UIStrings;
+export default HTMLHasLang;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/html-lang-valid.js b/lighthouse-core/audits/accessibility/html-lang-valid.js
index 664dd9a8ee98..4bc2c1534de4 100644
--- a/lighthouse-core/audits/accessibility/html-lang-valid.js
+++ b/lighthouse-core/audits/accessibility/html-lang-valid.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the value for root HTML tag's lang attribute is a valid BCP 47 language. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -42,5 +43,5 @@ class HTMLLangValid extends AxeAudit {
   }
 }
 
-module.exports = HTMLLangValid;
-module.exports.UIStrings = UIStrings;
+export default HTMLLangValid;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/image-alt.js b/lighthouse-core/audits/accessibility/image-alt.js
index 40d8968d2431..a9a8ffe29ea1 100644
--- a/lighthouse-core/audits/accessibility/image-alt.js
+++ b/lighthouse-core/audits/accessibility/image-alt.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all image elements have the alt HTML attribute to describe their contents. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -41,5 +42,5 @@ class ImageAlt extends AxeAudit {
   }
 }
 
-module.exports = ImageAlt;
-module.exports.UIStrings = UIStrings;
+export default ImageAlt;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/input-image-alt.js b/lighthouse-core/audits/accessibility/input-image-alt.js
index e08a67a3f336..696e58e40554 100644
--- a/lighthouse-core/audits/accessibility/input-image-alt.js
+++ b/lighthouse-core/audits/accessibility/input-image-alt.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all input elements of type image have an alt HTML attribute to describe their contents. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -41,5 +42,5 @@ class InputImageAlt extends AxeAudit {
   }
 }
 
-module.exports = InputImageAlt;
-module.exports.UIStrings = UIStrings;
+export default InputImageAlt;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/label.js b/lighthouse-core/audits/accessibility/label.js
index d5df13e36dba..16cf7c4c2c76 100644
--- a/lighthouse-core/audits/accessibility/label.js
+++ b/lighthouse-core/audits/accessibility/label.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all form elements have corresponding label elements. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -41,5 +42,5 @@ class Label extends AxeAudit {
   }
 }
 
-module.exports = Label;
-module.exports.UIStrings = UIStrings;
+export default Label;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/link-name.js b/lighthouse-core/audits/accessibility/link-name.js
index 3ec77a66a8c9..1a36a979d9c0 100644
--- a/lighthouse-core/audits/accessibility/link-name.js
+++ b/lighthouse-core/audits/accessibility/link-name.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all link elements have a non-generic name to screen readers. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -42,5 +43,5 @@ class LinkName extends AxeAudit {
   }
 }
 
-module.exports = LinkName;
-module.exports.UIStrings = UIStrings;
+export default LinkName;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/list.js b/lighthouse-core/audits/accessibility/list.js
index ae3d7f702f08..020f97e815c7 100644
--- a/lighthouse-core/audits/accessibility/list.js
+++ b/lighthouse-core/audits/accessibility/list.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all list elements have a valid structure containing only list items. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -43,5 +44,5 @@ class List extends AxeAudit {
   }
 }
 
-module.exports = List;
-module.exports.UIStrings = UIStrings;
+export default List;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/listitem.js b/lighthouse-core/audits/accessibility/listitem.js
index 5c5f3687db33..a66c136e4028 100644
--- a/lighthouse-core/audits/accessibility/listitem.js
+++ b/lighthouse-core/audits/accessibility/listitem.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if any list item elements do not have list parent elements. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -42,5 +43,5 @@ class ListItem extends AxeAudit {
   }
 }
 
-module.exports = ListItem;
-module.exports.UIStrings = UIStrings;
+export default ListItem;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/manual/custom-controls-labels.js b/lighthouse-core/audits/accessibility/manual/custom-controls-labels.js
index a6119ed95e60..ccf350181e1c 100644
--- a/lighthouse-core/audits/accessibility/manual/custom-controls-labels.js
+++ b/lighthouse-core/audits/accessibility/manual/custom-controls-labels.js
@@ -6,7 +6,7 @@
  */
 'use strict';
 
-const ManualAudit = require('../../manual/manual-audit.js');
+import ManualAudit from '../../manual/manual-audit.js';
 
 /**
  * @fileoverview Manual A11y audit to assert custom controls have associated labels.
@@ -25,4 +25,4 @@ class CustomControlsLabels extends ManualAudit {
   }
 }
 
-module.exports = CustomControlsLabels;
+export default CustomControlsLabels;
diff --git a/lighthouse-core/audits/accessibility/manual/custom-controls-roles.js b/lighthouse-core/audits/accessibility/manual/custom-controls-roles.js
index d3b239c55004..b3196c6e2d9b 100644
--- a/lighthouse-core/audits/accessibility/manual/custom-controls-roles.js
+++ b/lighthouse-core/audits/accessibility/manual/custom-controls-roles.js
@@ -6,7 +6,7 @@
  */
 'use strict';
 
-const ManualAudit = require('../../manual/manual-audit.js');
+import ManualAudit from '../../manual/manual-audit.js';
 
 /**
  * @fileoverview Manual A11y audit to assert custom controls have associated roles.
@@ -25,4 +25,4 @@ class CustomControlsRoles extends ManualAudit {
   }
 }
 
-module.exports = CustomControlsRoles;
+export default CustomControlsRoles;
diff --git a/lighthouse-core/audits/accessibility/manual/focus-traps.js b/lighthouse-core/audits/accessibility/manual/focus-traps.js
index da68ffc77df2..78a4f2319542 100644
--- a/lighthouse-core/audits/accessibility/manual/focus-traps.js
+++ b/lighthouse-core/audits/accessibility/manual/focus-traps.js
@@ -6,7 +6,7 @@
  */
 'use strict';
 
-const ManualAudit = require('../../manual/manual-audit.js');
+import ManualAudit from '../../manual/manual-audit.js';
 
 /**
  * @fileoverview Manual A11y audit to avoid trapping keyboard focus in a region.
@@ -25,4 +25,4 @@ class FocusTraps extends ManualAudit {
   }
 }
 
-module.exports = FocusTraps;
+export default FocusTraps;
diff --git a/lighthouse-core/audits/accessibility/manual/focusable-controls.js b/lighthouse-core/audits/accessibility/manual/focusable-controls.js
index bf8a57364e5f..5dd73829b2b4 100644
--- a/lighthouse-core/audits/accessibility/manual/focusable-controls.js
+++ b/lighthouse-core/audits/accessibility/manual/focusable-controls.js
@@ -6,7 +6,7 @@
  */
 'use strict';
 
-const ManualAudit = require('../../manual/manual-audit.js');
+import ManualAudit from '../../manual/manual-audit.js';
 
 /**
  * @fileoverview Manual A11y audit for focusable controls.
@@ -25,4 +25,4 @@ class FocusableControls extends ManualAudit {
   }
 }
 
-module.exports = FocusableControls;
+export default FocusableControls;
diff --git a/lighthouse-core/audits/accessibility/manual/interactive-element-affordance.js b/lighthouse-core/audits/accessibility/manual/interactive-element-affordance.js
index 83b519472671..9cabd5b60456 100644
--- a/lighthouse-core/audits/accessibility/manual/interactive-element-affordance.js
+++ b/lighthouse-core/audits/accessibility/manual/interactive-element-affordance.js
@@ -6,7 +6,7 @@
  */
 'use strict';
 
-const ManualAudit = require('../../manual/manual-audit.js');
+import ManualAudit from '../../manual/manual-audit.js';
 
 /**
  * @fileoverview Manual A11y audit for interactive element affordance.
@@ -25,4 +25,4 @@ class InteractiveElementAffordance extends ManualAudit {
   }
 }
 
-module.exports = InteractiveElementAffordance;
+export default InteractiveElementAffordance;
diff --git a/lighthouse-core/audits/accessibility/manual/logical-tab-order.js b/lighthouse-core/audits/accessibility/manual/logical-tab-order.js
index e02894b5d15c..1eee117341fd 100644
--- a/lighthouse-core/audits/accessibility/manual/logical-tab-order.js
+++ b/lighthouse-core/audits/accessibility/manual/logical-tab-order.js
@@ -6,7 +6,7 @@
  */
 'use strict';
 
-const ManualAudit = require('../../manual/manual-audit.js');
+import ManualAudit from '../../manual/manual-audit.js';
 
 /**
  * @fileoverview Manual A11y audit for tab order that follows DOM order.
@@ -25,4 +25,4 @@ class LogicalTabOrder extends ManualAudit {
   }
 }
 
-module.exports = LogicalTabOrder;
+export default LogicalTabOrder;
diff --git a/lighthouse-core/audits/accessibility/manual/managed-focus.js b/lighthouse-core/audits/accessibility/manual/managed-focus.js
index 23717d767bbb..9c762ad71a8c 100644
--- a/lighthouse-core/audits/accessibility/manual/managed-focus.js
+++ b/lighthouse-core/audits/accessibility/manual/managed-focus.js
@@ -6,7 +6,7 @@
  */
 'use strict';
 
-const ManualAudit = require('../../manual/manual-audit.js');
+import ManualAudit from '../../manual/manual-audit.js';
 
 /**
  * @fileoverview Manual A11y audit for focusing new content that's added to the page.
@@ -25,4 +25,4 @@ class ManagedFocus extends ManualAudit {
   }
 }
 
-module.exports = ManagedFocus;
+export default ManagedFocus;
diff --git a/lighthouse-core/audits/accessibility/manual/offscreen-content-hidden.js b/lighthouse-core/audits/accessibility/manual/offscreen-content-hidden.js
index ff3b10defbcc..4c58c65dbef5 100644
--- a/lighthouse-core/audits/accessibility/manual/offscreen-content-hidden.js
+++ b/lighthouse-core/audits/accessibility/manual/offscreen-content-hidden.js
@@ -6,7 +6,7 @@
  */
 'use strict';
 
-const ManualAudit = require('../../manual/manual-audit.js');
+import ManualAudit from '../../manual/manual-audit.js';
 
 /**
  * @fileoverview Manual A11y audit to check that offscreen content is hidden from
@@ -26,4 +26,4 @@ class OffscreenContentHidden extends ManualAudit {
   }
 }
 
-module.exports = OffscreenContentHidden;
+export default OffscreenContentHidden;
diff --git a/lighthouse-core/audits/accessibility/manual/use-landmarks.js b/lighthouse-core/audits/accessibility/manual/use-landmarks.js
index 8355d2cf2d57..603a28a8d18f 100644
--- a/lighthouse-core/audits/accessibility/manual/use-landmarks.js
+++ b/lighthouse-core/audits/accessibility/manual/use-landmarks.js
@@ -6,7 +6,7 @@
  */
 'use strict';
 
-const ManualAudit = require('../../manual/manual-audit.js');
+import ManualAudit from '../../manual/manual-audit.js';
 
 /**
  * @fileoverview Manual A11y audit to check that landmark elements are used whenever possible.
@@ -25,4 +25,4 @@ class UseLandmarks extends ManualAudit {
   }
 }
 
-module.exports = UseLandmarks;
+export default UseLandmarks;
diff --git a/lighthouse-core/audits/accessibility/manual/visual-order-follows-dom.js b/lighthouse-core/audits/accessibility/manual/visual-order-follows-dom.js
index 342a92660dc7..c40009d2c599 100644
--- a/lighthouse-core/audits/accessibility/manual/visual-order-follows-dom.js
+++ b/lighthouse-core/audits/accessibility/manual/visual-order-follows-dom.js
@@ -6,7 +6,7 @@
  */
 'use strict';
 
-const ManualAudit = require('../../manual/manual-audit.js');
+import ManualAudit from '../../manual/manual-audit.js';
 
 /**
  * @fileoverview Manual A11y audit to check that the visual layout of the page matches the DOM.
@@ -25,4 +25,4 @@ class VisualOrderFollowsDOM extends ManualAudit {
   }
 }
 
-module.exports = VisualOrderFollowsDOM;
+export default VisualOrderFollowsDOM;
diff --git a/lighthouse-core/audits/accessibility/meta-refresh.js b/lighthouse-core/audits/accessibility/meta-refresh.js
index fc51553225aa..415a2beb933d 100644
--- a/lighthouse-core/audits/accessibility/meta-refresh.js
+++ b/lighthouse-core/audits/accessibility/meta-refresh.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the page uses a meta tag that refreshes the page automatically. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -42,5 +43,5 @@ class MetaRefresh extends AxeAudit {
   }
 }
 
-module.exports = MetaRefresh;
-module.exports.UIStrings = UIStrings;
+export default MetaRefresh;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/meta-viewport.js b/lighthouse-core/audits/accessibility/meta-viewport.js
index 060a77c869e8..3be716728797 100644
--- a/lighthouse-core/audits/accessibility/meta-viewport.js
+++ b/lighthouse-core/audits/accessibility/meta-viewport.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the page has limited the scaling properties of the page in a way that harms users with low vision. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -43,5 +44,5 @@ class MetaViewport extends AxeAudit {
   }
 }
 
-module.exports = MetaViewport;
-module.exports.UIStrings = UIStrings;
+export default MetaViewport;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/object-alt.js b/lighthouse-core/audits/accessibility/object-alt.js
index 5d7a257ae9ee..4bdffa78b5a5 100644
--- a/lighthouse-core/audits/accessibility/object-alt.js
+++ b/lighthouse-core/audits/accessibility/object-alt.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all object elements have an alt HTML attribute that describes their contents. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -41,5 +42,5 @@ class ObjectAlt extends AxeAudit {
   }
 }
 
-module.exports = ObjectAlt;
-module.exports.UIStrings = UIStrings;
+export default ObjectAlt;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/tabindex.js b/lighthouse-core/audits/accessibility/tabindex.js
index ed07004afab7..b73317e2b2a0 100644
--- a/lighthouse-core/audits/accessibility/tabindex.js
+++ b/lighthouse-core/audits/accessibility/tabindex.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if any elements have custom tabindex HTML attributes that might frustrate users of assitive technology. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -41,5 +42,5 @@ class TabIndex extends AxeAudit {
   }
 }
 
-module.exports = TabIndex;
-module.exports.UIStrings = UIStrings;
+export default TabIndex;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/td-headers-attr.js b/lighthouse-core/audits/accessibility/td-headers-attr.js
index 3969285ecb0b..aae97106a4d8 100644
--- a/lighthouse-core/audits/accessibility/td-headers-attr.js
+++ b/lighthouse-core/audits/accessibility/td-headers-attr.js
@@ -11,8 +11,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all table cell elements in a table that use the headers HTML attribute use it correctly to refer to header cells within the same table. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -45,5 +46,5 @@ class TDHeadersAttr extends AxeAudit {
   }
 }
 
-module.exports = TDHeadersAttr;
-module.exports.UIStrings = UIStrings;
+export default TDHeadersAttr;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/th-has-data-cells.js b/lighthouse-core/audits/accessibility/th-has-data-cells.js
index 15331ee04fec..047e599519aa 100644
--- a/lighthouse-core/audits/accessibility/th-has-data-cells.js
+++ b/lighthouse-core/audits/accessibility/th-has-data-cells.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all table header elements have children. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -44,5 +45,5 @@ class THHasDataCells extends AxeAudit {
   }
 }
 
-module.exports = THHasDataCells;
-module.exports.UIStrings = UIStrings;
+export default THHasDataCells;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/valid-lang.js b/lighthouse-core/audits/accessibility/valid-lang.js
index f968d5a4efee..5a90a6e4825a 100644
--- a/lighthouse-core/audits/accessibility/valid-lang.js
+++ b/lighthouse-core/audits/accessibility/valid-lang.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all lang HTML attributes are valid BCP 47 languages. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -41,5 +42,5 @@ class ValidLang extends AxeAudit {
   }
 }
 
-module.exports = ValidLang;
-module.exports.UIStrings = UIStrings;
+export default ValidLang;
+export {UIStrings};
diff --git a/lighthouse-core/audits/accessibility/video-caption.js b/lighthouse-core/audits/accessibility/video-caption.js
index 3be2b8563727..f2c16fb2016f 100644
--- a/lighthouse-core/audits/accessibility/video-caption.js
+++ b/lighthouse-core/audits/accessibility/video-caption.js
@@ -10,8 +10,9 @@
  * See base class in axe-audit.js for audit() implementation.
  */
 
-const AxeAudit = require('./axe-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import AxeAudit from './axe-audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all video elements contain a child track element that has captions describing their audio. This title is descriptive of the successful state and is shown to users when no user action is required. */
@@ -42,5 +43,5 @@ class VideoCaption extends AxeAudit {
   }
 }
 
-module.exports = VideoCaption;
-module.exports.UIStrings = UIStrings;
+export default VideoCaption;
+export {UIStrings};
diff --git a/lighthouse-core/audits/apple-touch-icon.js b/lighthouse-core/audits/apple-touch-icon.js
index 06ac21ff047d..213e661feb40 100644
--- a/lighthouse-core/audits/apple-touch-icon.js
+++ b/lighthouse-core/audits/apple-touch-icon.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
+import Audit from './audit.js';
+import i18n from '../lib/i18n/i18n.js';
 
 /**
  * @fileoverview Audits if a page has an `apple-touch-icon` link element with a valid href.
@@ -68,5 +68,5 @@ class AppleTouchIcon extends Audit {
   }
 }
 
-module.exports = AppleTouchIcon;
-module.exports.UIStrings = UIStrings;
+export default AppleTouchIcon;
+export {UIStrings};
diff --git a/lighthouse-core/audits/audit.js b/lighthouse-core/audits/audit.js
index 8dbb57aa64c7..f432ba154c5b 100644
--- a/lighthouse-core/audits/audit.js
+++ b/lighthouse-core/audits/audit.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const {isUnderTest} = require('../lib/lh-env.js');
-const statistics = require('../lib/statistics.js');
-const {Util} = require('../util-commonjs.js');
+import {isUnderTest} from '../lib/lh-env.js';
+import statistics from '../lib/statistics.js';
+import {Util} from '../util-commonjs.js';
 
 const DEFAULT_PASS = 'defaultPass';
 
@@ -388,4 +388,4 @@ class Audit {
   }
 }
 
-module.exports = Audit;
+export {Audit};
diff --git a/lighthouse-core/audits/autocomplete.js b/lighthouse-core/audits/autocomplete.js
index f0cb14b20f98..319aac5c25f9 100644
--- a/lighthouse-core/audits/autocomplete.js
+++ b/lighthouse-core/audits/autocomplete.js
@@ -12,9 +12,9 @@
 
 'use strict';
 
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
-const log = require('lighthouse-logger');
+import Audit from './audit.js';
+import i18n from '../lib/i18n/i18n.js';
+import log from 'lighthouse-logger';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that lets the user know if there are any missing or invalid autocomplete attributes on page inputs. This descriptive title is shown to users when all input attributes have a valid autocomplete attribute. */
@@ -286,5 +286,5 @@ class AutocompleteAudit extends Audit {
   }
 }
 
-module.exports = AutocompleteAudit;
-module.exports.UIStrings = UIStrings;
+export default AutocompleteAudit;
+export {UIStrings};
diff --git a/lighthouse-core/audits/bootup-time.js b/lighthouse-core/audits/bootup-time.js
index af99e0cbd9b9..db27952de9c3 100644
--- a/lighthouse-core/audits/bootup-time.js
+++ b/lighthouse-core/audits/bootup-time.js
@@ -5,12 +5,12 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const NetworkRequest = require('../lib/network-request.js');
-const {taskGroups} = require('../lib/tracehouse/task-groups.js');
-const i18n = require('../lib/i18n/i18n.js');
-const NetworkRecords = require('../computed/network-records.js');
-const MainThreadTasks = require('../computed/main-thread-tasks.js');
+import Audit from './audit.js';
+import NetworkRequest from '../lib/network-request.js';
+import {taskGroups} from '../lib/tracehouse/task-groups.js';
+import i18n from '../lib/i18n/i18n.js';
+import NetworkRecords from '../computed/network-records.js';
+import MainThreadTasks from '../computed/main-thread-tasks.js';
 
 const UIStrings = {
   /** Title of a diagnostic audit that provides detail on the time spent executing javascript files during the load. This descriptive title is shown to users when the amount is acceptable and no user action is required. */
@@ -216,5 +216,5 @@ class BootupTime extends Audit {
   }
 }
 
-module.exports = BootupTime;
-module.exports.UIStrings = UIStrings;
+export default BootupTime;
+export {UIStrings};
diff --git a/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js b/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js
index 3456bc771f85..958166c03fa4 100644
--- a/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js
+++ b/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js
@@ -5,13 +5,13 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const linearInterpolation = require('../../lib/statistics.js').linearInterpolation;
-const Interactive = require('../../computed/metrics/lantern-interactive.js');
-const i18n = require('../../lib/i18n/i18n.js');
-const NetworkRecords = require('../../computed/network-records.js');
-const LoadSimulator = require('../../computed/load-simulator.js');
-const PageDependencyGraph = require('../../computed/page-dependency-graph.js');
+import Audit from '../audit.js';
+import {linearInterpolation} from '../../lib/statistics.js';
+import Interactive from '../../computed/metrics/lantern-interactive.js';
+import 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';
 
 const str_ = i18n.createMessageInstanceIdFn(__filename, {});
 
@@ -256,4 +256,4 @@ class UnusedBytes extends Audit {
   /* eslint-enable no-unused-vars */
 }
 
-module.exports = UnusedBytes;
+export default UnusedBytes;
diff --git a/lighthouse-core/audits/byte-efficiency/duplicated-javascript.js b/lighthouse-core/audits/byte-efficiency/duplicated-javascript.js
index 1cb02931e468..4a734f888429 100644
--- a/lighthouse-core/audits/byte-efficiency/duplicated-javascript.js
+++ b/lighthouse-core/audits/byte-efficiency/duplicated-javascript.js
@@ -9,10 +9,11 @@
 /** @typedef {LH.Audit.ByteEfficiencyItem & {source: string, subItems: {type: 'subitems', items: SubItem[]}}} Item */
 /** @typedef {{url: string, sourceTransferBytes?: number}} SubItem */
 
-const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
-const ModuleDuplication = require('../../computed/module-duplication.js');
-const i18n = require('../../lib/i18n/i18n.js');
-const {getRequestForScript} = require('../../lib/script-helpers.js');
+import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+
+import ModuleDuplication from '../../computed/module-duplication.js';
+import i18n from '../../lib/i18n/i18n.js';
+import {getRequestForScript} from '../../lib/script-helpers.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to remove duplicate JavaScript from their code. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -244,5 +245,5 @@ class DuplicatedJavascript extends ByteEfficiencyAudit {
   }
 }
 
-module.exports = DuplicatedJavascript;
-module.exports.UIStrings = UIStrings;
+export default DuplicatedJavascript;
+export {UIStrings};
diff --git a/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js b/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js
index d78bd83235ae..09678ccd565e 100644
--- a/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js
+++ b/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js
@@ -8,9 +8,9 @@
  */
 'use strict';
 
-const NetworkRequest = require('../../lib/network-request.js');
-const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import NetworkRequest from '../../lib/network-request.js';
+import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to use video formats rather than animated GIFs, which are wasteful. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -88,5 +88,5 @@ class EfficientAnimatedContent extends ByteEfficiencyAudit {
   }
 }
 
-module.exports = EfficientAnimatedContent;
-module.exports.UIStrings = UIStrings;
+export default EfficientAnimatedContent;
+export {UIStrings};
diff --git a/lighthouse-core/audits/byte-efficiency/legacy-javascript.js b/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
index 913321685f2e..dcc6fd763a5a 100644
--- a/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
+++ b/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
@@ -18,11 +18,12 @@
 /** @typedef {LH.Audit.ByteEfficiencyItem & {subItems: {type: 'subitems', items: SubItem[]}}} Item */
 /** @typedef {{signal: string, location: LH.Audit.Details.SourceLocationValue}} SubItem */
 
-const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
-const JsBundles = require('../../computed/js-bundles.js');
-const i18n = require('../../lib/i18n/i18n.js');
-const thirdPartyWeb = require('../../lib/third-party-web.js');
-const {getRequestForScript} = require('../../lib/script-helpers.js');
+import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+
+import JsBundles from '../../computed/js-bundles.js';
+import i18n from '../../lib/i18n/i18n.js';
+import thirdPartyWeb from '../../lib/third-party-web.js';
+import {getRequestForScript} from '../../lib/script-helpers.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that tells the user about legacy polyfills and transforms used on the page. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -466,5 +467,5 @@ class LegacyJavascript extends ByteEfficiencyAudit {
   }
 }
 
-module.exports = LegacyJavascript;
-module.exports.UIStrings = UIStrings;
+export default LegacyJavascript;
+export {UIStrings};
diff --git a/lighthouse-core/audits/byte-efficiency/modern-image-formats.js b/lighthouse-core/audits/byte-efficiency/modern-image-formats.js
index ff31372e605c..547e24627e0a 100644
--- a/lighthouse-core/audits/byte-efficiency/modern-image-formats.js
+++ b/lighthouse-core/audits/byte-efficiency/modern-image-formats.js
@@ -8,9 +8,9 @@
  */
 'use strict';
 
-const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
-const URL = require('../../lib/url-shim.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+import URL from '../../lib/url-shim.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to serve images in newer and more efficient image formats in order to enhance the performance of a page. A non-modern image format was designed 20+ years ago. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -182,5 +182,5 @@ class ModernImageFormats extends ByteEfficiencyAudit {
   }
 }
 
-module.exports = ModernImageFormats;
-module.exports.UIStrings = UIStrings;
+export default ModernImageFormats;
+export {UIStrings};
diff --git a/lighthouse-core/audits/byte-efficiency/offscreen-images.js b/lighthouse-core/audits/byte-efficiency/offscreen-images.js
index c49e9313932a..001a8f996427 100644
--- a/lighthouse-core/audits/byte-efficiency/offscreen-images.js
+++ b/lighthouse-core/audits/byte-efficiency/offscreen-images.js
@@ -9,13 +9,13 @@
  */
 'use strict';
 
-const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
-const NetworkRequest = require('../../lib/network-request.js');
-const Sentry = require('../../lib/sentry.js');
-const URL = require('../../lib/url-shim.js');
-const i18n = require('../../lib/i18n/i18n.js');
-const Interactive = require('../../computed/metrics/interactive.js');
-const ProcessedTrace = require('../../computed/processed-trace.js');
+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 i18n from '../../lib/i18n/i18n.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. */
@@ -249,5 +249,5 @@ class OffscreenImages extends ByteEfficiencyAudit {
   }
 }
 
-module.exports = OffscreenImages;
-module.exports.UIStrings = UIStrings;
+export default OffscreenImages;
+export {UIStrings};
diff --git a/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js b/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js
index 97270c2b7e58..d05a419625a8 100644
--- a/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js
+++ b/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js
@@ -9,16 +9,16 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
-const BaseNode = require('../../lib/dependency-graph/base-node.js');
-const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
-const UnusedCSS = require('../../computed/unused-css.js');
-const NetworkRequest = require('../../lib/network-request.js');
-const ProcessedTrace = require('../../computed/processed-trace.js');
-const ProcessedNavigation = require('../../computed/processed-navigation.js');
-const LoadSimulator = require('../../computed/load-simulator.js');
-const FirstContentfulPaint = require('../../computed/metrics/first-contentful-paint.js');
+import Audit from '../audit.js';
+import 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 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';
 
 /** @typedef {import('../../lib/dependency-graph/simulator/simulator')} Simulator */
 /** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
@@ -304,5 +304,5 @@ class RenderBlockingResources extends Audit {
   }
 }
 
-module.exports = RenderBlockingResources;
-module.exports.UIStrings = UIStrings;
+export default RenderBlockingResources;
+export {UIStrings};
diff --git a/lighthouse-core/audits/byte-efficiency/total-byte-weight.js b/lighthouse-core/audits/byte-efficiency/total-byte-weight.js
index 5c576e5d78da..31721d16ee01 100644
--- a/lighthouse-core/audits/byte-efficiency/total-byte-weight.js
+++ b/lighthouse-core/audits/byte-efficiency/total-byte-weight.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
-const NetworkRequest = require('../../lib/network-request.js');
-const NetworkRecords = require('../../computed/network-records.js');
+import Audit from '../audit.js';
+import i18n from '../../lib/i18n/i18n.js';
+import NetworkRequest from '../../lib/network-request.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. */
@@ -107,5 +107,5 @@ class TotalByteWeight extends Audit {
   }
 }
 
-module.exports = TotalByteWeight;
-module.exports.UIStrings = UIStrings;
+export default TotalByteWeight;
+export {UIStrings};
diff --git a/lighthouse-core/audits/byte-efficiency/unminified-css.js b/lighthouse-core/audits/byte-efficiency/unminified-css.js
index a283ff44a576..b8ca3250a0f3 100644
--- a/lighthouse-core/audits/byte-efficiency/unminified-css.js
+++ b/lighthouse-core/audits/byte-efficiency/unminified-css.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
-const UnusedCSS = require('../../computed/unused-css.js');
-const i18n = require('../../lib/i18n/i18n.js');
-const computeTokenLength = require('../../lib/minification-estimator.js').computeCSSTokenLength;
+import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+import UnusedCSS from '../../computed/unused-css.js';
+import i18n from '../../lib/i18n/i18n.js';
+import {computeCSSTokenLength as computeTokenLength} from '../../lib/minification-estimator.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to minify (remove whitespace) the page's CSS code. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -111,5 +111,5 @@ class UnminifiedCSS extends ByteEfficiencyAudit {
   }
 }
 
-module.exports = UnminifiedCSS;
-module.exports.UIStrings = UIStrings;
+export default UnminifiedCSS;
+export {UIStrings};
diff --git a/lighthouse-core/audits/byte-efficiency/unminified-javascript.js b/lighthouse-core/audits/byte-efficiency/unminified-javascript.js
index b512edef9a85..f0764ae48638 100644
--- a/lighthouse-core/audits/byte-efficiency/unminified-javascript.js
+++ b/lighthouse-core/audits/byte-efficiency/unminified-javascript.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
-const computeTokenLength = require('../../lib/minification-estimator.js').computeJSTokenLength;
-const {getRequestForScript, isInline} = require('../../lib/script-helpers.js');
+import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+import i18n from '../../lib/i18n/i18n.js';
+import {computeJSTokenLength as computeTokenLength} from '../../lib/minification-estimator.js';
+import {getRequestForScript, isInline} from '../../lib/script-helpers.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to minify the page’s JS code to reduce file size. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -115,5 +115,5 @@ class UnminifiedJavaScript extends ByteEfficiencyAudit {
   }
 }
 
-module.exports = UnminifiedJavaScript;
-module.exports.UIStrings = UIStrings;
+export default UnminifiedJavaScript;
+export {UIStrings};
diff --git a/lighthouse-core/audits/byte-efficiency/unused-css-rules.js b/lighthouse-core/audits/byte-efficiency/unused-css-rules.js
index e83cc8085cc8..ca9c633e953f 100644
--- a/lighthouse-core/audits/byte-efficiency/unused-css-rules.js
+++ b/lighthouse-core/audits/byte-efficiency/unused-css-rules.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
-const UnusedCSS = require('../../computed/unused-css.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+import UnusedCSS from '../../computed/unused-css.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to reduce content from their CSS that isn’t needed immediately and instead load that content at a later time. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -66,5 +66,5 @@ class UnusedCSSRules extends ByteEfficiencyAudit {
   }
 }
 
-module.exports = UnusedCSSRules;
-module.exports.UIStrings = UIStrings;
+export default UnusedCSSRules;
+export {UIStrings};
diff --git a/lighthouse-core/audits/byte-efficiency/unused-javascript.js b/lighthouse-core/audits/byte-efficiency/unused-javascript.js
index a416f9300e02..34983fa76405 100644
--- a/lighthouse-core/audits/byte-efficiency/unused-javascript.js
+++ b/lighthouse-core/audits/byte-efficiency/unused-javascript.js
@@ -5,11 +5,11 @@
  */
 'use strict';
 
-const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
-const UnusedJavaScriptSummary = require('../../computed/unused-javascript-summary.js');
-const JsBundles = require('../../computed/js-bundles.js');
-const i18n = require('../../lib/i18n/i18n.js');
-const {getRequestForScript} = require('../../lib/script-helpers.js');
+import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+import UnusedJavaScriptSummary from '../../computed/unused-javascript-summary.js';
+import JsBundles from '../../computed/js-bundles.js';
+import i18n from '../../lib/i18n/i18n.js';
+import {getRequestForScript} from '../../lib/script-helpers.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to reduce JavaScript that is never evaluated during page load. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -160,5 +160,5 @@ class UnusedJavaScript extends ByteEfficiencyAudit {
   }
 }
 
-module.exports = UnusedJavaScript;
-module.exports.UIStrings = UIStrings;
+export default UnusedJavaScript;
+export {UIStrings};
diff --git a/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js b/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js
index 90726899c3c5..d61a7d2e267d 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js
@@ -5,13 +5,13 @@
  */
 'use strict';
 
-const parseCacheControl = require('parse-cache-control');
-const Audit = require('../audit.js');
-const NetworkRequest = require('../../lib/network-request.js');
-const URL = require('../../lib/url-shim.js');
-const linearInterpolation = require('../../lib/statistics.js').linearInterpolation;
-const i18n = require('../../lib/i18n/i18n.js');
-const NetworkRecords = require('../../computed/network-records.js');
+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 {linearInterpolation} from '../../lib/statistics.js';
+import i18n from '../../lib/i18n/i18n.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. */
@@ -294,5 +294,5 @@ class CacheHeaders extends Audit {
   }
 }
 
-module.exports = CacheHeaders;
-module.exports.UIStrings = UIStrings;
+export default CacheHeaders;
+export {UIStrings};
diff --git a/lighthouse-core/audits/byte-efficiency/uses-optimized-images.js b/lighthouse-core/audits/byte-efficiency/uses-optimized-images.js
index 9b432f3358a6..7ec7288e5a75 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-optimized-images.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-optimized-images.js
@@ -9,9 +9,9 @@
  */
 'use strict';
 
-const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
-const URL = require('../../lib/url-shim.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+import URL from '../../lib/url-shim.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to encode images with optimization (better compression). This is displayed in a list of audit titles that Lighthouse generates. */
@@ -141,5 +141,5 @@ class UsesOptimizedImages extends ByteEfficiencyAudit {
   }
 }
 
-module.exports = UsesOptimizedImages;
-module.exports.UIStrings = UIStrings;
+export default UsesOptimizedImages;
+export {UIStrings};
diff --git a/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js b/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js
index 3e1fd1ae1d3e..292abdd1cbdf 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js
@@ -11,10 +11,10 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const UsesResponsiveImages = require('./uses-responsive-images.js');
-const URL = require('../../lib/url-shim.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import Audit from '../audit.js';
+import UsesResponsiveImages from './uses-responsive-images.js';
+import URL from '../../lib/url-shim.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Descriptive title of a Lighthouse audit that checks if images match their displayed dimensions. This is displayed when the audit is passing. */
@@ -96,5 +96,5 @@ class UsesResponsiveImagesSnapshot extends Audit {
   }
 }
 
-module.exports = UsesResponsiveImagesSnapshot;
-module.exports.UIStrings = UIStrings;
+export default UsesResponsiveImagesSnapshot;
+export {UIStrings};
diff --git a/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js b/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js
index 1dac9573df02..064b7eb697f6 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js
@@ -13,11 +13,11 @@
  */
 'use strict';
 
-const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
-const NetworkRequest = require('../../lib/network-request.js');
-const ImageRecords = require('../../computed/image-records.js');
-const URL = require('../../lib/url-shim.js');
-const i18n = require('../../lib/i18n/i18n.js');
+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 i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to resize images to match the display dimensions. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -172,6 +172,6 @@ class UsesResponsiveImages extends ByteEfficiencyAudit {
   }
 }
 
-module.exports = UsesResponsiveImages;
-module.exports.UIStrings = UIStrings;
+export default UsesResponsiveImages;
+export {UIStrings};
 module.exports.str_ = str_;
diff --git a/lighthouse-core/audits/byte-efficiency/uses-text-compression.js b/lighthouse-core/audits/byte-efficiency/uses-text-compression.js
index 008067a40376..f621c9858c33 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-text-compression.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-text-compression.js
@@ -9,9 +9,9 @@
  */
 'use strict';
 
-const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
-const URL = require('../../lib/url-shim.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+import URL from '../../lib/url-shim.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to enable text compression (like gzip) in order to enhance the performance of a page. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -96,5 +96,5 @@ class ResponsesAreCompressed extends ByteEfficiencyAudit {
   }
 }
 
-module.exports = ResponsesAreCompressed;
-module.exports.UIStrings = UIStrings;
+export default ResponsesAreCompressed;
+export {UIStrings};
diff --git a/lighthouse-core/audits/content-width.js b/lighthouse-core/audits/content-width.js
index 718ae991abf2..d12890861e60 100644
--- a/lighthouse-core/audits/content-width.js
+++ b/lighthouse-core/audits/content-width.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
+import Audit from './audit.js';
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the content size of a web site compared to the viewport, which is the size of the screen the site is displayed on. This descriptive title is shown to users when the site's content is sized appropriately. */
@@ -73,5 +73,5 @@ class ContentWidth extends Audit {
   }
 }
 
-module.exports = ContentWidth;
-module.exports.UIStrings = UIStrings;
+export default ContentWidth;
+export {UIStrings};
diff --git a/lighthouse-core/audits/critical-request-chains.js b/lighthouse-core/audits/critical-request-chains.js
index e822d078b587..fe4f377c0bdc 100644
--- a/lighthouse-core/audits/critical-request-chains.js
+++ b/lighthouse-core/audits/critical-request-chains.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
-const ComputedChains = require('../computed/critical-request-chains.js');
+import Audit from './audit.js';
+import i18n from '../lib/i18n/i18n.js';
+import 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. */
@@ -216,5 +216,5 @@ class CriticalRequestChains extends Audit {
   }
 }
 
-module.exports = CriticalRequestChains;
-module.exports.UIStrings = UIStrings;
+export default CriticalRequestChains;
+export {UIStrings};
diff --git a/lighthouse-core/audits/csp-xss.js b/lighthouse-core/audits/csp-xss.js
index e45fb0d8f2a9..93af42ee340e 100644
--- a/lighthouse-core/audits/csp-xss.js
+++ b/lighthouse-core/audits/csp-xss.js
@@ -5,13 +5,10 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const MainResource = require('../computed/main-resource.js');
-const i18n = require('../lib/i18n/i18n.js');
-const {
-  evaluateRawCspsForXss,
-  getTranslatedDescription,
-} = require('../lib/csp-evaluator.js');
+import Audit from './audit.js';
+import MainResource from '../computed/main-resource.js';
+import i18n from '../lib/i18n/i18n.js';
+import {evaluateRawCspsForXss, getTranslatedDescription} from '../lib/csp-evaluator.js';
 
 /** @typedef {import('../lib/csp-evaluator.js').Finding} Finding */
 
@@ -182,5 +179,5 @@ class CspXss extends Audit {
   }
 }
 
-module.exports = CspXss;
-module.exports.UIStrings = UIStrings;
+export default CspXss;
+export {UIStrings};
diff --git a/lighthouse-core/audits/deprecations.js b/lighthouse-core/audits/deprecations.js
index 671668d4a1bb..920f45bd37a3 100644
--- a/lighthouse-core/audits/deprecations.js
+++ b/lighthouse-core/audits/deprecations.js
@@ -9,9 +9,10 @@
  * @fileoverview Audits a page to determine if it is calling deprecated APIs.
  */
 
-const Audit = require('./audit.js');
-const JsBundles = require('../computed/js-bundles.js');
-const i18n = require('../lib/i18n/i18n.js');
+import {Audit} from './audit.js';
+
+import JsBundles from '../computed/js-bundles.js';
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the use of deprecated APIs. This descriptive title is shown to users when the page does not use deprecated APIs. */
@@ -90,5 +91,5 @@ class Deprecations extends Audit {
   }
 }
 
-module.exports = Deprecations;
-module.exports.UIStrings = UIStrings;
+export default Deprecations;
+export {UIStrings};
diff --git a/lighthouse-core/audits/diagnostics.js b/lighthouse-core/audits/diagnostics.js
index 5928e57b9898..b32391b403b6 100644
--- a/lighthouse-core/audits/diagnostics.js
+++ b/lighthouse-core/audits/diagnostics.js
@@ -5,11 +5,11 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const MainThreadTasksComputed = require('../computed/main-thread-tasks.js');
-const NetworkRecordsComputed = require('../computed/network-records.js');
-const NetworkAnalysisComputed = require('../computed/network-analysis.js');
-const MainResource = require('../computed/main-resource.js');
+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';
 
 class Diagnostics extends Audit {
   /**
@@ -77,4 +77,4 @@ class Diagnostics extends Audit {
   }
 }
 
-module.exports = Diagnostics;
+export default Diagnostics;
diff --git a/lighthouse-core/audits/dobetterweb/charset.js b/lighthouse-core/audits/dobetterweb/charset.js
index 110d60eac109..acee3da6c835 100644
--- a/lighthouse-core/audits/dobetterweb/charset.js
+++ b/lighthouse-core/audits/dobetterweb/charset.js
@@ -12,9 +12,9 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
-const MainResource = require('../../computed/main-resource.js');
+import Audit from '../audit.js';
+import i18n from '../../lib/i18n/i18n.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. */
@@ -89,8 +89,8 @@ class CharsetDefined extends Audit {
   }
 }
 
-module.exports = CharsetDefined;
-module.exports.UIStrings = UIStrings;
+export default CharsetDefined;
+export {UIStrings};
 module.exports.CHARSET_HTML_REGEX = CHARSET_HTML_REGEX;
 module.exports.CHARSET_HTTP_REGEX = CHARSET_HTTP_REGEX;
 module.exports.IANA_REGEX = IANA_REGEX;
diff --git a/lighthouse-core/audits/dobetterweb/doctype.js b/lighthouse-core/audits/dobetterweb/doctype.js
index 51a992d0dc7c..513c2425019a 100644
--- a/lighthouse-core/audits/dobetterweb/doctype.js
+++ b/lighthouse-core/audits/dobetterweb/doctype.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import Audit from '../audit.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the doctype of a page. This descriptive title is shown to users when the pages's doctype is set to HTML. */
@@ -101,5 +101,5 @@ class Doctype extends Audit {
   }
 }
 
-module.exports = Doctype;
-module.exports.UIStrings = UIStrings;
+export default Doctype;
+export {UIStrings};
diff --git a/lighthouse-core/audits/dobetterweb/dom-size.js b/lighthouse-core/audits/dobetterweb/dom-size.js
index 7ff253eae131..a931b5186290 100644
--- a/lighthouse-core/audits/dobetterweb/dom-size.js
+++ b/lighthouse-core/audits/dobetterweb/dom-size.js
@@ -12,8 +12,8 @@
 
 'use strict';
 
-const Audit = require('../audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import Audit from '../audit.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a diagnostic audit that provides detail on the size of the web page's DOM. The size of a DOM is characterized by the total number of DOM elements and greatest DOM depth. This descriptive title is shown to users when the amount is acceptable and no user action is required. */
@@ -119,5 +119,5 @@ class DOMSize extends Audit {
   }
 }
 
-module.exports = DOMSize;
-module.exports.UIStrings = UIStrings;
+export default DOMSize;
+export {UIStrings};
diff --git a/lighthouse-core/audits/dobetterweb/geolocation-on-start.js b/lighthouse-core/audits/dobetterweb/geolocation-on-start.js
index 33b0df066597..1fe92677cac9 100644
--- a/lighthouse-core/audits/dobetterweb/geolocation-on-start.js
+++ b/lighthouse-core/audits/dobetterweb/geolocation-on-start.js
@@ -11,8 +11,8 @@
 
 'use strict';
 
-const ViolationAudit = require('../violation-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import ViolationAudit from '../violation-audit.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on geolocation permission requests while the page is loading. This descriptive title is shown to users when the page does not ask for geolocation permissions on load. */
@@ -66,5 +66,5 @@ class GeolocationOnStart extends ViolationAudit {
   }
 }
 
-module.exports = GeolocationOnStart;
-module.exports.UIStrings = UIStrings;
+export default GeolocationOnStart;
+export {UIStrings};
diff --git a/lighthouse-core/audits/dobetterweb/inspector-issues.js b/lighthouse-core/audits/dobetterweb/inspector-issues.js
index 781b8f48b70a..07e6c33f7071 100644
--- a/lighthouse-core/audits/dobetterweb/inspector-issues.js
+++ b/lighthouse-core/audits/dobetterweb/inspector-issues.js
@@ -15,8 +15,9 @@
 /** @typedef {{url: string}} IssueSubItem */
 /** @typedef {{issueType: string|LH.IcuMessage, subItems: Array<IssueSubItem>}} IssueItem */
 
-const Audit = require('../audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import Audit from '../audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on various types of problems with a website, like security or network errors. This descriptive title is shown to users when no issues were logged into the Chrome DevTools Issues panel. */
@@ -188,5 +189,5 @@ class IssuesPanelEntries extends Audit {
   }
 }
 
-module.exports = IssuesPanelEntries;
-module.exports.UIStrings = UIStrings;
+export default IssuesPanelEntries;
+export {UIStrings};
diff --git a/lighthouse-core/audits/dobetterweb/js-libraries.js b/lighthouse-core/audits/dobetterweb/js-libraries.js
index 84c3a16c0571..dddbc10298a5 100644
--- a/lighthouse-core/audits/dobetterweb/js-libraries.js
+++ b/lighthouse-core/audits/dobetterweb/js-libraries.js
@@ -10,8 +10,8 @@
 
 'use strict';
 
-const Audit = require('../audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import Audit from '../audit.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the Javascript libraries that are used on the page. */
@@ -84,5 +84,5 @@ class JsLibrariesAudit extends Audit {
   }
 }
 
-module.exports = JsLibrariesAudit;
-module.exports.UIStrings = UIStrings;
+export default JsLibrariesAudit;
+export {UIStrings};
diff --git a/lighthouse-core/audits/dobetterweb/no-document-write.js b/lighthouse-core/audits/dobetterweb/no-document-write.js
index fc29e657d8cf..5ac171a4c874 100644
--- a/lighthouse-core/audits/dobetterweb/no-document-write.js
+++ b/lighthouse-core/audits/dobetterweb/no-document-write.js
@@ -28,8 +28,8 @@
 
 'use strict';
 
-const ViolationAudit = require('../violation-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import ViolationAudit from '../violation-audit.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the page's use of the `document.write` API. This descriptive title is shown to users when the page does not use `document.write`. */
@@ -81,5 +81,5 @@ class NoDocWriteAudit extends ViolationAudit {
   }
 }
 
-module.exports = NoDocWriteAudit;
-module.exports.UIStrings = UIStrings;
+export default NoDocWriteAudit;
+export {UIStrings};
diff --git a/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js b/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
index 2743b5d730b6..20a208cd72e3 100644
--- a/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
+++ b/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
@@ -12,11 +12,11 @@
 
 'use strict';
 
-const Audit = require('../audit.js');
-const Sentry = require('../../lib/sentry.js');
-const semver = require('semver');
-const snykDatabase = require('../../../third-party/snyk/snapshot.json');
-const i18n = require('../../lib/i18n/i18n.js');
+import Audit from '../audit.js';
+import Sentry from '../../lib/sentry.js';
+import semver from 'semver';
+import snykDatabase from '../../../third-party/snyk/snapshot.json';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on Javascript libraries the page uses. This descriptive title is shown to users when all Javascript libraries are free of known security vulnerabilities. */
@@ -221,5 +221,5 @@ class NoVulnerableLibrariesAudit extends Audit {
   }
 }
 
-module.exports = NoVulnerableLibrariesAudit;
-module.exports.UIStrings = UIStrings;
+export default NoVulnerableLibrariesAudit;
+export {UIStrings};
diff --git a/lighthouse-core/audits/dobetterweb/notification-on-start.js b/lighthouse-core/audits/dobetterweb/notification-on-start.js
index 7df8a4b445a0..cea112037094 100644
--- a/lighthouse-core/audits/dobetterweb/notification-on-start.js
+++ b/lighthouse-core/audits/dobetterweb/notification-on-start.js
@@ -11,8 +11,8 @@
 
 'use strict';
 
-const ViolationAudit = require('../violation-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import ViolationAudit from '../violation-audit.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the page's notification permission requests. This descriptive title is shown to users when the page does not ask for notification permission on load. */
@@ -65,5 +65,5 @@ class NotificationOnStart extends ViolationAudit {
   }
 }
 
-module.exports = NotificationOnStart;
-module.exports.UIStrings = UIStrings;
+export default NotificationOnStart;
+export {UIStrings};
diff --git a/lighthouse-core/audits/dobetterweb/password-inputs-can-be-pasted-into.js b/lighthouse-core/audits/dobetterweb/password-inputs-can-be-pasted-into.js
index fb08ef99071a..a6c839497aca 100644
--- a/lighthouse-core/audits/dobetterweb/password-inputs-can-be-pasted-into.js
+++ b/lighthouse-core/audits/dobetterweb/password-inputs-can-be-pasted-into.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import Audit from '../audit.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the ability to paste into password fields. This descriptive title is shown to users when the page allows pasting of content into password fields. */
@@ -62,5 +62,5 @@ class PasswordInputsCanBePastedIntoAudit extends Audit {
   }
 }
 
-module.exports = PasswordInputsCanBePastedIntoAudit;
-module.exports.UIStrings = UIStrings;
+export default PasswordInputsCanBePastedIntoAudit;
+export {UIStrings};
diff --git a/lighthouse-core/audits/dobetterweb/uses-http2.js b/lighthouse-core/audits/dobetterweb/uses-http2.js
index c2e5146e58b2..44f6cc3ea856 100644
--- a/lighthouse-core/audits/dobetterweb/uses-http2.js
+++ b/lighthouse-core/audits/dobetterweb/uses-http2.js
@@ -13,16 +13,17 @@
 /** @typedef {import('../../lib/dependency-graph/simulator/simulator')} Simulator */
 /** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
 
-const Audit = require('../audit.js');
-const ThirdParty = require('../../lib/third-party-web.js');
-const URL = require('../../lib/url-shim.js');
-const ByteEfficiencyAudit = require('../byte-efficiency/byte-efficiency-audit.js');
-const Interactive = require('../../computed/metrics/lantern-interactive.js');
-const NetworkRequest = require('../../lib/network-request.js');
-const NetworkRecords = require('../../computed/network-records.js');
-const LoadSimulator = require('../../computed/load-simulator.js');
-const PageDependencyGraph = require('../../computed/page-dependency-graph.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import Audit from '../audit.js';
+
+import ThirdParty from '../../lib/third-party-web.js';
+import URL from '../../lib/url-shim.js';
+import ByteEfficiencyAudit from '../byte-efficiency/byte-efficiency-audit.js';
+import Interactive 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 i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to enable HTTP/2. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -255,5 +256,5 @@ class UsesHTTP2Audit extends Audit {
   }
 }
 
-module.exports = UsesHTTP2Audit;
-module.exports.UIStrings = UIStrings;
+export default UsesHTTP2Audit;
+export {UIStrings};
diff --git a/lighthouse-core/audits/dobetterweb/uses-passive-event-listeners.js b/lighthouse-core/audits/dobetterweb/uses-passive-event-listeners.js
index db33a7a90c3e..12a46f14b257 100644
--- a/lighthouse-core/audits/dobetterweb/uses-passive-event-listeners.js
+++ b/lighthouse-core/audits/dobetterweb/uses-passive-event-listeners.js
@@ -11,8 +11,8 @@
 
 'use strict';
 
-const ViolationAudit = require('../violation-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import ViolationAudit from '../violation-audit.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the page's use of passive event listeners used to improve the scrolling performance of the page. This descriptive title is shown to users when the page does use passive listeners. */
@@ -64,5 +64,5 @@ class PassiveEventsAudit extends ViolationAudit {
   }
 }
 
-module.exports = PassiveEventsAudit;
-module.exports.UIStrings = UIStrings;
+export default PassiveEventsAudit;
+export {UIStrings};
diff --git a/lighthouse-core/audits/errors-in-console.js b/lighthouse-core/audits/errors-in-console.js
index a1ed54d507ea..6387336c2912 100644
--- a/lighthouse-core/audits/errors-in-console.js
+++ b/lighthouse-core/audits/errors-in-console.js
@@ -10,10 +10,11 @@
  * This is done by collecting Chrome console log messages and filtering out the non-error ones.
  */
 
-const log = require('lighthouse-logger');
-const Audit = require('./audit.js');
-const JsBundles = require('../computed/js-bundles.js');
-const i18n = require('../lib/i18n/i18n.js');
+import log from 'lighthouse-logger';
+
+import Audit from './audit.js';
+import JsBundles from '../computed/js-bundles.js';
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on browser errors. This descriptive title is shown to users when no browser errors were logged into the devtools console. */
@@ -114,5 +115,5 @@ class ErrorLogs extends Audit {
   }
 }
 
-module.exports = ErrorLogs;
-module.exports.UIStrings = UIStrings;
+export default ErrorLogs;
+export {UIStrings};
diff --git a/lighthouse-core/audits/final-screenshot.js b/lighthouse-core/audits/final-screenshot.js
index a67fd069b48d..b4a8a1e516cd 100644
--- a/lighthouse-core/audits/final-screenshot.js
+++ b/lighthouse-core/audits/final-screenshot.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const LHError = require('../lib/lh-error.js');
-const ProcessedTrace = require('../computed/processed-trace.js');
-const Screenshots = require('../computed/screenshots.js');
+import Audit from './audit.js';
+import LHError from '../lib/lh-error.js';
+import ProcessedTrace from '../computed/processed-trace.js';
+import Screenshots from '../computed/screenshots.js';
 
 class FinalScreenshot extends Audit {
   /**
@@ -56,4 +56,4 @@ class FinalScreenshot extends Audit {
   }
 }
 
-module.exports = FinalScreenshot;
+export default FinalScreenshot;
diff --git a/lighthouse-core/audits/font-display.js b/lighthouse-core/audits/font-display.js
index 769f94e8b5d3..587f4d956bee 100644
--- a/lighthouse-core/audits/font-display.js
+++ b/lighthouse-core/audits/font-display.js
@@ -5,14 +5,14 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const URL = require('../lib/url-shim.js');
+import Audit from './audit.js';
+import URL from '../lib/url-shim.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');
-const i18n = require('../lib/i18n/i18n.js');
-const Sentry = require('../lib/sentry.js');
-const NetworkRecords = require('../computed/network-records.js');
+import 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. */
@@ -189,5 +189,5 @@ class FontDisplay extends Audit {
   }
 }
 
-module.exports = FontDisplay;
-module.exports.UIStrings = UIStrings;
+export default FontDisplay;
+export {UIStrings};
diff --git a/lighthouse-core/audits/full-page-screenshot.js b/lighthouse-core/audits/full-page-screenshot.js
index 29e3252e246a..7a4b3d32f843 100644
--- a/lighthouse-core/audits/full-page-screenshot.js
+++ b/lighthouse-core/audits/full-page-screenshot.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
+import Audit from './audit.js';
 
 class FullPageScreenshot extends Audit {
   /**
@@ -40,4 +40,4 @@ class FullPageScreenshot extends Audit {
   }
 }
 
-module.exports = FullPageScreenshot;
+export default FullPageScreenshot;
diff --git a/lighthouse-core/audits/image-aspect-ratio.js b/lighthouse-core/audits/image-aspect-ratio.js
index b81c95cceb9f..e67abc11da25 100644
--- a/lighthouse-core/audits/image-aspect-ratio.js
+++ b/lighthouse-core/audits/image-aspect-ratio.js
@@ -11,9 +11,9 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const URL = require('../lib/url-shim.js');
-const i18n = require('../lib/i18n/i18n.js');
+import Audit from './audit.js';
+import URL from '../lib/url-shim.js';
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the aspect ratios of all images on the page. This descriptive title is shown to users when all images use correct aspect ratios. */
@@ -118,5 +118,5 @@ class ImageAspectRatio extends Audit {
   }
 }
 
-module.exports = ImageAspectRatio;
-module.exports.UIStrings = UIStrings;
+export default ImageAspectRatio;
+export {UIStrings};
diff --git a/lighthouse-core/audits/image-size-responsive.js b/lighthouse-core/audits/image-size-responsive.js
index ec4ff234f523..838a9ff911ba 100644
--- a/lighthouse-core/audits/image-size-responsive.js
+++ b/lighthouse-core/audits/image-size-responsive.js
@@ -10,9 +10,9 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const URL = require('../lib/url-shim.js');
-const i18n = require('../lib/i18n/i18n.js');
+import Audit from './audit.js';
+import URL from '../lib/url-shim.js';
+import i18n from '../lib/i18n/i18n.js';
 
 /** @typedef {LH.Artifacts.ImageElement & Required<Pick<LH.Artifacts.ImageElement, 'naturalDimensions'>>} ImageWithNaturalDimensions */
 
@@ -327,5 +327,5 @@ function quantizeDpr(dpr) {
   return 1.0;
 }
 
-module.exports = ImageSizeResponsive;
-module.exports.UIStrings = UIStrings;
+export default ImageSizeResponsive;
+export {UIStrings};
diff --git a/lighthouse-core/audits/installable-manifest.js b/lighthouse-core/audits/installable-manifest.js
index 271785454d19..7ed7411f0920 100644
--- a/lighthouse-core/audits/installable-manifest.js
+++ b/lighthouse-core/audits/installable-manifest.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
-const ManifestValues = require('../computed/manifest-values.js');
+import Audit from './audit.js';
+import i18n from '../lib/i18n/i18n.js';
+import ManifestValues from '../computed/manifest-values.js';
 
 /* eslint-disable max-len */
 const UIStrings = {
@@ -262,5 +262,5 @@ class InstallableManifest extends Audit {
   }
 }
 
-module.exports = InstallableManifest;
-module.exports.UIStrings = UIStrings;
+export default InstallableManifest;
+export {UIStrings};
diff --git a/lighthouse-core/audits/is-on-https.js b/lighthouse-core/audits/is-on-https.js
index 9cddce28d3ca..cd7b9c77a507 100644
--- a/lighthouse-core/audits/is-on-https.js
+++ b/lighthouse-core/audits/is-on-https.js
@@ -5,11 +5,11 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const URL = require('../lib/url-shim.js');
-const NetworkRequest = require('../lib/network-request.js');
-const NetworkRecords = require('../computed/network-records.js');
-const i18n = require('../lib/i18n/i18n.js');
+import Audit from './audit.js';
+import URL from '../lib/url-shim.js';
+import NetworkRequest from '../lib/network-request.js';
+import NetworkRecords from '../computed/network-records.js';
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the useage of HTTPS on a page. This descriptive title is shown to users when all requests on a page are fufilled using HTTPS. */
@@ -121,5 +121,5 @@ class HTTPS extends Audit {
   }
 }
 
-module.exports = HTTPS;
-module.exports.UIStrings = UIStrings;
+export default HTTPS;
+export {UIStrings};
diff --git a/lighthouse-core/audits/largest-contentful-paint-element.js b/lighthouse-core/audits/largest-contentful-paint-element.js
index 159c2853d820..440410d6658e 100644
--- a/lighthouse-core/audits/largest-contentful-paint-element.js
+++ b/lighthouse-core/audits/largest-contentful-paint-element.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
+import Audit from './audit.js';
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Descriptive title of a diagnostic audit that provides the element that was determined to be the Largest Contentful Paint. */
@@ -66,5 +66,5 @@ class LargestContentfulPaintElement extends Audit {
   }
 }
 
-module.exports = LargestContentfulPaintElement;
-module.exports.UIStrings = UIStrings;
+export default LargestContentfulPaintElement;
+export {UIStrings};
diff --git a/lighthouse-core/audits/layout-shift-elements.js b/lighthouse-core/audits/layout-shift-elements.js
index 6d3f4f9bde5b..b300e2647a12 100644
--- a/lighthouse-core/audits/layout-shift-elements.js
+++ b/lighthouse-core/audits/layout-shift-elements.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
+import Audit from './audit.js';
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Descriptive title of a diagnostic audit that provides up to the top five elements contributing to Cumulative Layout Shift. */
@@ -71,5 +71,5 @@ class LayoutShiftElements extends Audit {
   }
 }
 
-module.exports = LayoutShiftElements;
-module.exports.UIStrings = UIStrings;
+export default LayoutShiftElements;
+export {UIStrings};
diff --git a/lighthouse-core/audits/lcp-lazy-loaded.js b/lighthouse-core/audits/lcp-lazy-loaded.js
index f9d75c889b30..bba892517a62 100644
--- a/lighthouse-core/audits/lcp-lazy-loaded.js
+++ b/lighthouse-core/audits/lcp-lazy-loaded.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
+import Audit from './audit.js';
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on whether the largest above-the-fold image was loaded with sufficient priority. This descriptive title is shown to users when the image was loaded properly. */
@@ -80,5 +80,5 @@ class LargestContentfulPaintLazyLoaded extends Audit {
   }
 }
 
-module.exports = LargestContentfulPaintLazyLoaded;
-module.exports.UIStrings = UIStrings;
+export default LargestContentfulPaintLazyLoaded;
+export {UIStrings};
diff --git a/lighthouse-core/audits/long-tasks.js b/lighthouse-core/audits/long-tasks.js
index 6d59ac742b7c..1648d10a7adc 100644
--- a/lighthouse-core/audits/long-tasks.js
+++ b/lighthouse-core/audits/long-tasks.js
@@ -5,13 +5,13 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const NetworkRecords = require('../computed/network-records.js');
-const i18n = require('../lib/i18n/i18n.js');
-const MainThreadTasks = require('../computed/main-thread-tasks.js');
-const BootupTime = require('./bootup-time.js');
-const PageDependencyGraph = require('../computed/page-dependency-graph.js');
-const LoadSimulator = require('../computed/load-simulator.js');
+import Audit from './audit.js';
+import NetworkRecords from '../computed/network-records.js';
+import i18n from '../lib/i18n/i18n.js';
+import MainThreadTasks from '../computed/main-thread-tasks.js';
+import BootupTime from './bootup-time.js';
+import PageDependencyGraph from '../computed/page-dependency-graph.js';
+import LoadSimulator from '../computed/load-simulator.js';
 
 /** We don't always have timing data for short tasks, if we're missing timing data. Treat it as though it were 0ms. */
 const DEFAULT_TIMING = {startTime: 0, endTime: 0, duration: 0};
@@ -121,5 +121,5 @@ class LongTasks extends Audit {
   }
 }
 
-module.exports = LongTasks;
-module.exports.UIStrings = UIStrings;
+export default LongTasks;
+export {UIStrings};
diff --git a/lighthouse-core/audits/main-thread-tasks.js b/lighthouse-core/audits/main-thread-tasks.js
index 5d90dd333206..f83a862644d9 100644
--- a/lighthouse-core/audits/main-thread-tasks.js
+++ b/lighthouse-core/audits/main-thread-tasks.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const MainThreadTasksComputed = require('../computed/main-thread-tasks.js');
+import Audit from './audit.js';
+import MainThreadTasksComputed from '../computed/main-thread-tasks.js';
 
 class MainThreadTasks extends Audit {
   /**
@@ -56,4 +56,4 @@ class MainThreadTasks extends Audit {
   }
 }
 
-module.exports = MainThreadTasks;
+export default MainThreadTasks;
diff --git a/lighthouse-core/audits/mainthread-work-breakdown.js b/lighthouse-core/audits/mainthread-work-breakdown.js
index 159cd7151c7f..73f29e00f4e3 100644
--- a/lighthouse-core/audits/mainthread-work-breakdown.js
+++ b/lighthouse-core/audits/mainthread-work-breakdown.js
@@ -10,10 +10,10 @@
 
 'use strict';
 
-const Audit = require('./audit.js');
-const {taskGroups} = require('../lib/tracehouse/task-groups.js');
-const i18n = require('../lib/i18n/i18n.js');
-const MainThreadTasks = require('../computed/main-thread-tasks.js');
+import Audit from './audit.js';
+import {taskGroups} from '../lib/tracehouse/task-groups.js';
+import i18n from '../lib/i18n/i18n.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. */
@@ -130,5 +130,5 @@ class MainThreadWorkBreakdown extends Audit {
   }
 }
 
-module.exports = MainThreadWorkBreakdown;
-module.exports.UIStrings = UIStrings;
+export default MainThreadWorkBreakdown;
+export {UIStrings};
diff --git a/lighthouse-core/audits/manual/manual-audit.js b/lighthouse-core/audits/manual/manual-audit.js
index 6eaf37b5e62f..041c7f5f1007 100644
--- a/lighthouse-core/audits/manual/manual-audit.js
+++ b/lighthouse-core/audits/manual/manual-audit.js
@@ -10,7 +10,7 @@
  * their site.
  */
 
-const Audit = require('../audit.js');
+import Audit from '../audit.js';
 
 class ManualAudit extends Audit {
   /**
@@ -34,4 +34,4 @@ class ManualAudit extends Audit {
   }
 }
 
-module.exports = ManualAudit;
+export default ManualAudit;
diff --git a/lighthouse-core/audits/manual/pwa-cross-browser.js b/lighthouse-core/audits/manual/pwa-cross-browser.js
index 82f79379a4cd..e225407452ae 100644
--- a/lighthouse-core/audits/manual/pwa-cross-browser.js
+++ b/lighthouse-core/audits/manual/pwa-cross-browser.js
@@ -6,8 +6,8 @@
  */
 'use strict';
 
-const ManualAudit = require('./manual-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import ManualAudit from './manual-audit.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that prompts the user to manually check that their site works across different web browsers. */
@@ -36,6 +36,6 @@ class PWACrossBrowser extends ManualAudit {
   }
 }
 
-module.exports = PWACrossBrowser;
-module.exports.UIStrings = UIStrings;
+export default PWACrossBrowser;
+export {UIStrings};
 
diff --git a/lighthouse-core/audits/manual/pwa-each-page-has-url.js b/lighthouse-core/audits/manual/pwa-each-page-has-url.js
index 29ac16a0bafc..473cfd3ca2e0 100644
--- a/lighthouse-core/audits/manual/pwa-each-page-has-url.js
+++ b/lighthouse-core/audits/manual/pwa-each-page-has-url.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const ManualAudit = require('./manual-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import ManualAudit from './manual-audit.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that prompts the user to manually check that each page on their website uses a unique URL. */
@@ -35,5 +35,5 @@ class PWAEachPageHasURL extends ManualAudit {
   }
 }
 
-module.exports = PWAEachPageHasURL;
-module.exports.UIStrings = UIStrings;
+export default PWAEachPageHasURL;
+export {UIStrings};
diff --git a/lighthouse-core/audits/manual/pwa-page-transitions.js b/lighthouse-core/audits/manual/pwa-page-transitions.js
index 6906d0e73075..5396ca0edbf7 100644
--- a/lighthouse-core/audits/manual/pwa-page-transitions.js
+++ b/lighthouse-core/audits/manual/pwa-page-transitions.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const ManualAudit = require('./manual-audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import ManualAudit from './manual-audit.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that prompts the user to manually check that page transitions (navigating to other pages on a website) shouldn't feel like they are waiting for the network to load. */
@@ -35,5 +35,5 @@ class PWAPageTransitions extends ManualAudit {
   }
 }
 
-module.exports = PWAPageTransitions;
-module.exports.UIStrings = UIStrings;
+export default PWAPageTransitions;
+export {UIStrings};
diff --git a/lighthouse-core/audits/maskable-icon.js b/lighthouse-core/audits/maskable-icon.js
index 2657d9981001..7fd1619af19e 100644
--- a/lighthouse-core/audits/maskable-icon.js
+++ b/lighthouse-core/audits/maskable-icon.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const ManifestValues = require('../computed/manifest-values.js');
-const i18n = require('../lib/i18n/i18n.js');
+import Audit from './audit.js';
+import ManifestValues from '../computed/manifest-values.js';
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on if the manifest contains a maskable icon. This descriptive title is shown to users when the manifest contains at least one maskable icon. */
@@ -67,5 +67,5 @@ class MaskableIcon extends Audit {
   }
 }
 
-module.exports = MaskableIcon;
-module.exports.UIStrings = UIStrings;
+export default MaskableIcon;
+export {UIStrings};
diff --git a/lighthouse-core/audits/metrics.js b/lighthouse-core/audits/metrics.js
index 79c444f3ca24..d4e943198c11 100644
--- a/lighthouse-core/audits/metrics.js
+++ b/lighthouse-core/audits/metrics.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const ComputedTimingSummary = require('../computed/metrics/timing-summary.js');
+import Audit from './audit.js';
+import ComputedTimingSummary from '../computed/metrics/timing-summary.js';
 
 /** @type {Set<keyof LH.Artifacts.TimingSummary>} */
 const DECIMAL_METRIC_KEYS = new Set([
@@ -71,4 +71,4 @@ class Metrics extends Audit {
   }
 }
 
-module.exports = Metrics;
+export default Metrics;
diff --git a/lighthouse-core/audits/metrics/cumulative-layout-shift.js b/lighthouse-core/audits/metrics/cumulative-layout-shift.js
index eb97cc531066..62fefdf343f1 100644
--- a/lighthouse-core/audits/metrics/cumulative-layout-shift.js
+++ b/lighthouse-core/audits/metrics/cumulative-layout-shift.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const ComputedCLS = require('../../computed/metrics/cumulative-layout-shift.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import Audit from '../audit.js';
+import ComputedCLS from '../../computed/metrics/cumulative-layout-shift.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Description of the Cumulative Layout Shift metric that indicates how much the page changes its layout while it loads. If big segments of the page shift their location during load, the Cumulative Layout Shift will be higher. This description 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. */
@@ -75,5 +75,5 @@ class CumulativeLayoutShift extends Audit {
   }
 }
 
-module.exports = CumulativeLayoutShift;
-module.exports.UIStrings = UIStrings;
+export default CumulativeLayoutShift;
+export {UIStrings};
diff --git a/lighthouse-core/audits/metrics/experimental-interaction-to-next-paint.js b/lighthouse-core/audits/metrics/experimental-interaction-to-next-paint.js
index 2ef0c4ae2d42..b71666a77ff7 100644
--- a/lighthouse-core/audits/metrics/experimental-interaction-to-next-paint.js
+++ b/lighthouse-core/audits/metrics/experimental-interaction-to-next-paint.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const ComputedResponsivenes = require('../../computed/metrics/responsiveness.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import {Audit} from '../audit.js';
+import ComputedResponsivenes from '../../computed/metrics/responsiveness.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Description of the Interaction to Next Paint metric. This description 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. */
@@ -80,5 +80,5 @@ class ExperimentalInteractionToNextPaint extends Audit {
   }
 }
 
-module.exports = ExperimentalInteractionToNextPaint;
-module.exports.UIStrings = UIStrings;
+export default ExperimentalInteractionToNextPaint;
+export {UIStrings};
diff --git a/lighthouse-core/audits/metrics/first-contentful-paint-3g.js b/lighthouse-core/audits/metrics/first-contentful-paint-3g.js
index 3df6362a12e1..8fb222d02642 100644
--- a/lighthouse-core/audits/metrics/first-contentful-paint-3g.js
+++ b/lighthouse-core/audits/metrics/first-contentful-paint-3g.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
+import Audit from '../audit.js';
 const regular3G = require('../../config/constants.js').throttling.mobileRegular3G;
-const ComputedFcp = require('../../computed/metrics/first-contentful-paint.js');
+import ComputedFcp from '../../computed/metrics/first-contentful-paint.js';
 
 class FirstContentfulPaint3G extends Audit {
   /**
@@ -64,4 +64,4 @@ class FirstContentfulPaint3G extends Audit {
   }
 }
 
-module.exports = FirstContentfulPaint3G;
+export default FirstContentfulPaint3G;
diff --git a/lighthouse-core/audits/metrics/first-contentful-paint.js b/lighthouse-core/audits/metrics/first-contentful-paint.js
index fb5823fad971..5c103e1cc98a 100644
--- a/lighthouse-core/audits/metrics/first-contentful-paint.js
+++ b/lighthouse-core/audits/metrics/first-contentful-paint.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
-const ComputedFcp = require('../../computed/metrics/first-contentful-paint.js');
+import Audit from '../audit.js';
+import i18n from '../../lib/i18n/i18n.js';
+import 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. */
@@ -82,5 +82,5 @@ class FirstContentfulPaint extends Audit {
   }
 }
 
-module.exports = FirstContentfulPaint;
-module.exports.UIStrings = UIStrings;
+export default FirstContentfulPaint;
+export {UIStrings};
diff --git a/lighthouse-core/audits/metrics/first-meaningful-paint.js b/lighthouse-core/audits/metrics/first-meaningful-paint.js
index 80789c9cbdc0..6c8574bdae8f 100644
--- a/lighthouse-core/audits/metrics/first-meaningful-paint.js
+++ b/lighthouse-core/audits/metrics/first-meaningful-paint.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
-const ComputedFmp = require('../../computed/metrics/first-meaningful-paint.js');
+import Audit from '../audit.js';
+import i18n from '../../lib/i18n/i18n.js';
+import 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. */
@@ -86,5 +86,5 @@ class FirstMeaningfulPaint extends Audit {
   }
 }
 
-module.exports = FirstMeaningfulPaint;
-module.exports.UIStrings = UIStrings;
+export default FirstMeaningfulPaint;
+export {UIStrings};
diff --git a/lighthouse-core/audits/metrics/interactive.js b/lighthouse-core/audits/metrics/interactive.js
index 989f8c2e44c2..ac4c32112e81 100644
--- a/lighthouse-core/audits/metrics/interactive.js
+++ b/lighthouse-core/audits/metrics/interactive.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
-const Interactive = require('../../computed/metrics/interactive.js');
+import Audit from '../audit.js';
+import i18n from '../../lib/i18n/i18n.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. */
@@ -90,5 +90,5 @@ class InteractiveMetric extends Audit {
   }
 }
 
-module.exports = InteractiveMetric;
-module.exports.UIStrings = UIStrings;
+export default InteractiveMetric;
+export {UIStrings};
diff --git a/lighthouse-core/audits/metrics/largest-contentful-paint.js b/lighthouse-core/audits/metrics/largest-contentful-paint.js
index 659eee21db4b..ca63cade4fb1 100644
--- a/lighthouse-core/audits/metrics/largest-contentful-paint.js
+++ b/lighthouse-core/audits/metrics/largest-contentful-paint.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
-const ComputedLcp = require('../../computed/metrics/largest-contentful-paint.js');
-const LHError = require('../../lib/lh-error.js');
+import Audit from '../audit.js';
+import i18n from '../../lib/i18n/i18n.js';
+import ComputedLcp from '../../computed/metrics/largest-contentful-paint.js';
+import LHError from '../../lib/lh-error.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. */
@@ -111,5 +111,5 @@ class LargestContentfulPaint extends Audit {
   }
 }
 
-module.exports = LargestContentfulPaint;
-module.exports.UIStrings = UIStrings;
+export default LargestContentfulPaint;
+export {UIStrings};
diff --git a/lighthouse-core/audits/metrics/max-potential-fid.js b/lighthouse-core/audits/metrics/max-potential-fid.js
index 464a073e5060..fcd4dbca35e5 100644
--- a/lighthouse-core/audits/metrics/max-potential-fid.js
+++ b/lighthouse-core/audits/metrics/max-potential-fid.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const ComputedFid = require('../../computed/metrics/max-potential-fid.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import Audit from '../audit.js';
+import ComputedFid from '../../computed/metrics/max-potential-fid.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Description of the Maximum Potential First Input Delay metric that marks the maximum estimated time between the page receiving input (a user clicking, tapping, or typing) and the page responding. This description 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. */
@@ -73,5 +73,5 @@ class MaxPotentialFID extends Audit {
   }
 }
 
-module.exports = MaxPotentialFID;
-module.exports.UIStrings = UIStrings;
+export default MaxPotentialFID;
+export {UIStrings};
diff --git a/lighthouse-core/audits/metrics/speed-index.js b/lighthouse-core/audits/metrics/speed-index.js
index 884bd53e7dce..70577cbbc8a3 100644
--- a/lighthouse-core/audits/metrics/speed-index.js
+++ b/lighthouse-core/audits/metrics/speed-index.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
-const ComputedSi = require('../../computed/metrics/speed-index.js');
+import Audit from '../audit.js';
+import i18n from '../../lib/i18n/i18n.js';
+import 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. */
@@ -85,5 +85,5 @@ class SpeedIndex extends Audit {
   }
 }
 
-module.exports = SpeedIndex;
-module.exports.UIStrings = UIStrings;
+export default SpeedIndex;
+export {UIStrings};
diff --git a/lighthouse-core/audits/metrics/total-blocking-time.js b/lighthouse-core/audits/metrics/total-blocking-time.js
index 77843ac00454..41eb5786c662 100644
--- a/lighthouse-core/audits/metrics/total-blocking-time.js
+++ b/lighthouse-core/audits/metrics/total-blocking-time.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const ComputedTBT = require('../../computed/metrics/total-blocking-time.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import Audit from '../audit.js';
+import ComputedTBT from '../../computed/metrics/total-blocking-time.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Description of the Total Blocking Time (TBT) metric, which calculates the total duration of blocking time for a web page. Blocking times are time periods when the page would be blocked (prevented) from responding to user input (clicks, taps, and keypresses will feel slow to respond). This is displayed within a tooltip when the user hovers on the metric name to see more. No character length limits.*/
@@ -114,5 +114,5 @@ class TotalBlockingTime extends Audit {
   }
 }
 
-module.exports = TotalBlockingTime;
-module.exports.UIStrings = UIStrings;
+export default TotalBlockingTime;
+export {UIStrings};
diff --git a/lighthouse-core/audits/multi-check-audit.js b/lighthouse-core/audits/multi-check-audit.js
index d6eea7f97b87..52670f878b09 100644
--- a/lighthouse-core/audits/multi-check-audit.js
+++ b/lighthouse-core/audits/multi-check-audit.js
@@ -9,7 +9,7 @@
  * @fileoverview Base class for boolean audits that can have multiple reasons for failure
  */
 
-const Audit = require('./audit.js');
+import Audit from './audit.js';
 
 class MultiCheckAudit extends Audit {
   /**
@@ -80,4 +80,4 @@ class MultiCheckAudit extends Audit {
   /* eslint-enable no-unused-vars */
 }
 
-module.exports = MultiCheckAudit;
+export default MultiCheckAudit;
diff --git a/lighthouse-core/audits/network-requests.js b/lighthouse-core/audits/network-requests.js
index 870154af807e..0832db88a845 100644
--- a/lighthouse-core/audits/network-requests.js
+++ b/lighthouse-core/audits/network-requests.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const URL = require('../lib/url-shim.js');
-const NetworkRecords = require('../computed/network-records.js');
+import Audit from './audit.js';
+import URL from '../lib/url-shim.js';
+import NetworkRecords from '../computed/network-records.js';
 
 class NetworkRequests extends Audit {
   /**
@@ -100,4 +100,4 @@ class NetworkRequests extends Audit {
   }
 }
 
-module.exports = NetworkRequests;
+export default NetworkRequests;
diff --git a/lighthouse-core/audits/network-rtt.js b/lighthouse-core/audits/network-rtt.js
index 3b35357b1908..0d49395c8692 100644
--- a/lighthouse-core/audits/network-rtt.js
+++ b/lighthouse-core/audits/network-rtt.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
-const NetworkRecords = require('../computed/network-records.js');
-const NetworkAnalysisComputed = require('../computed/network-analysis.js');
+import Audit from './audit.js';
+import i18n from '../lib/i18n/i18n.js';
+import NetworkRecords from '../computed/network-records.js';
+import NetworkAnalysisComputed 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. */
@@ -86,5 +86,5 @@ class NetworkRTT extends Audit {
   }
 }
 
-module.exports = NetworkRTT;
-module.exports.UIStrings = UIStrings;
+export default NetworkRTT;
+export {UIStrings};
diff --git a/lighthouse-core/audits/network-server-latency.js b/lighthouse-core/audits/network-server-latency.js
index f7a849778a3a..578bf87bc769 100644
--- a/lighthouse-core/audits/network-server-latency.js
+++ b/lighthouse-core/audits/network-server-latency.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
-const NetworkRecords = require('../computed/network-records.js');
-const NetworkAnalysisComputed = require('../computed/network-analysis.js');
+import Audit from './audit.js';
+import i18n from '../lib/i18n/i18n.js';
+import NetworkRecords from '../computed/network-records.js';
+import NetworkAnalysisComputed 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. */
@@ -85,5 +85,5 @@ class NetworkServerLatency extends Audit {
   }
 }
 
-module.exports = NetworkServerLatency;
-module.exports.UIStrings = UIStrings;
+export default NetworkServerLatency;
+export {UIStrings};
diff --git a/lighthouse-core/audits/no-unload-listeners.js b/lighthouse-core/audits/no-unload-listeners.js
index a93c885801d6..8f6a24ce5821 100644
--- a/lighthouse-core/audits/no-unload-listeners.js
+++ b/lighthouse-core/audits/no-unload-listeners.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const JsBundles = require('../computed/js-bundles.js');
-const i18n = require('./../lib/i18n/i18n.js');
+import Audit from './audit.js';
+import JsBundles from '../computed/js-bundles.js';
+import i18n from './../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Descriptive title of a Lighthouse audit that checks if a web page has 'unload' event listeners and finds none. */
@@ -83,5 +83,5 @@ class NoUnloadListeners extends Audit {
   }
 }
 
-module.exports = NoUnloadListeners;
-module.exports.UIStrings = UIStrings;
+export default NoUnloadListeners;
+export {UIStrings};
diff --git a/lighthouse-core/audits/non-composited-animations.js b/lighthouse-core/audits/non-composited-animations.js
index b0691e4ed273..f167db93d278 100644
--- a/lighthouse-core/audits/non-composited-animations.js
+++ b/lighthouse-core/audits/non-composited-animations.js
@@ -11,8 +11,9 @@
  * https://docs.google.com/document/d/1XKcJP2CKmNKfOcDsVvliAQ-e1H9C1nf2H-pzTdyafAA/edit?usp=sharing
  */
 
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
+import Audit from './audit.js';
+
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a diagnostic LH audit that provides details on animations that are not composited. */
@@ -202,5 +203,5 @@ class NonCompositedAnimations extends Audit {
   }
 }
 
-module.exports = NonCompositedAnimations;
-module.exports.UIStrings = UIStrings;
+export default NonCompositedAnimations;
+export {UIStrings};
diff --git a/lighthouse-core/audits/oopif-iframe-test-audit.js b/lighthouse-core/audits/oopif-iframe-test-audit.js
index 08071aa29078..ed7263cb1ff2 100644
--- a/lighthouse-core/audits/oopif-iframe-test-audit.js
+++ b/lighthouse-core/audits/oopif-iframe-test-audit.js
@@ -18,7 +18,7 @@
  * test-only audit in our core list instead.
  */
 
-module.exports = {
+export default {
   meta: {
     id: 'oopif-iframe-test-audit',
     title: 'IFrame Elements',
diff --git a/lighthouse-core/audits/performance-budget.js b/lighthouse-core/audits/performance-budget.js
index e737e78ea887..0262b90a5257 100644
--- a/lighthouse-core/audits/performance-budget.js
+++ b/lighthouse-core/audits/performance-budget.js
@@ -5,11 +5,11 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const ResourceSummary = require('../computed/resource-summary.js');
-const MainResource = require('../computed/main-resource.js');
-const Budget = require('../config/budget.js');
-const i18n = require('../lib/i18n/i18n.js');
+import Audit from './audit.js';
+import ResourceSummary from '../computed/resource-summary.js';
+import MainResource from '../computed/main-resource.js';
+import Budget from '../config/budget.js';
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that compares the size and quantity of page resources against targets set by the user. These targets are thought of as "performance budgets" because these metrics impact page performance (i.e. how quickly a page loads). */
@@ -150,5 +150,5 @@ class ResourceBudget extends Audit {
   }
 }
 
-module.exports = ResourceBudget;
-module.exports.UIStrings = UIStrings;
+export default ResourceBudget;
+export {UIStrings};
diff --git a/lighthouse-core/audits/predictive-perf.js b/lighthouse-core/audits/predictive-perf.js
index 1eaa6d562075..ec525b60b34b 100644
--- a/lighthouse-core/audits/predictive-perf.js
+++ b/lighthouse-core/audits/predictive-perf.js
@@ -5,14 +5,13 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
-
-const LanternFcp = require('../computed/metrics/lantern-first-contentful-paint.js');
-const LanternFmp = require('../computed/metrics/lantern-first-meaningful-paint.js');
-const LanternInteractive = require('../computed/metrics/lantern-interactive.js');
-const LanternSpeedIndex = require('../computed/metrics/lantern-speed-index.js');
-const LanternLcp = require('../computed/metrics/lantern-largest-contentful-paint.js');
+import Audit from './audit.js';
+import 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';
 
 // Parameters (in ms) for log-normal CDF scoring. To see the curve:
 //   https://www.desmos.com/calculator/bksgkihhj8
@@ -99,4 +98,4 @@ class PredictivePerf extends Audit {
   }
 }
 
-module.exports = PredictivePerf;
+export default PredictivePerf;
diff --git a/lighthouse-core/audits/preload-fonts.js b/lighthouse-core/audits/preload-fonts.js
index 80cad4a712be..ef81b3a98426 100644
--- a/lighthouse-core/audits/preload-fonts.js
+++ b/lighthouse-core/audits/preload-fonts.js
@@ -10,11 +10,12 @@
  * Audit that checks whether fonts that use `font-display: optional` were preloaded.
  */
 
-const Audit = require('./audit.js');
-const i18n = require('./../lib/i18n/i18n.js');
-const FontDisplay = require('./../audits/font-display.js');
+import Audit from './audit.js';
+
+import i18n from './../lib/i18n/i18n.js';
+import FontDisplay from './../audits/font-display.js';
 const PASSING_FONT_DISPLAY_REGEX = /^(optional)$/;
-const NetworkRecords = require('../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. */
@@ -103,5 +104,5 @@ class PreloadFontsAudit extends Audit {
   }
 }
 
-module.exports = PreloadFontsAudit;
-module.exports.UIStrings = UIStrings;
+export default PreloadFontsAudit;
+export {UIStrings};
diff --git a/lighthouse-core/audits/preload-lcp-image.js b/lighthouse-core/audits/preload-lcp-image.js
index d2f9a5e8d18b..1a3c15bf28c8 100644
--- a/lighthouse-core/audits/preload-lcp-image.js
+++ b/lighthouse-core/audits/preload-lcp-image.js
@@ -5,13 +5,13 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
-const NetworkRequest = require('../lib/network-request.js');
-const MainResource = require('../computed/main-resource.js');
-const LanternLCP = require('../computed/metrics/lantern-largest-contentful-paint.js');
-const LoadSimulator = require('../computed/load-simulator.js');
-const UnusedBytes = require('./byte-efficiency/byte-efficiency-audit.js');
+import Audit from './audit.js';
+import 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 UnusedBytes from './byte-efficiency/byte-efficiency-audit.js';
 
 const UIStrings = {
   /** Title of a lighthouse audit that tells a user to preload an image in order to improve their LCP time. */
@@ -238,5 +238,5 @@ class PreloadLCPImageAudit extends Audit {
   }
 }
 
-module.exports = PreloadLCPImageAudit;
-module.exports.UIStrings = UIStrings;
+export default PreloadLCPImageAudit;
+export {UIStrings};
diff --git a/lighthouse-core/audits/redirects.js b/lighthouse-core/audits/redirects.js
index a1a75222a485..a56c0dc2557c 100644
--- a/lighthouse-core/audits/redirects.js
+++ b/lighthouse-core/audits/redirects.js
@@ -5,13 +5,13 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const UnusedBytes = require('./byte-efficiency/byte-efficiency-audit.js');
-const i18n = require('../lib/i18n/i18n.js');
-const ProcessedTrace = require('../computed/processed-trace.js');
-const NetworkRecords = require('../computed/network-records.js');
-const MainResource = require('../computed/main-resource.js');
-const LanternInteractive = require('../computed/metrics/lantern-interactive.js');
+import Audit from './audit.js';
+import UnusedBytes from './byte-efficiency/byte-efficiency-audit.js';
+import 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';
 
 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. */
@@ -159,5 +159,5 @@ class Redirects extends Audit {
   }
 }
 
-module.exports = Redirects;
-module.exports.UIStrings = UIStrings;
+export default Redirects;
+export {UIStrings};
diff --git a/lighthouse-core/audits/resource-summary.js b/lighthouse-core/audits/resource-summary.js
index 5646b9fe1c63..197a0344df65 100644
--- a/lighthouse-core/audits/resource-summary.js
+++ b/lighthouse-core/audits/resource-summary.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const ComputedResourceSummary = require('../computed/resource-summary.js');
-const i18n = require('../lib/i18n/i18n.js');
+import Audit from './audit.js';
+import ComputedResourceSummary from '../computed/resource-summary.js';
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to minimize the size and quantity of resources used to load the page. */
@@ -100,5 +100,5 @@ class ResourceSummary extends Audit {
   }
 }
 
-module.exports = ResourceSummary;
-module.exports.UIStrings = UIStrings;
+export default ResourceSummary;
+export {UIStrings};
diff --git a/lighthouse-core/audits/screenshot-thumbnails.js b/lighthouse-core/audits/screenshot-thumbnails.js
index 277cc720b4cf..8828e78c924d 100644
--- a/lighthouse-core/audits/screenshot-thumbnails.js
+++ b/lighthouse-core/audits/screenshot-thumbnails.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const LHError = require('../lib/lh-error.js');
-const jpeg = require('jpeg-js');
-const Speedline = require('../computed/speedline.js');
+import Audit from './audit.js';
+import LHError from '../lib/lh-error.js';
+import jpeg from 'jpeg-js';
+import Speedline from '../computed/speedline.js';
 
 const NUMBER_OF_THUMBNAILS = 10;
 const THUMBNAIL_WIDTH = 120;
@@ -160,4 +160,4 @@ class ScreenshotThumbnails extends Audit {
   }
 }
 
-module.exports = ScreenshotThumbnails;
+export default ScreenshotThumbnails;
diff --git a/lighthouse-core/audits/script-elements-test-audit.js b/lighthouse-core/audits/script-elements-test-audit.js
index 2078dca89b9c..b08df7b81701 100644
--- a/lighthouse-core/audits/script-elements-test-audit.js
+++ b/lighthouse-core/audits/script-elements-test-audit.js
@@ -18,7 +18,7 @@
  * test-only audit in our core list instead.
  */
 
-module.exports = {
+export default {
   meta: {
     id: 'script-elements-test-audit',
     title: 'ScriptElements',
diff --git a/lighthouse-core/audits/script-treemap-data.js b/lighthouse-core/audits/script-treemap-data.js
index 0e46533a3a97..c049bbe74646 100644
--- a/lighthouse-core/audits/script-treemap-data.js
+++ b/lighthouse-core/audits/script-treemap-data.js
@@ -15,11 +15,12 @@
  * @typedef {Omit<LH.Treemap.Node, 'name'|'children'>} SourceData
  */
 
-const Audit = require('./audit.js');
-const JsBundles = require('../computed/js-bundles.js');
-const UnusedJavaScriptSummary = require('../computed/unused-javascript-summary.js');
-const ModuleDuplication = require('../computed/module-duplication.js');
-const {isInline} = require('../lib/script-helpers.js');
+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 {isInline} from '../lib/script-helpers.js';
 
 class ScriptTreemapDataAudit extends Audit {
   /**
@@ -285,4 +286,4 @@ class ScriptTreemapDataAudit extends Audit {
   }
 }
 
-module.exports = ScriptTreemapDataAudit;
+export default ScriptTreemapDataAudit;
diff --git a/lighthouse-core/audits/seo/canonical.js b/lighthouse-core/audits/seo/canonical.js
index 99aa4bae015c..057819e973cb 100644
--- a/lighthouse-core/audits/seo/canonical.js
+++ b/lighthouse-core/audits/seo/canonical.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const URL = require('../../lib/url-shim.js');
-const MainResource = require('../../computed/main-resource.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import Audit from '../audit.js';
+import URL from '../../lib/url-shim.js';
+import MainResource from '../../computed/main-resource.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on a page's rel=canonical link. This descriptive title is shown to users when the rel=canonical link is valid. "rel=canonical" is an HTML attribute and value and so should not be translated. */
@@ -214,5 +214,5 @@ class Canonical extends Audit {
   }
 }
 
-module.exports = Canonical;
-module.exports.UIStrings = UIStrings;
+export default Canonical;
+export {UIStrings};
diff --git a/lighthouse-core/audits/seo/crawlable-anchors.js b/lighthouse-core/audits/seo/crawlable-anchors.js
index 821208300258..7966aa446126 100644
--- a/lighthouse-core/audits/seo/crawlable-anchors.js
+++ b/lighthouse-core/audits/seo/crawlable-anchors.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import Audit from '../audit.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on whether links have potentially-crawlable href attributes. This descriptive title is shown when all links on the page are potentially-crawlable. */
@@ -90,5 +90,5 @@ class CrawlableAnchors extends Audit {
   }
 }
 
-module.exports = CrawlableAnchors;
-module.exports.UIStrings = UIStrings;
+export default CrawlableAnchors;
+export {UIStrings};
diff --git a/lighthouse-core/audits/seo/font-size.js b/lighthouse-core/audits/seo/font-size.js
index 0a212c080234..bf66f605a055 100644
--- a/lighthouse-core/audits/seo/font-size.js
+++ b/lighthouse-core/audits/seo/font-size.js
@@ -7,9 +7,10 @@
 
 /** @typedef {LH.Artifacts.FontSize['analyzedFailingNodesData'][0]} FailingNodeData */
 
-const i18n = require('../../lib/i18n/i18n.js');
-const Audit = require('../audit.js');
-const ComputedViewportMeta = require('../../computed/viewport-meta.js');
+import i18n from '../../lib/i18n/i18n.js';
+
+import Audit from '../audit.js';
+import ComputedViewportMeta from '../../computed/viewport-meta.js';
 const MINIMAL_PERCENTAGE_OF_LEGIBLE_TEXT = 60;
 
 const UIStrings = {
@@ -340,5 +341,5 @@ class FontSize extends Audit {
   }
 }
 
-module.exports = FontSize;
-module.exports.UIStrings = UIStrings;
+export default FontSize;
+export {UIStrings};
diff --git a/lighthouse-core/audits/seo/hreflang.js b/lighthouse-core/audits/seo/hreflang.js
index 3749560332f1..a6383ce796b6 100644
--- a/lighthouse-core/audits/seo/hreflang.js
+++ b/lighthouse-core/audits/seo/hreflang.js
@@ -9,9 +9,10 @@
 /** @typedef {{source: Source, subItems: {type: 'subitems', items: SubItem[]}}} InvalidHreflang */
 /** @typedef {{reason: LH.IcuMessage}} SubItem */
 
-const Audit = require('../audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
-const {isValidLang} = require('../../../third-party/axe/valid-langs.js');
+import Audit from '../audit.js';
+
+import i18n from '../../lib/i18n/i18n.js';
+import {isValidLang} from '../../../third-party/axe/valid-langs.js';
 
 const NO_LANGUAGE = 'x-default';
 
@@ -145,5 +146,5 @@ class Hreflang extends Audit {
   }
 }
 
-module.exports = Hreflang;
-module.exports.UIStrings = UIStrings;
+export default Hreflang;
+export {UIStrings};
diff --git a/lighthouse-core/audits/seo/http-status-code.js b/lighthouse-core/audits/seo/http-status-code.js
index 9814b2bc72a1..08d150c8c36e 100644
--- a/lighthouse-core/audits/seo/http-status-code.js
+++ b/lighthouse-core/audits/seo/http-status-code.js
@@ -5,11 +5,11 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
+import Audit from '../audit.js';
 const HTTP_UNSUCCESSFUL_CODE_LOW = 400;
 const HTTP_UNSUCCESSFUL_CODE_HIGH = 599;
-const i18n = require('../../lib/i18n/i18n.js');
-const MainResource = require('../../computed/main-resource.js');
+import i18n from '../../lib/i18n/i18n.js';
+import MainResource from '../../computed/main-resource.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the HTTP status code a page responds with. This descriptive title is shown when the page has responded with a valid HTTP status code. */
@@ -64,5 +64,5 @@ class HTTPStatusCode extends Audit {
   }
 }
 
-module.exports = HTTPStatusCode;
-module.exports.UIStrings = UIStrings;
+export default HTTPStatusCode;
+export {UIStrings};
diff --git a/lighthouse-core/audits/seo/is-crawlable.js b/lighthouse-core/audits/seo/is-crawlable.js
index f356589e9b20..731024ef25f0 100644
--- a/lighthouse-core/audits/seo/is-crawlable.js
+++ b/lighthouse-core/audits/seo/is-crawlable.js
@@ -5,18 +5,20 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
+import Audit from '../audit.js';
+
 // TODO(esmodules): cast can be removed when this switches to import.
-const robotsParser = /** @type {typeof import('robots-parser').default} */ (/** @type {unknown} */(require('robots-parser'))); // eslint-disable-line max-len
-const URL = require('../../lib/url-shim.js');
-const MainResource = require('../../computed/main-resource.js');
+import robotsParser from 'robots-parser'; // eslint-disable-line max-len
+
+import URL from '../../lib/url-shim.js';
+import MainResource from '../../computed/main-resource.js';
 const BLOCKLIST = new Set([
   'noindex',
   'none',
 ]);
 const ROBOTS_HEADER = 'x-robots-tag';
 const UNAVAILABLE_AFTER = 'unavailable_after';
-const i18n = require('../../lib/i18n/i18n.js');
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on if search-engine crawlers are blocked from indexing the page. This title is shown when the page is not blocked from indexing and can be crawled. */
@@ -151,5 +153,5 @@ class IsCrawlable extends Audit {
   }
 }
 
-module.exports = IsCrawlable;
-module.exports.UIStrings = UIStrings;
+export default IsCrawlable;
+export {UIStrings};
diff --git a/lighthouse-core/audits/seo/link-text.js b/lighthouse-core/audits/seo/link-text.js
index e451035199f9..880f1955453b 100644
--- a/lighthouse-core/audits/seo/link-text.js
+++ b/lighthouse-core/audits/seo/link-text.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const URL = require('../../lib/url-shim.js');
+import Audit from '../audit.js';
+import URL from '../../lib/url-shim.js';
 const BLOCKLIST = new Set([
   // English
   'click here',
@@ -74,7 +74,7 @@ const BLOCKLIST = new Set([
   'mer info',
   'mer information',
 ]);
-const i18n = require('../../lib/i18n/i18n.js');
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that tests if each link on a page contains a sufficient description of what a user will find when they click it. Generic, non-descriptive text like "click here" doesn't give an indication of what the link leads to. This descriptive title is shown when all links on the page have sufficient textual descriptions. */
@@ -156,5 +156,5 @@ class LinkText extends Audit {
   }
 }
 
-module.exports = LinkText;
-module.exports.UIStrings = UIStrings;
+export default LinkText;
+export {UIStrings};
diff --git a/lighthouse-core/audits/seo/manual/structured-data.js b/lighthouse-core/audits/seo/manual/structured-data.js
index d87bfbb09153..b4ec57a7ead7 100644
--- a/lighthouse-core/audits/seo/manual/structured-data.js
+++ b/lighthouse-core/audits/seo/manual/structured-data.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const ManualAudit = require('../../manual/manual-audit.js');
-const i18n = require('../../../lib/i18n/i18n.js');
+import ManualAudit from '../../manual/manual-audit.js';
+import i18n from '../../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Description of a Lighthouse audit that provides detail on the structured data in a page. "Structured data" is a standardized data format on a page that helps a search engine categorize and understand its contents. This description is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation. */
@@ -34,5 +34,5 @@ class StructuredData extends ManualAudit {
   }
 }
 
-module.exports = StructuredData;
-module.exports.UIStrings = UIStrings;
+export default StructuredData;
+export {UIStrings};
diff --git a/lighthouse-core/audits/seo/meta-description.js b/lighthouse-core/audits/seo/meta-description.js
index 88d5bfb5eb03..658d60c17aef 100644
--- a/lighthouse-core/audits/seo/meta-description.js
+++ b/lighthouse-core/audits/seo/meta-description.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import Audit from '../audit.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the web page's document meta description. This descriptive title is shown when the document has a meta description. "meta" should be left untranslated because it refers to an HTML element. */
@@ -63,5 +63,5 @@ class Description extends Audit {
   }
 }
 
-module.exports = Description;
-module.exports.UIStrings = UIStrings;
+export default Description;
+export {UIStrings};
diff --git a/lighthouse-core/audits/seo/plugins.js b/lighthouse-core/audits/seo/plugins.js
index 6b2d2c338a92..35db743a8225 100644
--- a/lighthouse-core/audits/seo/plugins.js
+++ b/lighthouse-core/audits/seo/plugins.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('../audit.js');
-const URL = require('../../lib/url-shim.js');
+import Audit from '../audit.js';
+import URL from '../../lib/url-shim.js';
 
 const JAVA_APPLET_TYPE = 'application/x-java-applet';
 const JAVA_BEAN_TYPE = 'application/x-java-bean';
@@ -31,7 +31,7 @@ const SOURCE_PARAMS = new Set([
   'source',
   'src',
 ]);
-const i18n = require('../../lib/i18n/i18n.js');
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the browser plugins used by the page. This descriptive title is shown when there is no plugin content on the page that would restrict search indexing. */
@@ -148,5 +148,5 @@ class Plugins extends Audit {
   }
 }
 
-module.exports = Plugins;
-module.exports.UIStrings = UIStrings;
+export default Plugins;
+export {UIStrings};
diff --git a/lighthouse-core/audits/seo/robots-txt.js b/lighthouse-core/audits/seo/robots-txt.js
index 13fecbe49d26..ea9528401c9b 100644
--- a/lighthouse-core/audits/seo/robots-txt.js
+++ b/lighthouse-core/audits/seo/robots-txt.js
@@ -12,8 +12,9 @@
  * https://github.com/GoogleChrome/lighthouse/issues/4356#issuecomment-375489925
  */
 
-const Audit = require('../audit.js');
-const URL = require('../../lib/url-shim.js');
+import Audit from '../audit.js';
+
+import URL from '../../lib/url-shim.js';
 
 const HTTP_CLIENT_ERROR_CODE_LOW = 400;
 const HTTP_SERVER_ERROR_CODE_LOW = 500;
@@ -31,7 +32,7 @@ const DIRECTIVE_SAFELIST = new Set([
   'request-rate', 'visit-time', 'noindex', // not officially supported, but used in the wild
 ]);
 const SITEMAP_VALID_PROTOCOLS = new Set(['https:', 'http:', 'ftp:']);
-const i18n = require('../../lib/i18n/i18n.js');
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the site's robots.txt file. Note: "robots.txt" is a canonical filename and should not be translated. This descriptive title is shown when the robots.txt file is present and configured correctly. */
@@ -252,5 +253,5 @@ class RobotsTxt extends Audit {
   }
 }
 
-module.exports = RobotsTxt;
-module.exports.UIStrings = UIStrings;
+export default RobotsTxt;
+export {UIStrings};
diff --git a/lighthouse-core/audits/seo/tap-targets.js b/lighthouse-core/audits/seo/tap-targets.js
index 846d112fb582..6e77565d623e 100644
--- a/lighthouse-core/audits/seo/tap-targets.js
+++ b/lighthouse-core/audits/seo/tap-targets.js
@@ -9,18 +9,21 @@
  * @fileoverview Checks that links, buttons, etc. are sufficiently large and that there's
  * no other tap target that's too close so that the user might accidentally tap on.
  */
-const Audit = require('../audit.js');
-const ComputedViewportMeta = require('../../computed/viewport-meta.js');
-const {
+import Audit from '../audit.js';
+
+import ComputedViewportMeta from '../../computed/viewport-meta.js';
+
+import {
   rectsTouchOrOverlap,
   getRectOverlapArea,
   getRectAtCenter,
   allRectsContainedWithinEachOther,
   getLargestRect,
   getBoundingRectWithPadding,
-} = require('../../lib/rect-helpers.js');
-const {getTappableRectsFromClientRects} = require('../../lib/tappable-rects.js');
-const i18n = require('../../lib/i18n/i18n.js');
+} from '../../lib/rect-helpers.js';
+
+import {getTappableRectsFromClientRects} from '../../lib/tappable-rects.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on whether tap targets (like buttons and links) on a page are big enough so they can easily be tapped on a mobile device. This descriptive title is shown when tap targets are easy to tap on. */
@@ -317,8 +320,8 @@ class TapTargets extends Audit {
 
 TapTargets.FINGER_SIZE_PX = FINGER_SIZE_PX;
 
-module.exports = TapTargets;
-module.exports.UIStrings = UIStrings;
+export default TapTargets;
+export {UIStrings};
 
 
 /** @typedef {{
diff --git a/lighthouse-core/audits/server-response-time.js b/lighthouse-core/audits/server-response-time.js
index 95838d28e2b3..850fba433ef5 100644
--- a/lighthouse-core/audits/server-response-time.js
+++ b/lighthouse-core/audits/server-response-time.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
-const MainResource = require('../computed/main-resource.js');
+import Audit from './audit.js';
+import i18n from '../lib/i18n/i18n.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. */
@@ -87,5 +87,5 @@ class ServerResponseTime extends Audit {
   }
 }
 
-module.exports = ServerResponseTime;
-module.exports.UIStrings = UIStrings;
+export default ServerResponseTime;
+export {UIStrings};
diff --git a/lighthouse-core/audits/service-worker.js b/lighthouse-core/audits/service-worker.js
index 800fd98f61fc..0449166495f0 100644
--- a/lighthouse-core/audits/service-worker.js
+++ b/lighthouse-core/audits/service-worker.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const URL = require('../lib/url-shim.js');
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
+import URL from '../lib/url-shim.js';
+import Audit from './audit.js';
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on a page's service worker. This descriptive title is shown to users when a service worker is registered and valid. */
@@ -180,5 +180,5 @@ class ServiceWorker extends Audit {
   }
 }
 
-module.exports = ServiceWorker;
-module.exports.UIStrings = UIStrings;
+export default ServiceWorker;
+export {UIStrings};
diff --git a/lighthouse-core/audits/splash-screen.js b/lighthouse-core/audits/splash-screen.js
index 2dbcd3606150..c02285c50bbd 100644
--- a/lighthouse-core/audits/splash-screen.js
+++ b/lighthouse-core/audits/splash-screen.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const MultiCheckAudit = require('./multi-check-audit.js');
-const ManifestValues = require('../computed/manifest-values.js');
-const i18n = require('../lib/i18n/i18n.js');
+import MultiCheckAudit from './multi-check-audit.js';
+import ManifestValues from '../computed/manifest-values.js';
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on splash screens. This descriptive title is shown to users when the site has a custom splash screen. */
@@ -95,5 +95,5 @@ class SplashScreen extends MultiCheckAudit {
   }
 }
 
-module.exports = SplashScreen;
-module.exports.UIStrings = UIStrings;
+export default SplashScreen;
+export {UIStrings};
diff --git a/lighthouse-core/audits/themed-omnibox.js b/lighthouse-core/audits/themed-omnibox.js
index 95556fd444e6..6698372bbf29 100644
--- a/lighthouse-core/audits/themed-omnibox.js
+++ b/lighthouse-core/audits/themed-omnibox.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const MultiCheckAudit = require('./multi-check-audit.js');
-const ManifestValues = require('../computed/manifest-values.js');
-const cssParsers = require('cssstyle/lib/parsers');
-const i18n = require('../lib/i18n/i18n.js');
+import MultiCheckAudit from './multi-check-audit.js';
+import ManifestValues from '../computed/manifest-values.js';
+import cssParsers from 'cssstyle/lib/parsers';
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the theme color the web page has set for the browser's address bar. This descriptive title is shown to users when an address-bar theme color has been set. */
@@ -106,5 +106,5 @@ class ThemedOmnibox extends MultiCheckAudit {
   }
 }
 
-module.exports = ThemedOmnibox;
-module.exports.UIStrings = UIStrings;
+export default ThemedOmnibox;
+export {UIStrings};
diff --git a/lighthouse-core/audits/third-party-facades.js b/lighthouse-core/audits/third-party-facades.js
index 286e8a1837d3..e16cf6ea1943 100644
--- a/lighthouse-core/audits/third-party-facades.js
+++ b/lighthouse-core/audits/third-party-facades.js
@@ -20,13 +20,14 @@
 
 /** @typedef {{product: ThirdPartyProduct, entity: ThirdPartyEntity}} FacadableProduct */
 
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
-const thirdPartyWeb = require('../lib/third-party-web.js');
-const NetworkRecords = require('../computed/network-records.js');
-const MainResource = require('../computed/main-resource.js');
-const MainThreadTasks = require('../computed/main-thread-tasks.js');
-const ThirdPartySummary = require('./third-party-summary.js');
+import Audit from './audit.js';
+
+import i18n from '../lib/i18n/i18n.js';
+import thirdPartyWeb from '../lib/third-party-web.js';
+import NetworkRecords from '../computed/network-records.js';
+import MainResource from '../computed/main-resource.js';
+import MainThreadTasks from '../computed/main-thread-tasks.js';
+import ThirdPartySummary from './third-party-summary.js';
 
 const UIStrings = {
   /** Title of a diagnostic audit that provides details about the third-party code on a web page that can be lazy loaded with a facade alternative. This descriptive title is shown to users when no resources have facade alternatives available. A facade is a lightweight component which looks like the desired resource. Lazy loading means resources are deferred until they are needed. Third-party code refers to resources that are not within the control of the site owner. */
@@ -217,5 +218,5 @@ class ThirdPartyFacades extends Audit {
   }
 }
 
-module.exports = ThirdPartyFacades;
-module.exports.UIStrings = UIStrings;
+export default ThirdPartyFacades;
+export {UIStrings};
diff --git a/lighthouse-core/audits/third-party-summary.js b/lighthouse-core/audits/third-party-summary.js
index 6c8f6283e3ed..14173e7f165c 100644
--- a/lighthouse-core/audits/third-party-summary.js
+++ b/lighthouse-core/audits/third-party-summary.js
@@ -5,12 +5,12 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const BootupTime = require('./bootup-time.js');
-const i18n = require('../lib/i18n/i18n.js');
-const thirdPartyWeb = require('../lib/third-party-web.js');
-const NetworkRecords = require('../computed/network-records.js');
-const MainThreadTasks = require('../computed/main-thread-tasks.js');
+import Audit from './audit.js';
+import BootupTime from './bootup-time.js';
+import i18n from '../lib/i18n/i18n.js';
+import thirdPartyWeb from '../lib/third-party-web.js';
+import NetworkRecords from '../computed/network-records.js';
+import MainThreadTasks from '../computed/main-thread-tasks.js';
 
 const UIStrings = {
   /** Title of a diagnostic audit that provides details about the code on a web page that the user doesn't control (referred to as "third-party code"). This descriptive title is shown to users when the amount is acceptable and no user action is required. */
@@ -255,5 +255,5 @@ class ThirdPartySummary extends Audit {
   }
 }
 
-module.exports = ThirdPartySummary;
-module.exports.UIStrings = UIStrings;
+export default ThirdPartySummary;
+export {UIStrings};
diff --git a/lighthouse-core/audits/timing-budget.js b/lighthouse-core/audits/timing-budget.js
index 8abe4779e73b..4fd27f75d9fc 100644
--- a/lighthouse-core/audits/timing-budget.js
+++ b/lighthouse-core/audits/timing-budget.js
@@ -5,11 +5,11 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const TimingSummary = require('../computed/metrics/timing-summary.js');
-const MainResource = require('../computed/main-resource.js');
-const Budget = require('../config/budget.js');
-const i18n = require('../lib/i18n/i18n.js');
+import Audit from './audit.js';
+import TimingSummary from '../computed/metrics/timing-summary.js';
+import MainResource from '../computed/main-resource.js';
+import Budget from '../config/budget.js';
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that compares how quickly the page loads against targets set by the user. Timing budgets are a type of performance budget. */
@@ -171,5 +171,5 @@ class TimingBudget extends Audit {
   }
 }
 
-module.exports = TimingBudget;
-module.exports.UIStrings = UIStrings;
+export default TimingBudget;
+export {UIStrings};
diff --git a/lighthouse-core/audits/unsized-images.js b/lighthouse-core/audits/unsized-images.js
index d44e8d541fcc..16a01614aace 100644
--- a/lighthouse-core/audits/unsized-images.js
+++ b/lighthouse-core/audits/unsized-images.js
@@ -10,9 +10,9 @@
 
 'use strict';
 
-const Audit = require('./audit.js');
-const i18n = require('./../lib/i18n/i18n.js');
-const URL = require('./../lib/url-shim.js');
+import Audit from './audit.js';
+import i18n from './../lib/i18n/i18n.js';
+import URL from './../lib/url-shim.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on whether all images have explicit width and height. This descriptive title is shown to users when every image has explicit width and height */
@@ -159,5 +159,5 @@ class UnsizedImages extends Audit {
   }
 }
 
-module.exports = UnsizedImages;
-module.exports.UIStrings = UIStrings;
+export default UnsizedImages;
+export {UIStrings};
diff --git a/lighthouse-core/audits/user-timings.js b/lighthouse-core/audits/user-timings.js
index f47019360dd1..feb204dd8631 100644
--- a/lighthouse-core/audits/user-timings.js
+++ b/lighthouse-core/audits/user-timings.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
-const ComputedUserTimings = require('../computed/user-timings.js');
+import Audit from './audit.js';
+import i18n from '../lib/i18n/i18n.js';
+import ComputedUserTimings from '../computed/user-timings.js';
 
 const UIStrings = {
   /** Descriptive title of a diagnostic audit that provides details on any timestamps generated by the page. User Timing refers to the 'User Timing API', which enables a website to record specific times as 'marks', or spans of time as 'measures'. */
@@ -116,5 +116,5 @@ class UserTimings extends Audit {
   }
 }
 
-module.exports = UserTimings;
-module.exports.UIStrings = UIStrings;
+export default UserTimings;
+export {UIStrings};
diff --git a/lighthouse-core/audits/uses-rel-preconnect.js b/lighthouse-core/audits/uses-rel-preconnect.js
index d7a26ec31f9a..2292b35471e4 100644
--- a/lighthouse-core/audits/uses-rel-preconnect.js
+++ b/lighthouse-core/audits/uses-rel-preconnect.js
@@ -6,17 +6,17 @@
 
 'use strict';
 
-const Audit = require('./audit.js');
-const UnusedBytes = require('./byte-efficiency/byte-efficiency-audit.js');
-const URL = require('../lib/url-shim.js');
-const i18n = require('../lib/i18n/i18n.js');
-const NetworkRecords = require('../computed/network-records.js');
-const MainResource = require('../computed/main-resource.js');
-const LoadSimulator = require('../computed/load-simulator.js');
-const ProcessedTrace = require('../computed/processed-trace.js');
-const ProcessedNavigation = require('../computed/processed-navigation.js');
-const PageDependencyGraph = require('../computed/page-dependency-graph.js');
-const LanternLCP = require('../computed/metrics/lantern-largest-contentful-paint.js');
+import Audit from './audit.js';
+import UnusedBytes from './byte-efficiency/byte-efficiency-audit.js';
+import URL from '../lib/url-shim.js';
+import i18n from '../lib/i18n/i18n.js';
+import NetworkRecords from '../computed/network-records.js';
+import MainResource from '../computed/main-resource.js';
+import LoadSimulator from '../computed/load-simulator.js';
+import ProcessedTrace from '../computed/processed-trace.js';
+import ProcessedNavigation from '../computed/processed-navigation.js';
+import PageDependencyGraph from '../computed/page-dependency-graph.js';
+import LanternLCP from '../computed/metrics/lantern-largest-contentful-paint.js';
 
 // Preconnect establishes a "clean" socket. Chrome's socket manager will keep an unused socket
 // around for 10s. Meaning, the time delta between processing preconnect a request should be <10s,
@@ -250,5 +250,5 @@ class UsesRelPreconnectAudit extends Audit {
   }
 }
 
-module.exports = UsesRelPreconnectAudit;
-module.exports.UIStrings = UIStrings;
+export default UsesRelPreconnectAudit;
+export {UIStrings};
diff --git a/lighthouse-core/audits/uses-rel-preload.js b/lighthouse-core/audits/uses-rel-preload.js
index 49959f978097..1777b73dd6cd 100644
--- a/lighthouse-core/audits/uses-rel-preload.js
+++ b/lighthouse-core/audits/uses-rel-preload.js
@@ -5,15 +5,15 @@
  */
 'use strict';
 
-const URL = require('../lib/url-shim.js');
-const NetworkRequest = require('../lib/network-request.js');
-const Audit = require('./audit.js');
-const UnusedBytes = require('./byte-efficiency/byte-efficiency-audit.js');
-const CriticalRequestChains = require('../computed/critical-request-chains.js');
-const i18n = require('../lib/i18n/i18n.js');
-const MainResource = require('../computed/main-resource.js');
-const PageDependencyGraph = require('../computed/page-dependency-graph.js');
-const LoadSimulator = require('../computed/load-simulator.js');
+import URL from '../lib/url-shim.js';
+import NetworkRequest from '../lib/network-request.js';
+import Audit from './audit.js';
+import UnusedBytes from './byte-efficiency/byte-efficiency-audit.js';
+import CriticalRequestChains from '../computed/critical-request-chains.js';
+import i18n from '../lib/i18n/i18n.js';
+import MainResource from '../computed/main-resource.js';
+import PageDependencyGraph from '../computed/page-dependency-graph.js';
+import LoadSimulator from '../computed/load-simulator.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to use <link rel=preload> to initiate important network requests earlier during page load. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -263,5 +263,5 @@ class UsesRelPreloadAudit extends Audit {
   }
 }
 
-module.exports = UsesRelPreloadAudit;
-module.exports.UIStrings = UIStrings;
+export default UsesRelPreloadAudit;
+export {UIStrings};
diff --git a/lighthouse-core/audits/valid-source-maps.js b/lighthouse-core/audits/valid-source-maps.js
index 6dd465df2c78..66d8eff4e174 100644
--- a/lighthouse-core/audits/valid-source-maps.js
+++ b/lighthouse-core/audits/valid-source-maps.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const thirdPartyWeb = require('../lib/third-party-web.js');
-const Audit = require('./audit.js');
-const i18n = require('../lib/i18n/i18n.js');
+import thirdPartyWeb from '../lib/third-party-web.js';
+import Audit from './audit.js';
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on HTTP to HTTPS redirects. This descriptive title is shown to users when HTTP traffic is redirected to HTTPS. */
@@ -151,5 +151,5 @@ class ValidSourceMaps extends Audit {
   }
 }
 
-module.exports = ValidSourceMaps;
-module.exports.UIStrings = UIStrings;
+export default ValidSourceMaps;
+export {UIStrings};
diff --git a/lighthouse-core/audits/viewport.js b/lighthouse-core/audits/viewport.js
index d91af1906cd6..d2018c596677 100644
--- a/lighthouse-core/audits/viewport.js
+++ b/lighthouse-core/audits/viewport.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const ComputedViewportMeta = require('../computed/viewport-meta.js');
-const i18n = require('../lib/i18n/i18n.js');
+import Audit from './audit.js';
+import ComputedViewportMeta from '../computed/viewport-meta.js';
+import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the viewport meta tag in a web page's html. This descriptive title is shown to users when a viewport tag is set and configured. */
@@ -61,5 +61,5 @@ class Viewport extends Audit {
   }
 }
 
-module.exports = Viewport;
-module.exports.UIStrings = UIStrings;
+export default Viewport;
+export {UIStrings};
diff --git a/lighthouse-core/audits/violation-audit.js b/lighthouse-core/audits/violation-audit.js
index a322d6b20f66..9e2fd6a8383b 100644
--- a/lighthouse-core/audits/violation-audit.js
+++ b/lighthouse-core/audits/violation-audit.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const JsBundles = require('../computed/js-bundles.js');
+import Audit from './audit.js';
+import JsBundles from '../computed/js-bundles.js';
 
 class ViolationAudit extends Audit {
   /**
@@ -47,4 +47,4 @@ class ViolationAudit extends Audit {
   }
 }
 
-module.exports = ViolationAudit;
+export default ViolationAudit;
diff --git a/lighthouse-core/computed/computed-artifact.js b/lighthouse-core/computed/computed-artifact.js
index eb0e63e2baaa..98b7e0614e06 100644
--- a/lighthouse-core/computed/computed-artifact.js
+++ b/lighthouse-core/computed/computed-artifact.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const ArbitraryEqualityMap = require('../lib/arbitrary-equality-map.js');
-const log = require('lighthouse-logger');
+import ArbitraryEqualityMap from '../lib/arbitrary-equality-map.js';
+import log from 'lighthouse-logger';
 
 /**
  * Decorate computableArtifact with a caching `request()` method which will
@@ -59,4 +59,4 @@ function makeComputedArtifact(computableArtifact, keys) {
   return Object.assign(computableArtifact, {request});
 }
 
-module.exports = makeComputedArtifact;
+export default makeComputedArtifact;
diff --git a/lighthouse-core/computed/critical-request-chains.js b/lighthouse-core/computed/critical-request-chains.js
index 13da33e423ef..1ebaf603a88d 100644
--- a/lighthouse-core/computed/critical-request-chains.js
+++ b/lighthouse-core/computed/critical-request-chains.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('./computed-artifact.js');
-const NetworkRequest = require('../lib/network-request.js');
-const MainResource = require('./main-resource.js');
-const PageDependencyGraph = require('./page-dependency-graph.js');
+import makeComputedArtifact from './computed-artifact.js';
+import NetworkRequest from '../lib/network-request.js';
+import MainResource from './main-resource.js';
+import PageDependencyGraph from './page-dependency-graph.js';
 
 class CriticalRequestChains {
   /**
@@ -139,4 +139,4 @@ class CriticalRequestChains {
   }
 }
 
-module.exports = makeComputedArtifact(CriticalRequestChains, ['URL', 'devtoolsLog', 'trace']);
+export default makeComputedArtifact(CriticalRequestChains, ['URL', 'devtoolsLog', 'trace']);
diff --git a/lighthouse-core/computed/image-records.js b/lighthouse-core/computed/image-records.js
index 5a534fb240ec..f573044723c3 100644
--- a/lighthouse-core/computed/image-records.js
+++ b/lighthouse-core/computed/image-records.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const URL = require('../lib/url-shim.js');
-const makeComputedArtifact = require('./computed-artifact.js');
+import URL from '../lib/url-shim.js';
+import makeComputedArtifact from './computed-artifact.js';
 
 class ImageRecords {
   /**
@@ -59,5 +59,5 @@ class ImageRecords {
   }
 }
 
-module.exports = makeComputedArtifact(ImageRecords, ['ImageElements', 'networkRecords']);
+export default makeComputedArtifact(ImageRecords, ['ImageElements', 'networkRecords']);
 
diff --git a/lighthouse-core/computed/js-bundles.js b/lighthouse-core/computed/js-bundles.js
index 3404a87ca772..8c039b1823d5 100644
--- a/lighthouse-core/computed/js-bundles.js
+++ b/lighthouse-core/computed/js-bundles.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
-const makeComputedArtifact = require('./computed-artifact.js');
-const SDK = require('../lib/cdt/SDK.js');
+import log from 'lighthouse-logger';
+import makeComputedArtifact from './computed-artifact.js';
+import SDK from '../lib/cdt/SDK.js';
 
 /**
  * Calculate the number of bytes contributed by each source file
@@ -116,4 +116,4 @@ class JSBundles {
   }
 }
 
-module.exports = makeComputedArtifact(JSBundles, ['Scripts', 'SourceMaps']);
+export default makeComputedArtifact(JSBundles, ['Scripts', 'SourceMaps']);
diff --git a/lighthouse-core/computed/load-simulator.js b/lighthouse-core/computed/load-simulator.js
index bc56c39dbef4..cea5e4a9b2f8 100644
--- a/lighthouse-core/computed/load-simulator.js
+++ b/lighthouse-core/computed/load-simulator.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('./computed-artifact.js');
-const constants = require('../config/constants.js');
-const Simulator = require('../lib/dependency-graph/simulator/simulator.js');
-const NetworkAnalysis = require('./network-analysis.js');
+import makeComputedArtifact from './computed-artifact.js';
+import constants from '../config/constants.js';
+import Simulator from '../lib/dependency-graph/simulator/simulator.js';
+import NetworkAnalysis from './network-analysis.js';
 
 class LoadSimulator {
   /**
@@ -89,4 +89,4 @@ class LoadSimulator {
   }
 }
 
-module.exports = makeComputedArtifact(LoadSimulator, ['devtoolsLog', 'settings']);
+export default makeComputedArtifact(LoadSimulator, ['devtoolsLog', 'settings']);
diff --git a/lighthouse-core/computed/main-resource.js b/lighthouse-core/computed/main-resource.js
index e05619127d37..18ac8a181f4b 100644
--- a/lighthouse-core/computed/main-resource.js
+++ b/lighthouse-core/computed/main-resource.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('./computed-artifact.js');
-const NetworkAnalyzer = require('../lib/dependency-graph/simulator/network-analyzer.js');
-const NetworkRecords = require('./network-records.js');
+import makeComputedArtifact from './computed-artifact.js';
+import NetworkAnalyzer from '../lib/dependency-graph/simulator/network-analyzer.js';
+import NetworkRecords from './network-records.js';
 
 /**
  * @fileoverview This artifact identifies the main resource on the page. Current solution assumes
@@ -32,4 +32,4 @@ class MainResource {
   }
 }
 
-module.exports = makeComputedArtifact(MainResource, ['URL', 'devtoolsLog']);
+export default makeComputedArtifact(MainResource, ['URL', 'devtoolsLog']);
diff --git a/lighthouse-core/computed/main-thread-tasks.js b/lighthouse-core/computed/main-thread-tasks.js
index 76d39a9129b3..4be5bf733541 100644
--- a/lighthouse-core/computed/main-thread-tasks.js
+++ b/lighthouse-core/computed/main-thread-tasks.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('./computed-artifact.js');
-const MainThreadTasks_ = require('../lib/tracehouse/main-thread-tasks.js');
-const ProcessedTrace = require('./processed-trace.js');
+import makeComputedArtifact from './computed-artifact.js';
+import MainThreadTasks_ from '../lib/tracehouse/main-thread-tasks.js';
+import ProcessedTrace from './processed-trace.js';
 
 class MainThreadTasks {
   /**
@@ -21,4 +21,4 @@ class MainThreadTasks {
   }
 }
 
-module.exports = makeComputedArtifact(MainThreadTasks, null);
+export default makeComputedArtifact(MainThreadTasks, null);
diff --git a/lighthouse-core/computed/manifest-values.js b/lighthouse-core/computed/manifest-values.js
index a68ed0c32df5..0b4dc7f85878 100644
--- a/lighthouse-core/computed/manifest-values.js
+++ b/lighthouse-core/computed/manifest-values.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('./computed-artifact.js');
-const icons = require('../lib/icons.js');
+import makeComputedArtifact from './computed-artifact.js';
+import icons from '../lib/icons.js';
 
 const PWA_DISPLAY_VALUES = ['minimal-ui', 'fullscreen', 'standalone'];
 
@@ -132,4 +132,4 @@ class ManifestValues {
   }
 }
 
-module.exports = makeComputedArtifact(ManifestValues, ['InstallabilityErrors', 'WebAppManifest']);
+export default makeComputedArtifact(ManifestValues, ['InstallabilityErrors', 'WebAppManifest']);
diff --git a/lighthouse-core/computed/metrics/cumulative-layout-shift.js b/lighthouse-core/computed/metrics/cumulative-layout-shift.js
index 599442bcf318..0f555465105e 100644
--- a/lighthouse-core/computed/metrics/cumulative-layout-shift.js
+++ b/lighthouse-core/computed/metrics/cumulative-layout-shift.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('../computed-artifact.js');
-const ProcessedTrace = require('../processed-trace.js');
-const LHError = require('../../lib/lh-error.js');
+import makeComputedArtifact from '../computed-artifact.js';
+import ProcessedTrace from '../processed-trace.js';
+import LHError from '../../lib/lh-error.js';
 
 /** @typedef {{ts: number, isMainFrame: boolean, weightedScore: number}} LayoutShiftEvent */
 
@@ -126,4 +126,4 @@ class CumulativeLayoutShift {
   }
 }
 
-module.exports = makeComputedArtifact(CumulativeLayoutShift, null);
+export default makeComputedArtifact(CumulativeLayoutShift, null);
diff --git a/lighthouse-core/computed/metrics/first-contentful-paint-all-frames.js b/lighthouse-core/computed/metrics/first-contentful-paint-all-frames.js
index 023b42fe6fb7..a0cb5f2cccbb 100644
--- a/lighthouse-core/computed/metrics/first-contentful-paint-all-frames.js
+++ b/lighthouse-core/computed/metrics/first-contentful-paint-all-frames.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('../computed-artifact.js');
-const NavigationMetric = require('./navigation-metric.js');
+import makeComputedArtifact from '../computed-artifact.js';
+import NavigationMetric from './navigation-metric.js';
 
 class FirstContentfulPaintAllFrames extends NavigationMetric {
   /**
@@ -31,7 +31,7 @@ class FirstContentfulPaintAllFrames extends NavigationMetric {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   FirstContentfulPaintAllFrames,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
diff --git a/lighthouse-core/computed/metrics/first-contentful-paint.js b/lighthouse-core/computed/metrics/first-contentful-paint.js
index 7db90d4ddbe0..322a32a12e57 100644
--- a/lighthouse-core/computed/metrics/first-contentful-paint.js
+++ b/lighthouse-core/computed/metrics/first-contentful-paint.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('../computed-artifact.js');
-const NavigationMetric = require('./navigation-metric.js');
-const LanternFirstContentfulPaint = require('./lantern-first-contentful-paint.js');
+import makeComputedArtifact from '../computed-artifact.js';
+import NavigationMetric from './navigation-metric.js';
+import LanternFirstContentfulPaint from './lantern-first-contentful-paint.js';
 
 class FirstContentfulPaint extends NavigationMetric {
   /**
@@ -34,7 +34,7 @@ class FirstContentfulPaint extends NavigationMetric {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   FirstContentfulPaint,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
diff --git a/lighthouse-core/computed/metrics/first-meaningful-paint.js b/lighthouse-core/computed/metrics/first-meaningful-paint.js
index a03223aaeba5..71c9a3c30cfa 100644
--- a/lighthouse-core/computed/metrics/first-meaningful-paint.js
+++ b/lighthouse-core/computed/metrics/first-meaningful-paint.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('../computed-artifact.js');
-const NavigationMetric = require('./navigation-metric.js');
-const LHError = require('../../lib/lh-error.js');
-const LanternFirstMeaningfulPaint = require('./lantern-first-meaningful-paint.js');
+import makeComputedArtifact from '../computed-artifact.js';
+import NavigationMetric from './navigation-metric.js';
+import LHError from '../../lib/lh-error.js';
+import LanternFirstMeaningfulPaint from './lantern-first-meaningful-paint.js';
 
 class FirstMeaningfulPaint extends NavigationMetric {
   /**
@@ -38,7 +38,7 @@ class FirstMeaningfulPaint extends NavigationMetric {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   FirstMeaningfulPaint,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
diff --git a/lighthouse-core/computed/metrics/interactive.js b/lighthouse-core/computed/metrics/interactive.js
index 48100723c7ff..2083f308502d 100644
--- a/lighthouse-core/computed/metrics/interactive.js
+++ b/lighthouse-core/computed/metrics/interactive.js
@@ -5,13 +5,12 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('../computed-artifact.js');
-const NavigationMetric = require('./navigation-metric.js');
-const LanternInteractive = require('./lantern-interactive.js');
-
-const NetworkMonitor = require('../../gather/driver/network-monitor.js');
-const TracingProcessor = require('../../lib/tracehouse/trace-processor.js');
-const LHError = require('../../lib/lh-error.js');
+import makeComputedArtifact from '../computed-artifact.js';
+import NavigationMetric from './navigation-metric.js';
+import LanternInteractive from './lantern-interactive.js';
+import NetworkMonitor from '../../gather/driver/network-monitor.js';
+import TracingProcessor from '../../lib/tracehouse/trace-processor.js';
+import LHError from '../../lib/lh-error.js';
 
 const REQUIRED_QUIET_WINDOW = 5000;
 const ALLOWED_CONCURRENT_REQUESTS = 2;
@@ -181,7 +180,7 @@ class Interactive extends NavigationMetric {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   Interactive,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
diff --git a/lighthouse-core/computed/metrics/lantern-first-contentful-paint.js b/lighthouse-core/computed/metrics/lantern-first-contentful-paint.js
index 21a0906085b7..d23c2a0fbca1 100644
--- a/lighthouse-core/computed/metrics/lantern-first-contentful-paint.js
+++ b/lighthouse-core/computed/metrics/lantern-first-contentful-paint.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('../computed-artifact.js');
-const LanternMetric = require('./lantern-metric.js');
-const BaseNode = require('../../lib/dependency-graph/base-node.js');
+import makeComputedArtifact from '../computed-artifact.js';
+import LanternMetric from './lantern-metric.js';
+import BaseNode from '../../lib/dependency-graph/base-node.js';
 
 /** @typedef {BaseNode.Node} Node */
 /** @typedef {import('../../lib/dependency-graph/cpu-node')} CPUNode */
@@ -198,7 +198,7 @@ class LanternFirstContentfulPaint extends LanternMetric {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   LanternFirstContentfulPaint,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
diff --git a/lighthouse-core/computed/metrics/lantern-first-meaningful-paint.js b/lighthouse-core/computed/metrics/lantern-first-meaningful-paint.js
index b36b76f49be3..e86722a0f370 100644
--- a/lighthouse-core/computed/metrics/lantern-first-meaningful-paint.js
+++ b/lighthouse-core/computed/metrics/lantern-first-meaningful-paint.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('../computed-artifact.js');
-const LanternMetric = require('./lantern-metric.js');
-const LHError = require('../../lib/lh-error.js');
-const LanternFirstContentfulPaint = require('./lantern-first-contentful-paint.js');
+import makeComputedArtifact from '../computed-artifact.js';
+import LanternMetric from './lantern-metric.js';
+import LHError from '../../lib/lh-error.js';
+import LanternFirstContentfulPaint from './lantern-first-contentful-paint.js';
 
 /** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
 
@@ -77,7 +77,7 @@ class LanternFirstMeaningfulPaint extends LanternMetric {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   LanternFirstMeaningfulPaint,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
diff --git a/lighthouse-core/computed/metrics/lantern-interactive.js b/lighthouse-core/computed/metrics/lantern-interactive.js
index d84637832231..f3af9f667008 100644
--- a/lighthouse-core/computed/metrics/lantern-interactive.js
+++ b/lighthouse-core/computed/metrics/lantern-interactive.js
@@ -5,11 +5,11 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('../computed-artifact.js');
-const LanternMetric = require('./lantern-metric.js');
-const BaseNode = require('../../lib/dependency-graph/base-node.js');
-const NetworkRequest = require('../../lib/network-request.js');
-const LanternFirstMeaningfulPaint = require('./lantern-first-meaningful-paint.js');
+import makeComputedArtifact from '../computed-artifact.js';
+import LanternMetric from './lantern-metric.js';
+import BaseNode from '../../lib/dependency-graph/base-node.js';
+import NetworkRequest from '../../lib/network-request.js';
+import LanternFirstMeaningfulPaint from './lantern-first-meaningful-paint.js';
 
 /** @typedef {BaseNode.Node} Node */
 
@@ -107,7 +107,7 @@ class LanternInteractive extends LanternMetric {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   LanternInteractive,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
diff --git a/lighthouse-core/computed/metrics/lantern-largest-contentful-paint.js b/lighthouse-core/computed/metrics/lantern-largest-contentful-paint.js
index 53ce1f2ac2a8..bb66793e4780 100644
--- a/lighthouse-core/computed/metrics/lantern-largest-contentful-paint.js
+++ b/lighthouse-core/computed/metrics/lantern-largest-contentful-paint.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('../computed-artifact.js');
-const LanternMetric = require('./lantern-metric.js');
-const LHError = require('../../lib/lh-error.js');
-const LanternFirstContentfulPaint = require('./lantern-first-contentful-paint.js');
+import makeComputedArtifact from '../computed-artifact.js';
+import LanternMetric from './lantern-metric.js';
+import LHError from '../../lib/lh-error.js';
+import LanternFirstContentfulPaint from './lantern-first-contentful-paint.js';
 
 /** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
 
@@ -105,7 +105,7 @@ class LanternLargestContentfulPaint extends LanternMetric {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   LanternLargestContentfulPaint,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
diff --git a/lighthouse-core/computed/metrics/lantern-max-potential-fid.js b/lighthouse-core/computed/metrics/lantern-max-potential-fid.js
index 9b092d2ce3a5..633df576dd51 100644
--- a/lighthouse-core/computed/metrics/lantern-max-potential-fid.js
+++ b/lighthouse-core/computed/metrics/lantern-max-potential-fid.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('../computed-artifact.js');
-const LanternMetricArtifact = require('./lantern-metric.js');
-const BaseNode = require('../../lib/dependency-graph/base-node.js');
-const LanternFirstContentfulPaint = require('./lantern-first-contentful-paint.js');
+import makeComputedArtifact from '../computed-artifact.js';
+import LanternMetricArtifact from './lantern-metric.js';
+import BaseNode from '../../lib/dependency-graph/base-node.js';
+import LanternFirstContentfulPaint from './lantern-first-contentful-paint.js';
 
 /** @typedef {BaseNode.Node} Node */
 
@@ -87,7 +87,7 @@ class LanternMaxPotentialFID extends LanternMetricArtifact {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   LanternMaxPotentialFID,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
diff --git a/lighthouse-core/computed/metrics/lantern-metric.js b/lighthouse-core/computed/metrics/lantern-metric.js
index 609702dfa58b..2ff115f6d37d 100644
--- a/lighthouse-core/computed/metrics/lantern-metric.js
+++ b/lighthouse-core/computed/metrics/lantern-metric.js
@@ -5,12 +5,12 @@
  */
 'use strict';
 
-const BaseNode = require('../../lib/dependency-graph/base-node.js');
-const NetworkRequest = require('../../lib/network-request.js');
-const ProcessedTrace = require('../processed-trace.js');
-const ProcessedNavigation = require('../processed-navigation.js');
-const PageDependencyGraph = require('../page-dependency-graph.js');
-const LoadSimulator = require('../load-simulator.js');
+import BaseNode from '../../lib/dependency-graph/base-node.js';
+import NetworkRequest from '../../lib/network-request.js';
+import ProcessedTrace from '../processed-trace.js';
+import ProcessedNavigation from '../processed-navigation.js';
+import PageDependencyGraph from '../page-dependency-graph.js';
+import LoadSimulator from '../load-simulator.js';
 
 /** @typedef {BaseNode.Node} Node */
 /** @typedef {import('../../lib/dependency-graph/network-node')} NetworkNode */
@@ -162,4 +162,4 @@ class LanternMetricArtifact {
   }
 }
 
-module.exports = LanternMetricArtifact;
+export default LanternMetricArtifact;
diff --git a/lighthouse-core/computed/metrics/lantern-speed-index.js b/lighthouse-core/computed/metrics/lantern-speed-index.js
index 096afb7d70f1..7215274b259b 100644
--- a/lighthouse-core/computed/metrics/lantern-speed-index.js
+++ b/lighthouse-core/computed/metrics/lantern-speed-index.js
@@ -5,12 +5,12 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('../computed-artifact.js');
-const LanternMetric = require('./lantern-metric.js');
-const BaseNode = require('../../lib/dependency-graph/base-node.js');
-const Speedline = require('../speedline.js');
-const LanternFirstContentfulPaint = require('./lantern-first-contentful-paint.js');
-const defaultThrottling = require('../../config/constants.js').throttling;
+import makeComputedArtifact from '../computed-artifact.js';
+import LanternMetric from './lantern-metric.js';
+import BaseNode from '../../lib/dependency-graph/base-node.js';
+import Speedline from '../speedline.js';
+import LanternFirstContentfulPaint from './lantern-first-contentful-paint.js';
+import {throttling as defaultThrottling} from '../../config/constants.js';
 
 /** @typedef {BaseNode.Node} Node */
 
@@ -144,7 +144,7 @@ class LanternSpeedIndex extends LanternMetric {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   LanternSpeedIndex,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
diff --git a/lighthouse-core/computed/metrics/lantern-total-blocking-time.js b/lighthouse-core/computed/metrics/lantern-total-blocking-time.js
index a49705203743..1ec37b8b317e 100644
--- a/lighthouse-core/computed/metrics/lantern-total-blocking-time.js
+++ b/lighthouse-core/computed/metrics/lantern-total-blocking-time.js
@@ -5,12 +5,12 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('../computed-artifact.js');
-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');
+import makeComputedArtifact from '../computed-artifact.js';
+import LanternMetric from './lantern-metric.js';
+import BaseNode from '../../lib/dependency-graph/base-node.js';
+import LanternFirstContentfulPaint from './lantern-first-contentful-paint.js';
+import LanternInteractive from './lantern-interactive.js';
+import {BLOCKING_TIME_THRESHOLD, calculateSumOfBlockingTime} from './tbt-utils.js';
 
 /** @typedef {BaseNode.Node} Node */
 
@@ -120,7 +120,7 @@ class LanternTotalBlockingTime extends LanternMetric {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   LanternTotalBlockingTime,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
diff --git a/lighthouse-core/computed/metrics/largest-contentful-paint-all-frames.js b/lighthouse-core/computed/metrics/largest-contentful-paint-all-frames.js
index 34b62660390a..ab43a46fe6c7 100644
--- a/lighthouse-core/computed/metrics/largest-contentful-paint-all-frames.js
+++ b/lighthouse-core/computed/metrics/largest-contentful-paint-all-frames.js
@@ -9,9 +9,10 @@
  * @fileoverview Computed Largest Contentful Paint (LCP) for all frames.
  */
 
-const makeComputedArtifact = require('../computed-artifact.js');
-const NavigationMetric = require('./navigation-metric.js');
-const LHError = require('../../lib/lh-error.js');
+import makeComputedArtifact from '../computed-artifact.js';
+
+import NavigationMetric from './navigation-metric.js';
+import LHError from '../../lib/lh-error.js';
 
 class LargestContentfulPaintAllFrames extends NavigationMetric {
   /**
@@ -39,7 +40,7 @@ class LargestContentfulPaintAllFrames extends NavigationMetric {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   LargestContentfulPaintAllFrames,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
diff --git a/lighthouse-core/computed/metrics/largest-contentful-paint.js b/lighthouse-core/computed/metrics/largest-contentful-paint.js
index 07fe5de8eedc..34b2c2d6d362 100644
--- a/lighthouse-core/computed/metrics/largest-contentful-paint.js
+++ b/lighthouse-core/computed/metrics/largest-contentful-paint.js
@@ -13,10 +13,11 @@
  * @see https://web.dev/largest-contentful-paint
  */
 
-const makeComputedArtifact = require('../computed-artifact.js');
-const NavigationMetric = require('./navigation-metric.js');
-const LHError = require('../../lib/lh-error.js');
-const LanternLargestContentfulPaint = require('./lantern-largest-contentful-paint.js');
+import makeComputedArtifact from '../computed-artifact.js';
+
+import NavigationMetric from './navigation-metric.js';
+import LHError from '../../lib/lh-error.js';
+import LanternLargestContentfulPaint from './lantern-largest-contentful-paint.js';
 
 class LargestContentfulPaint extends NavigationMetric {
   /**
@@ -46,7 +47,7 @@ class LargestContentfulPaint extends NavigationMetric {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   LargestContentfulPaint,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
diff --git a/lighthouse-core/computed/metrics/max-potential-fid.js b/lighthouse-core/computed/metrics/max-potential-fid.js
index dfb0dd6bd9e8..f08a454e6c4d 100644
--- a/lighthouse-core/computed/metrics/max-potential-fid.js
+++ b/lighthouse-core/computed/metrics/max-potential-fid.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('../computed-artifact.js');
-const NavigationMetric = require('./navigation-metric.js');
-const LanternMaxPotentialFID = require('./lantern-max-potential-fid.js');
-const TracingProcessor = require('../../lib/tracehouse/trace-processor.js');
+import makeComputedArtifact from '../computed-artifact.js';
+import NavigationMetric from './navigation-metric.js';
+import LanternMaxPotentialFID from './lantern-max-potential-fid.js';
+import TracingProcessor from '../../lib/tracehouse/trace-processor.js';
 
 class MaxPotentialFID extends NavigationMetric {
   /**
@@ -39,7 +39,7 @@ class MaxPotentialFID extends NavigationMetric {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   MaxPotentialFID,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
diff --git a/lighthouse-core/computed/metrics/metric.js b/lighthouse-core/computed/metrics/metric.js
index b09c97fb24c0..b6545e93a994 100644
--- a/lighthouse-core/computed/metrics/metric.js
+++ b/lighthouse-core/computed/metrics/metric.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const TracingProcessor = require('../../lib/tracehouse/trace-processor.js');
-const ProcessedTrace = require('../processed-trace.js');
-const ProcessedNavigation = require('../processed-navigation.js');
-const NetworkRecords = require('../network-records.js');
+import TracingProcessor from '../../lib/tracehouse/trace-processor.js';
+import ProcessedTrace from '../processed-trace.js';
+import ProcessedNavigation from '../processed-navigation.js';
+import NetworkRecords from '../network-records.js';
 
 /**
  * @fileOverview Encapsulates logic for choosing the correct metric computation method based on the
@@ -98,4 +98,4 @@ class Metric {
   }
 }
 
-module.exports = Metric;
+export default Metric;
diff --git a/lighthouse-core/computed/metrics/navigation-metric.js b/lighthouse-core/computed/metrics/navigation-metric.js
index e87e0ed708c6..f0ad2c82bb5e 100644
--- a/lighthouse-core/computed/metrics/navigation-metric.js
+++ b/lighthouse-core/computed/metrics/navigation-metric.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const Metric = require('./metric.js');
+import Metric from './metric.js';
 
 /**
  * @fileOverview Enforces that a metric can only be computed on navigations.
@@ -43,4 +43,4 @@ class NavigationMetric extends Metric {
   }
 }
 
-module.exports = NavigationMetric;
+export default NavigationMetric;
diff --git a/lighthouse-core/computed/metrics/responsiveness.js b/lighthouse-core/computed/metrics/responsiveness.js
index 56bc33f03ce8..6a0a56250401 100644
--- a/lighthouse-core/computed/metrics/responsiveness.js
+++ b/lighthouse-core/computed/metrics/responsiveness.js
@@ -11,8 +11,9 @@
  * user input in the provided trace).
  */
 
-const makeComputedArtifact = require('../computed-artifact.js');
-const ProcessedTrace = require('../processed-trace.js');
+import makeComputedArtifact from '../computed-artifact.js';
+
+import ProcessedTrace from '../processed-trace.js';
 
 class Responsiveness {
   /**
@@ -58,7 +59,7 @@ class Responsiveness {
   }
 }
 
-module.exports = makeComputedArtifact(Responsiveness, [
+export default makeComputedArtifact(Responsiveness, [
   'trace',
   'settings',
 ]);
diff --git a/lighthouse-core/computed/metrics/speed-index.js b/lighthouse-core/computed/metrics/speed-index.js
index b0588542749e..d13992b1313c 100644
--- a/lighthouse-core/computed/metrics/speed-index.js
+++ b/lighthouse-core/computed/metrics/speed-index.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('../computed-artifact.js');
-const NavigationMetric = require('./navigation-metric.js');
-const LanternSpeedIndex = require('./lantern-speed-index.js');
-const Speedline = require('../speedline.js');
+import makeComputedArtifact from '../computed-artifact.js';
+import NavigationMetric from './navigation-metric.js';
+import LanternSpeedIndex from './lantern-speed-index.js';
+import Speedline from '../speedline.js';
 
 class SpeedIndex extends NavigationMetric {
   /**
@@ -34,7 +34,7 @@ class SpeedIndex extends NavigationMetric {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   SpeedIndex,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
diff --git a/lighthouse-core/computed/metrics/tbt-utils.js b/lighthouse-core/computed/metrics/tbt-utils.js
index 657d9a976216..94030abaf0fa 100644
--- a/lighthouse-core/computed/metrics/tbt-utils.js
+++ b/lighthouse-core/computed/metrics/tbt-utils.js
@@ -51,7 +51,7 @@ function calculateSumOfBlockingTime(topLevelEvents, startTimeMs, endTimeMs) {
   return sumBlockingTime;
 }
 
-module.exports = {
+export default {
   BLOCKING_TIME_THRESHOLD,
   calculateSumOfBlockingTime,
 };
diff --git a/lighthouse-core/computed/metrics/timing-summary.js b/lighthouse-core/computed/metrics/timing-summary.js
index 53ecc231a00b..66815eaf5857 100644
--- a/lighthouse-core/computed/metrics/timing-summary.js
+++ b/lighthouse-core/computed/metrics/timing-summary.js
@@ -5,20 +5,20 @@
  */
 'use strict';
 
-const ProcessedTrace = require('../processed-trace.js');
-const ProcessedNavigation = require('../processed-navigation.js');
-const Speedline = require('../speedline.js');
-const FirstContentfulPaint = require('./first-contentful-paint.js');
-const FirstContentfulPaintAllFrames = require('./first-contentful-paint-all-frames.js');
-const FirstMeaningfulPaint = require('./first-meaningful-paint.js');
-const LargestContentfulPaint = require('./largest-contentful-paint.js');
-const LargestContentfulPaintAllFrames = require('./largest-contentful-paint-all-frames.js');
-const Interactive = require('./interactive.js');
-const CumulativeLayoutShift = require('./cumulative-layout-shift.js');
-const SpeedIndex = require('./speed-index.js');
-const MaxPotentialFID = require('./max-potential-fid.js');
-const TotalBlockingTime = require('./total-blocking-time.js');
-const makeComputedArtifact = require('../computed-artifact.js');
+import ProcessedTrace from '../processed-trace.js';
+import ProcessedNavigation from '../processed-navigation.js';
+import Speedline from '../speedline.js';
+import FirstContentfulPaint from './first-contentful-paint.js';
+import FirstContentfulPaintAllFrames from './first-contentful-paint-all-frames.js';
+import FirstMeaningfulPaint from './first-meaningful-paint.js';
+import LargestContentfulPaint from './largest-contentful-paint.js';
+import LargestContentfulPaintAllFrames from './largest-contentful-paint-all-frames.js';
+import Interactive from './interactive.js';
+import CumulativeLayoutShift from './cumulative-layout-shift.js';
+import SpeedIndex from './speed-index.js';
+import MaxPotentialFID from './max-potential-fid.js';
+import TotalBlockingTime from './total-blocking-time.js';
+import makeComputedArtifact from '../computed-artifact.js';
 
 class TimingSummary {
   /**
@@ -151,7 +151,7 @@ class TimingSummary {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   TimingSummary,
   ['devtoolsLog', 'gatherContext', 'settings', 'trace', 'URL']
 );
diff --git a/lighthouse-core/computed/metrics/total-blocking-time.js b/lighthouse-core/computed/metrics/total-blocking-time.js
index eb9faa7c669a..8eb00cd5f02d 100644
--- a/lighthouse-core/computed/metrics/total-blocking-time.js
+++ b/lighthouse-core/computed/metrics/total-blocking-time.js
@@ -5,12 +5,12 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('../computed-artifact.js');
-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');
+import makeComputedArtifact from '../computed-artifact.js';
+import ComputedMetric from './metric.js';
+import TraceProcessor from '../../lib/tracehouse/trace-processor.js';
+import LanternTotalBlockingTime from './lantern-total-blocking-time.js';
+import TimetoInteractive from './interactive.js';
+import {calculateSumOfBlockingTime} from './tbt-utils.js';
 
 /**
  * @fileoverview This audit determines Total Blocking Time.
@@ -68,7 +68,7 @@ class TotalBlockingTime extends ComputedMetric {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   TotalBlockingTime,
   ['devtoolsLog', 'gatherContext', 'settings', 'simulator', 'trace', 'URL']
 );
diff --git a/lighthouse-core/computed/module-duplication.js b/lighthouse-core/computed/module-duplication.js
index 18812702c146..d353962a15e8 100644
--- a/lighthouse-core/computed/module-duplication.js
+++ b/lighthouse-core/computed/module-duplication.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('./computed-artifact.js');
-const JsBundles = require('./js-bundles.js');
+import makeComputedArtifact from './computed-artifact.js';
+import JsBundles from './js-bundles.js';
 
 const RELATIVE_SIZE_THRESHOLD = 0.1;
 const ABSOLUTE_SIZE_THRESHOLD_BYTES = 1024 * 0.5;
@@ -134,4 +134,4 @@ class ModuleDuplication {
   }
 }
 
-module.exports = makeComputedArtifact(ModuleDuplication, ['Scripts', 'SourceMaps']);
+export default makeComputedArtifact(ModuleDuplication, ['Scripts', 'SourceMaps']);
diff --git a/lighthouse-core/computed/network-analysis.js b/lighthouse-core/computed/network-analysis.js
index 6d10dc15ad49..8f8b9961eab6 100644
--- a/lighthouse-core/computed/network-analysis.js
+++ b/lighthouse-core/computed/network-analysis.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('./computed-artifact.js');
-const NetworkAnalyzer = require('../lib/dependency-graph/simulator/network-analyzer.js');
-const NetworkRecords = require('./network-records.js');
+import makeComputedArtifact from './computed-artifact.js';
+import NetworkAnalyzer from '../lib/dependency-graph/simulator/network-analyzer.js';
+import NetworkRecords from './network-records.js';
 
 class NetworkAnalysis {
   /**
@@ -61,4 +61,4 @@ class NetworkAnalysis {
   }
 }
 
-module.exports = makeComputedArtifact(NetworkAnalysis, null);
+export default makeComputedArtifact(NetworkAnalysis, null);
diff --git a/lighthouse-core/computed/network-records.js b/lighthouse-core/computed/network-records.js
index 361a3f73b930..74c4a3718b3e 100644
--- a/lighthouse-core/computed/network-records.js
+++ b/lighthouse-core/computed/network-records.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('./computed-artifact.js');
-const NetworkRecorder = require('../lib/network-recorder.js');
+import makeComputedArtifact from './computed-artifact.js';
+import NetworkRecorder from '../lib/network-recorder.js';
 
 class NetworkRecords {
   /**
@@ -18,4 +18,4 @@ class NetworkRecords {
   }
 }
 
-module.exports = makeComputedArtifact(NetworkRecords, null);
+export default makeComputedArtifact(NetworkRecords, null);
diff --git a/lighthouse-core/computed/page-dependency-graph.js b/lighthouse-core/computed/page-dependency-graph.js
index f1084d9a61e1..3b50e8e10b50 100644
--- a/lighthouse-core/computed/page-dependency-graph.js
+++ b/lighthouse-core/computed/page-dependency-graph.js
@@ -5,14 +5,14 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('./computed-artifact.js');
-const NetworkNode = require('../lib/dependency-graph/network-node.js');
-const CPUNode = require('../lib/dependency-graph/cpu-node.js');
-const TracingProcessor = require('../lib/tracehouse/trace-processor.js');
-const NetworkRequest = require('../lib/network-request.js');
-const ProcessedTrace = require('./processed-trace.js');
-const NetworkRecords = require('./network-records.js');
-const NetworkAnalyzer = require('../lib/dependency-graph/simulator/network-analyzer.js');
+import makeComputedArtifact from './computed-artifact.js';
+import NetworkNode from '../lib/dependency-graph/network-node.js';
+import CPUNode from '../lib/dependency-graph/cpu-node.js';
+import TracingProcessor from '../lib/tracehouse/trace-processor.js';
+import NetworkRequest from '../lib/network-request.js';
+import ProcessedTrace from './processed-trace.js';
+import NetworkRecords from './network-records.js';
+import NetworkAnalyzer from '../lib/dependency-graph/simulator/network-analyzer.js';
 
 /** @typedef {import('../lib/dependency-graph/base-node.js').Node} Node */
 /** @typedef {Omit<LH.Artifacts['URL'], 'initialUrl'|'finalUrl'>} URLArtifact */
@@ -504,7 +504,7 @@ class PageDependencyGraph {
   }
 }
 
-module.exports = makeComputedArtifact(PageDependencyGraph, ['devtoolsLog', 'trace', 'URL']);
+export default makeComputedArtifact(PageDependencyGraph, ['devtoolsLog', 'trace', 'URL']);
 
 /**
  * @typedef {Object} NetworkNodeOutput
diff --git a/lighthouse-core/computed/processed-navigation.js b/lighthouse-core/computed/processed-navigation.js
index bb7f00a3bcd3..df8f4ef945c1 100644
--- a/lighthouse-core/computed/processed-navigation.js
+++ b/lighthouse-core/computed/processed-navigation.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('./computed-artifact.js');
-const LHTraceProcessor = require('../lib/lh-trace-processor.js');
+import makeComputedArtifact from './computed-artifact.js';
+import LHTraceProcessor from '../lib/lh-trace-processor.js';
 
 class ProcessedNavigation {
   /**
@@ -18,4 +18,4 @@ class ProcessedNavigation {
   }
 }
 
-module.exports = makeComputedArtifact(ProcessedNavigation, null);
+export default makeComputedArtifact(ProcessedNavigation, null);
diff --git a/lighthouse-core/computed/processed-trace.js b/lighthouse-core/computed/processed-trace.js
index c66a20f645d0..ee90435ca87e 100644
--- a/lighthouse-core/computed/processed-trace.js
+++ b/lighthouse-core/computed/processed-trace.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('./computed-artifact.js');
-const LHTraceProcessor = require('../lib/lh-trace-processor.js');
+import makeComputedArtifact from './computed-artifact.js';
+import LHTraceProcessor from '../lib/lh-trace-processor.js';
 
 class ProcessedTrace {
   /**
@@ -18,4 +18,4 @@ class ProcessedTrace {
   }
 }
 
-module.exports = makeComputedArtifact(ProcessedTrace, null);
+export default makeComputedArtifact(ProcessedTrace, null);
diff --git a/lighthouse-core/computed/resource-summary.js b/lighthouse-core/computed/resource-summary.js
index 8e3f27d0f9fc..267d4dd9e0f9 100644
--- a/lighthouse-core/computed/resource-summary.js
+++ b/lighthouse-core/computed/resource-summary.js
@@ -5,12 +5,12 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('./computed-artifact.js');
-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');
+import makeComputedArtifact from './computed-artifact.js';
+import NetworkRecords from './network-records.js';
+import URL from '../lib/url-shim.js';
+import NetworkRequest from '../lib/network-request.js';
+import Budget from '../config/budget.js';
+import {Util} from '../util-commonjs.js';
 
 /** @typedef {{count: number, resourceSize: number, transferSize: number}} ResourceEntry */
 
@@ -111,4 +111,4 @@ class ResourceSummary {
   }
 }
 
-module.exports = makeComputedArtifact(ResourceSummary, ['URL', 'devtoolsLog', 'budgets']);
+export default makeComputedArtifact(ResourceSummary, ['URL', 'devtoolsLog', 'budgets']);
diff --git a/lighthouse-core/computed/screenshots.js b/lighthouse-core/computed/screenshots.js
index 8c76aef4679c..3988916da9bf 100644
--- a/lighthouse-core/computed/screenshots.js
+++ b/lighthouse-core/computed/screenshots.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('./computed-artifact.js');
+import makeComputedArtifact from './computed-artifact.js';
 
 const SCREENSHOT_TRACE_NAME = 'Screenshot';
 
@@ -26,4 +26,4 @@ class Screenshots {
   }
 }
 
-module.exports = makeComputedArtifact(Screenshots, null);
+export default makeComputedArtifact(Screenshots, null);
diff --git a/lighthouse-core/computed/speedline.js b/lighthouse-core/computed/speedline.js
index 831b33266a44..aa11a5cdcc23 100644
--- a/lighthouse-core/computed/speedline.js
+++ b/lighthouse-core/computed/speedline.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('./computed-artifact.js');
-const speedline = require('speedline-core');
-const LHError = require('../lib/lh-error.js');
-const ProcessedTrace = require('./processed-trace.js');
+import makeComputedArtifact from './computed-artifact.js';
+import speedline from 'speedline-core';
+import LHError from '../lib/lh-error.js';
+import ProcessedTrace from './processed-trace.js';
 
 class Speedline {
   /**
@@ -51,4 +51,4 @@ class Speedline {
   }
 }
 
-module.exports = makeComputedArtifact(Speedline, null);
+export default makeComputedArtifact(Speedline, null);
diff --git a/lighthouse-core/computed/trace-of-tab.js b/lighthouse-core/computed/trace-of-tab.js
index ff600b1782ec..1a5ac2ea50d2 100644
--- a/lighthouse-core/computed/trace-of-tab.js
+++ b/lighthouse-core/computed/trace-of-tab.js
@@ -7,10 +7,11 @@
 
 /** @fileoverview This file is no longer used internally, but remains here for backcompat with plugins. */
 
-const log = require('lighthouse-logger');
-const makeComputedArtifact = require('./computed-artifact.js');
-const ProcessedTrace = require('./processed-trace.js');
-const ProcessedNavigation = require('./processed-navigation.js');
+import log from 'lighthouse-logger';
+
+import makeComputedArtifact from './computed-artifact.js';
+import ProcessedTrace from './processed-trace.js';
+import ProcessedNavigation from './processed-navigation.js';
 
 class TraceOfTab {
   /**
@@ -26,5 +27,5 @@ class TraceOfTab {
 }
 
 log.warn(`trace-of-tab`, `trace-of-tab is deprecated, use processed-trace / processed-navigation instead`); // eslint-disable-line max-len
-module.exports = makeComputedArtifact(TraceOfTab, null);
+export default makeComputedArtifact(TraceOfTab, null);
 
diff --git a/lighthouse-core/computed/unused-css.js b/lighthouse-core/computed/unused-css.js
index 7f1227f48609..ad9d7c8e2e22 100644
--- a/lighthouse-core/computed/unused-css.js
+++ b/lighthouse-core/computed/unused-css.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('./computed-artifact.js');
-const ByteEfficiencyAudit = require('../audits/byte-efficiency/byte-efficiency-audit.js');
-const NetworkRecords = require('./network-records.js');
+import makeComputedArtifact from './computed-artifact.js';
+import ByteEfficiencyAudit from '../audits/byte-efficiency/byte-efficiency-audit.js';
+import NetworkRecords from './network-records.js';
 
 const PREVIEW_LENGTH = 100;
 
@@ -150,4 +150,4 @@ class UnusedCSS {
   }
 }
 
-module.exports = makeComputedArtifact(UnusedCSS, ['CSSUsage', 'devtoolsLog']);
+export default makeComputedArtifact(UnusedCSS, ['CSSUsage', 'devtoolsLog']);
diff --git a/lighthouse-core/computed/unused-javascript-summary.js b/lighthouse-core/computed/unused-javascript-summary.js
index 72db19b20c93..a90129ba83f6 100644
--- a/lighthouse-core/computed/unused-javascript-summary.js
+++ b/lighthouse-core/computed/unused-javascript-summary.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('./computed-artifact.js');
+import makeComputedArtifact from './computed-artifact.js';
 
 /**
  * @typedef WasteData
@@ -149,7 +149,7 @@ class UnusedJavascriptSummary {
   }
 }
 
-module.exports = makeComputedArtifact(
+export default makeComputedArtifact(
   UnusedJavascriptSummary,
   ['bundle', 'scriptCoverage', 'scriptId']
 );
diff --git a/lighthouse-core/computed/user-timings.js b/lighthouse-core/computed/user-timings.js
index 7bc5fe271d46..76b84a161c28 100644
--- a/lighthouse-core/computed/user-timings.js
+++ b/lighthouse-core/computed/user-timings.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const makeComputedArtifact = require('./computed-artifact.js');
-const ProcessedTrace = require('./processed-trace.js');
+import makeComputedArtifact from './computed-artifact.js';
+import ProcessedTrace from './processed-trace.js';
 
 /** @typedef {{name: string, isMark: true, args: LH.TraceEvent['args'], startTime: number}} MarkEvent */
 /** @typedef {{name: string, isMark: false, args: LH.TraceEvent['args'], startTime: number, endTime: number, duration: number}} MeasureEvent */
@@ -80,4 +80,4 @@ class UserTimings {
   }
 }
 
-module.exports = makeComputedArtifact(UserTimings, null);
+export default makeComputedArtifact(UserTimings, null);
diff --git a/lighthouse-core/computed/viewport-meta.js b/lighthouse-core/computed/viewport-meta.js
index 55598de5f5fe..a9f21252064f 100644
--- a/lighthouse-core/computed/viewport-meta.js
+++ b/lighthouse-core/computed/viewport-meta.js
@@ -5,9 +5,8 @@
  */
 'use strict';
 
-const Parser = require('metaviewport-parser');
-
-const makeComputedArtifact = require('./computed-artifact.js');
+import Parser from 'metaviewport-parser';
+import makeComputedArtifact from './computed-artifact.js';
 
 class ViewportMeta {
   /**
@@ -46,7 +45,7 @@ class ViewportMeta {
   }
 }
 
-module.exports = makeComputedArtifact(ViewportMeta, null);
+export default makeComputedArtifact(ViewportMeta, null);
 
 /**
  * @typedef {object} ViewportMetaResult
diff --git a/lighthouse-core/config/budget.js b/lighthouse-core/config/budget.js
index 91f675438a7b..689d7edfeb3f 100644
--- a/lighthouse-core/config/budget.js
+++ b/lighthouse-core/config/budget.js
@@ -338,4 +338,4 @@ class Budget {
   }
 }
 
-module.exports = Budget;
+export {Budget};
diff --git a/lighthouse-core/config/config-helpers.js b/lighthouse-core/config/config-helpers.js
index 090ddb2b5253..da85e5b74295 100644
--- a/lighthouse-core/config/config-helpers.js
+++ b/lighthouse-core/config/config-helpers.js
@@ -5,17 +5,17 @@
  */
 'use strict';
 
-const path = require('path');
-const isDeepEqual = require('lodash/isEqual.js');
-const constants = require('./constants.js');
-const Budget = require('./budget.js');
-const ConfigPlugin = require('./config-plugin.js');
-const Runner = require('../runner.js');
-const i18n = require('../lib/i18n/i18n.js');
-const validation = require('../fraggle-rock/config/validation.js');
-
-/** @typedef {typeof import('../gather/gatherers/gatherer.js')} GathererConstructor */
-/** @typedef {typeof import('../audits/audit.js')} Audit */
+import path from 'path';
+import isDeepEqual from 'lodash/isEqual.js';
+import constants from './constants.js';
+import {Budget} from './budget.js';
+import ConfigPlugin from './config-plugin.js';
+import {Runner} from '../runner.js';
+import i18n from '../lib/i18n/i18n.js';
+import * as validation from '../fraggle-rock/config/validation.js';
+
+/** @typedef {typeof import('../gather/gatherers/gatherer.js')['Gatherer']} GathererConstructor */
+/** @typedef {typeof import('../audits/audit.js')['Audit']} Audit */
 /** @typedef {InstanceType<GathererConstructor>} Gatherer */
 
 function isBundledEnvironment() {
@@ -576,7 +576,7 @@ function deepCloneConfigJson(json) {
   return cloned;
 }
 
-module.exports = {
+export default {
   deepClone,
   deepCloneConfigJson,
   mergeConfigFragment,
diff --git a/lighthouse-core/config/config-plugin.js b/lighthouse-core/config/config-plugin.js
index bf2cd374716f..4574e2cfb672 100644
--- a/lighthouse-core/config/config-plugin.js
+++ b/lighthouse-core/config/config-plugin.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const i18n = require('../lib/i18n/i18n.js');
+import i18n from '../lib/i18n/i18n.js';
 
 /**
  * @param {unknown} arr
@@ -222,4 +222,4 @@ class ConfigPlugin {
   }
 }
 
-module.exports = ConfigPlugin;
+export default ConfigPlugin;
diff --git a/lighthouse-core/config/config.js b/lighthouse-core/config/config.js
index dd2fd420a1f7..e3c8788f150d 100644
--- a/lighthouse-core/config/config.js
+++ b/lighthouse-core/config/config.js
@@ -6,15 +6,15 @@
 'use strict';
 
 const defaultConfigPath = './default-config.js';
-const defaultConfig = require('./default-config.js');
-const constants = require('./constants.js');
-const format = require('../../shared/localization/format.js');
-const validation = require('./../fraggle-rock/config/validation.js');
-
-const log = require('lighthouse-logger');
-const path = require('path');
-const Runner = require('../runner.js');
-const {
+import defaultConfig from './default-config.js';
+import constants from './constants.js';
+import format from '../../shared/localization/format.js';
+import validation from './../fraggle-rock/config/validation.js';
+import log from 'lighthouse-logger';
+import path from 'path';
+import Runner from '../runner.js';
+
+import {
   mergePlugins,
   mergeConfigFragment,
   resolveSettings,
@@ -22,7 +22,7 @@ const {
   resolveGathererToDefn,
   deepClone,
   deepCloneConfigJson,
-} = require('./config-helpers.js');
+} from './config-helpers.js';
 
 /** @typedef {typeof import('../gather/gatherers/gatherer.js')} GathererConstructor */
 /** @typedef {InstanceType<GathererConstructor>} Gatherer */
@@ -541,4 +541,4 @@ class Config {
   }
 }
 
-module.exports = Config;
+export default Config;
diff --git a/lighthouse-core/config/constants.js b/lighthouse-core/config/constants.js
index 17c3a99490a9..4b37d5785d02 100644
--- a/lighthouse-core/config/constants.js
+++ b/lighthouse-core/config/constants.js
@@ -158,7 +158,7 @@ const nonSimulatedPassConfigOverrides = {
   cpuQuietThresholdMs: 5250,
 };
 
-module.exports = {
+export default {
   throttling,
   screenEmulationMetrics,
   userAgents,
diff --git a/lighthouse-core/config/default-config.js b/lighthouse-core/config/default-config.js
index 359187f854d2..7bac6013ea03 100644
--- a/lighthouse-core/config/default-config.js
+++ b/lighthouse-core/config/default-config.js
@@ -7,9 +7,10 @@
 
 /* eslint-disable max-len */
 
-const constants = require('./constants.js');
-const i18n = require('../lib/i18n/i18n.js');
-const m2a = require('./metrics-to-audits.js');
+import constants from './constants.js';
+
+import i18n from '../lib/i18n/i18n.js';
+import m2a from './metrics-to-audits.js';
 
 const UIStrings = {
   /** Title of the Performance category of audits. Equivalent to 'Web performance', this term is inclusive of all web page speed and loading optimization topics. Also used as a label of a score gauge; try to limit to 20 characters. */
@@ -624,7 +625,7 @@ const defaultConfig = {
   },
 };
 
-module.exports = defaultConfig;
+export default defaultConfig;
 
 // Use `defineProperty` so that the strings are accesible from original but ignored when we copy it
 Object.defineProperty(module.exports, 'UIStrings', {
diff --git a/lighthouse-core/config/desktop-config.js b/lighthouse-core/config/desktop-config.js
index 2703b4d9b645..6f4329822395 100644
--- a/lighthouse-core/config/desktop-config.js
+++ b/lighthouse-core/config/desktop-config.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const constants = require('./constants.js');
+import constants from './constants.js';
 
 /** @type {LH.Config.Json} */
 const config = {
@@ -18,4 +18,4 @@ const config = {
   },
 };
 
-module.exports = config;
+export default config;
diff --git a/lighthouse-core/config/experimental-config.js b/lighthouse-core/config/experimental-config.js
index 5671f5f43cf5..a382a5dbe67e 100644
--- a/lighthouse-core/config/experimental-config.js
+++ b/lighthouse-core/config/experimental-config.js
@@ -27,4 +27,4 @@ const config = {
   },
 };
 
-module.exports = config;
+export default config;
diff --git a/lighthouse-core/config/full-config.js b/lighthouse-core/config/full-config.js
index e8a202ae0c3f..c8cbe77c0fab 100644
--- a/lighthouse-core/config/full-config.js
+++ b/lighthouse-core/config/full-config.js
@@ -11,4 +11,4 @@ const fullConfig = {
   settings: {},
 };
 
-module.exports = fullConfig;
+export default fullConfig;
diff --git a/lighthouse-core/config/lr-desktop-config.js b/lighthouse-core/config/lr-desktop-config.js
index 04f164c88d5c..5854625e3be0 100644
--- a/lighthouse-core/config/lr-desktop-config.js
+++ b/lighthouse-core/config/lr-desktop-config.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const constants = require('./constants.js');
+import constants from './constants.js';
 
 /** @type {LH.Config.Json} */
 const config = {
@@ -22,4 +22,4 @@ const config = {
   },
 };
 
-module.exports = config;
+export default config;
diff --git a/lighthouse-core/config/lr-mobile-config.js b/lighthouse-core/config/lr-mobile-config.js
index 7c6af55a17c2..4bcf28ca5c67 100644
--- a/lighthouse-core/config/lr-mobile-config.js
+++ b/lighthouse-core/config/lr-mobile-config.js
@@ -28,4 +28,4 @@ const config = {
   },
 };
 
-module.exports = config;
+export default config;
diff --git a/lighthouse-core/config/metrics-to-audits.js b/lighthouse-core/config/metrics-to-audits.js
index 8c943c5ae338..fa6915f75faa 100644
--- a/lighthouse-core/config/metrics-to-audits.js
+++ b/lighthouse-core/config/metrics-to-audits.js
@@ -48,7 +48,7 @@ const clsRelevantAudits = [
   // 'preload-fonts', // actually in BP, rather than perf
 ];
 
-module.exports = {
+export default {
   fcpRelevantAudits,
   lcpRelevantAudits,
   tbtRelevantAudits,
diff --git a/lighthouse-core/config/perf-config.js b/lighthouse-core/config/perf-config.js
index 0e6f5903823f..ee9a98d95295 100644
--- a/lighthouse-core/config/perf-config.js
+++ b/lighthouse-core/config/perf-config.js
@@ -14,4 +14,4 @@ const perfConfig = {
   },
 };
 
-module.exports = perfConfig;
+export default perfConfig;
diff --git a/lighthouse-core/fraggle-rock/api.js b/lighthouse-core/fraggle-rock/api.js
index 57ab155580dd..116a2ce2c1cb 100644
--- a/lighthouse-core/fraggle-rock/api.js
+++ b/lighthouse-core/fraggle-rock/api.js
@@ -5,12 +5,12 @@
  */
 'use strict';
 
-const {UserFlow, auditGatherSteps} = require('./user-flow.js');
-const {snapshotGather} = require('./gather/snapshot-runner.js');
-const {startTimespanGather} = require('./gather/timespan-runner.js');
-const {navigationGather} = require('./gather/navigation-runner.js');
-const {generateFlowReportHtml} = require('../../report/generator/report-generator.js');
-const Runner = require('../runner.js');
+import {UserFlow, auditGatherSteps} from './user-flow.js';
+import {snapshotGather} from './gather/snapshot-runner.js';
+import {startTimespanGather} from './gather/timespan-runner.js';
+import {navigationGather} from './gather/navigation-runner.js';
+import {generateFlowReportHtml} from '../../report/generator/report-generator.js';
+import Runner from '../runner.js';
 
 /**
  * @param {LH.Puppeteer.Page} page
@@ -67,7 +67,7 @@ async function auditFlowArtifacts(flowArtifacts, config) {
   return await auditGatherSteps(gatherSteps, {name, config});
 }
 
-module.exports = {
+export {
   snapshot,
   startTimespan,
   navigation,
diff --git a/lighthouse-core/fraggle-rock/config/config.js b/lighthouse-core/fraggle-rock/config/config.js
index 1d1480b77032..ec01abfc1a8e 100644
--- a/lighthouse-core/fraggle-rock/config/config.js
+++ b/lighthouse-core/fraggle-rock/config/config.js
@@ -5,21 +5,24 @@
  */
 'use strict';
 
-const path = require('path');
-const log = require('lighthouse-logger');
-const Runner = require('../../runner.js');
-const defaultConfig = require('./default-config.js');
-const {defaultNavigationConfig, nonSimulatedPassConfigOverrides} = require('../../config/constants.js'); // eslint-disable-line max-len
-const {
+import path from 'path';
+import log from 'lighthouse-logger';
+import Runner from '../../runner.js';
+import defaultConfig from './default-config.js';
+import {defaultNavigationConfig, nonSimulatedPassConfigOverrides} from '../../config/constants.js'; // eslint-disable-line max-len
+
+import {
   isFRGathererDefn,
   throwInvalidDependencyOrder,
   isValidArtifactDependency,
   throwInvalidArtifactDependency,
   assertArtifactTopologicalOrder,
   assertValidConfig,
-} = require('./validation.js');
-const {filterConfigByGatherMode, filterConfigByExplicitFilters} = require('./filters.js');
-const {
+} from './validation.js';
+
+import {filterConfigByGatherMode, filterConfigByExplicitFilters} from './filters.js';
+
+import {
   deepCloneConfigJson,
   resolveSettings,
   resolveAuditsToDefns,
@@ -27,7 +30,8 @@ const {
   mergePlugins,
   mergeConfigFragment,
   mergeConfigFragmentArrayByKey,
-} = require('../../config/config-helpers.js');
+} from '../../config/config-helpers.js';
+
 const defaultConfigPath = path.join(__dirname, './default-config.js');
 
 /** @typedef {LH.Config.FRContext & {gatherMode: LH.Gatherer.GatherMode}} ConfigContext */
@@ -278,4 +282,4 @@ function initializeConfig(configJSON, context) {
   return {config, warnings};
 }
 
-module.exports = {resolveWorkingCopy, initializeConfig};
+export default {resolveWorkingCopy, initializeConfig};
diff --git a/lighthouse-core/fraggle-rock/config/default-config.js b/lighthouse-core/fraggle-rock/config/default-config.js
index f67925360ce3..3fbddbab3971 100644
--- a/lighthouse-core/fraggle-rock/config/default-config.js
+++ b/lighthouse-core/fraggle-rock/config/default-config.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const legacyDefaultConfig = require('../../config/default-config.js');
-const {deepClone} = require('../../config/config-helpers.js');
+import legacyDefaultConfig from '../../config/default-config.js';
+import {deepClone} from '../../config/config-helpers.js';
 
 /** @type {LH.Config.AuditJson[]} */
 const frAudits = [
@@ -199,4 +199,4 @@ const defaultConfig = {
   groups: legacyDefaultConfig.groups,
 };
 
-module.exports = defaultConfig;
+export default defaultConfig;
diff --git a/lighthouse-core/fraggle-rock/config/filters.js b/lighthouse-core/fraggle-rock/config/filters.js
index c1166dbb7081..508547fc4df1 100644
--- a/lighthouse-core/fraggle-rock/config/filters.js
+++ b/lighthouse-core/fraggle-rock/config/filters.js
@@ -5,9 +5,8 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
-
-const Audit = require('../../audits/audit.js');
+import log from 'lighthouse-logger';
+import Audit from '../../audits/audit.js';
 
 /** @type {Record<keyof LH.FRBaseArtifacts, string>} */
 const baseArtifactKeySource = {
@@ -321,7 +320,7 @@ function filterConfigByExplicitFilters(config, filters) {
   };
 }
 
-module.exports = {
+export default {
   filterConfigByGatherMode,
   filterConfigByExplicitFilters,
   filterArtifactsByGatherMode,
diff --git a/lighthouse-core/fraggle-rock/config/validation.js b/lighthouse-core/fraggle-rock/config/validation.js
index d24a7724d66e..bb4760c5f885 100644
--- a/lighthouse-core/fraggle-rock/config/validation.js
+++ b/lighthouse-core/fraggle-rock/config/validation.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const Audit = require('../../audits/audit.js');
-const BaseFRGatherer = require('../gather/base-gatherer.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import {Audit} from '../../audits/audit.js';
+import BaseFRGatherer from '../gather/base-gatherer.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 /**
  * @param {LH.Config.GathererDefn | LH.Config.AnyFRGathererDefn} gathererDefn
@@ -297,7 +297,7 @@ function throwInvalidArtifactDependency(artifactId, dependencyKey) {
   );
 }
 
-module.exports = {
+export {
   isFRGathererDefn,
   isValidArtifactDependency,
   assertValidPluginName,
diff --git a/lighthouse-core/fraggle-rock/gather/base-artifacts.js b/lighthouse-core/fraggle-rock/gather/base-artifacts.js
index f616b6a64841..4c4744d58c02 100644
--- a/lighthouse-core/fraggle-rock/gather/base-artifacts.js
+++ b/lighthouse-core/fraggle-rock/gather/base-artifacts.js
@@ -5,13 +5,11 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
-const isDeepEqual = require('lodash/isEqual.js');
-const {
-  getBrowserVersion,
-  getBenchmarkIndex,
-  getEnvironmentWarnings,
-} = require('../../gather/driver/environment.js');
+import log from 'lighthouse-logger';
+import isDeepEqual from 'lodash/isEqual.js';
+import {
+  getBrowserVersion, getBenchmarkIndex, getEnvironmentWarnings,
+} from '../../gather/driver/environment.js';
 
 /**
  * @param {LH.Config.FRConfig} config
@@ -96,7 +94,7 @@ function finalizeArtifacts(baseArtifacts, gathererArtifacts) {
   return artifacts;
 }
 
-module.exports = {
+export {
   getBaseArtifacts,
   finalizeArtifacts,
 };
diff --git a/lighthouse-core/fraggle-rock/gather/base-gatherer.js b/lighthouse-core/fraggle-rock/gather/base-gatherer.js
index 471d8f57611b..e36139c1a463 100644
--- a/lighthouse-core/fraggle-rock/gather/base-gatherer.js
+++ b/lighthouse-core/fraggle-rock/gather/base-gatherer.js
@@ -104,4 +104,4 @@ class FRGatherer {
   }
 }
 
-module.exports = FRGatherer;
+export default FRGatherer;
diff --git a/lighthouse-core/fraggle-rock/gather/driver.js b/lighthouse-core/fraggle-rock/gather/driver.js
index 20835d533afd..7c3c81d17b74 100644
--- a/lighthouse-core/fraggle-rock/gather/driver.js
+++ b/lighthouse-core/fraggle-rock/gather/driver.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
-const ProtocolSession = require('./session.js');
-const ExecutionContext = require('../../gather/driver/execution-context.js');
-const Fetcher = require('../../gather/fetcher.js');
+import log from 'lighthouse-logger';
+import ProtocolSession from './session.js';
+import ExecutionContext from '../../gather/driver/execution-context.js';
+import Fetcher from '../../gather/fetcher.js';
 
 /** @return {*} */
 const throwNotConnectedFn = () => {
@@ -85,4 +85,4 @@ class Driver {
   }
 }
 
-module.exports = Driver;
+export default Driver;
diff --git a/lighthouse-core/fraggle-rock/gather/navigation-runner.js b/lighthouse-core/fraggle-rock/gather/navigation-runner.js
index cc799b745224..1775a39ebff0 100644
--- a/lighthouse-core/fraggle-rock/gather/navigation-runner.js
+++ b/lighthouse-core/fraggle-rock/gather/navigation-runner.js
@@ -5,29 +5,25 @@
  */
 'use strict';
 
-const puppeteer = require('puppeteer-core');
-const log = require('lighthouse-logger');
-const Driver = require('./driver.js');
-const Runner = require('../../runner.js');
-const {
-  getEmptyArtifactState,
-  collectPhaseArtifacts,
-  awaitArtifacts,
-} = require('./runner-helpers.js');
-const prepare = require('../../gather/driver/prepare.js');
-const {gotoURL} = require('../../gather/driver/navigation.js');
-const storage = require('../../gather/driver/storage.js');
-const emulation = require('../../lib/emulation.js');
-const {defaultNavigationConfig} = require('../../config/constants.js');
-const {initializeConfig} = require('../config/config.js');
-const {getBaseArtifacts, finalizeArtifacts} = require('./base-artifacts.js');
-const format = require('../../../shared/localization/format.js');
-const LighthouseError = require('../../lib/lh-error.js');
-const URL = require('../../lib/url-shim.js');
-const {getPageLoadError} = require('../../lib/navigation-error.js');
-const Trace = require('../../gather/gatherers/trace.js');
-const DevtoolsLog = require('../../gather/gatherers/devtools-log.js');
-const NetworkRecords = require('../../computed/network-records.js');
+import puppeteer from 'puppeteer-core';
+import log from 'lighthouse-logger';
+import Driver from './driver.js';
+import Runner from '../../runner.js';
+import {getEmptyArtifactState, collectPhaseArtifacts, awaitArtifacts} from './runner-helpers.js';
+import prepare from '../../gather/driver/prepare.js';
+import {gotoURL} from '../../gather/driver/navigation.js';
+import storage from '../../gather/driver/storage.js';
+import emulation from '../../lib/emulation.js';
+import {defaultNavigationConfig} from '../../config/constants.js';
+import {initializeConfig} from '../config/config.js';
+import {getBaseArtifacts, finalizeArtifacts} from './base-artifacts.js';
+import format from '../../../shared/localization/format.js';
+import LighthouseError from '../../lib/lh-error.js';
+import URL from '../../lib/url-shim.js';
+import {getPageLoadError} from '../../lib/navigation-error.js';
+import Trace from '../../gather/gatherers/trace.js';
+import DevtoolsLog from '../../gather/gatherers/devtools-log.js';
+import NetworkRecords from '../../computed/network-records.js';
 
 /** @typedef {{skipAboutBlank?: boolean}} InternalOptions */
 
@@ -148,11 +144,11 @@ async function _collectDebugData(navigationContext, phaseState) {
   const getArtifactState = phaseState.artifactState.getArtifact;
 
   const devtoolsLogArtifactId = devtoolsLogArtifactDefn?.id;
-  const devtoolsLog = devtoolsLogArtifactId && await getArtifactState[devtoolsLogArtifactId];
-  const records = devtoolsLog && await NetworkRecords.request(devtoolsLog, navigationContext);
+  const devtoolsLog = devtoolsLogArtifactId && (await getArtifactState[devtoolsLogArtifactId]);
+  const records = devtoolsLog && (await NetworkRecords.request(devtoolsLog, navigationContext));
 
   const traceArtifactId = traceArtifactDefn?.id;
-  const trace = traceArtifactId && await getArtifactState[traceArtifactId];
+  const trace = traceArtifactId && (await getArtifactState[traceArtifactId]);
 
   return {devtoolsLog, records, trace};
 }
@@ -353,7 +349,7 @@ async function navigationGather(requestor, options) {
   return {artifacts, runnerOptions};
 }
 
-module.exports = {
+export default {
   navigationGather,
   _setup,
   _setupNavigation,
diff --git a/lighthouse-core/fraggle-rock/gather/runner-helpers.js b/lighthouse-core/fraggle-rock/gather/runner-helpers.js
index ee8ac4fa5bb7..481a1d82788a 100644
--- a/lighthouse-core/fraggle-rock/gather/runner-helpers.js
+++ b/lighthouse-core/fraggle-rock/gather/runner-helpers.js
@@ -23,7 +23,7 @@
 
 /** @typedef {LH.Gatherer.FRTransitionalContext<LH.Gatherer.DependencyKey>['dependencies']} Dependencies */
 
-const log = require('lighthouse-logger');
+import log from 'lighthouse-logger';
 
 /**
  *
@@ -149,7 +149,7 @@ async function awaitArtifacts(artifactState) {
   return artifacts;
 }
 
-module.exports = {
+export default {
   getEmptyArtifactState,
   awaitArtifacts,
   collectPhaseArtifacts,
diff --git a/lighthouse-core/fraggle-rock/gather/session.js b/lighthouse-core/fraggle-rock/gather/session.js
index 5116df75339a..78dc6597c7d6 100644
--- a/lighthouse-core/fraggle-rock/gather/session.js
+++ b/lighthouse-core/fraggle-rock/gather/session.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const LHError = require('../../lib/lh-error.js');
+import LHError from '../../lib/lh-error.js';
 const SessionEmitMonkeypatch = Symbol('monkeypatch');
 
 // Controls how long to wait for a response after sending a DevTools protocol command.
@@ -179,4 +179,4 @@ class ProtocolSession {
   }
 }
 
-module.exports = ProtocolSession;
+export default ProtocolSession;
diff --git a/lighthouse-core/fraggle-rock/gather/snapshot-runner.js b/lighthouse-core/fraggle-rock/gather/snapshot-runner.js
index 92a60a564777..19c85aab256e 100644
--- a/lighthouse-core/fraggle-rock/gather/snapshot-runner.js
+++ b/lighthouse-core/fraggle-rock/gather/snapshot-runner.js
@@ -5,16 +5,12 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
-const Driver = require('./driver.js');
-const Runner = require('../../runner.js');
-const {
-  getEmptyArtifactState,
-  collectPhaseArtifacts,
-  awaitArtifacts,
-} = require('./runner-helpers.js');
-const {initializeConfig} = require('../config/config.js');
-const {getBaseArtifacts, finalizeArtifacts} = require('./base-artifacts.js');
+import log from 'lighthouse-logger';
+import Driver from './driver.js';
+import Runner from '../../runner.js';
+import {getEmptyArtifactState, collectPhaseArtifacts, awaitArtifacts} from './runner-helpers.js';
+import {initializeConfig} from '../config/config.js';
+import {getBaseArtifacts, finalizeArtifacts} from './base-artifacts.js';
 
 /**
  * @param {{page: LH.Puppeteer.Page, config?: LH.Config.Json, configContext?: LH.Config.FRContext}} options
@@ -64,6 +60,6 @@ async function snapshotGather(options) {
   return {artifacts, runnerOptions};
 }
 
-module.exports = {
+export default {
   snapshotGather,
 };
diff --git a/lighthouse-core/fraggle-rock/gather/timespan-runner.js b/lighthouse-core/fraggle-rock/gather/timespan-runner.js
index 25ceab578caa..e1d838d29364 100644
--- a/lighthouse-core/fraggle-rock/gather/timespan-runner.js
+++ b/lighthouse-core/fraggle-rock/gather/timespan-runner.js
@@ -5,17 +5,13 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
-const Driver = require('./driver.js');
-const Runner = require('../../runner.js');
-const {
-  getEmptyArtifactState,
-  collectPhaseArtifacts,
-  awaitArtifacts,
-} = require('./runner-helpers.js');
-const {prepareTargetForTimespanMode} = require('../../gather/driver/prepare.js');
-const {initializeConfig} = require('../config/config.js');
-const {getBaseArtifacts, finalizeArtifacts} = require('./base-artifacts.js');
+import log from 'lighthouse-logger';
+import Driver from './driver.js';
+import Runner from '../../runner.js';
+import {getEmptyArtifactState, collectPhaseArtifacts, awaitArtifacts} from './runner-helpers.js';
+import {prepareTargetForTimespanMode} from '../../gather/driver/prepare.js';
+import {initializeConfig} from '../config/config.js';
+import {getBaseArtifacts, finalizeArtifacts} from './base-artifacts.js';
 
 /**
  * @param {{page: LH.Puppeteer.Page, config?: LH.Config.Json, configContext?: LH.Config.FRContext}} options
@@ -77,6 +73,6 @@ async function startTimespanGather(options) {
   };
 }
 
-module.exports = {
+export default {
   startTimespanGather,
 };
diff --git a/lighthouse-core/fraggle-rock/user-flow.js b/lighthouse-core/fraggle-rock/user-flow.js
index 552879e24fc5..25339859dc79 100644
--- a/lighthouse-core/fraggle-rock/user-flow.js
+++ b/lighthouse-core/fraggle-rock/user-flow.js
@@ -5,12 +5,12 @@
  */
 'use strict';
 
-const {generateFlowReportHtml} = require('../../report/generator/report-generator.js');
-const {snapshotGather} = require('./gather/snapshot-runner.js');
-const {startTimespanGather} = require('./gather/timespan-runner.js');
-const {navigationGather} = require('./gather/navigation-runner.js');
-const Runner = require('../runner.js');
-const {initializeConfig} = require('./config/config.js');
+import {generateFlowReportHtml} from '../../report/generator/report-generator.js';
+import {snapshotGather} from './gather/snapshot-runner.js';
+import {startTimespanGather} from './gather/timespan-runner.js';
+import {navigationGather} from './gather/navigation-runner.js';
+import {Runner} from '../runner.js';
+import {initializeConfig} from './config/config.js';
 
 /** @typedef {Parameters<snapshotGather>[0]} FrOptions */
 /** @typedef {Omit<FrOptions, 'page'> & {name?: string}} UserFlowOptions */
@@ -223,7 +223,7 @@ async function auditGatherSteps(gatherSteps, options) {
 }
 
 
-module.exports = {
+export {
   UserFlow,
   auditGatherSteps,
 };
diff --git a/lighthouse-core/gather/connections/connection.js b/lighthouse-core/gather/connections/connection.js
index 3db1d757c030..dab478269a02 100644
--- a/lighthouse-core/gather/connections/connection.js
+++ b/lighthouse-core/gather/connections/connection.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const EventEmitter = require('events').EventEmitter;
-const log = require('lighthouse-logger');
-const LHError = require('../../lib/lh-error.js');
+import {EventEmitter} from 'events';
+import log from 'lighthouse-logger';
+import LHError from '../../lib/lh-error.js';
 
 // TODO(bckenny): CommandCallback properties should be tied by command type after
 // https://github.com/Microsoft/TypeScript/pull/22348. See driver.js TODO.
@@ -176,4 +176,4 @@ class Connection {
   }
 }
 
-module.exports = Connection;
+export {Connection};
diff --git a/lighthouse-core/gather/connections/cri.js b/lighthouse-core/gather/connections/cri.js
index ab5168c621e8..b2dd08dffef8 100644
--- a/lighthouse-core/gather/connections/cri.js
+++ b/lighthouse-core/gather/connections/cri.js
@@ -5,11 +5,11 @@
  */
 'use strict';
 
-const Connection = require('./connection.js');
-const WebSocket = require('ws');
-const http = require('http');
-const log = require('lighthouse-logger');
-const LighthouseError = require('../../lib/lh-error.js');
+import {Connection} from './connection.js';
+import WebSocket from 'ws';
+import http from 'http';
+import log from 'lighthouse-logger';
+import LighthouseError from '../../lib/lh-error.js';
 
 const DEFAULT_HOSTNAME = '127.0.0.1';
 const CONNECT_TIMEOUT = 10000;
@@ -169,4 +169,4 @@ class CriConnection extends Connection {
   }
 }
 
-module.exports = CriConnection;
+export {CriConnection};
diff --git a/lighthouse-core/gather/connections/raw.js b/lighthouse-core/gather/connections/raw.js
index e701a7a07280..62af13d83912 100644
--- a/lighthouse-core/gather/connections/raw.js
+++ b/lighthouse-core/gather/connections/raw.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const Connection = require('./connection.js');
+import {Connection} from './connection.js';
 
 /* eslint-disable no-unused-vars */
 
@@ -55,4 +55,4 @@ class RawConnection extends Connection {
   }
 }
 
-module.exports = RawConnection;
+export {RawConnection};
diff --git a/lighthouse-core/gather/devtools-log.js b/lighthouse-core/gather/devtools-log.js
index 69916729d2bb..085902c49638 100644
--- a/lighthouse-core/gather/devtools-log.js
+++ b/lighthouse-core/gather/devtools-log.js
@@ -58,4 +58,4 @@ class DevtoolsLog {
   }
 }
 
-module.exports = DevtoolsLog;
+export {DevtoolsLog};
diff --git a/lighthouse-core/gather/driver.js b/lighthouse-core/gather/driver.js
index d8a2c8f65edd..85f25be6ff31 100644
--- a/lighthouse-core/gather/driver.js
+++ b/lighthouse-core/gather/driver.js
@@ -5,20 +5,15 @@
  */
 'use strict';
 
-const Fetcher = require('./fetcher.js');
-const ExecutionContext = require('./driver/execution-context.js');
-const LHError = require('../lib/lh-error.js');
-const {fetchResponseBodyFromCache} = require('../gather/driver/network.js');
-const EventEmitter = require('events').EventEmitter;
-
-const log = require('lighthouse-logger');
-const DevtoolsLog = require('./devtools-log.js');
-const TraceGatherer = require('./gatherers/trace.js');
-
-// Pulled in for Connection type checking.
-// eslint-disable-next-line no-unused-vars
-const Connection = require('./connections/connection.js');
-const {getBrowserVersion} = require('./driver/environment.js');
+import {Fetcher} from './fetcher.js';
+import {ExecutionContext} from './driver/execution-context.js';
+import LHError from '../lib/lh-error.js';
+import {fetchResponseBodyFromCache} from '../gather/driver/network.js';
+import {EventEmitter} from 'events';
+import log from 'lighthouse-logger';
+import {DevtoolsLog} from './devtools-log.js';
+import TraceGatherer from './gatherers/trace.js';
+import {getBrowserVersion} from './driver/environment.js';
 
 // Controls how long to wait for a response after sending a DevTools protocol command.
 const DEFAULT_PROTOCOL_TIMEOUT = 30000;
@@ -67,7 +62,7 @@ class Driver {
   fetcher = new Fetcher(this.defaultSession, this.executionContext);
 
   /**
-   * @param {Connection} connection
+   * @param {import('./connections/connection.js').Connection} connection
    */
   constructor(connection) {
     this._connection = connection;
@@ -477,4 +472,4 @@ class Driver {
   }
 }
 
-module.exports = Driver;
+export {Driver};
diff --git a/lighthouse-core/gather/driver/dom.js b/lighthouse-core/gather/driver/dom.js
index c5629fca103d..bb8d43ff5f8e 100644
--- a/lighthouse-core/gather/driver/dom.js
+++ b/lighthouse-core/gather/driver/dom.js
@@ -55,4 +55,4 @@ async function resolveDevtoolsNodePathToObjectId(session, path) {
   }
 }
 
-module.exports = {resolveNodeIdToObjectId, resolveDevtoolsNodePathToObjectId};
+export {resolveNodeIdToObjectId, resolveDevtoolsNodePathToObjectId};
diff --git a/lighthouse-core/gather/driver/environment.js b/lighthouse-core/gather/driver/environment.js
index 8345d8a9349d..e3446e316c86 100644
--- a/lighthouse-core/gather/driver/environment.js
+++ b/lighthouse-core/gather/driver/environment.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
-const constants = require('../../config/constants.js');
-const pageFunctions = require('../../lib/page-functions.js');
-const i18n = require('../../lib/i18n/i18n.js');
+import log from 'lighthouse-logger';
+import constants from '../../config/constants.js';
+import pageFunctions from '../../lib/page-functions.js';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /**
@@ -96,7 +96,7 @@ function getEnvironmentWarnings(context) {
   ].filter(/** @return {s is LH.IcuMessage} */ s => !!s);
 }
 
-module.exports = {
+export {
   UIStrings,
   getBrowserVersion,
   getBenchmarkIndex,
diff --git a/lighthouse-core/gather/driver/execution-context.js b/lighthouse-core/gather/driver/execution-context.js
index 5a7214e8c075..795399100ed6 100644
--- a/lighthouse-core/gather/driver/execution-context.js
+++ b/lighthouse-core/gather/driver/execution-context.js
@@ -7,7 +7,7 @@
 
 /* global window */
 
-const pageFunctions = require('../../lib/page-functions.js');
+import {pageFunctions} from '../../lib/page-functions.js';
 
 class ExecutionContext {
   /** @param {LH.Gatherer.FRProtocolSession} session */
@@ -248,4 +248,4 @@ class ExecutionContext {
   }
 }
 
-module.exports = ExecutionContext;
+export {ExecutionContext};
diff --git a/lighthouse-core/gather/driver/navigation.js b/lighthouse-core/gather/driver/navigation.js
index 557317a6acae..130a2b67ac62 100644
--- a/lighthouse-core/gather/driver/navigation.js
+++ b/lighthouse-core/gather/driver/navigation.js
@@ -5,12 +5,12 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
-const NetworkMonitor = require('./network-monitor.js');
-const {waitForFullyLoaded, waitForFrameNavigated, waitForUserToContinue} = require('./wait-for-condition.js'); // eslint-disable-line max-len
-const constants = require('../../config/constants.js');
-const i18n = require('../../lib/i18n/i18n.js');
-const URL = require('../../lib/url-shim.js');
+import log from 'lighthouse-logger';
+import {NetworkMonitor} from './network-monitor.js';
+import {waitForFullyLoaded, waitForFrameNavigated, waitForUserToContinue} from './wait-for-condition.js'; // eslint-disable-line max-len
+import constants from '../../config/constants.js';
+import i18n from '../../lib/i18n/i18n.js';
+import URL from '../../lib/url-shim.js';
 
 const UIStrings = {
   /**
@@ -176,4 +176,4 @@ function getNavigationWarnings(navigation) {
   return warnings;
 }
 
-module.exports = {gotoURL, getNavigationWarnings, UIStrings};
+export {gotoURL, getNavigationWarnings, UIStrings};
diff --git a/lighthouse-core/gather/driver/network-monitor.js b/lighthouse-core/gather/driver/network-monitor.js
index bbc6c86405fe..ddca4b2c3a37 100644
--- a/lighthouse-core/gather/driver/network-monitor.js
+++ b/lighthouse-core/gather/driver/network-monitor.js
@@ -10,12 +10,13 @@
  * status inspection state.
  */
 
-const log = require('lighthouse-logger');
-const {EventEmitter} = require('events');
-const NetworkRecorder = require('../../lib/network-recorder.js');
-const NetworkRequest = require('../../lib/network-request.js');
-const URL = require('../../lib/url-shim.js');
-const TargetManager = require('./target-manager.js');
+import log from 'lighthouse-logger';
+
+import {EventEmitter} from 'events';
+import NetworkRecorder from '../../lib/network-recorder.js';
+import NetworkRequest from '../../lib/network-request.js';
+import URL from '../../lib/url-shim.js';
+import {TargetManager} from './target-manager.js';
 
 /** @typedef {import('../../lib/network-recorder.js').NetworkRecorderEvent} NetworkRecorderEvent */
 /** @typedef {'network-2-idle'|'network-critical-idle'|'networkidle'|'networkbusy'|'network-critical-busy'|'network-2-busy'} NetworkMonitorEvent_ */
@@ -300,4 +301,4 @@ class NetworkMonitor {
   }
 }
 
-module.exports = NetworkMonitor;
+export {NetworkMonitor};
diff --git a/lighthouse-core/gather/driver/network.js b/lighthouse-core/gather/driver/network.js
index c4c29250a391..5d94fd085f70 100644
--- a/lighthouse-core/gather/driver/network.js
+++ b/lighthouse-core/gather/driver/network.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const NetworkRequest = require('../../lib/network-request.js');
+import NetworkRequest from '../../lib/network-request.js';
 
 /**
  * Return the body of the response with the given ID. Rejects if getting the
@@ -25,4 +25,4 @@ async function fetchResponseBodyFromCache(session, requestId, timeout = 1000) {
   return result.body;
 }
 
-module.exports = {fetchResponseBodyFromCache};
+export {fetchResponseBodyFromCache};
diff --git a/lighthouse-core/gather/driver/prepare.js b/lighthouse-core/gather/driver/prepare.js
index 1f2eaa0300cc..6a4ce9b53620 100644
--- a/lighthouse-core/gather/driver/prepare.js
+++ b/lighthouse-core/gather/driver/prepare.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
-const storage = require('./storage.js');
-const emulation = require('../../lib/emulation.js');
-const pageFunctions = require('../../lib/page-functions.js');
+import log from 'lighthouse-logger';
+import * as storage from './storage.js';
+import * as emulation from '../../lib/emulation.js';
+import {pageFunctions} from '../../lib/page-functions.js';
 
 /**
  * Enables `Debugger` domain to receive async stacktrace information on network request initiators.
@@ -218,7 +218,7 @@ async function prepareTargetForIndividualNavigation(session, settings, navigatio
   return {warnings};
 }
 
-module.exports = {
+export {
   prepareThrottlingAndNetwork,
   prepareTargetForTimespanMode,
   prepareTargetForNavigationMode,
diff --git a/lighthouse-core/gather/driver/service-workers.js b/lighthouse-core/gather/driver/service-workers.js
index 5de97fd3279e..f1c33588facb 100644
--- a/lighthouse-core/gather/driver/service-workers.js
+++ b/lighthouse-core/gather/driver/service-workers.js
@@ -50,4 +50,4 @@ function getServiceWorkerRegistrations(session) {
   });
 }
 
-module.exports = {getServiceWorkerVersions, getServiceWorkerRegistrations};
+export {getServiceWorkerVersions, getServiceWorkerRegistrations};
diff --git a/lighthouse-core/gather/driver/storage.js b/lighthouse-core/gather/driver/storage.js
index 40d16d93dd08..97a708bb1bc6 100644
--- a/lighthouse-core/gather/driver/storage.js
+++ b/lighthouse-core/gather/driver/storage.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
-const i18n = require('../../lib/i18n/i18n.js');
+import log from 'lighthouse-logger';
+import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /**
@@ -117,7 +117,7 @@ async function clearBrowserCaches(session) {
   log.timeEnd(status);
 }
 
-module.exports = {
+export {
   clearDataForOrigin,
   clearBrowserCaches,
   getImportantStorageWarning,
diff --git a/lighthouse-core/gather/driver/target-manager.js b/lighthouse-core/gather/driver/target-manager.js
index 831f6560d447..12b70c55b2c8 100644
--- a/lighthouse-core/gather/driver/target-manager.js
+++ b/lighthouse-core/gather/driver/target-manager.js
@@ -10,7 +10,7 @@
   * listen for protocol events before each target is resumed.
   */
 
-const log = require('lighthouse-logger');
+import log from 'lighthouse-logger';
 
 /** @typedef {{target: LH.Crdp.Target.TargetInfo, session: LH.Gatherer.FRProtocolSession}} TargetWithSession */
 
@@ -122,4 +122,4 @@ class TargetManager {
   }
 }
 
-module.exports = TargetManager;
+export {TargetManager};
diff --git a/lighthouse-core/gather/driver/wait-for-condition.js b/lighthouse-core/gather/driver/wait-for-condition.js
index fa3d06944393..3d10c8e79c3f 100644
--- a/lighthouse-core/gather/driver/wait-for-condition.js
+++ b/lighthouse-core/gather/driver/wait-for-condition.js
@@ -7,11 +7,12 @@
 
 /* global window */
 
-const log = require('lighthouse-logger');
-const LHError = require('../../lib/lh-error.js');
-const ExecutionContext = require('./execution-context.js');
+import log from 'lighthouse-logger';
 
-/** @typedef {import('./network-monitor.js')} NetworkMonitor */
+import LHError from '../../lib/lh-error.js';
+import {ExecutionContext} from './execution-context.js';
+
+/** @typedef {InstanceType<import('./network-monitor.js')['NetworkMonitor']>} NetworkMonitor */
 /** @typedef {import('./network-monitor.js').NetworkMonitorEvent} NetworkMonitorEvent */
 /** @typedef {{promise: Promise<void>, cancel: function(): void}} CancellableWait */
 
@@ -523,7 +524,7 @@ function waitForUserToContinue(driver) {
   return driver.executionContext.evaluate(createInPagePromise, {args: []});
 }
 
-module.exports = {
+export {
   waitForNothing,
   waitForFrameNavigated,
   waitForFcp,
diff --git a/lighthouse-core/gather/fetcher.js b/lighthouse-core/gather/fetcher.js
index 7de4caf3e9ec..ef930c46d2bd 100644
--- a/lighthouse-core/gather/fetcher.js
+++ b/lighthouse-core/gather/fetcher.js
@@ -15,13 +15,14 @@
 
 /** @typedef {{content: string|null, status: number|null}} FetchResponse */
 
-const log = require('lighthouse-logger');
-const {getBrowserVersion} = require('./driver/environment.js');
+import log from 'lighthouse-logger';
+
+import {getBrowserVersion} from './driver/environment.js';
 
 class Fetcher {
   /**
    * @param {LH.Gatherer.FRProtocolSession} session
-   * @param {import('./driver/execution-context.js')} executionContext
+   * @param {import('./driver/execution-context.js').ExecutionContext} executionContext
    */
   constructor(session, executionContext) {
     this.session = session;
@@ -315,4 +316,4 @@ class Fetcher {
   }
 }
 
-module.exports = Fetcher;
+export {Fetcher};
diff --git a/lighthouse-core/gather/gather-runner.js b/lighthouse-core/gather/gather-runner.js
index 07dd5b7894a7..62f92b8791e4 100644
--- a/lighthouse-core/gather/gather-runner.js
+++ b/lighthouse-core/gather/gather-runner.js
@@ -5,25 +5,25 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
-const NetworkRecords = require('../computed/network-records.js');
-const {getPageLoadError} = require('../lib/navigation-error.js');
-const emulation = require('../lib/emulation.js');
-const constants = require('../config/constants.js');
-const format = require('../../shared/localization/format.js');
-const {getBenchmarkIndex, getEnvironmentWarnings} = require('./driver/environment.js');
-const prepare = require('./driver/prepare.js');
-const storage = require('./driver/storage.js');
-const navigation = require('./driver/navigation.js');
-const serviceWorkers = require('./driver/service-workers.js');
-const WebAppManifest = require('./gatherers/web-app-manifest.js');
-const InstallabilityErrors = require('./gatherers/installability-errors.js');
-const NetworkUserAgent = require('./gatherers/network-user-agent.js');
-const Stacks = require('./gatherers/stacks.js');
-const {finalizeArtifacts} = require('../fraggle-rock/gather/base-artifacts.js');
-
-/** @typedef {import('../gather/driver.js')} Driver */
-/** @typedef {import('../lib/arbitrary-equality-map.js')} ArbitraryEqualityMap */
+import log from 'lighthouse-logger';
+import NetworkRecords from '../computed/network-records.js';
+import {getPageLoadError} from '../lib/navigation-error.js';
+import emulation from '../lib/emulation.js';
+import constants from '../config/constants.js';
+import format from '../../shared/localization/format.js';
+import {getBenchmarkIndex, getEnvironmentWarnings} from './driver/environment.js';
+import * as prepare from './driver/prepare.js';
+import * as storage from './driver/storage.js';
+import * as navigation from './driver/navigation.js';
+import * as serviceWorkers from './driver/service-workers.js';
+import WebAppManifest from './gatherers/web-app-manifest.js';
+import InstallabilityErrors from './gatherers/installability-errors.js';
+import NetworkUserAgent from './gatherers/network-user-agent.js';
+import Stacks from './gatherers/stacks.js';
+import {finalizeArtifacts} from '../fraggle-rock/gather/base-artifacts.js';
+
+/** @typedef {import('../gather/driver.js').Driver} Driver */
+/** @typedef {import('../lib/arbitrary-equality-map.js').ArbitraryEqualityMap} ArbitraryEqualityMap */
 
 /**
  * Each entry in each gatherer result array is the output of a gatherer phase:
@@ -626,4 +626,4 @@ class GatherRunner {
   }
 }
 
-module.exports = GatherRunner;
+export {GatherRunner};
diff --git a/lighthouse-core/gather/gatherers/accessibility.js b/lighthouse-core/gather/gatherers/accessibility.js
index ae75a17650bd..2c7982aff80e 100644
--- a/lighthouse-core/gather/gatherers/accessibility.js
+++ b/lighthouse-core/gather/gatherers/accessibility.js
@@ -7,9 +7,10 @@
 
 /* global window, document, getNodeDetails */
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
-const axeLibSource = require('../../lib/axe.js').source;
-const pageFunctions = require('../../lib/page-functions.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+
+import {source as axeLibSource} from '../../lib/axe.js';
+import {pageFunctions} from '../../lib/page-functions.js';
 
 /**
  * @return {Promise<LH.Artifacts.Accessibility>}
@@ -181,4 +182,4 @@ class Accessibility extends FRGatherer {
   }
 }
 
-module.exports = Accessibility;
+export default Accessibility;
diff --git a/lighthouse-core/gather/gatherers/anchor-elements.js b/lighthouse-core/gather/gatherers/anchor-elements.js
index efc62078b6c9..1efa6cb09753 100644
--- a/lighthouse-core/gather/gatherers/anchor-elements.js
+++ b/lighthouse-core/gather/gatherers/anchor-elements.js
@@ -7,9 +7,10 @@
 
 /* global getNodeDetails */
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
-const dom = require('../driver/dom.js');
-const pageFunctions = require('../../lib/page-functions.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+
+import {pageFunctions} from '../../lib/page-functions.js';
+import {resolveDevtoolsNodePathToObjectId} from '../driver/dom.js';
 
 /* eslint-env browser, node */
 
@@ -80,7 +81,7 @@ function collectAnchorElements() {
  * @return {Promise<Array<{type: string}>>}
  */
 async function getEventListeners(session, devtoolsNodePath) {
-  const objectId = await dom.resolveDevtoolsNodePathToObjectId(session, devtoolsNodePath);
+  const objectId = await resolveDevtoolsNodePathToObjectId(session, devtoolsNodePath);
   if (!objectId) return [];
 
   const response = await session.sendCommand('DOMDebugger.getEventListeners', {
@@ -130,4 +131,4 @@ class AnchorElements extends FRGatherer {
   }
 }
 
-module.exports = AnchorElements;
+export default AnchorElements;
diff --git a/lighthouse-core/gather/gatherers/cache-contents.js b/lighthouse-core/gather/gatherers/cache-contents.js
index 675f7b9699d0..14b90f53fa5f 100644
--- a/lighthouse-core/gather/gatherers/cache-contents.js
+++ b/lighthouse-core/gather/gatherers/cache-contents.js
@@ -7,7 +7,7 @@
 
 /* global caches */
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 /**
  * @return {Promise<Array<string>>}
@@ -56,4 +56,4 @@ class CacheContents extends FRGatherer {
   }
 }
 
-module.exports = CacheContents;
+export default CacheContents;
diff --git a/lighthouse-core/gather/gatherers/console-messages.js b/lighthouse-core/gather/gatherers/console-messages.js
index 481d07370d3a..1b967034b8ff 100644
--- a/lighthouse-core/gather/gatherers/console-messages.js
+++ b/lighthouse-core/gather/gatherers/console-messages.js
@@ -11,7 +11,7 @@
 
 'use strict';
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 /**
  * @param {LH.Crdp.Runtime.RemoteObject} obj
@@ -172,4 +172,4 @@ class ConsoleMessages extends FRGatherer {
   }
 }
 
-module.exports = ConsoleMessages;
+export default ConsoleMessages;
diff --git a/lighthouse-core/gather/gatherers/css-usage.js b/lighthouse-core/gather/gatherers/css-usage.js
index 4802c64d7eab..8c12ae742f7c 100644
--- a/lighthouse-core/gather/gatherers/css-usage.js
+++ b/lighthouse-core/gather/gatherers/css-usage.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 /**
  * @fileoverview Tracks unused CSS rules.
@@ -121,4 +121,4 @@ class CSSUsage extends FRGatherer {
   }
 }
 
-module.exports = CSSUsage;
+export default CSSUsage;
diff --git a/lighthouse-core/gather/gatherers/devtools-log-compat.js b/lighthouse-core/gather/gatherers/devtools-log-compat.js
index e8e3e9961844..7175bb8ad5bf 100644
--- a/lighthouse-core/gather/gatherers/devtools-log-compat.js
+++ b/lighthouse-core/gather/gatherers/devtools-log-compat.js
@@ -11,8 +11,9 @@
  * when devtools logs and traces were special-cased.
  */
 
-const DevtoolsLogGatherer = require('./devtools-log.js');
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
+import DevtoolsLogGatherer from './devtools-log.js';
+
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 /** @implements {LH.Gatherer.FRGathererInstance<'DevtoolsLog'>} */
 class DevtoolsLogCompat extends FRGatherer {
@@ -33,4 +34,4 @@ class DevtoolsLogCompat extends FRGatherer {
   }
 }
 
-module.exports = DevtoolsLogCompat;
+export default DevtoolsLogCompat;
diff --git a/lighthouse-core/gather/gatherers/devtools-log.js b/lighthouse-core/gather/gatherers/devtools-log.js
index 3038aba09aa5..3a7fd27f4269 100644
--- a/lighthouse-core/gather/gatherers/devtools-log.js
+++ b/lighthouse-core/gather/gatherers/devtools-log.js
@@ -11,9 +11,10 @@
  * This protocol log can be used to recreate the network records using lib/network-recorder.js.
  */
 
-const NetworkMonitor = require('../driver/network-monitor.js');
-const MessageLog = require('../devtools-log.js');
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
+import NetworkMonitor from '../driver/network-monitor.js';
+
+import MessageLog from '../devtools-log.js';
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 class DevtoolsLog extends FRGatherer {
   static symbol = Symbol('DevtoolsLog');
@@ -63,4 +64,4 @@ class DevtoolsLog extends FRGatherer {
   }
 }
 
-module.exports = DevtoolsLog;
+export default DevtoolsLog;
diff --git a/lighthouse-core/gather/gatherers/dobetterweb/doctype.js b/lighthouse-core/gather/gatherers/dobetterweb/doctype.js
index 72eab418958a..3ab8e71e46d8 100644
--- a/lighthouse-core/gather/gatherers/dobetterweb/doctype.js
+++ b/lighthouse-core/gather/gatherers/dobetterweb/doctype.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const FRGatherer = require('../../../fraggle-rock/gather/base-gatherer.js');
+import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
 
 /* global document */
 
@@ -45,4 +45,4 @@ class Doctype extends FRGatherer {
   }
 }
 
-module.exports = Doctype;
+export default Doctype;
diff --git a/lighthouse-core/gather/gatherers/dobetterweb/domstats.js b/lighthouse-core/gather/gatherers/dobetterweb/domstats.js
index d3d5c6c0b058..2f205ad2e85a 100644
--- a/lighthouse-core/gather/gatherers/dobetterweb/domstats.js
+++ b/lighthouse-core/gather/gatherers/dobetterweb/domstats.js
@@ -13,8 +13,8 @@
 
 'use strict';
 
-const FRGatherer = require('../../../fraggle-rock/gather/base-gatherer.js');
-const pageFunctions = require('../../../lib/page-functions.js');
+import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
+import pageFunctions from '../../../lib/page-functions.js';
 
 /**
  * Calculates the maximum tree depth of the DOM.
@@ -100,4 +100,4 @@ class DOMStats extends FRGatherer {
   }
 }
 
-module.exports = DOMStats;
+export default DOMStats;
diff --git a/lighthouse-core/gather/gatherers/dobetterweb/optimized-images.js b/lighthouse-core/gather/gatherers/dobetterweb/optimized-images.js
index 2b0d0b4b8812..6f0ab94d81e0 100644
--- a/lighthouse-core/gather/gatherers/dobetterweb/optimized-images.js
+++ b/lighthouse-core/gather/gatherers/dobetterweb/optimized-images.js
@@ -10,13 +10,13 @@
   */
 'use strict';
 
-const log = require('lighthouse-logger');
-const FRGatherer = require('../../../fraggle-rock/gather/base-gatherer.js');
-const URL = require('../../../lib/url-shim.js');
-const NetworkRequest = require('../../../lib/network-request.js');
-const Sentry = require('../../../lib/sentry.js');
-const NetworkRecords = require('../../../computed/network-records.js');
-const DevtoolsLog = require('../devtools-log.js');
+import log from 'lighthouse-logger';
+import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
+import URL from '../../../lib/url-shim.js';
+import NetworkRequest from '../../../lib/network-request.js';
+import Sentry from '../../../lib/sentry.js';
+import NetworkRecords from '../../../computed/network-records.js';
+import DevtoolsLog from '../devtools-log.js';
 
 // Image encoding can be slow and we don't want to spend forever on it.
 // Cap our encoding to 5 seconds, anything after that will be estimated.
@@ -189,4 +189,4 @@ class OptimizedImages extends FRGatherer {
   }
 }
 
-module.exports = OptimizedImages;
+export default OptimizedImages;
diff --git a/lighthouse-core/gather/gatherers/dobetterweb/password-inputs-with-prevented-paste.js b/lighthouse-core/gather/gatherers/dobetterweb/password-inputs-with-prevented-paste.js
index 0fff0b5d8269..3b18135008e1 100644
--- a/lighthouse-core/gather/gatherers/dobetterweb/password-inputs-with-prevented-paste.js
+++ b/lighthouse-core/gather/gatherers/dobetterweb/password-inputs-with-prevented-paste.js
@@ -7,8 +7,9 @@
 
 /* global document ClipboardEvent getNodeDetails */
 
-const FRGatherer = require('../../../fraggle-rock/gather/base-gatherer.js');
-const pageFunctions = require('../../../lib/page-functions.js');
+import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
+
+import pageFunctions from '../../../lib/page-functions.js';
 
 /**
  * @return {LH.Artifacts['PasswordInputsWithPreventedPaste']}
@@ -47,4 +48,4 @@ class PasswordInputsWithPreventedPaste extends FRGatherer {
 }
 
 
-module.exports = PasswordInputsWithPreventedPaste;
+export default PasswordInputsWithPreventedPaste;
diff --git a/lighthouse-core/gather/gatherers/dobetterweb/response-compression.js b/lighthouse-core/gather/gatherers/dobetterweb/response-compression.js
index 16cc4028842a..ff502fb59eb1 100644
--- a/lighthouse-core/gather/gatherers/dobetterweb/response-compression.js
+++ b/lighthouse-core/gather/gatherers/dobetterweb/response-compression.js
@@ -10,15 +10,15 @@
   */
 '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');
-const NetworkRequest = require('../../../lib/network-request.js');
-const gzip = require('zlib').gzip;
-const DevtoolsLog = require('../devtools-log.js');
-const {fetchResponseBodyFromCache} = require('../../driver/network.js');
-const NetworkRecords = require('../../../computed/network-records.js');
+import {Buffer} from 'buffer';
+import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
+import URL from '../../../lib/url-shim.js';
+import Sentry from '../../../lib/sentry.js';
+import NetworkRequest from '../../../lib/network-request.js';
+import {gzip} from 'zlib';
+import DevtoolsLog from '../devtools-log.js';
+import {fetchResponseBodyFromCache} from '../../driver/network.js';
+import NetworkRecords from '../../../computed/network-records.js';
 
 const CHROME_EXTENSION_PROTOCOL = 'chrome-extension:';
 const compressionHeaders = [
@@ -151,4 +151,4 @@ class ResponseCompression extends FRGatherer {
   }
 }
 
-module.exports = ResponseCompression;
+export default ResponseCompression;
diff --git a/lighthouse-core/gather/gatherers/dobetterweb/tags-blocking-first-paint.js b/lighthouse-core/gather/gatherers/dobetterweb/tags-blocking-first-paint.js
index ec2a6eac939e..9801d6c5a735 100644
--- a/lighthouse-core/gather/gatherers/dobetterweb/tags-blocking-first-paint.js
+++ b/lighthouse-core/gather/gatherers/dobetterweb/tags-blocking-first-paint.js
@@ -18,9 +18,9 @@
 
 'use strict';
 
-const NetworkRecords = require('../../../computed/network-records.js');
-const DevtoolsLog = require('../devtools-log.js');
-const FRGatherer = require('../../../fraggle-rock/gather/base-gatherer.js');
+import NetworkRecords from '../../../computed/network-records.js';
+import DevtoolsLog from '../devtools-log.js';
+import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
 
 /* global document, window, HTMLLinkElement, SVGScriptElement */
 
@@ -235,4 +235,4 @@ class TagsBlockingFirstPaint extends FRGatherer {
   }
 }
 
-module.exports = TagsBlockingFirstPaint;
+export default TagsBlockingFirstPaint;
diff --git a/lighthouse-core/gather/gatherers/full-page-screenshot.js b/lighthouse-core/gather/gatherers/full-page-screenshot.js
index f9031d6fab29..afba7574e806 100644
--- a/lighthouse-core/gather/gatherers/full-page-screenshot.js
+++ b/lighthouse-core/gather/gatherers/full-page-screenshot.js
@@ -7,11 +7,12 @@
 
 /* globals window document getBoundingClientRect requestAnimationFrame */
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
-const emulation = require('../../lib/emulation.js');
-const pageFunctions = require('../../lib/page-functions.js');
-const NetworkMonitor = require('../driver/network-monitor.js');
-const {waitForNetworkIdle} = require('../driver/wait-for-condition.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+
+import emulation from '../../lib/emulation.js';
+import pageFunctions from '../../lib/page-functions.js';
+import NetworkMonitor from '../driver/network-monitor.js';
+import {waitForNetworkIdle} from '../driver/wait-for-condition.js';
 
 // JPEG quality setting
 // Exploration and examples of reports using different quality settings: https://docs.google.com/document/d/1ZSffucIca9XDW2eEwfoevrk-OTl7WQFeMf0CgeJAA8M/edit#
@@ -233,4 +234,4 @@ class FullPageScreenshot extends FRGatherer {
   }
 }
 
-module.exports = FullPageScreenshot;
+export default FullPageScreenshot;
diff --git a/lighthouse-core/gather/gatherers/gatherer.js b/lighthouse-core/gather/gatherers/gatherer.js
index 25deff88c49a..2d1eafb637ec 100644
--- a/lighthouse-core/gather/gatherers/gatherer.js
+++ b/lighthouse-core/gather/gatherers/gatherer.js
@@ -56,4 +56,4 @@ class Gatherer {
   /* eslint-enable no-unused-vars */
 }
 
-module.exports = Gatherer;
+export {Gatherer};
diff --git a/lighthouse-core/gather/gatherers/global-listeners.js b/lighthouse-core/gather/gatherers/global-listeners.js
index 2914a7af7b0d..e5df4ddcbc12 100644
--- a/lighthouse-core/gather/gatherers/global-listeners.js
+++ b/lighthouse-core/gather/gatherers/global-listeners.js
@@ -12,7 +12,7 @@
  * around page unload, but this can be expanded in the future.
  */
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 class GlobalListeners extends FRGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
@@ -89,4 +89,4 @@ class GlobalListeners extends FRGatherer {
   }
 }
 
-module.exports = GlobalListeners;
+export default GlobalListeners;
diff --git a/lighthouse-core/gather/gatherers/iframe-elements.js b/lighthouse-core/gather/gatherers/iframe-elements.js
index 5a4659db87ed..2f98ab158b6c 100644
--- a/lighthouse-core/gather/gatherers/iframe-elements.js
+++ b/lighthouse-core/gather/gatherers/iframe-elements.js
@@ -7,8 +7,9 @@
 
 /* global getNodeDetails */
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
-const pageFunctions = require('../../lib/page-functions.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+
+import pageFunctions from '../../lib/page-functions.js';
 
 /* eslint-env browser, node */
 
@@ -62,4 +63,4 @@ class IFrameElements extends FRGatherer {
   }
 }
 
-module.exports = IFrameElements;
+export default IFrameElements;
diff --git a/lighthouse-core/gather/gatherers/image-elements.js b/lighthouse-core/gather/gatherers/image-elements.js
index 0f65cd48aa3b..afee0b0182f7 100644
--- a/lighthouse-core/gather/gatherers/image-elements.js
+++ b/lighthouse-core/gather/gatherers/image-elements.js
@@ -9,10 +9,10 @@
   */
 'use strict';
 
-const log = require('lighthouse-logger');
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
-const pageFunctions = require('../../lib/page-functions.js');
-const FontSize = require('./seo/font-size.js');
+import log from 'lighthouse-logger';
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import pageFunctions from '../../lib/page-functions.js';
+import FontSize from './seo/font-size.js';
 
 /* global window, getElementsInDocument, Image, getNodeDetails, ShadowRoot */
 
@@ -372,4 +372,4 @@ class ImageElements extends FRGatherer {
   }
 }
 
-module.exports = ImageElements;
+export default ImageElements;
diff --git a/lighthouse-core/gather/gatherers/inputs.js b/lighthouse-core/gather/gatherers/inputs.js
index 72c687715c64..986b90c7bee3 100644
--- a/lighthouse-core/gather/gatherers/inputs.js
+++ b/lighthouse-core/gather/gatherers/inputs.js
@@ -7,8 +7,9 @@
 
 /* global getNodeDetails */
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
-const pageFunctions = require('../../lib/page-functions.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+
+import pageFunctions from '../../lib/page-functions.js';
 
 /* eslint-env browser, node */
 
@@ -58,7 +59,7 @@ function collectElements() {
     const parentFormIndex = parentFormEl ?
       [...formElToArtifact.keys()].indexOf(parentFormEl) :
       undefined;
-    const labelIndices = [...inputEl.labels || []].map((labelEl) => {
+    const labelIndices = [...(inputEl.labels || [])].map((labelEl) => {
       return [...labelElToArtifact.keys()].indexOf(labelEl);
     });
 
@@ -110,4 +111,4 @@ class Inputs extends FRGatherer {
   }
 }
 
-module.exports = Inputs;
+export default Inputs;
diff --git a/lighthouse-core/gather/gatherers/inspector-issues.js b/lighthouse-core/gather/gatherers/inspector-issues.js
index a1439fd3f9d1..c75fe9053b72 100644
--- a/lighthouse-core/gather/gatherers/inspector-issues.js
+++ b/lighthouse-core/gather/gatherers/inspector-issues.js
@@ -10,9 +10,9 @@
 
 'use strict';
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
-const NetworkRecords = require('../../computed/network-records.js');
-const DevtoolsLog = require('./devtools-log.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import NetworkRecords from '../../computed/network-records.js';
+import DevtoolsLog from './devtools-log.js';
 
 class InspectorIssues extends FRGatherer {
   /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
@@ -124,4 +124,4 @@ class InspectorIssues extends FRGatherer {
   }
 }
 
-module.exports = InspectorIssues;
+export default InspectorIssues;
diff --git a/lighthouse-core/gather/gatherers/installability-errors.js b/lighthouse-core/gather/gatherers/installability-errors.js
index 6f9160ee7602..68a35c2dff22 100644
--- a/lighthouse-core/gather/gatherers/installability-errors.js
+++ b/lighthouse-core/gather/gatherers/installability-errors.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
+import log from 'lighthouse-logger';
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 class InstallabilityErrors extends FRGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
@@ -45,4 +45,4 @@ class InstallabilityErrors extends FRGatherer {
   }
 }
 
-module.exports = InstallabilityErrors;
+export default InstallabilityErrors;
diff --git a/lighthouse-core/gather/gatherers/js-usage.js b/lighthouse-core/gather/gatherers/js-usage.js
index 2e83af257799..12ed95d023ce 100644
--- a/lighthouse-core/gather/gatherers/js-usage.js
+++ b/lighthouse-core/gather/gatherers/js-usage.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 /**
  * @fileoverview Tracks unused JavaScript
@@ -67,4 +67,4 @@ class JsUsage extends FRGatherer {
   }
 }
 
-module.exports = JsUsage;
+export default JsUsage;
diff --git a/lighthouse-core/gather/gatherers/link-elements.js b/lighthouse-core/gather/gatherers/link-elements.js
index 244bbd3f4174..fc6a6c799009 100644
--- a/lighthouse-core/gather/gatherers/link-elements.js
+++ b/lighthouse-core/gather/gatherers/link-elements.js
@@ -5,12 +5,12 @@
  */
 'use strict';
 
-const LinkHeader = require('http-link-header');
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
-const {URL} = require('../../lib/url-shim.js');
-const pageFunctions = require('../../lib/page-functions.js');
-const DevtoolsLog = require('./devtools-log.js');
-const MainResource = require('../../computed/main-resource.js');
+import LinkHeader from 'http-link-header';
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import {URL} from '../../lib/url-shim.js';
+import pageFunctions from '../../lib/page-functions.js';
+import DevtoolsLog from './devtools-log.js';
+import MainResource from '../../computed/main-resource.js';
 
 /* globals HTMLLinkElement getNodeDetails */
 
@@ -179,4 +179,4 @@ class LinkElements extends FRGatherer {
   }
 }
 
-module.exports = LinkElements;
+export default LinkElements;
diff --git a/lighthouse-core/gather/gatherers/main-document-content.js b/lighthouse-core/gather/gatherers/main-document-content.js
index ad78f1e34019..09bd8dc36cca 100644
--- a/lighthouse-core/gather/gatherers/main-document-content.js
+++ b/lighthouse-core/gather/gatherers/main-document-content.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
-const DevtoolsLog = require('./devtools-log.js');
-const {fetchResponseBodyFromCache} = require('../driver/network.js');
-const MainResource = require('../../computed/main-resource.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import DevtoolsLog from './devtools-log.js';
+import {fetchResponseBodyFromCache} from '../driver/network.js';
+import MainResource from '../../computed/main-resource.js';
 
 /**
  * Collects the content of the main html document.
@@ -53,4 +53,4 @@ class MainDocumentContent extends FRGatherer {
   }
 }
 
-module.exports = MainDocumentContent;
+export default MainDocumentContent;
diff --git a/lighthouse-core/gather/gatherers/meta-elements.js b/lighthouse-core/gather/gatherers/meta-elements.js
index 21fb66621a97..cfb0654b56a5 100644
--- a/lighthouse-core/gather/gatherers/meta-elements.js
+++ b/lighthouse-core/gather/gatherers/meta-elements.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
-const pageFunctions = require('../../lib/page-functions.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import pageFunctions from '../../lib/page-functions.js';
 
 /* globals getElementsInDocument getNodeDetails */
 
@@ -65,4 +65,4 @@ class MetaElements extends FRGatherer {
   }
 }
 
-module.exports = MetaElements;
+export default MetaElements;
diff --git a/lighthouse-core/gather/gatherers/network-user-agent.js b/lighthouse-core/gather/gatherers/network-user-agent.js
index e0b1c7284f03..ea41e7b6645e 100644
--- a/lighthouse-core/gather/gatherers/network-user-agent.js
+++ b/lighthouse-core/gather/gatherers/network-user-agent.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
-const DevtoolsLogGatherer = require('./devtools-log.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import DevtoolsLogGatherer from './devtools-log.js';
 
 /** @implements {LH.Gatherer.FRGathererInstance<'DevtoolsLog'>} */
 class NetworkUserAgent extends FRGatherer {
@@ -39,4 +39,4 @@ class NetworkUserAgent extends FRGatherer {
   }
 }
 
-module.exports = NetworkUserAgent;
+export default NetworkUserAgent;
diff --git a/lighthouse-core/gather/gatherers/script-elements.js b/lighthouse-core/gather/gatherers/script-elements.js
index 98b6d8ce8b02..3e8d78826f44 100644
--- a/lighthouse-core/gather/gatherers/script-elements.js
+++ b/lighthouse-core/gather/gatherers/script-elements.js
@@ -5,11 +5,11 @@
  */
 'use strict';
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
-const NetworkRecords = require('../../computed/network-records.js');
-const NetworkRequest = require('../../lib/network-request.js');
-const pageFunctions = require('../../lib/page-functions.js');
-const DevtoolsLog = require('./devtools-log.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import NetworkRecords from '../../computed/network-records.js';
+import NetworkRequest from '../../lib/network-request.js';
+import pageFunctions from '../../lib/page-functions.js';
+import DevtoolsLog from './devtools-log.js';
 
 /* global getNodeDetails */
 
@@ -108,4 +108,4 @@ class ScriptElements extends FRGatherer {
   }
 }
 
-module.exports = ScriptElements;
+export default ScriptElements;
diff --git a/lighthouse-core/gather/gatherers/scripts.js b/lighthouse-core/gather/gatherers/scripts.js
index 8e3be365f92c..81b6c5c6ee3d 100644
--- a/lighthouse-core/gather/gatherers/scripts.js
+++ b/lighthouse-core/gather/gatherers/scripts.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 /**
  * @template T, U
@@ -151,4 +151,4 @@ class Scripts extends FRGatherer {
   }
 }
 
-module.exports = Scripts;
+export default Scripts;
diff --git a/lighthouse-core/gather/gatherers/seo/embedded-content.js b/lighthouse-core/gather/gatherers/seo/embedded-content.js
index e21178733743..a80d8fac89be 100644
--- a/lighthouse-core/gather/gatherers/seo/embedded-content.js
+++ b/lighthouse-core/gather/gatherers/seo/embedded-content.js
@@ -7,8 +7,9 @@
 
 /* globals getElementsInDocument getNodeDetails */
 
-const FRGatherer = require('../../../fraggle-rock/gather/base-gatherer.js');
-const pageFunctions = require('../../../lib/page-functions.js');
+import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
+
+import pageFunctions from '../../../lib/page-functions.js';
 
 /**
  * @return {LH.Artifacts.EmbeddedContentInfo[]}
@@ -61,4 +62,4 @@ class EmbeddedContent extends FRGatherer {
   }
 }
 
-module.exports = EmbeddedContent;
+export default EmbeddedContent;
diff --git a/lighthouse-core/gather/gatherers/seo/font-size.js b/lighthouse-core/gather/gatherers/seo/font-size.js
index 26a8afc67f7b..ef07394c5915 100644
--- a/lighthouse-core/gather/gatherers/seo/font-size.js
+++ b/lighthouse-core/gather/gatherers/seo/font-size.js
@@ -16,7 +16,8 @@
  * This gatherer collects stylesheet metadata by itself, instead of relying on the styles gatherer which is slow (because it parses the stylesheet content).
  */
 
-const FRGatherer = require('../../../fraggle-rock/gather/base-gatherer.js');
+import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
+
 const FONT_SIZE_PROPERTY_NAME = 'font-size';
 const MINIMAL_LEGIBLE_FONT_SIZE_PX = 12;
 // limit number of protocol calls to make sure that gatherer doesn't take more than 1-2s
diff --git a/lighthouse-core/gather/gatherers/seo/robots-txt.js b/lighthouse-core/gather/gatherers/seo/robots-txt.js
index 220d654e2ca2..cc1f87370e48 100644
--- a/lighthouse-core/gather/gatherers/seo/robots-txt.js
+++ b/lighthouse-core/gather/gatherers/seo/robots-txt.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const FRGatherer = require('../../../fraggle-rock/gather/base-gatherer.js');
+import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
 
 /* global fetch, location */
 
@@ -54,4 +54,4 @@ class RobotsTxt extends FRGatherer {
   }
 }
 
-module.exports = RobotsTxt;
+export default RobotsTxt;
diff --git a/lighthouse-core/gather/gatherers/seo/tap-targets.js b/lighthouse-core/gather/gatherers/seo/tap-targets.js
index 93eacec51f38..0a032c50a086 100644
--- a/lighthouse-core/gather/gatherers/seo/tap-targets.js
+++ b/lighthouse-core/gather/gatherers/seo/tap-targets.js
@@ -7,9 +7,10 @@
 
 /* global document, window, getComputedStyle, getElementsInDocument, Node, getNodeDetails, getRectCenterPoint */
 
-const FRGatherer = require('../../../fraggle-rock/gather/base-gatherer.js');
-const pageFunctions = require('../../../lib/page-functions.js');
-const RectHelpers = require('../../../lib/rect-helpers.js');
+import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
+
+import pageFunctions from '../../../lib/page-functions.js';
+import RectHelpers from '../../../lib/rect-helpers.js';
 
 const TARGET_SELECTORS = [
   'button',
@@ -367,4 +368,4 @@ class TapTargets extends FRGatherer {
   }
 }
 
-module.exports = TapTargets;
+export default TapTargets;
diff --git a/lighthouse-core/gather/gatherers/service-worker.js b/lighthouse-core/gather/gatherers/service-worker.js
index 211381024d04..413af0c0110e 100644
--- a/lighthouse-core/gather/gatherers/service-worker.js
+++ b/lighthouse-core/gather/gatherers/service-worker.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
-const serviceWorkers = require('../driver/service-workers.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import serviceWorkers from '../driver/service-workers.js';
 
 class ServiceWorker extends FRGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
@@ -42,4 +42,4 @@ class ServiceWorker extends FRGatherer {
   }
 }
 
-module.exports = ServiceWorker;
+export default ServiceWorker;
diff --git a/lighthouse-core/gather/gatherers/source-maps.js b/lighthouse-core/gather/gatherers/source-maps.js
index 4af24b00e629..1cc363ffe9e1 100644
--- a/lighthouse-core/gather/gatherers/source-maps.js
+++ b/lighthouse-core/gather/gatherers/source-maps.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
-const URL = require('../../lib/url-shim.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import URL from '../../lib/url-shim.js';
 
 /**
  * @fileoverview Gets JavaScript source maps.
@@ -150,4 +150,4 @@ class SourceMaps extends FRGatherer {
   }
 }
 
-module.exports = SourceMaps;
+export default SourceMaps;
diff --git a/lighthouse-core/gather/gatherers/stacks.js b/lighthouse-core/gather/gatherers/stacks.js
index f0fe99fb8087..43b5b0d607ba 100644
--- a/lighthouse-core/gather/gatherers/stacks.js
+++ b/lighthouse-core/gather/gatherers/stacks.js
@@ -12,9 +12,10 @@
 /* global window */
 /* global d41d8cd98f00b204e9800998ecf8427e_LibraryDetectorTests */
 
-const fs = require('fs');
-const log = require('lighthouse-logger');
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
+import fs from 'fs';
+
+import log from 'lighthouse-logger';
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 const libDetectorSource = fs.readFileSync(
   require.resolve('js-library-detector/library/libraries.js'), 'utf8');
 
@@ -122,4 +123,4 @@ class Stacks extends FRGatherer {
   }
 }
 
-module.exports = Stacks;
+export default Stacks;
diff --git a/lighthouse-core/gather/gatherers/trace-compat.js b/lighthouse-core/gather/gatherers/trace-compat.js
index 81db17c2aa75..097933a25f12 100644
--- a/lighthouse-core/gather/gatherers/trace-compat.js
+++ b/lighthouse-core/gather/gatherers/trace-compat.js
@@ -11,8 +11,9 @@
  * when devtools logs and traces were special-cased.
  */
 
-const TraceGatherer = require('./trace.js');
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
+import TraceGatherer from './trace.js';
+
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 /** @implements {LH.Gatherer.FRGathererInstance<'Trace'>} */
 class TraceCompat extends FRGatherer {
@@ -33,4 +34,4 @@ class TraceCompat extends FRGatherer {
   }
 }
 
-module.exports = TraceCompat;
+export default TraceCompat;
diff --git a/lighthouse-core/gather/gatherers/trace-elements.js b/lighthouse-core/gather/gatherers/trace-elements.js
index f43a241344c7..68661e212134 100644
--- a/lighthouse-core/gather/gatherers/trace-elements.js
+++ b/lighthouse-core/gather/gatherers/trace-elements.js
@@ -13,15 +13,16 @@
  * We take the backend nodeId from the trace and use it to find the corresponding element in the DOM.
  */
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
-const {resolveNodeIdToObjectId} = require('../driver/dom.js');
-const pageFunctions = require('../../lib/page-functions.js');
-const RectHelpers = require('../../lib/rect-helpers.js');
-const Sentry = require('../../lib/sentry.js');
-const Trace = require('./trace.js');
-const ProcessedTrace = require('../../computed/processed-trace.js');
-const ProcessedNavigation = require('../../computed/processed-navigation.js');
-const LighthouseError = require('../../lib/lh-error.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+
+import {resolveNodeIdToObjectId} from '../driver/dom.js';
+import pageFunctions from '../../lib/page-functions.js';
+import RectHelpers from '../../lib/rect-helpers.js';
+import Sentry from '../../lib/sentry.js';
+import Trace from './trace.js';
+import ProcessedTrace from '../../computed/processed-trace.js';
+import ProcessedNavigation from '../../computed/processed-navigation.js';
+import LighthouseError from '../../lib/lh-error.js';
 
 /** @typedef {{nodeId: number, score?: number, animations?: {name?: string, failureReasonsMask?: number, unsupportedProperties?: string[]}[]}} TraceElementData */
 
@@ -308,4 +309,4 @@ class TraceElements extends FRGatherer {
   }
 }
 
-module.exports = TraceElements;
+export default TraceElements;
diff --git a/lighthouse-core/gather/gatherers/trace.js b/lighthouse-core/gather/gatherers/trace.js
index ebb55b0d5a81..9e0b923e7024 100644
--- a/lighthouse-core/gather/gatherers/trace.js
+++ b/lighthouse-core/gather/gatherers/trace.js
@@ -11,8 +11,9 @@
  * This protocol log can be used to recreate the network records using lib/network-recorder.js.
  */
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
-const TraceProcessor = require('../../lib/tracehouse/trace-processor.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+
+import TraceProcessor from '../../lib/tracehouse/trace-processor.js';
 
 class Trace extends FRGatherer {
   /** @type {LH.Trace} */
@@ -128,4 +129,4 @@ class Trace extends FRGatherer {
   }
 }
 
-module.exports = Trace;
+export default Trace;
diff --git a/lighthouse-core/gather/gatherers/viewport-dimensions.js b/lighthouse-core/gather/gatherers/viewport-dimensions.js
index c27c2205b248..71ae1f456c7f 100644
--- a/lighthouse-core/gather/gatherers/viewport-dimensions.js
+++ b/lighthouse-core/gather/gatherers/viewport-dimensions.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 /* global window */
 
@@ -55,4 +55,4 @@ class ViewportDimensions extends FRGatherer {
   }
 }
 
-module.exports = ViewportDimensions;
+export default ViewportDimensions;
diff --git a/lighthouse-core/gather/gatherers/web-app-manifest.js b/lighthouse-core/gather/gatherers/web-app-manifest.js
index 6736755d4653..a0637247affe 100644
--- a/lighthouse-core/gather/gatherers/web-app-manifest.js
+++ b/lighthouse-core/gather/gatherers/web-app-manifest.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
-const manifestParser = require('../../lib/manifest-parser.js');
-const FRGatherer = require('../../fraggle-rock/gather/base-gatherer.js');
+import log from 'lighthouse-logger';
+import manifestParser from '../../lib/manifest-parser.js';
+import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 class WebAppManifest extends FRGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
@@ -99,4 +99,4 @@ class WebAppManifest extends FRGatherer {
   }
 }
 
-module.exports = WebAppManifest;
+export default WebAppManifest;
diff --git a/lighthouse-core/index.js b/lighthouse-core/index.js
index f4a6b5d8a4d2..51a2874d9f77 100644
--- a/lighthouse-core/index.js
+++ b/lighthouse-core/index.js
@@ -5,14 +5,15 @@
  */
 'use strict';
 
-const Runner = require('./runner.js');
-const log = require('lighthouse-logger');
-const ChromeProtocol = require('./gather/connections/cri.js');
-const Config = require('./config/config.js');
-const URL = require('./lib/url-shim.js');
-const fraggleRock = require('./fraggle-rock/api.js');
+import {Runner} from './runner.js';
+import log from 'lighthouse-logger';
+import {CriConnection} from './gather/connections/cri.js';
+import Config from './config/config.js';
+import URL from './lib/url-shim.js';
+import * as fraggleRock from './fraggle-rock/api.js';
+import {Driver} from './gather/driver.js';
 
-/** @typedef {import('./gather/connections/connection.js')} Connection */
+/** @typedef {import('./gather/connections/connection.js').Connection} Connection */
 
 /*
  * The relationship between these root modules:
@@ -67,7 +68,7 @@ async function legacyNavigation(url, flags = {}, configJSON, userConnection) {
   const config = generateConfig(configJSON, flags);
   const computedCache = new Map();
   const options = {config, computedCache};
-  const connection = userConnection || new ChromeProtocol(flags.port, flags.hostname);
+  const connection = userConnection || new CriConnection(flags.port, flags.hostname);
 
   // kick off a lighthouse run
   const artifacts = await Runner.gather(() => {
@@ -92,7 +93,7 @@ function generateConfig(configJson, flags) {
 lighthouse.legacyNavigation = legacyNavigation;
 lighthouse.generateConfig = generateConfig;
 lighthouse.getAuditList = Runner.getAuditList;
-lighthouse.traceCategories = require('./gather/driver.js').traceCategories;
+lighthouse.traceCategories = Driver.traceCategories;
 lighthouse.Audit = require('./audits/audit.js');
 lighthouse.Gatherer = require('./fraggle-rock/gather/base-gatherer.js');
 
@@ -101,4 +102,4 @@ lighthouse.Gatherer = require('./fraggle-rock/gather/base-gatherer.js');
 /** @type {typeof import('./computed/network-records.js')} */
 lighthouse.NetworkRecords = require('./computed/network-records.js');
 
-module.exports = lighthouse;
+export default lighthouse;
diff --git a/lighthouse-core/lib/arbitrary-equality-map.js b/lighthouse-core/lib/arbitrary-equality-map.js
index 3386153ca2d5..1b9682fc2e75 100644
--- a/lighthouse-core/lib/arbitrary-equality-map.js
+++ b/lighthouse-core/lib/arbitrary-equality-map.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const isDeepEqual = require('lodash/isEqual.js');
+import isDeepEqual from 'lodash/isEqual.js';
 
 /**
  * @fileoverview This class is designed to allow maps with arbitrary equality functions.
@@ -78,4 +78,4 @@ class ArbitraryEqualityMap {
   }
 }
 
-module.exports = ArbitraryEqualityMap;
+export {ArbitraryEqualityMap};
diff --git a/lighthouse-core/lib/asset-saver.js b/lighthouse-core/lib/asset-saver.js
index 22894d7e9ad7..86e87dc2df25 100644
--- a/lighthouse-core/lib/asset-saver.js
+++ b/lighthouse-core/lib/asset-saver.js
@@ -5,17 +5,17 @@
  */
 'use strict';
 
-const fs = require('fs');
-const path = require('path');
-const log = require('lighthouse-logger');
-const stream = require('stream');
-const {promisify} = require('util');
-const Simulator = require('./dependency-graph/simulator/simulator.js');
-const lanternTraceSaver = require('./lantern-trace-saver.js');
-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');
+import fs from 'fs';
+import path from 'path';
+import log from 'lighthouse-logger';
+import stream from 'stream';
+import {promisify} from 'util';
+import Simulator from './dependency-graph/simulator/simulator.js';
+import lanternTraceSaver from './lantern-trace-saver.js';
+import Metrics from './traces/pwmetrics-events.js';
+import NetworkAnalysisComputed from '../computed/network-analysis.js';
+import LoadSimulatorComputed from '../computed/load-simulator.js';
+import LHError from '../lib/lh-error.js';
 // 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.
@@ -327,7 +327,7 @@ function normalizeTimingEntries(timings) {
   }
 }
 
-module.exports = {
+export default {
   saveArtifacts,
   saveLhr,
   loadArtifacts,
diff --git a/lighthouse-core/lib/axe.js b/lighthouse-core/lib/axe.js
index aae144e037fd..582980167bd8 100644
--- a/lighthouse-core/lib/axe.js
+++ b/lighthouse-core/lib/axe.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const fs = require('fs');
+import fs from 'fs';
 const source = fs.readFileSync(require.resolve('axe-core/axe.min.js'), 'utf8');
 
-module.exports = {
+export default {
   source,
 };
diff --git a/lighthouse-core/lib/cdt/package.json b/lighthouse-core/lib/cdt/package.json
new file mode 100644
index 000000000000..bd346284783c
--- /dev/null
+++ b/lighthouse-core/lib/cdt/package.json
@@ -0,0 +1,4 @@
+{
+  "type": "module",
+  "//": "Any directory that uses `import ... from` or `export ...` must be type module. Temporary file until root package.json is type: module"
+}
\ No newline at end of file
diff --git a/lighthouse-core/lib/csp-evaluator.js b/lighthouse-core/lib/csp-evaluator.js
index 5ca26bdbdd29..12662f3ba665 100644
--- a/lighthouse-core/lib/csp-evaluator.js
+++ b/lighthouse-core/lib/csp-evaluator.js
@@ -7,18 +7,16 @@
 
 /** @typedef {import('csp_evaluator/finding').Finding} Finding */
 
-const {
-  evaluateForFailure,
-  evaluateForSyntaxErrors,
-  evaluateForWarnings,
-} = require('csp_evaluator/dist/lighthouse/lighthouse_checks.js');
-const {Type} = require('csp_evaluator/dist/finding.js');
-const {CspParser} = require('csp_evaluator/dist/parser.js');
-const {Directive} = require('csp_evaluator/dist/csp.js');
+import {
+  evaluateForFailure, evaluateForSyntaxErrors, evaluateForWarnings,
+} from 'csp_evaluator/dist/lighthouse/lighthouse_checks.js';
 
-const log = require('lighthouse-logger');
-const i18n = require('../lib/i18n/i18n.js');
-const {isIcuMessage} = require('../../shared/localization/format.js');
+import {Type} from 'csp_evaluator/dist/finding.js';
+import {CspParser} from 'csp_evaluator/dist/parser.js';
+import {Directive} from 'csp_evaluator/dist/csp.js';
+import log from 'lighthouse-logger';
+import i18n from '../lib/i18n/i18n.js';
+import {isIcuMessage} from '../../shared/localization/format.js';
 
 const UIStrings = {
   /** Message shown when a CSP does not have a base-uri directive. Shown in a table with a list of other CSP vulnerabilities and suggestions. "CSP" stands for "Content Security Policy". "base-uri", "'none'", and "'self'" do not need to be translated. */
@@ -165,7 +163,7 @@ function evaluateRawCspsForXss(rawCsps) {
   return {bypasses, warnings, syntax};
 }
 
-module.exports = {
+export default {
   getTranslatedDescription,
   evaluateRawCspsForXss,
   parseCsp,
diff --git a/lighthouse-core/lib/dependency-graph/base-node.js b/lighthouse-core/lib/dependency-graph/base-node.js
index 18fbb2a0cfba..90ce1923a6ae 100644
--- a/lighthouse-core/lib/dependency-graph/base-node.js
+++ b/lighthouse-core/lib/dependency-graph/base-node.js
@@ -8,7 +8,7 @@
 /**
  * A union of all types derived from BaseNode, allowing type check discrimination
  * based on `node.type`. If a new node type is created, it should be added here.
- * @typedef {import('./cpu-node.js') | import('./network-node.js')} Node
+ * @typedef {import('./cpu-node.js').CPUNode | import('./network-node.js').NetworkNode} Node
  */
 
 /**
@@ -360,4 +360,4 @@ BaseNode.TYPES = /** @type {{NETWORK: 'network', CPU: 'cpu'}} */({
   CPU: 'cpu',
 });
 
-module.exports = BaseNode;
+export {BaseNode};
diff --git a/lighthouse-core/lib/dependency-graph/cpu-node.js b/lighthouse-core/lib/dependency-graph/cpu-node.js
index 10c5afbde4c8..3e034a961e4f 100644
--- a/lighthouse-core/lib/dependency-graph/cpu-node.js
+++ b/lighthouse-core/lib/dependency-graph/cpu-node.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const BaseNode = require('./base-node.js');
+import {BaseNode} from './base-node.js';
 
 class CPUNode extends BaseNode {
   /**
@@ -83,4 +83,4 @@ class CPUNode extends BaseNode {
   }
 }
 
-module.exports = CPUNode;
+export {CPUNode};
diff --git a/lighthouse-core/lib/dependency-graph/network-node.js b/lighthouse-core/lib/dependency-graph/network-node.js
index cfdc8674267a..9e75086d90c3 100644
--- a/lighthouse-core/lib/dependency-graph/network-node.js
+++ b/lighthouse-core/lib/dependency-graph/network-node.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const BaseNode = require('./base-node.js');
-const NetworkRequest = require('../network-request.js');
+import {BaseNode} from './base-node.js';
+import {NetworkRequest} from '../network-request.js';
 
 class NetworkNode extends BaseNode {
   /**
@@ -96,4 +96,4 @@ class NetworkNode extends BaseNode {
   }
 }
 
-module.exports = NetworkNode;
+export {NetworkNode};
diff --git a/lighthouse-core/lib/dependency-graph/simulator/connection-pool.js b/lighthouse-core/lib/dependency-graph/simulator/connection-pool.js
index e9594f93d194..2fefaa1ad5cd 100644
--- a/lighthouse-core/lib/dependency-graph/simulator/connection-pool.js
+++ b/lighthouse-core/lib/dependency-graph/simulator/connection-pool.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const NetworkAnalyzer = require('./network-analyzer.js');
-const TcpConnection = require('./tcp-connection.js');
+import NetworkAnalyzer from './network-analyzer.js';
+import TcpConnection from './tcp-connection.js';
 
 const DEFAULT_SERVER_RESPONSE_TIME = 30;
 const TLS_SCHEMES = ['https', 'wss'];
@@ -15,7 +15,7 @@ const TLS_SCHEMES = ['https', 'wss'];
 // https://cs.chromium.org/chromium/src/net/socket/client_socket_pool_manager.cc?type=cs&q="int+g_max_sockets_per_group"
 const CONNECTIONS_PER_ORIGIN = 6;
 
-module.exports = class ConnectionPool {
+export default class ConnectionPool {
   /**
    * @param {LH.Artifacts.NetworkRequest[]} records
    * @param {Required<LH.Gatherer.Simulation.Options>} options
@@ -168,4 +168,4 @@ module.exports = class ConnectionPool {
     this._connectionsByRecord.delete(record);
     this._connectionsInUse.delete(connection);
   }
-};
+}
diff --git a/lighthouse-core/lib/dependency-graph/simulator/dns-cache.js b/lighthouse-core/lib/dependency-graph/simulator/dns-cache.js
index 5a03336f23b1..05a8898f7b6d 100644
--- a/lighthouse-core/lib/dependency-graph/simulator/dns-cache.js
+++ b/lighthouse-core/lib/dependency-graph/simulator/dns-cache.js
@@ -70,4 +70,4 @@ class DNSCache {
 
 DNSCache.RTT_MULTIPLIER = DNS_RESOLUTION_RTT_MULTIPLIER;
 
-module.exports = DNSCache;
+export default DNSCache;
diff --git a/lighthouse-core/lib/dependency-graph/simulator/network-analyzer.js b/lighthouse-core/lib/dependency-graph/simulator/network-analyzer.js
index 30055c9d06fb..9d3bf8bd4293 100644
--- a/lighthouse-core/lib/dependency-graph/simulator/network-analyzer.js
+++ b/lighthouse-core/lib/dependency-graph/simulator/network-analyzer.js
@@ -6,7 +6,7 @@
 'use strict';
 
 const INITIAL_CWD = 14 * 1024;
-const URL = require('../../url-shim.js');
+import URL from '../../url-shim.js';
 
 // Assume that 40% of TTFB was server response time by default for static assets
 const DEFAULT_SERVER_RESPONSE_PERCENTAGE = 0.4;
@@ -457,7 +457,7 @@ class NetworkAnalyzer {
   }
 }
 
-module.exports = NetworkAnalyzer;
+export default NetworkAnalyzer;
 
 /**
  * @typedef NetworkAnalyzer.Summary
diff --git a/lighthouse-core/lib/dependency-graph/simulator/simulator-timing-map.js b/lighthouse-core/lib/dependency-graph/simulator/simulator-timing-map.js
index 0a1e8cfdd59a..b2bdbf5d30d3 100644
--- a/lighthouse-core/lib/dependency-graph/simulator/simulator-timing-map.js
+++ b/lighthouse-core/lib/dependency-graph/simulator/simulator-timing-map.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const BaseNode = require('../base-node.js');
+import {BaseNode} from '../base-node.js';
 
 /**
  * @fileoverview
@@ -16,9 +16,9 @@ const BaseNode = require('../base-node.js');
  */
 
 
-/** @typedef {BaseNode.Node} Node */
-/** @typedef {import('../network-node')} NetworkNode */
-/** @typedef {import('../cpu-node')} CpuNode */
+/** @typedef {import('../base-node.js').Node} Node */
+/** @typedef {import('../network-node').NetworkNode} NetworkNode */
+/** @typedef {import('../cpu-node').CPUNode} CpuNode */
 
 /**
  * @typedef NodeTimingComplete
@@ -209,4 +209,4 @@ class SimulatorTimingMap {
   }
 }
 
-module.exports = SimulatorTimingMap;
+export default SimulatorTimingMap;
diff --git a/lighthouse-core/lib/dependency-graph/simulator/simulator.js b/lighthouse-core/lib/dependency-graph/simulator/simulator.js
index 881345eab3fc..e4983ae8a3dd 100644
--- a/lighthouse-core/lib/dependency-graph/simulator/simulator.js
+++ b/lighthouse-core/lib/dependency-graph/simulator/simulator.js
@@ -5,16 +5,16 @@
  */
 'use strict';
 
-const BaseNode = require('../base-node.js');
-const TcpConnection = require('./tcp-connection.js');
-const ConnectionPool = require('./connection-pool.js');
-const DNSCache = require('./dns-cache.js');
+import {BaseNode} from '../base-node.js';
+import TcpConnection from './tcp-connection.js';
+import ConnectionPool from './connection-pool.js';
+import DNSCache from './dns-cache.js';
 const mobileSlow4G = require('../../../config/constants.js').throttling.mobileSlow4G;
-const SimulatorTimingMap = require('./simulator-timing-map.js');
+import SimulatorTimingMap from './simulator-timing-map.js';
 
-/** @typedef {BaseNode.Node} Node */
-/** @typedef {import('../network-node')} NetworkNode */
-/** @typedef {import('../cpu-node')} CpuNode */
+/** @typedef {import('../base-node.js').Node} Node */
+/** @typedef {import('../network-node').NetworkNode} NetworkNode */
+/** @typedef {import('../cpu-node').CPUNode} CpuNode */
 
 // see https://cs.chromium.org/search/?q=kDefaultMaxNumDelayableRequestsPerClient&sq=package:chromium&type=cs
 const DEFAULT_MAXIMUM_CONCURRENT_REQUESTS = 10;
@@ -520,4 +520,4 @@ class Simulator {
   }
 }
 
-module.exports = Simulator;
+export {Simulator};
diff --git a/lighthouse-core/lib/dependency-graph/simulator/tcp-connection.js b/lighthouse-core/lib/dependency-graph/simulator/tcp-connection.js
index b8812c88b6ec..5a2536ef00a2 100644
--- a/lighthouse-core/lib/dependency-graph/simulator/tcp-connection.js
+++ b/lighthouse-core/lib/dependency-graph/simulator/tcp-connection.js
@@ -187,7 +187,7 @@ class TcpConnection {
   }
 }
 
-module.exports = TcpConnection;
+export default TcpConnection;
 
 /**
  * @typedef DownloadOptions
diff --git a/lighthouse-core/lib/emulation.js b/lighthouse-core/lib/emulation.js
index 59ca17afd174..03cb80537261 100644
--- a/lighthouse-core/lib/emulation.js
+++ b/lighthouse-core/lib/emulation.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const {version: lighthouseVersion} = require('../../package.json');
+import {version as lighthouseVersion} from '../../package.json';
 
 const NO_THROTTLING_METRICS = {
   latency: 0,
@@ -153,7 +153,7 @@ function clearCPUThrottling(session) {
   return session.sendCommand('Emulation.setCPUThrottlingRate', NO_CPU_THROTTLE_METRICS);
 }
 
-module.exports = {
+export default {
   emulate,
   throttle,
   clearThrottling,
diff --git a/lighthouse-core/lib/i18n/i18n.js b/lighthouse-core/lib/i18n/i18n.js
index 4abdad25f405..535f1a192187 100644
--- a/lighthouse-core/lib/i18n/i18n.js
+++ b/lighthouse-core/lib/i18n/i18n.js
@@ -7,16 +7,13 @@
 
 /** @typedef {import('../../../shared/localization/locales').LhlMessages} LhlMessages */
 
-const path = require('path');
-const lookupClosestLocale = require('lookup-closest-locale');
-const {getAvailableLocales} = require('../../../shared/localization/format.js');
-const log = require('lighthouse-logger');
-const {LH_ROOT} = require('../../../root.js');
-const {
-  isIcuMessage,
-  formatMessage,
-  DEFAULT_LOCALE,
-} = require('../../../shared/localization/format.js');
+import path from 'path';
+
+import lookupClosestLocale from 'lookup-closest-locale';
+import {getAvailableLocales} from '../../../shared/localization/format.js';
+import log from 'lighthouse-logger';
+import {LH_ROOT} from '../../../root.js';
+import {isIcuMessage, formatMessage, DEFAULT_LOCALE} from '../../../shared/localization/format.js';
 
 const UIStrings = {
   /** Used to show the duration in milliseconds that something lasted. The `{timeInMs}` placeholder will be replaced with the time duration, shown in milliseconds (e.g. 63 ms) */
@@ -211,7 +208,7 @@ function isStringOrIcuMessage(value) {
   return typeof value === 'string' || isIcuMessage(value);
 }
 
-module.exports = {
+export default {
   UIStrings,
   lookupLocale,
   createIcuMessageFn,
diff --git a/lighthouse-core/lib/icons.js b/lighthouse-core/lib/icons.js
index fb38a7b7c0ac..4abfdb91777a 100644
--- a/lighthouse-core/lib/icons.js
+++ b/lighthouse-core/lib/icons.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const URL = require('./url-shim.js');
+import URL from './url-shim.js';
 
 /**
  * @param {NonNullable<LH.Artifacts.Manifest['value']>} manifest
@@ -78,7 +78,7 @@ function containsMaskableIcon(manifest) {
   });
 }
 
-module.exports = {
+export default {
   doExist,
   pngSizedAtLeast,
   containsMaskableIcon,
diff --git a/lighthouse-core/lib/lantern-trace-saver.js b/lighthouse-core/lib/lantern-trace-saver.js
index d0e23cc27db1..d4b45cdf6f66 100644
--- a/lighthouse-core/lib/lantern-trace-saver.js
+++ b/lighthouse-core/lib/lantern-trace-saver.js
@@ -186,7 +186,7 @@ function convertNodeTimingsToTrace(nodeTimings) {
   }
 }
 
-module.exports = {
+export default {
   simulationNamesToIgnore: [
     'unlabeled',
     // These node timings should be nearly identical to the ones produced for Interactive
diff --git a/lighthouse-core/lib/lh-env.js b/lighthouse-core/lib/lh-env.js
index fac8fd29ab47..341901e6d7e1 100644
--- a/lighthouse-core/lib/lh-env.js
+++ b/lighthouse-core/lib/lh-env.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const process = require('process');
+import process from 'process';
 
-module.exports = {
+export default {
   // NODE_ENV is set to test by jest and by smokehouse CLI runner
   // CI as a catchall for everything we do in GitHub Actions
   isUnderTest: !!process.env.CI || process.env.NODE_ENV === 'test',
diff --git a/lighthouse-core/lib/lh-error.js b/lighthouse-core/lib/lh-error.js
index 8687d0d8cc4a..2f66e2e2fcc3 100644
--- a/lighthouse-core/lib/lh-error.js
+++ b/lighthouse-core/lib/lh-error.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const i18n = require('./i18n/i18n.js');
+import i18n from './i18n/i18n.js';
 
 /* eslint-disable max-len */
 const UIStrings = {
@@ -417,5 +417,5 @@ const ERRORS = {
 LighthouseError.errors = ERRORS;
 LighthouseError.NO_ERROR = 'NO_ERROR';
 LighthouseError.UNKNOWN_ERROR = 'UNKNOWN_ERROR';
-module.exports = LighthouseError;
-module.exports.UIStrings = UIStrings;
+
+export {LighthouseError, UIStrings};
diff --git a/lighthouse-core/lib/lh-trace-processor.js b/lighthouse-core/lib/lh-trace-processor.js
index 53c69cc4f4e9..d1c688935ec9 100644
--- a/lighthouse-core/lib/lh-trace-processor.js
+++ b/lighthouse-core/lib/lh-trace-processor.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const LHError = require('../lib/lh-error.js');
-const TraceProcessor = require('../lib/tracehouse/trace-processor.js');
+import LHError from '../lib/lh-error.js';
+import TraceProcessor from '../lib/tracehouse/trace-processor.js';
 
 // TraceProcessor throws generic errors, but we'd like our special localized and code-specific LHError
 // objects to be thrown instead.
@@ -43,4 +43,4 @@ class LHTraceProcessor extends TraceProcessor {
   }
 }
 
-module.exports = LHTraceProcessor;
+export default LHTraceProcessor;
diff --git a/lighthouse-core/lib/manifest-parser.js b/lighthouse-core/lib/manifest-parser.js
index 01f1cba9e08d..299511a7e9fa 100644
--- a/lighthouse-core/lib/manifest-parser.js
+++ b/lighthouse-core/lib/manifest-parser.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const URL = require('./url-shim.js');
-const cssParsers = require('cssstyle/lib/parsers');
+import URL from './url-shim.js';
+import cssParsers from 'cssstyle/lib/parsers';
 
 const ALLOWED_DISPLAY_VALUES = [
   'fullscreen',
@@ -458,7 +458,7 @@ function parseBackgroundColor(jsonInput) {
  * @param {string} manifestUrl URL of manifest file.
  * @param {string} documentUrl URL of document containing manifest link element.
  */
-function parse(string, manifestUrl, documentUrl) {
+function parseManifest(string, manifestUrl, documentUrl) {
   if (manifestUrl === undefined || documentUrl === undefined) {
     throw new Error('Manifest and document URLs required for manifest parsing.');
   }
@@ -510,4 +510,4 @@ function parse(string, manifestUrl, documentUrl) {
   };
 }
 
-module.exports = parse;
+export {parseManifest};
diff --git a/lighthouse-core/lib/median-run.js b/lighthouse-core/lib/median-run.js
index 3cb91cc43ee3..78124b35f4c0 100644
--- a/lighthouse-core/lib/median-run.js
+++ b/lighthouse-core/lib/median-run.js
@@ -89,4 +89,4 @@ function filterToValidRuns(runs) {
     .filter(run => Number.isFinite(getNumericValue(run, 'interactive')));
 }
 
-module.exports = {computeMedianRun, filterToValidRuns};
+export default {computeMedianRun, filterToValidRuns};
diff --git a/lighthouse-core/lib/minification-estimator.js b/lighthouse-core/lib/minification-estimator.js
index 4deed7d81e39..d93cea0e2735 100644
--- a/lighthouse-core/lib/minification-estimator.js
+++ b/lighthouse-core/lib/minification-estimator.js
@@ -190,4 +190,4 @@ function computeCSSTokenLength(content) {
   return computeTokenLength(content, {singlelineComments: false, regex: false});
 }
 
-module.exports = {computeJSTokenLength, computeCSSTokenLength};
+export default {computeJSTokenLength, computeCSSTokenLength};
diff --git a/lighthouse-core/lib/minify-devtoolslog.js b/lighthouse-core/lib/minify-devtoolslog.js
index 629bd20fbfc7..4da00156e16e 100644
--- a/lighthouse-core/lib/minify-devtoolslog.js
+++ b/lighthouse-core/lib/minify-devtoolslog.js
@@ -84,4 +84,4 @@ function minifyDevtoolsLog(log) {
   });
 }
 
-module.exports = {minifyDevtoolsLog};
+export default {minifyDevtoolsLog};
diff --git a/lighthouse-core/lib/minify-trace.js b/lighthouse-core/lib/minify-trace.js
index a01111225dab..a25bb1422316 100644
--- a/lighthouse-core/lib/minify-trace.js
+++ b/lighthouse-core/lib/minify-trace.js
@@ -15,7 +15,7 @@
  *    - lighthouse-core/lib/tracehouse/trace-processor.js
  */
 
-const TracingProcessor = require('./tracehouse/trace-processor.js');
+import TracingProcessor from './tracehouse/trace-processor.js';
 
 const toplevelTaskNames = new Set([
   'RunTask', // m71+
@@ -170,4 +170,4 @@ function minifyTrace(inputTrace) {
   return {traceEvents: filterTraceEvents(inputTrace.traceEvents)};
 }
 
-module.exports = {minifyTrace};
+export default {minifyTrace};
diff --git a/lighthouse-core/lib/navigation-error.js b/lighthouse-core/lib/navigation-error.js
index d1276001c59f..abee53444414 100644
--- a/lighthouse-core/lib/navigation-error.js
+++ b/lighthouse-core/lib/navigation-error.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const LHError = require('./lh-error.js');
-const NetworkAnalyzer = require('./dependency-graph/simulator/network-analyzer.js');
-const NetworkRequest = require('./network-request.js');
+import LHError from './lh-error.js';
+import NetworkAnalyzer from './dependency-graph/simulator/network-analyzer.js';
+import NetworkRequest from './network-request.js';
 
 /**
  * Returns an error if the original network request failed or wasn't found.
@@ -146,7 +146,7 @@ function getPageLoadError(navigationError, context) {
 }
 
 
-module.exports = {
+export default {
   getNetworkError,
   getInterstitialError,
   getPageLoadError,
diff --git a/lighthouse-core/lib/network-recorder.js b/lighthouse-core/lib/network-recorder.js
index 317c7d406866..246b41615935 100644
--- a/lighthouse-core/lib/network-recorder.js
+++ b/lighthouse-core/lib/network-recorder.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
-const NetworkRequest = require('./network-request.js');
-const EventEmitter = require('events').EventEmitter;
+import log from 'lighthouse-logger';
+import NetworkRequest from './network-request.js';
+import {EventEmitter} from 'events';
 
 /** @typedef {'requeststarted'|'requestloaded'} NetworkRecorderEvent */
 
@@ -334,4 +334,4 @@ class NetworkRecorder extends EventEmitter {
   }
 }
 
-module.exports = NetworkRecorder;
+export default NetworkRecorder;
diff --git a/lighthouse-core/lib/network-request.js b/lighthouse-core/lib/network-request.js
index 223592de15a0..2c324f06c23e 100644
--- a/lighthouse-core/lib/network-request.js
+++ b/lighthouse-core/lib/network-request.js
@@ -11,7 +11,7 @@
  * @see https://cs.chromium.org/chromium/src/third_party/blink/renderer/devtools/front_end/sdk/NetworkManager.js
  */
 
-const URL = require('./url-shim.js');
+import URL from './url-shim.js';
 
 
 // Lightrider X-Header names for timing information.
@@ -537,4 +537,4 @@ NetworkRequest.HEADER_TOTAL = HEADER_TOTAL;
 NetworkRequest.HEADER_FETCHED_SIZE = HEADER_FETCHED_SIZE;
 NetworkRequest.HEADER_PROTOCOL_IS_H2 = HEADER_PROTOCOL_IS_H2;
 
-module.exports = NetworkRequest;
+export {NetworkRequest};
diff --git a/lighthouse-core/lib/page-functions.js b/lighthouse-core/lib/page-functions.js
index c70429619ba8..316abfae9a1f 100644
--- a/lighthouse-core/lib/page-functions.js
+++ b/lighthouse-core/lib/page-functions.js
@@ -535,7 +535,7 @@ const getNodeDetailsString = `function getNodeDetails(element) {
   return (${getNodeDetails.toString()})(element);
 }`;
 
-module.exports = {
+export const pageFunctions = {
   wrapRuntimeEvalErrorInBrowserString: wrapRuntimeEvalErrorInBrowser.toString(),
   wrapRuntimeEvalErrorInBrowser,
   getElementsInDocument,
diff --git a/lighthouse-core/lib/proto-preprocessor.js b/lighthouse-core/lib/proto-preprocessor.js
index bb465c2dd1bb..a69e204fc7d9 100644
--- a/lighthouse-core/lib/proto-preprocessor.js
+++ b/lighthouse-core/lib/proto-preprocessor.js
@@ -6,7 +6,7 @@
 
 'use strict';
 
-const fs = require('fs');
+import fs from 'fs';
 
 /**
  * @fileoverview Helper functions to transform an LHR into a proto-ready LHR.
@@ -127,7 +127,7 @@ if (require.main === module) {
     fs.writeFileSync(output, JSON.stringify(report), 'utf-8');
   }
 } else {
-  module.exports = {
+  export default {
     processForProto,
   };
 }
diff --git a/lighthouse-core/lib/rect-helpers.js b/lighthouse-core/lib/rect-helpers.js
index cffcb7919a6e..6ede07a9d279 100644
--- a/lighthouse-core/lib/rect-helpers.js
+++ b/lighthouse-core/lib/rect-helpers.js
@@ -233,7 +233,7 @@ function allRectsContainedWithinEachOther(rectListA, rectListB) {
   return true;
 }
 
-module.exports = {
+export default {
   rectContainsPoint,
   rectContains,
   addRectWidthAndHeight,
diff --git a/lighthouse-core/lib/script-helpers.js b/lighthouse-core/lib/script-helpers.js
index 506ed60a2821..9d23f241af44 100644
--- a/lighthouse-core/lib/script-helpers.js
+++ b/lighthouse-core/lib/script-helpers.js
@@ -26,4 +26,4 @@ function getRequestForScript(networkRecords, script) {
   return networkRequest;
 }
 
-module.exports = {getRequestForScript, isInline};
+export default {getRequestForScript, isInline};
diff --git a/lighthouse-core/lib/sd-validation/helpers/walk-object.js b/lighthouse-core/lib/sd-validation/helpers/walk-object.js
index 6eab98a7836a..dc1eac195fb6 100644
--- a/lighthouse-core/lib/sd-validation/helpers/walk-object.js
+++ b/lighthouse-core/lib/sd-validation/helpers/walk-object.js
@@ -12,7 +12,7 @@
  * @param {function(string, any, Array<string>, any): void} callback
  * @param {Array<string>} path
  */
-module.exports = function walkObject(obj, callback, path = []) {
+export default function walkObject(obj, callback, path = []) {
   if (obj === null) {
     return;
   }
@@ -27,4 +27,4 @@ module.exports = function walkObject(obj, callback, path = []) {
       walkObject(fieldValue, callback, newPath);
     }
   });
-};
+}
diff --git a/lighthouse-core/lib/sd-validation/json-expander.js b/lighthouse-core/lib/sd-validation/json-expander.js
index 35e60512d221..b42260f83315 100644
--- a/lighthouse-core/lib/sd-validation/json-expander.js
+++ b/lighthouse-core/lib/sd-validation/json-expander.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const {URL} = require('../url-shim.js');
-const jsonld = require('jsonld');
-const schemaOrgContext = require('./assets/jsonldcontext.json');
+import {URL} from '../url-shim.js';
+import jsonld from 'jsonld';
+import schemaOrgContext from './assets/jsonldcontext.json';
 const SCHEMA_ORG_HOST = 'schema.org';
 
 /**
@@ -45,7 +45,7 @@ async function documentLoader(schemaUrl) {
  * @param {any} inputObject
  * @return {Promise<LH.StructuredData.ExpandedSchemaRepresentation|null>}
  */
-module.exports = async function expand(inputObject) {
+export default async function expand(inputObject) {
   try {
     return await jsonld.expand(inputObject, {documentLoader});
   } catch (err) {
@@ -53,4 +53,4 @@ module.exports = async function expand(inputObject) {
     if (err.details?.cause) throw err.details.cause;
     throw err;
   }
-};
+}
diff --git a/lighthouse-core/lib/sd-validation/json-linter.js b/lighthouse-core/lib/sd-validation/json-linter.js
index ecba0b940bd0..243b1af772d8 100644
--- a/lighthouse-core/lib/sd-validation/json-linter.js
+++ b/lighthouse-core/lib/sd-validation/json-linter.js
@@ -5,13 +5,13 @@
  */
 'use strict';
 
-const jsonlint = require('jsonlint-mod');
+import jsonlint from 'jsonlint-mod';
 
 /**
  * @param {string} input
  * @return {{message: string, lineNumber: number|null}|null}
  */
-module.exports = function parseJSON(input) {
+export default function parseJSON(input) {
   try {
     jsonlint.parse(input);
   } catch (error) {
@@ -46,4 +46,4 @@ module.exports = function parseJSON(input) {
   }
 
   return null;
-};
+}
diff --git a/lighthouse-core/lib/sd-validation/jsonld-keyword-validator.js b/lighthouse-core/lib/sd-validation/jsonld-keyword-validator.js
index 739d76aeab32..2b6feb5e62b4 100644
--- a/lighthouse-core/lib/sd-validation/jsonld-keyword-validator.js
+++ b/lighthouse-core/lib/sd-validation/jsonld-keyword-validator.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const walkObject = require('./helpers/walk-object.js');
+import walkObject from './helpers/walk-object.js';
 
 // This list comes from the JSON-LD 1.1 editors draft:
 // https://w3c.github.io/json-ld-syntax/#syntax-tokens-and-keywords
@@ -33,7 +33,7 @@ const VALID_KEYWORDS = new Set([
  * @param {*} json
  * @return {Array<{path: string, message: string}>}
  */
-module.exports = function validateJsonLD(json) {
+export default function validateJsonLD(json) {
   /** @type {Array<{path: string, message: string}>} */
   const errors = [];
 
@@ -47,4 +47,4 @@ module.exports = function validateJsonLD(json) {
   });
 
   return errors;
-};
+}
diff --git a/lighthouse-core/lib/sd-validation/line-number-from-jsonld-path.js b/lighthouse-core/lib/sd-validation/line-number-from-jsonld-path.js
index dcf67bab2a23..0001bbfae9cb 100644
--- a/lighthouse-core/lib/sd-validation/line-number-from-jsonld-path.js
+++ b/lighthouse-core/lib/sd-validation/line-number-from-jsonld-path.js
@@ -57,4 +57,4 @@ function setValueAtJsonLDPath(obj, path, value) {
   });
 }
 
-module.exports = getLineNumberFromJsonLDPath;
+export default getLineNumberFromJsonLDPath;
diff --git a/lighthouse-core/lib/sd-validation/schema-validator.js b/lighthouse-core/lib/sd-validation/schema-validator.js
index 2d93774b0213..821fdf4c176e 100644
--- a/lighthouse-core/lib/sd-validation/schema-validator.js
+++ b/lighthouse-core/lib/sd-validation/schema-validator.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const walkObject = require('./helpers/walk-object.js');
-const schemaStructure = require('./assets/schema-tree.json');
+import walkObject from './helpers/walk-object.js';
+import schemaStructure from './assets/schema-tree.json';
 const TYPE_KEYWORD = '@type';
 const SCHEMA_ORG_URL_REGEX = /https?:\/\/schema\.org\//;
 
@@ -107,7 +107,7 @@ function validateObjectKeys(typeOrTypes, keys) {
  * @param {LH.StructuredData.ExpandedSchemaRepresentation|null} expandedObj Valid JSON-LD object in expanded form
  * @return {Array<Pick<LH.StructuredData.ValidationError, "message" | "validTypes" | "path">>}
  */
-module.exports = function validateSchemaOrg(expandedObj) {
+export default function validateSchemaOrg(expandedObj) {
   /** @type {Array<Pick<LH.StructuredData.ValidationError, "message" | "validTypes" | "path">>} */
   const errors = [];
 
@@ -143,4 +143,4 @@ module.exports = function validateSchemaOrg(expandedObj) {
   });
 
   return errors;
-};
+}
diff --git a/lighthouse-core/lib/sd-validation/scripts/download-jsonldcontext.js b/lighthouse-core/lib/sd-validation/scripts/download-jsonldcontext.js
index 4c5e0f944151..6d2b21cadb67 100644
--- a/lighthouse-core/lib/sd-validation/scripts/download-jsonldcontext.js
+++ b/lighthouse-core/lib/sd-validation/scripts/download-jsonldcontext.js
@@ -9,9 +9,10 @@
  * Call this script to update assets/jsonldcontext.json with the latest schema.org spec
  */
 
-const fetch = require('node-fetch');
-const path = require('path');
-const fs = require('fs');
+import fetch from 'node-fetch';
+
+import path from 'path';
+import fs from 'fs';
 
 const SCHEMA_ORG_URL = 'https://schema.org';
 const CONTEXT_FILE = path.join(__dirname, '../assets/jsonldcontext.json');
diff --git a/lighthouse-core/lib/sd-validation/scripts/generate-schema-tree.js b/lighthouse-core/lib/sd-validation/scripts/generate-schema-tree.js
index 46a6e548f290..5352095976b2 100644
--- a/lighthouse-core/lib/sd-validation/scripts/generate-schema-tree.js
+++ b/lighthouse-core/lib/sd-validation/scripts/generate-schema-tree.js
@@ -9,9 +9,10 @@
  * Call this script to update assets/schema-tree.json with the latest schema.org spec
  */
 
-const fetch = require('node-fetch');
-const path = require('path');
-const fs = require('fs');
+import fetch from 'node-fetch';
+
+import path from 'path';
+import fs from 'fs';
 
 const SCHEMA_ORG_URL = 'https://schema.org/version/latest/schema.jsonld';
 const SCHEMA_TREE_FILE = path.join(__dirname, '../assets/schema-tree.json');
diff --git a/lighthouse-core/lib/sd-validation/sd-validation.js b/lighthouse-core/lib/sd-validation/sd-validation.js
index 4f20145793c1..8423e14802e0 100644
--- a/lighthouse-core/lib/sd-validation/sd-validation.js
+++ b/lighthouse-core/lib/sd-validation/sd-validation.js
@@ -5,11 +5,11 @@
  */
 'use strict';
 
-const parseJSON = require('./json-linter.js');
-const validateJsonLD = require('./jsonld-keyword-validator.js');
-const expandAsync = require('./json-expander.js');
-const validateSchemaOrg = require('./schema-validator.js');
-const getLineNumberFromJsonLDPath = require('./line-number-from-jsonld-path.js');
+import parseJSON from './json-linter.js';
+import validateJsonLD from './jsonld-keyword-validator.js';
+import expandAsync from './json-expander.js';
+import validateSchemaOrg from './schema-validator.js';
+import getLineNumberFromJsonLDPath from './line-number-from-jsonld-path.js';
 
 /**
  * Validates JSON-LD input. Returns array of error objects.
@@ -17,7 +17,7 @@ const getLineNumberFromJsonLDPath = require('./line-number-from-jsonld-path.js')
  * @param {string} textInput
  * @return {Promise<Array<LH.StructuredData.ValidationError>>}
  */
-module.exports = async function validate(textInput) {
+export default async function validate(textInput) {
   // STEP 1: VALIDATE JSON
   const parseError = parseJSON(textInput);
 
@@ -73,5 +73,5 @@ module.exports = async function validate(textInput) {
   }
 
   return [];
-};
+}
 
diff --git a/lighthouse-core/lib/sentry.js b/lighthouse-core/lib/sentry.js
index 2cfc3d083904..b665ca9d8110 100644
--- a/lighthouse-core/lib/sentry.js
+++ b/lighthouse-core/lib/sentry.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
+import log from 'lighthouse-logger';
 
 /** @typedef {import('@sentry/node').Breadcrumb} Breadcrumb */
 /** @typedef {import('@sentry/node').NodeClient} NodeClient */
@@ -141,4 +141,4 @@ function init(opts) {
   }
 }
 
-module.exports = sentryDelegate;
+export default sentryDelegate;
diff --git a/lighthouse-core/lib/stack-packs.js b/lighthouse-core/lib/stack-packs.js
index b7b9dde4666f..2d5e5f089ef7 100644
--- a/lighthouse-core/lib/stack-packs.js
+++ b/lighthouse-core/lib/stack-packs.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
-const stackPacks = require('lighthouse-stack-packs');
-const i18n = require('./i18n/i18n.js');
+import log from 'lighthouse-logger';
+import stackPacks from 'lighthouse-stack-packs';
+import i18n from './i18n/i18n.js';
 
 /**
  * Pairs consisting of a stack pack's ID and the set of stacks needed to be
@@ -115,7 +115,7 @@ function getStackPacks(pageStacks) {
   return packs;
 }
 
-module.exports = {
+export default {
   getStackPacks,
   stackPacksToInclude,
 };
diff --git a/lighthouse-core/lib/statistics.js b/lighthouse-core/lib/statistics.js
index d7b64675aa8c..707eaeef1a5a 100644
--- a/lighthouse-core/lib/statistics.js
+++ b/lighthouse-core/lib/statistics.js
@@ -98,7 +98,7 @@ function linearInterpolation(x0, y0, x1, y1, x) {
   return y0 + (x - x0) * slope;
 }
 
-module.exports = {
+export default {
   linearInterpolation,
   getLogNormalScore,
 };
diff --git a/lighthouse-core/lib/tappable-rects.js b/lighthouse-core/lib/tappable-rects.js
index 73566ec3c830..19ab9c554b97 100644
--- a/lighthouse-core/lib/tappable-rects.js
+++ b/lighthouse-core/lib/tappable-rects.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const RectHelpers = require('./rect-helpers.js');
+import RectHelpers from './rect-helpers.js';
 
 /**
  * Merge client rects together and remove small ones. This may result in a larger overall
@@ -94,6 +94,6 @@ function mergeTouchingClientRects(clientRects) {
   return clientRects;
 }
 
-module.exports = {
+export default {
   getTappableRectsFromClientRects,
 };
diff --git a/lighthouse-core/lib/third-party-web.js b/lighthouse-core/lib/third-party-web.js
index e2336cf90233..04241b4259bf 100644
--- a/lighthouse-core/lib/third-party-web.js
+++ b/lighthouse-core/lib/third-party-web.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const thirdPartyWeb = require('third-party-web/httparchive-nostats-subset');
+import thirdPartyWeb from 'third-party-web/httparchive-nostats-subset';
 
 /** @typedef {import("third-party-web").IEntity} ThirdPartyEntity */
 /** @typedef {import("third-party-web").IProduct} ThirdPartyProduct */
@@ -45,7 +45,7 @@ function isFirstParty(url, mainDocumentEntity) {
   return !isThirdParty(url, mainDocumentEntity);
 }
 
-module.exports = {
+export default {
   getEntity,
   getProduct,
   isThirdParty,
diff --git a/lighthouse-core/lib/timing-trace-saver.js b/lighthouse-core/lib/timing-trace-saver.js
index 3a40fae526b6..046e598b39d0 100644
--- a/lighthouse-core/lib/timing-trace-saver.js
+++ b/lighthouse-core/lib/timing-trace-saver.js
@@ -94,4 +94,4 @@ ${events.map(evt => JSON.stringify(evt)).join(',\n')}
   return jsonStr;
 }
 
-module.exports = {generateTraceEvents, createTraceString};
+export default {generateTraceEvents, createTraceString};
diff --git a/lighthouse-core/lib/tracehouse/cpu-profile-model.js b/lighthouse-core/lib/tracehouse/cpu-profile-model.js
index 1f9639e9d363..a739d5ed4bf0 100644
--- a/lighthouse-core/lib/tracehouse/cpu-profile-model.js
+++ b/lighthouse-core/lib/tracehouse/cpu-profile-model.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const MainThreadTasks = require('./main-thread-tasks.js');
+import MainThreadTasks from './main-thread-tasks.js';
 
 const SAMPLER_TRACE_EVENT_NAME = 'FunctionCall-SynthesizedByProfilerModel';
 
@@ -589,4 +589,4 @@ class CpuProfilerModel {
   }
 }
 
-module.exports = CpuProfilerModel;
+export default CpuProfilerModel;
diff --git a/lighthouse-core/lib/tracehouse/main-thread-tasks.js b/lighthouse-core/lib/tracehouse/main-thread-tasks.js
index c63619f0ad96..db609b4a32c1 100644
--- a/lighthouse-core/lib/tracehouse/main-thread-tasks.js
+++ b/lighthouse-core/lib/tracehouse/main-thread-tasks.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const {taskGroups, taskNameToGroup} = require('./task-groups.js');
+import {taskGroups, taskNameToGroup} from './task-groups.js';
 
 /**
  * @fileoverview
@@ -684,4 +684,4 @@ class MainThreadTasks {
   }
 }
 
-module.exports = MainThreadTasks;
+export default MainThreadTasks;
diff --git a/lighthouse-core/lib/tracehouse/task-groups.js b/lighthouse-core/lib/tracehouse/task-groups.js
index 3593ffbf1310..b354df889f90 100644
--- a/lighthouse-core/lib/tracehouse/task-groups.js
+++ b/lighthouse-core/lib/tracehouse/task-groups.js
@@ -105,7 +105,7 @@ for (const group of Object.values(taskGroups)) {
   }
 }
 
-module.exports = {
+export default {
   taskGroups,
   taskNameToGroup,
 };
diff --git a/lighthouse-core/lib/tracehouse/trace-processor.js b/lighthouse-core/lib/tracehouse/trace-processor.js
index 434bab1f16aa..192e23517366 100644
--- a/lighthouse-core/lib/tracehouse/trace-processor.js
+++ b/lighthouse-core/lib/tracehouse/trace-processor.js
@@ -22,7 +22,7 @@
 /** @typedef {Omit<LH.TraceEvent, 'name'|'args'> & {name: 'largestContentfulPaint::Invalidate'|'largestContentfulPaint::Candidate', args: {data?: {size?: number}, frame: string}}} LCPEvent */
 /** @typedef {Omit<LH.TraceEvent, 'name'|'args'> & {name: 'largestContentfulPaint::Candidate', args: {data: {size: number}, frame: string}}} LCPCandidateEvent */
 
-const log = require('lighthouse-logger');
+import log from 'lighthouse-logger';
 
 const ACCEPTABLE_NAVIGATION_URL_REGEX = /^(chrome|https?):/;
 
@@ -951,7 +951,7 @@ class TraceProcessor {
   }
 }
 
-module.exports = TraceProcessor;
+export default TraceProcessor;
 
 
 /**
diff --git a/lighthouse-core/lib/traces/pwmetrics-events.js b/lighthouse-core/lib/traces/pwmetrics-events.js
index f1ccb7543c1a..0590335c2bb2 100644
--- a/lighthouse-core/lib/traces/pwmetrics-events.js
+++ b/lighthouse-core/lib/traces/pwmetrics-events.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
-const TraceProcessor = require('../tracehouse/trace-processor.js');
+import log from 'lighthouse-logger';
+import TraceProcessor from '../tracehouse/trace-processor.js';
 
 /**
  * @param {LH.Result['audits']} auditResults
@@ -197,4 +197,4 @@ class Metrics {
   }
 }
 
-module.exports = Metrics;
+export default Metrics;
diff --git a/lighthouse-core/lib/url-shim.js b/lighthouse-core/lib/url-shim.js
index df8e8c9dc139..49002363d6c9 100644
--- a/lighthouse-core/lib/url-shim.js
+++ b/lighthouse-core/lib/url-shim.js
@@ -9,8 +9,9 @@
  * URL shim so we keep our code DRY
  */
 
-const {Util} = require('../util-commonjs.js');
-const LHError = require('../lib/lh-error.js');
+import {Util} from '../util-commonjs.js';
+
+import LHError from '../lib/lh-error.js';
 
 /** @typedef {import('./network-request.js')} NetworkRequest */
 
@@ -271,4 +272,4 @@ URLShim.INVALID_URL_DEBUG_STRING =
     'Lighthouse was unable to determine the URL of some script executions. ' +
     'It\'s possible a Chrome extension or other eval\'d code is the source.';
 
-module.exports = URLShim;
+export default URLShim;
diff --git a/lighthouse-core/runner.js b/lighthouse-core/runner.js
index 402f19f63c3f..073c8445531f 100644
--- a/lighthouse-core/runner.js
+++ b/lighthouse-core/runner.js
@@ -5,24 +5,24 @@
  */
 'use strict';
 
-const isDeepEqual = require('lodash/isEqual.js');
-const Driver = require('./gather/driver.js');
-const GatherRunner = require('./gather/gather-runner.js');
-const ReportScoring = require('./scoring.js');
-const Audit = require('./audits/audit.js');
-const log = require('lighthouse-logger');
-const format = require('../shared/localization/format.js');
-const stackPacks = require('./lib/stack-packs.js');
-const assetSaver = require('./lib/asset-saver.js');
-const fs = require('fs');
-const path = require('path');
-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 */
+import isDeepEqual from 'lodash/isEqual.js';
+import {Driver} from './gather/driver.js';
+import {GatherRunner} from './gather/gather-runner.js';
+import {ReportScoring} from './scoring.js';
+import {Audit} from './audits/audit.js';
+import log from 'lighthouse-logger';
+import format from '../shared/localization/format.js';
+import stackPacks from './lib/stack-packs.js';
+import assetSaver from './lib/asset-saver.js';
+import fs from 'fs';
+import path from 'path';
+import Sentry from './lib/sentry.js';
+import {generateReport} from '../report/generator/report-generator.js';
+import LHError from './lib/lh-error.js';
+import {version as lighthouseVersion} from '../package.json';
+
+/** @typedef {import('./gather/connections/connection.js').Connection} Connection */
+/** @typedef {import('./lib/arbitrary-equality-map.js').ArbitraryEqualityMap} ArbitraryEqualityMap */
 /** @typedef {LH.Config.Config} Config */
 
 class Runner {
@@ -362,7 +362,6 @@ class Runner {
         // If artifact was an error, output error result on behalf of audit.
         if (artifacts[artifactName] instanceof Error) {
           /** @type {Error} */
-          // @ts-expect-error An artifact *could* be an Error, but caught here, so ignore elsewhere.
           const artifactError = artifacts[artifactName];
 
           Sentry.captureException(artifactError, {
@@ -510,4 +509,5 @@ class Runner {
   }
 }
 
-module.exports = Runner;
+// TODO(esmodules): make this not a class.
+export {Runner};
diff --git a/lighthouse-core/scoring.js b/lighthouse-core/scoring.js
index c410e69aed44..a66abcb6979f 100644
--- a/lighthouse-core/scoring.js
+++ b/lighthouse-core/scoring.js
@@ -6,7 +6,7 @@
 
 'use strict';
 
-const Audit = require('./audits/audit.js');
+import {Audit} from './audits/audit.js';
 
 /**
  * Clamp figure to 2 decimal places
@@ -90,4 +90,4 @@ class ReportScoring {
   }
 }
 
-module.exports = ReportScoring;
+export {ReportScoring};
diff --git a/types/artifacts.d.ts b/types/artifacts.d.ts
index 56edd41b35fc..f449d213c5a5 100644
--- a/types/artifacts.d.ts
+++ b/types/artifacts.d.ts
@@ -4,16 +4,14 @@
  * 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 parseManifest = require('../lighthouse-core/lib/manifest-parser.js');
-import LanternSimulator = require('../lighthouse-core/lib/dependency-graph/simulator/simulator.js');
-import LighthouseError = require('../lighthouse-core/lib/lh-error.js');
-import _NetworkRequest = require('../lighthouse-core/lib/network-request.js');
-import speedline = require('speedline-core');
+import {parseManifest} from '../lighthouse-core/lib/manifest-parser.js';
+import {Simulator} from '../lighthouse-core/lib/dependency-graph/simulator/simulator.js';
+import {LighthouseError} from '../lighthouse-core/lib/lh-error.js';
+import {NetworkRequest as _NetworkRequest} from '../lighthouse-core/lib/network-request.js';
+import speedline from 'speedline-core';
 import TextSourceMap = require('../lighthouse-core/lib/cdt/generated/SourceMap.js');
-import ArbitraryEqualityMap = require('../lighthouse-core/lib/arbitrary-equality-map.js');
-
-type _TaskNode = import('../lighthouse-core/lib/tracehouse/main-thread-tasks.js').TaskNode;
-
+import {ArbitraryEqualityMap} from '../lighthouse-core/lib/arbitrary-equality-map.js';
+import type { TaskNode as _TaskNode } from '../lighthouse-core/lib/tracehouse/main-thread-tasks.js';
 import AuditDetails from './lhr/audit-details'
 import Config from './config';
 import Gatherer from './gatherer';
@@ -641,7 +639,7 @@ declare module Artifacts {
     trace: Trace;
     settings: Immutable<Config.Settings>;
     gatherContext: Artifacts['GatherContext'];
-    simulator?: InstanceType<typeof LanternSimulator>;
+    simulator?: InstanceType<typeof Simulator>;
     URL: Artifacts['URL'];
   }
 
diff --git a/types/audit.d.ts b/types/audit.d.ts
index 755d47a93e8f..b37750d74075 100644
--- a/types/audit.d.ts
+++ b/types/audit.d.ts
@@ -4,12 +4,12 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 
-import ArbitraryEqualityMap = require('../lighthouse-core/lib/arbitrary-equality-map.js');
+import {ArbitraryEqualityMap} from '../lighthouse-core/lib/arbitrary-equality-map.js';
 import {Artifacts} from './artifacts';
 import AuditDetails from './lhr/audit-details';
 import Config from './config';
 import Gatherer from './gatherer';
-import {FormattedIcu, IcuMessage} from './lhr/i18n';
+import {IcuMessage} from './lhr/i18n';
 import * as AuditResult from './lhr/audit-result';
 
 declare module Audit {
diff --git a/types/config.d.ts b/types/config.d.ts
index 4d170052e6ff..67e715d0c8c6 100644
--- a/types/config.d.ts
+++ b/types/config.d.ts
@@ -5,7 +5,7 @@
  * 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 Audit = require('../lighthouse-core/audits/audit.js');
+import {Audit} from '../lighthouse-core/audits/audit.js';
 import {SharedFlagsSettings, ConfigSettings} from './lhr/settings';
 import Gatherer from './gatherer';
 import {IcuMessage} from './lhr/i18n';
diff --git a/types/gatherer.d.ts b/types/gatherer.d.ts
index c25026aace2b..4db55fb04674 100644
--- a/types/gatherer.d.ts
+++ b/types/gatherer.d.ts
@@ -4,13 +4,13 @@
  * 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 _NetworkNode = require('../lighthouse-core/lib/dependency-graph/network-node');
-import _CPUNode = require('../lighthouse-core/lib/dependency-graph/cpu-node');
-import _Simulator = require('../lighthouse-core/lib/dependency-graph/simulator/simulator');
-import Driver = require('../lighthouse-core/gather/driver');
-import ExecutionContext = require('../lighthouse-core/gather/driver/execution-context');
-import Fetcher = require('../lighthouse-core/gather/fetcher');
-import ArbitraryEqualityMap = require('../lighthouse-core/lib/arbitrary-equality-map');
+import {NetworkNode as _NetworkNode} from '../lighthouse-core/lib/dependency-graph/network-node';
+import {CPUNode as _CPUNode} from '../lighthouse-core/lib/dependency-graph/cpu-node';
+import {Simulator as _Simulator} from '../lighthouse-core/lib/dependency-graph/simulator/simulator';
+import {Driver} from '../lighthouse-core/gather/driver';
+import {ExecutionContext} from '../lighthouse-core/gather/driver/execution-context';
+import {Fetcher} from '../lighthouse-core/gather/fetcher';
+import {ArbitraryEqualityMap} from '../lighthouse-core/lib/arbitrary-equality-map';
 
 import {Artifacts, BaseArtifacts, FRBaseArtifacts, GathererArtifacts} from './artifacts';
 import Config from './config';
diff --git a/types/global-lh.d.ts b/types/global-lh.d.ts
index daf56edbf630..2c5f3715786e 100644
--- a/types/global-lh.d.ts
+++ b/types/global-lh.d.ts
@@ -4,7 +4,7 @@
  * 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 ArbitraryEqualityMap_ = require('../lighthouse-core/lib/arbitrary-equality-map.js');
+import {ArbitraryEqualityMap as ArbitraryEqualityMap_} from '../lighthouse-core/lib/arbitrary-equality-map.js';
 import * as Artifacts_ from './artifacts';
 import Audit_ from './audit';
 import Budget_ from './lhr/budget';
@@ -14,7 +14,7 @@ import _CrdpMappings from 'devtools-protocol/types/protocol-mapping';
 import * as Externs from './externs';
 import Gatherer_ from './gatherer';
 import * as I18n from './lhr/i18n';
-import LHError = require('../lighthouse-core/lib/lh-error.js');
+import {LighthouseError as LighthouseError_} from '../lighthouse-core/lib/lh-error.js';
 import LHResult from './lhr/lhr';
 import FlowResult_ from './lhr/flow';
 import Protocol_ from './protocol';
@@ -59,7 +59,7 @@ declare global {
     export import DevToolsJsonTarget = Externs.DevToolsJsonTarget;
 
     export import Gatherer = Gatherer_;
-    export import LighthouseError = LHError;
+    export import LighthouseError = LighthouseError_;
     export import Result = LHResult;
     export import FlowResult = FlowResult_;
 

From 9aa283770fe34cb36b83fe26b206f26edf140d46 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 5 May 2022 09:29:12 -0700
Subject: [PATCH 02/96] convert build

---
 build/.eslintrc.cjs                      | 28 ++++++++++++++
 build/build-bundle.js                    | 48 +++++++++++++-----------
 build/build-cdt-lib.js                   | 10 +++--
 build/build-dt-report-resources.js       | 17 +++++----
 build/build-extension.js                 | 20 +++++-----
 build/build-lightrider-bundles.js        | 21 ++++++-----
 build/build-report-components.js         | 14 ++++---
 build/build-report.js                    | 33 ++++++++--------
 build/build-sample-reports.js            | 26 +++++++------
 build/build-smokehouse-bundle.js         | 10 ++---
 build/build-treemap.js                   | 10 ++---
 build/build-viewer.js                    | 12 +++---
 build/changelog-generator/index.js       |  8 ++--
 build/gh-pages-app.js                    | 35 ++++++++---------
 build/package.json                       |  4 ++
 build/plugins/browserify-inline-fs.js    | 12 +++---
 build/plugins/inline-fs.js               | 20 +++++-----
 build/plugins/rollup-plugin-inline-fs.js | 11 +++---
 build/rollup-plugins.js                  | 36 ++++++------------
 build/test/plugins/inline-fs-test.js     | 10 ++---
 tsconfig-base.json                       |  2 +
 21 files changed, 213 insertions(+), 174 deletions(-)
 create mode 100644 build/.eslintrc.cjs
 create mode 100644 build/package.json

diff --git a/build/.eslintrc.cjs b/build/.eslintrc.cjs
new file mode 100644
index 000000000000..d88a09d9d26c
--- /dev/null
+++ b/build/.eslintrc.cjs
@@ -0,0 +1,28 @@
+/**
+ * @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.
+ */
+
+module.exports = {
+  rules: {
+    // TODO(esmodules): move to root eslint when all code is ESM
+    // or when this is resolved: https://github.com/import-js/eslint-plugin-import/issues/2214
+    'import/order': [2, {
+      'groups': [
+        'builtin',
+        'external',
+        ['sibling', 'parent'],
+        'index',
+        'object',
+        'type',
+      ],
+      'newlines-between': 'always',
+    }],
+    'import/group-exports': 2,
+    'import/exports-last': 2,
+  },
+  parserOptions: {
+    sourceType: 'module',
+  },
+};
diff --git a/build/build-bundle.js b/build/build-bundle.js
index 51bd9ae87970..3f465a3e7a33 100644
--- a/build/build-bundle.js
+++ b/build/build-bundle.js
@@ -3,28 +3,35 @@
  * 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';
 
 /**
  * @fileoverview Script to bundle lighthouse entry points so that they can be run
  * in the browser (as long as they have access to a debugger protocol Connection).
  */
 
-const fs = require('fs');
-const path = require('path');
-const rollup = require('rollup');
-const rollupPlugins = require('./rollup-plugins.js');
-const Runner = require('../lighthouse-core/runner.js');
-const {LH_ROOT} = require('../root.js');
+import fs from 'fs';
+import path from 'path';
+import {execSync} from 'child_process';
 
-const COMMIT_HASH = require('child_process')
-  .execSync('git rev-parse HEAD')
-  .toString().trim();
+import esMain from 'es-main';
+import {rollup} from 'rollup';
+// @ts-expect-error
+import PubAdsPlugin from 'lighthouse-plugin-publisher-ads/plugin.js';
+
+import * as rollupPlugins from './rollup-plugins.js';
+import Runner from '../lighthouse-core/runner.js';
+import {LH_ROOT} from '../root.js';
+import {createCommonjsRefs} from '../lighthouse-core/scripts/esm-utils.js';
+
+const {require} = createCommonjsRefs(import.meta);
+
+/** The commit hash for the current HEAD. */
+const COMMIT_HASH = execSync('git rev-parse HEAD').toString().trim();
 
 // HACK: manually include the lighthouse-plugin-publisher-ads audits.
 /** @type {Array<string>} */
 // @ts-expect-error
-const pubAdsAudits = require('lighthouse-plugin-publisher-ads/plugin.js').audits.map(a => a.path);
+const pubAdsAudits = PubAdsPlugin.audits.map(a => a.path);
 
 /** @param {string} file */
 const isDevtools = file =>
@@ -62,7 +69,7 @@ const banner = `
  * @param {{minify: boolean}=} opts
  * @return {Promise<void>}
  */
-async function build(entryPath, distPath, opts = {minify: true}) {
+async function buildBundle(entryPath, distPath, opts = {minify: true}) {
   if (fs.existsSync(LH_ROOT + '/lighthouse-logger/node_modules')) {
     throw new Error('delete `lighthouse-logger/node_modules` because it messes up rollup bundle');
   }
@@ -119,7 +126,7 @@ async function build(entryPath, distPath, opts = {minify: true}) {
   shimsObj[require.resolve('../package.json')] =
     `export const version = ${JSON.stringify(require('../package.json').version)}`;
 
-  const bundle = await rollup.rollup({
+  const bundle = await rollup({
     input: entryPath,
     context: 'globalThis',
     plugins: [
@@ -214,19 +221,18 @@ async function cli(argv) {
   // Take paths relative to cwd and build.
   const [entryPath, distPath] = argv.slice(2)
     .map(filePath => path.resolve(process.cwd(), filePath));
-  await build(entryPath, distPath);
+  await buildBundle(entryPath, distPath);
 }
 
 // Test if called from the CLI or as a module.
-if (require.main === module) {
+if (esMain(import.meta)) {
   cli(process.argv).catch(err => {
     console.error(err);
     process.exit(1);
   });
-} else {
-  module.exports = {
-    /** The commit hash for the current HEAD. */
-    COMMIT_HASH,
-    build,
-  };
 }
+
+export {
+  COMMIT_HASH,
+  buildBundle,
+};
diff --git a/build/build-cdt-lib.js b/build/build-cdt-lib.js
index b2d1a2a84afb..3ab86f048daf 100644
--- a/build/build-cdt-lib.js
+++ b/build/build-cdt-lib.js
@@ -3,13 +3,15 @@
  * 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';
+
 
 /* eslint-disable no-console */
 
-const fs = require('fs');
-const ts = require('typescript');
-const {LH_ROOT} = require('../root.js');
+import fs from 'fs';
+
+import ts from 'typescript';
+
+import {LH_ROOT} from '../root.js';
 
 const outDir = `${LH_ROOT}/lighthouse-core/lib/cdt/generated`;
 const files = {
diff --git a/build/build-dt-report-resources.js b/build/build-dt-report-resources.js
index 5636dd2f02e0..c444c494bd67 100644
--- a/build/build-dt-report-resources.js
+++ b/build/build-dt-report-resources.js
@@ -3,14 +3,15 @@
  * 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 rollup = require('rollup');
-const rollupPlugins = require('./rollup-plugins.js');
-const fs = require('fs');
-const path = require('path');
-const assert = require('assert').strict;
-const {LH_ROOT} = require('../root.js');
+import fs from 'fs';
+import path from 'path';
+import {strict as assert} from 'assert';
+
+import {rollup} from 'rollup';
+
+import * as rollupPlugins from './rollup-plugins.js';
+import {LH_ROOT} from '../root.js';
 
 const distDir = path.join(LH_ROOT, 'dist', 'dt-report-resources');
 const bundleOutFile = `${distDir}/report-generator.mjs`;
@@ -30,7 +31,7 @@ fs.mkdirSync(distDir, {recursive: true});
 writeFile('report-generator.mjs.d.ts', 'export {}');
 
 async function buildReportGenerator() {
-  const bundle = await rollup.rollup({
+  const bundle = await rollup({
     input: 'report/generator/report-generator.js',
     plugins: [
       rollupPlugins.shim({
diff --git a/build/build-extension.js b/build/build-extension.js
index affd8b16e47c..e9931712a5e5 100644
--- a/build/build-extension.js
+++ b/build/build-extension.js
@@ -3,15 +3,15 @@
  * 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 fs = require('fs');
-const mkdir = fs.promises.mkdir;
-const archiver = require('archiver');
-const cpy = require('cpy');
-const rollup = require('rollup');
-const rollupPlugins = require('./rollup-plugins.js');
-const {LH_ROOT} = require('../root.js');
+import fs from 'fs';
+
+import archiver from 'archiver';
+import cpy from 'cpy';
+import {rollup} from 'rollup';
+
+import * as rollupPlugins from './rollup-plugins.js';
+import {LH_ROOT} from '../root.js';
 
 const argv = process.argv.slice(2);
 const browserBrand = argv[0];
@@ -29,7 +29,7 @@ const manifestVersion = require(`${sourceDir}/manifest.json`).version;
  * Bundle and minify entry point.
  */
 async function buildEntryPoint() {
-  const bundle = await rollup.rollup({
+  const bundle = await rollup({
     input: `${sourceDir}/scripts/${sourceName}`,
     plugins: [
       rollupPlugins.shim({
@@ -70,7 +70,7 @@ function copyAssets() {
  * @return {Promise<void>}
  */
 async function packageExtension() {
-  await mkdir(packagePath, {recursive: true});
+  await fs.promises.mkdir(packagePath, {recursive: true});
 
   return new Promise((resolve, reject) => {
     const archive = archiver('zip', {
diff --git a/build/build-lightrider-bundles.js b/build/build-lightrider-bundles.js
index 50ae541e12d5..d84f976fcd21 100644
--- a/build/build-lightrider-bundles.js
+++ b/build/build-lightrider-bundles.js
@@ -3,14 +3,15 @@
  * 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 rollup = require('rollup');
-const rollupPlugins = require('./rollup-plugins.js');
-const fs = require('fs');
-const path = require('path');
-const bundleBuilder = require('./build-bundle.js');
-const {LH_ROOT} = require('../root.js');
+import fs from 'fs';
+import path from 'path';
+
+import {rollup} from 'rollup';
+
+import * as rollupPlugins from './rollup-plugins.js';
+import {buildBundle} from './build-bundle.js';
+import {LH_ROOT} from '../root.js';
 
 const distDir = path.join(LH_ROOT, 'dist', 'lightrider');
 const sourceDir = path.join(LH_ROOT, 'clients', 'lightrider');
@@ -23,11 +24,11 @@ fs.mkdirSync(distDir, {recursive: true});
 function buildEntryPoint() {
   const inFile = `${sourceDir}/${entrySourceName}`;
   const outFile = `${distDir}/${entryDistName}`;
-  return bundleBuilder.build(inFile, outFile, {minify: false});
+  return buildBundle(inFile, outFile, {minify: false});
 }
 
 async function buildReportGenerator() {
-  const bundle = await rollup.rollup({
+  const bundle = await rollup({
     input: 'report/generator/report-generator.js',
     plugins: [
       rollupPlugins.shim({
@@ -48,7 +49,7 @@ async function buildReportGenerator() {
 }
 
 async function buildStaticServerBundle() {
-  const bundle = await rollup.rollup({
+  const bundle = await rollup({
     input: 'lighthouse-cli/test/fixtures/static-server.js',
     plugins: [
       rollupPlugins.shim({
diff --git a/build/build-report-components.js b/build/build-report-components.js
index 56bd5b76a3c1..4621a13e4de5 100644
--- a/build/build-report-components.js
+++ b/build/build-report-components.js
@@ -3,7 +3,6 @@
  * 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';
 
 /**
  * @typedef CompiledComponent
@@ -13,9 +12,12 @@
  * @property {string} functionCode
  */
 
-const fs = require('fs');
-const jsdom = require('jsdom');
-const {LH_ROOT} = require('../root.js');
+import fs from 'fs';
+
+import jsdom from 'jsdom';
+import esMain from 'es-main';
+
+import {LH_ROOT} from '../root.js';
 
 const html = fs.readFileSync(LH_ROOT + '/report/assets/templates.html', 'utf-8');
 const {window} = new jsdom.JSDOM(html);
@@ -213,11 +215,11 @@ ${makeGenericCreateComponentFunctionCode(compiledTemplates)}
   fs.writeFileSync(LH_ROOT + '/report/renderer/components.js', code);
 }
 
-if (require.main === module) {
+if (esMain(import.meta)) {
   main().catch(err => {
     console.error(err);
     process.exit(1);
   });
 }
 
-module.exports = {normalizeTextNodeText};
+export {normalizeTextNodeText};
diff --git a/build/build-report.js b/build/build-report.js
index 426619233d5f..4e0e2547a172 100644
--- a/build/build-report.js
+++ b/build/build-report.js
@@ -3,13 +3,16 @@
  * 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 rollup = require('rollup');
-const rollupPlugins = require('./rollup-plugins.js');
-const fs = require('fs');
-const {LH_ROOT} = require('../root.js');
-const {getIcuMessageIdParts} = require('../shared/localization/format.js');
+import {rollup} from 'rollup';
+import esMain from 'es-main';
+
+import * as rollupPlugins from './rollup-plugins.js';
+import {LH_ROOT} from '../root.js';
+import {getIcuMessageIdParts} from '../shared/localization/format.js';
+import locales from '../shared/localization/locales.js';
+// @ts-ignore
+import {UIStrings as FlowUIStrings} from '../flow-report/src/i18n/ui-strings.js';
 
 /**
  * Extract only the strings needed for the flow report into
@@ -17,17 +20,13 @@ const {getIcuMessageIdParts} = require('../shared/localization/format.js');
  * are locale codes (en-US, es, etc.) and values are localized UIStrings.
  */
 function buildFlowStrings() {
-  const locales = require('../shared/localization/locales.js');
-  // TODO(esmodules): use dynamic import when build/ is esm.
-  const i18nCode = fs.readFileSync(`${LH_ROOT}/flow-report/src/i18n/ui-strings.js`, 'utf-8');
-  const UIStrings = eval(i18nCode.replace(/export /g, '') + '\nmodule.exports = UIStrings;');
   const strings = /** @type {Record<LH.Locale, string>} */ ({});
 
   for (const [locale, lhlMessages] of Object.entries(locales)) {
     const localizedStrings = Object.fromEntries(
       Object.entries(lhlMessages).map(([icuMessageId, v]) => {
         const {filename, key} = getIcuMessageIdParts(icuMessageId);
-        if (!filename.endsWith('ui-strings.js') || !(key in UIStrings)) {
+        if (!filename.endsWith('ui-strings.js') || !(key in FlowUIStrings)) {
           return [];
         }
 
@@ -41,7 +40,7 @@ function buildFlowStrings() {
 }
 
 async function buildStandaloneReport() {
-  const bundle = await rollup.rollup({
+  const bundle = await rollup({
     input: 'report/clients/standalone.js',
     plugins: [
       rollupPlugins.commonjs(),
@@ -57,7 +56,7 @@ async function buildStandaloneReport() {
 }
 
 async function buildFlowReport() {
-  const bundle = await rollup.rollup({
+  const bundle = await rollup({
     input: 'flow-report/clients/standalone.ts',
     plugins: [
       rollupPlugins.inlineFs({verbose: true}),
@@ -92,7 +91,7 @@ async function buildFlowReport() {
 }
 
 async function buildEsModulesBundle() {
-  const bundle = await rollup.rollup({
+  const bundle = await rollup({
     input: 'report/clients/bundle.js',
     plugins: [
       rollupPlugins.commonjs(),
@@ -112,7 +111,7 @@ async function buildEsModulesBundle() {
 }
 
 async function buildUmdBundle() {
-  const bundle = await rollup.rollup({
+  const bundle = await rollup({
     input: 'report/clients/bundle.js',
     plugins: [
       rollupPlugins.inlineFs({verbose: true}),
@@ -168,14 +167,14 @@ async function main() {
   }
 }
 
-if (require.main === module) {
+if (esMain(import.meta)) {
   main().catch(err => {
     console.error(err);
     process.exit(1);
   });
 }
 
-module.exports = {
+export {
   buildStandaloneReport,
   buildFlowReport,
   buildUmdBundle,
diff --git a/build/build-sample-reports.js b/build/build-sample-reports.js
index a5efd142a3da..5ed6b734b24a 100644
--- a/build/build-sample-reports.js
+++ b/build/build-sample-reports.js
@@ -1,22 +1,26 @@
 #!/usr/bin/env node
-
 /**
  * @license Copyright 2019 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';
 
 /* eslint-disable no-console */
-const fs = require('fs');
-const path = require('path');
-const swapLocale = require('../shared/localization/swap-locale.js');
-const swapFlowLocale = require('../shared/localization/swap-flow-locale.js');
-const ReportGenerator = require('../report/generator/report-generator.js');
-const {defaultSettings} = require('../lighthouse-core/config/constants.js');
-const lighthouse = require('../lighthouse-core/index.js');
-const lhr = /** @type {LH.Result} */ (require('../lighthouse-core/test/results/sample_v2.json'));
-const {LH_ROOT, readJson} = require('../root.js');
+
+import fs from 'fs';
+import path from 'path';
+
+import swapLocale from '../shared/localization/swap-locale.js';
+import swapFlowLocale from '../shared/localization/swap-flow-locale.js';
+import ReportGenerator from '../report/generator/report-generator.js';
+import {defaultSettings} from '../lighthouse-core/config/constants.js';
+import lighthouse from '../lighthouse-core/index.js';
+import {LH_ROOT, readJson} from '../root.js';
+
+/** @type {LH.Result} */
+const lhr = readJson(
+  `${LH_ROOT}/lighthouse-core/test/fixtures/fraggle-rock/reports/sample_v2.json`
+);
 
 /** @type {LH.FlowResult} */
 const flowResult = readJson(
diff --git a/build/build-smokehouse-bundle.js b/build/build-smokehouse-bundle.js
index 2f7379e987eb..c4e02109bd69 100644
--- a/build/build-smokehouse-bundle.js
+++ b/build/build-smokehouse-bundle.js
@@ -3,11 +3,11 @@
  * 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 rollup = require('rollup');
-const rollupPlugins = require('./rollup-plugins.js');
-const {LH_ROOT} = require('../root.js');
+import {rollup} from 'rollup';
+
+import * as rollupPlugins from './rollup-plugins.js';
+import {LH_ROOT} from '../root.js';
 
 const distDir = `${LH_ROOT}/dist`;
 const bundleOutFile = `${distDir}/smokehouse-bundle.js`;
@@ -15,7 +15,7 @@ const smokehouseLibFilename = './lighthouse-cli/test/smokehouse/frontends/lib.js
 const smokehouseCliFilename = `${LH_ROOT}/lighthouse-cli/test/smokehouse/lighthouse-runners/cli.js`;
 
 async function build() {
-  const bundle = await rollup.rollup({
+  const bundle = await rollup({
     input: smokehouseLibFilename,
     context: 'globalThis',
     plugins: [
diff --git a/build/build-treemap.js b/build/build-treemap.js
index 1c23bd57f7d4..b4d9ca0e0a3d 100644
--- a/build/build-treemap.js
+++ b/build/build-treemap.js
@@ -3,12 +3,12 @@
  * 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 fs = require('fs');
-const GhPagesApp = require('./gh-pages-app.js');
-const {LH_ROOT} = require('../root.js');
-const {getIcuMessageIdParts} = require('../shared/localization/format.js');
+import fs from 'fs';
+
+import {GhPagesApp} from './gh-pages-app.js';
+import {LH_ROOT} from '../root.js';
+import {getIcuMessageIdParts} from '../shared/localization/format.js';
 
 /**
  * Extract only the strings needed for treemap into
diff --git a/build/build-viewer.js b/build/build-viewer.js
index d69c1bbfa30c..a9082a717fe9 100644
--- a/build/build-viewer.js
+++ b/build/build-viewer.js
@@ -3,15 +3,15 @@
  * 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 rollup = require('rollup');
-const rollupPlugins = require('./rollup-plugins.js');
-const GhPagesApp = require('./gh-pages-app.js');
-const {LH_ROOT} = require('../root.js');
+import {rollup} from 'rollup';
+
+import * as rollupPlugins from './rollup-plugins.js';
+import {GhPagesApp} from './gh-pages-app.js';
+import {LH_ROOT} from '../root.js';
 
 async function buildReportGenerator() {
-  const bundle = await rollup.rollup({
+  const bundle = await rollup({
     input: 'report/generator/report-generator.js',
     plugins: [
       rollupPlugins.shim({
diff --git a/build/changelog-generator/index.js b/build/changelog-generator/index.js
index e3d79163e1fc..3ed06067503e 100644
--- a/build/changelog-generator/index.js
+++ b/build/changelog-generator/index.js
@@ -3,10 +3,10 @@
  * 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 readFileSync = require('fs').readFileSync;
-const resolve = require('path').resolve;
+
+import {readFileSync} from 'fs';
+import {resolve} from 'path';
 const mainTemplate = readFileSync(resolve(__dirname, 'templates/template.hbs')).toString();
 const headerPartial = readFileSync(resolve(__dirname, 'templates/header.hbs')).toString();
 const commitPartial = readFileSync(resolve(__dirname, 'templates/commit.hbs')).toString();
@@ -109,7 +109,7 @@ const writerOpts = {
   commitsSort: ['type', 'scope'],
 };
 
-module.exports = {
+export default {
   writerOpts,
   parserOpts,
 };
diff --git a/build/gh-pages-app.js b/build/gh-pages-app.js
index 53d0444ce71f..9cb5b3353b2f 100644
--- a/build/gh-pages-app.js
+++ b/build/gh-pages-app.js
@@ -3,20 +3,21 @@
  * 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 fs = require('fs');
-const path = require('path');
-const rollup = require('rollup');
-const rollupPlugins = require('./rollup-plugins.js');
-const cpy = require('cpy');
-const ghPages = require('gh-pages');
-const glob = require('glob');
-const lighthousePackage = require('../package.json');
-const terser = require('terser');
-const {LH_ROOT} = require('../root.js');
+
+import fs from 'fs';
+import path from 'path';
+
+import {rollup} from 'rollup';
+import cpy from 'cpy';
+import ghPages from 'gh-pages';
+import glob from 'glob';
+import * as terser from 'terser';
+
+import * as rollupPlugins from './rollup-plugins.js';
+import {LH_ROOT, readJson} from '../root.js';
 
 const ghPagesDistDir = `${LH_ROOT}/dist/gh-pages`;
+const lighthousePackage = readJson(`${LH_ROOT}/package.json`);
 
 const license = `/*
 * @license Copyright 2020 The Lighthouse Authors. All Rights Reserved.
@@ -37,7 +38,7 @@ const license = `/*
 /**
  * Literal string (representing JS, CSS, etc...), or an object with a path, which would
  * be interpreted relative to opts.appDir and be glob-able.
- * @typedef {{path: string, rollup?: boolean, rollupPlugins?: rollup.Plugin[]} | string} Source
+ * @typedef {{path: string, rollup?: boolean, rollupPlugins?: import('rollup').Plugin[]} | string} Source
  */
 
 /**
@@ -145,7 +146,7 @@ class GhPagesApp {
 
   /**
    * @param {string} input
-   * @param {rollup.Plugin[]=} plugins
+   * @param {import('rollup').Plugin[]=} plugins
    * @return {Promise<string>}
    */
   async _rollupSource(input, plugins) {
@@ -154,7 +155,7 @@ class GhPagesApp {
       rollupPlugins.commonjs(),
     ];
     if (!process.env.DEBUG) plugins.push(rollupPlugins.terser());
-    const bundle = await rollup.rollup({
+    const bundle = await rollup({
       preserveEntrySignatures: 'strict',
       input,
       plugins,
@@ -210,7 +211,7 @@ class GhPagesApp {
     const contents = [
       `"use strict";`,
       versionJs,
-      ...await this._resolveSourcesList(this.opts.javascripts),
+      ...(await this._resolveSourcesList(this.opts.javascripts)),
     ];
     if (process.env.DEBUG) return contents.join('\n');
 
@@ -226,4 +227,4 @@ class GhPagesApp {
   }
 }
 
-module.exports = GhPagesApp;
+export {GhPagesApp};
diff --git a/build/package.json b/build/package.json
new file mode 100644
index 000000000000..bd346284783c
--- /dev/null
+++ b/build/package.json
@@ -0,0 +1,4 @@
+{
+  "type": "module",
+  "//": "Any directory that uses `import ... from` or `export ...` must be type module. Temporary file until root package.json is type: module"
+}
\ No newline at end of file
diff --git a/build/plugins/browserify-inline-fs.js b/build/plugins/browserify-inline-fs.js
index 89d05237a047..1c06b5de716a 100644
--- a/build/plugins/browserify-inline-fs.js
+++ b/build/plugins/browserify-inline-fs.js
@@ -3,15 +3,15 @@
  * 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';
+
 
 /** @fileoverview An inline-fs plugin for browserify. */
 
-const {Transform} = require('stream');
-const path = require('path');
+import {Transform} from 'stream';
+import path from 'path';
 
-const {inlineFs} = require('./inline-fs.js');
-const {LH_ROOT} = require('../../root.js');
+import {inlineFs} from './inline-fs.js';
+import {LH_ROOT} from '../../root.js';
 
 /**
  * @typedef Options
@@ -59,4 +59,4 @@ function browserifyInlineFs(options = {}) {
   return inlineFsTransform;
 }
 
-module.exports = browserifyInlineFs;
+export {browserifyInlineFs};
diff --git a/build/plugins/inline-fs.js b/build/plugins/inline-fs.js
index 1edf63ca0bbb..685cf3c73418 100644
--- a/build/plugins/inline-fs.js
+++ b/build/plugins/inline-fs.js
@@ -3,18 +3,18 @@
  * 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 assert = require('assert').strict;
-const fs = require('fs');
-const path = require('path');
 
-const acorn = require('acorn');
-const MagicString = require('magic-string').default;
-const resolve = require('resolve');
-const terser = require('terser');
+import {strict as assert} from 'assert';
+import fs from 'fs';
+import path from 'path';
 
-const {LH_ROOT} = require('../../root.js');
+import * as acorn from 'acorn';
+import MagicString from 'magic-string';
+import resolve from 'resolve';
+import * as terser from 'terser';
+
+import {LH_ROOT} from '../../root.js';
 
 // ESTree provides much better types for AST nodes. See https://github.com/acornjs/acorn/issues/946
 /** @typedef {import('estree').Node} Node */
@@ -372,6 +372,6 @@ function evaluateCallExpression(node, filepath) {
   return path[methodName](...args);
 }
 
-module.exports = {
+export {
   inlineFs,
 };
diff --git a/build/plugins/rollup-plugin-inline-fs.js b/build/plugins/rollup-plugin-inline-fs.js
index 81a14662daec..7c49e8bcec54 100644
--- a/build/plugins/rollup-plugin-inline-fs.js
+++ b/build/plugins/rollup-plugin-inline-fs.js
@@ -3,11 +3,12 @@
  * 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 path = require('path');
-const {inlineFs} = require('./inline-fs.js');
-const {LH_ROOT} = require('../../root.js');
+
+import path from 'path';
+
+import {inlineFs} from './inline-fs.js';
+import {LH_ROOT} from '../../root.js';
 
 /** @typedef {import('rollup').Plugin} RollupPlugin */
 
@@ -48,4 +49,4 @@ function rollupInlineFs(options = {}) {
   };
 }
 
-module.exports = rollupInlineFs;
+export default rollupInlineFs;
diff --git a/build/rollup-plugins.js b/build/rollup-plugins.js
index 9335253174b4..fd37a51ff95a 100644
--- a/build/rollup-plugins.js
+++ b/build/rollup-plugins.js
@@ -3,34 +3,22 @@
  * 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';
 
-/**
- * Rollup plugins don't export types that work with commonjs.
- * @template T
- * @param {T} module
- * @return {T['default']}
- */
-function rollupPluginTypeCoerce(module) {
-  // @ts-expect-error
-  return module;
-}
-
-const alias = rollupPluginTypeCoerce(require('@rollup/plugin-alias'));
-const commonjs = rollupPluginTypeCoerce(require('@rollup/plugin-commonjs'));
-const json = rollupPluginTypeCoerce(require('@rollup/plugin-json'));
-const nodePolyfills = rollupPluginTypeCoerce(require('rollup-plugin-polyfill-node'));
-const {nodeResolve} = require('@rollup/plugin-node-resolve');
-const postprocess = require('@stadtlandnetz/rollup-plugin-postprocess');
-const replace = rollupPluginTypeCoerce(require('rollup-plugin-replace'));
+import {nodeResolve} from '@rollup/plugin-node-resolve';
+import postprocess from '@stadtlandnetz/rollup-plugin-postprocess';
+import alias from '@rollup/plugin-alias';
+import commonjs from '@rollup/plugin-commonjs';
+import json from '@rollup/plugin-json';
+import nodePolyfills from 'rollup-plugin-polyfill-node';
+import replace from 'rollup-plugin-replace';
 // @ts-expect-error: no published types.
-const shim = require('rollup-plugin-shim');
-const {terser} = require('rollup-plugin-terser');
-const typescript = rollupPluginTypeCoerce(require('@rollup/plugin-typescript'));
+import shim from 'rollup-plugin-shim';
+import {terser} from 'rollup-plugin-terser';
+import typescript from '@rollup/plugin-typescript';
 
-const inlineFs = require('./plugins/rollup-plugin-inline-fs.js');
+import inlineFs from './plugins/rollup-plugin-inline-fs.js';
 
-module.exports = {
+export {
   alias,
   commonjs,
   inlineFs,
diff --git a/build/test/plugins/inline-fs-test.js b/build/test/plugins/inline-fs-test.js
index 82b5513fca97..5fc7f3c05778 100644
--- a/build/test/plugins/inline-fs-test.js
+++ b/build/test/plugins/inline-fs-test.js
@@ -3,15 +3,15 @@
  * 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';
+
 
 /* eslint-env jest */
 
-const fs = require('fs');
-const path = require('path');
-const {inlineFs} = require('../../plugins/inline-fs.js');
+import fs from 'fs';
+import path from 'path';
 
-const {LH_ROOT} = require('../../../root.js');
+import {inlineFs} from '../../plugins/inline-fs.js';
+import {LH_ROOT} from '../../../root.js';
 const filepath = `${LH_ROOT}/lighthouse-core/index.js`;
 
 describe('inline-fs', () => {
diff --git a/tsconfig-base.json b/tsconfig-base.json
index 345313f7c05a..abc276393f0f 100644
--- a/tsconfig-base.json
+++ b/tsconfig-base.json
@@ -10,6 +10,8 @@
     "module": "es2020",
     "moduleResolution": "node",
     "esModuleInterop": true,
+    // TODO(esmodules): remove when commonjs is gone.
+    "allowSyntheticDefaultImports": true,
 
     "allowJs": true,
     "checkJs": true,

From 05cea0330104b9b9af01690cf9988676e911b508 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 5 May 2022 09:44:22 -0700
Subject: [PATCH 03/96] fix

---
 build/build-extension.js |  4 ++--
 build/build-treemap.js   | 11 +++++------
 build/build-viewer.js    |  3 +++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/build/build-extension.js b/build/build-extension.js
index e9931712a5e5..8f30129422e1 100644
--- a/build/build-extension.js
+++ b/build/build-extension.js
@@ -11,7 +11,7 @@ import cpy from 'cpy';
 import {rollup} from 'rollup';
 
 import * as rollupPlugins from './rollup-plugins.js';
-import {LH_ROOT} from '../root.js';
+import {LH_ROOT, readJson} from '../root.js';
 
 const argv = process.argv.slice(2);
 const browserBrand = argv[0];
@@ -23,7 +23,7 @@ const sourceDir = `${LH_ROOT}/clients/extension`;
 const distDir = `${LH_ROOT}/dist/extension-${browserBrand}`;
 const packagePath = `${distDir}/../extension-${browserBrand}-package`;
 
-const manifestVersion = require(`${sourceDir}/manifest.json`).version;
+const manifestVersion = readJson(`${sourceDir}/manifest.json`).version;
 
 /**
  * Bundle and minify entry point.
diff --git a/build/build-treemap.js b/build/build-treemap.js
index b4d9ca0e0a3d..809f35c6514f 100644
--- a/build/build-treemap.js
+++ b/build/build-treemap.js
@@ -4,11 +4,14 @@
  * 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 fs from 'fs';
-
 import {GhPagesApp} from './gh-pages-app.js';
 import {LH_ROOT} from '../root.js';
 import {getIcuMessageIdParts} from '../shared/localization/format.js';
+import locales from '../shared/localization/locales.js';
+import {UIStrings} from '../treemap/app/src/util.js';
+import {createCommonjsRefs} from '../lighthouse-core/scripts/esm-utils.js';
+
+const {require} = createCommonjsRefs(import.meta);
 
 /**
  * Extract only the strings needed for treemap into
@@ -16,10 +19,6 @@ import {getIcuMessageIdParts} from '../shared/localization/format.js';
  * are locale codes (en-US, es, etc.) and values are localized UIStrings.
  */
 function buildStrings() {
-  const locales = require('../shared/localization/locales.js');
-  // TODO(esmodules): use dynamic import when build/ is esm.
-  const utilCode = fs.readFileSync(LH_ROOT + '/treemap/app/src/util.js', 'utf-8');
-  const {UIStrings} = eval(utilCode.replace(/export {/g, 'module.exports = {'));
   const strings = /** @type {Record<LH.Locale, string>} */ ({});
 
   for (const [locale, lhlMessages] of Object.entries(locales)) {
diff --git a/build/build-viewer.js b/build/build-viewer.js
index a9082a717fe9..45c95662692c 100644
--- a/build/build-viewer.js
+++ b/build/build-viewer.js
@@ -9,6 +9,9 @@ import {rollup} from 'rollup';
 import * as rollupPlugins from './rollup-plugins.js';
 import {GhPagesApp} from './gh-pages-app.js';
 import {LH_ROOT} from '../root.js';
+import {createCommonjsRefs} from '../lighthouse-core/scripts/esm-utils.js';
+
+const {require} = createCommonjsRefs(import.meta);
 
 async function buildReportGenerator() {
   const bundle = await rollup({

From c9c2bd3204dd90c6bac25c6b47f5a648374d81f8 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 5 May 2022 14:29:50 -0700
Subject: [PATCH 04/96] update

---
 build/build-bundle.js  | 6 +++---
 build/build-report.js  | 2 +-
 build/build-treemap.js | 1 +
 tsconfig-base.json     | 2 --
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/build/build-bundle.js b/build/build-bundle.js
index 3f465a3e7a33..f14172faef48 100644
--- a/build/build-bundle.js
+++ b/build/build-bundle.js
@@ -20,7 +20,7 @@ import PubAdsPlugin from 'lighthouse-plugin-publisher-ads/plugin.js';
 
 import * as rollupPlugins from './rollup-plugins.js';
 import Runner from '../lighthouse-core/runner.js';
-import {LH_ROOT} from '../root.js';
+import {LH_ROOT, readJson} from '../root.js';
 import {createCommonjsRefs} from '../lighthouse-core/scripts/esm-utils.js';
 
 const {require} = createCommonjsRefs(import.meta);
@@ -49,7 +49,7 @@ const today = (() => {
   const day = new Intl.DateTimeFormat('en', {day: '2-digit'}).format(date);
   return `${month} ${day} ${year}`;
 })();
-const pkg = JSON.parse(fs.readFileSync(LH_ROOT + '/package.json', 'utf-8'));
+const pkg = readJson(`${LH_ROOT}/package.json`);
 const banner = `
 /**
  * Lighthouse v${pkg.version} ${COMMIT_HASH} (${today})
@@ -124,7 +124,7 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
   }
 
   shimsObj[require.resolve('../package.json')] =
-    `export const version = ${JSON.stringify(require('../package.json').version)}`;
+    `export const version = ${pkg.version}`;
 
   const bundle = await rollup({
     input: entryPath,
diff --git a/build/build-report.js b/build/build-report.js
index 4e0e2547a172..3f377bdf4585 100644
--- a/build/build-report.js
+++ b/build/build-report.js
@@ -11,7 +11,7 @@ import * as rollupPlugins from './rollup-plugins.js';
 import {LH_ROOT} from '../root.js';
 import {getIcuMessageIdParts} from '../shared/localization/format.js';
 import locales from '../shared/localization/locales.js';
-// @ts-ignore
+// @ts-ignore: ignore project reference error
 import {UIStrings as FlowUIStrings} from '../flow-report/src/i18n/ui-strings.js';
 
 /**
diff --git a/build/build-treemap.js b/build/build-treemap.js
index 809f35c6514f..cab7c29f2d57 100644
--- a/build/build-treemap.js
+++ b/build/build-treemap.js
@@ -8,6 +8,7 @@ import {GhPagesApp} from './gh-pages-app.js';
 import {LH_ROOT} from '../root.js';
 import {getIcuMessageIdParts} from '../shared/localization/format.js';
 import locales from '../shared/localization/locales.js';
+// @ts-ignore: ignore project reference error
 import {UIStrings} from '../treemap/app/src/util.js';
 import {createCommonjsRefs} from '../lighthouse-core/scripts/esm-utils.js';
 
diff --git a/tsconfig-base.json b/tsconfig-base.json
index abc276393f0f..345313f7c05a 100644
--- a/tsconfig-base.json
+++ b/tsconfig-base.json
@@ -10,8 +10,6 @@
     "module": "es2020",
     "moduleResolution": "node",
     "esModuleInterop": true,
-    // TODO(esmodules): remove when commonjs is gone.
-    "allowSyntheticDefaultImports": true,
 
     "allowJs": true,
     "checkJs": true,

From 612a82deffc7792129ebe49f6323984e62d65165 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 5 May 2022 15:12:24 -0700
Subject: [PATCH 05/96] try to add build tsconfig

---
 build/build-report.js  |  1 -
 build/build-treemap.js |  1 -
 build/tsconfig.json    | 14 ++++++++++++++
 tsconfig-all.json      |  1 +
 tsconfig.json          |  1 -
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 build/tsconfig.json

diff --git a/build/build-report.js b/build/build-report.js
index 3f377bdf4585..2b16c5173de0 100644
--- a/build/build-report.js
+++ b/build/build-report.js
@@ -11,7 +11,6 @@ import * as rollupPlugins from './rollup-plugins.js';
 import {LH_ROOT} from '../root.js';
 import {getIcuMessageIdParts} from '../shared/localization/format.js';
 import locales from '../shared/localization/locales.js';
-// @ts-ignore: ignore project reference error
 import {UIStrings as FlowUIStrings} from '../flow-report/src/i18n/ui-strings.js';
 
 /**
diff --git a/build/build-treemap.js b/build/build-treemap.js
index cab7c29f2d57..809f35c6514f 100644
--- a/build/build-treemap.js
+++ b/build/build-treemap.js
@@ -8,7 +8,6 @@ import {GhPagesApp} from './gh-pages-app.js';
 import {LH_ROOT} from '../root.js';
 import {getIcuMessageIdParts} from '../shared/localization/format.js';
 import locales from '../shared/localization/locales.js';
-// @ts-ignore: ignore project reference error
 import {UIStrings} from '../treemap/app/src/util.js';
 import {createCommonjsRefs} from '../lighthouse-core/scripts/esm-utils.js';
 
diff --git a/build/tsconfig.json b/build/tsconfig.json
new file mode 100644
index 000000000000..5f39d4541254
--- /dev/null
+++ b/build/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-base.json",
+  "compilerOptions": {
+    "outDir": "../.tmp/tsbuildinfo/build",
+  },
+  "references": [
+    {"path": "../"},
+    {"path": "../treemap/"},
+  ],
+  "include": [
+    "**/*.js",
+    "../types/global-lh.d.ts",
+  ],
+}
diff --git a/tsconfig-all.json b/tsconfig-all.json
index d38a50f1cea5..7e7c57fdbbe4 100644
--- a/tsconfig-all.json
+++ b/tsconfig-all.json
@@ -10,6 +10,7 @@
     {"path": "./treemap/"},
     {"path": "./flow-report/"},
     {"path": "./shared/"},
+    {"path": "./build/"},
   ],
   "files": [],
   "include": [],
diff --git a/tsconfig.json b/tsconfig.json
index 93c40c3acc05..30fe9a02db7e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,7 +17,6 @@
     "lighthouse-cli/**/*.js",
     "lighthouse-core/**/*.js",
     "clients/**/*.js",
-    "build/**/*.js",
     "./types/**/*.d.ts",
     "eslint-local-rules.js",
     "third-party/axe/valid-langs.js",

From 4c6187bbc3bc7cd590e6c188024ea88a46e8df79 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 5 May 2022 15:24:40 -0700
Subject: [PATCH 06/96] hmmm

---
 build/build-cdt-lib.js                         | 2 +-
 build/tsconfig.json                            | 2 +-
 lighthouse-core/lib/cdt/generated/SourceMap.js | 2 +-
 treemap/app/src/main.js                        | 2 ++
 treemap/app/src/util.js                        | 2 +-
 treemap/types/treemap.d.ts                     | 5 -----
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/build/build-cdt-lib.js b/build/build-cdt-lib.js
index 3ab86f048daf..165e462ec694 100644
--- a/build/build-cdt-lib.js
+++ b/build/build-cdt-lib.js
@@ -88,7 +88,7 @@ for (const [inFilename, outFilename] of Object.entries(files)) {
       }).toString(),
     // Add some types.
     // eslint-disable-next-line max-len
-    'mappings() {': '/** @return {Array<{lineNumber: number, columnNumber: number, sourceURL?: string, sourceLineNumber, sourceColumnNumber: number, name?: string, lastColumnNumber?: number}>} */\nmappings() {',
+    'mappings() {': '/** @return {Array<{lineNumber: number, columnNumber: number, sourceURL?: string, sourceLineNumber: number, sourceColumnNumber: number, name?: string, lastColumnNumber?: number}>} */\nmappings() {',
   };
 
   // Verify that all the above code is present.
diff --git a/build/tsconfig.json b/build/tsconfig.json
index 5f39d4541254..7a39fd2f7ab8 100644
--- a/build/tsconfig.json
+++ b/build/tsconfig.json
@@ -9,6 +9,6 @@
   ],
   "include": [
     "**/*.js",
-    "../types/global-lh.d.ts",
+    "../types/*.d.ts",
   ],
 }
diff --git a/lighthouse-core/lib/cdt/generated/SourceMap.js b/lighthouse-core/lib/cdt/generated/SourceMap.js
index 180285deeb82..deac103dc887 100644
--- a/lighthouse-core/lib/cdt/generated/SourceMap.js
+++ b/lighthouse-core/lib/cdt/generated/SourceMap.js
@@ -149,7 +149,7 @@ class TextSourceMap {
         }
         return mappings.slice(startIndex, endIndex);
     }
-    /** @return {Array<{lineNumber: number, columnNumber: number, sourceURL?: string, sourceLineNumber, sourceColumnNumber: number, name?: string, lastColumnNumber?: number}>} */
+    /** @return {Array<{lineNumber: number, columnNumber: number, sourceURL?: string, sourceLineNumber: number, sourceColumnNumber: number, name?: string, lastColumnNumber?: number}>} */
 mappings() {
         if (this.mappingsInternal === null) {
             this.mappingsInternal = [];
diff --git a/treemap/app/src/main.js b/treemap/app/src/main.js
index 0a4c9687df5d..dfe6226b9a76 100644
--- a/treemap/app/src/main.js
+++ b/treemap/app/src/main.js
@@ -15,6 +15,8 @@ import {I18n} from '../../../report/renderer/i18n.js';
 import {TextEncoding} from '../../../report/renderer/text-encoding.js';
 import {Logger} from '../../../report/renderer/logger.js';
 
+/** @typedef {LH.Treemap.Node & {dom?: HTMLElement}} NodeWithElement */
+
 const DUPLICATED_MODULES_IGNORE_THRESHOLD = 1024;
 const DUPLICATED_MODULES_IGNORE_ROOT_RATIO = 0.01;
 
diff --git a/treemap/app/src/util.js b/treemap/app/src/util.js
index 5b0d07587b11..25272702e56b 100644
--- a/treemap/app/src/util.js
+++ b/treemap/app/src/util.js
@@ -38,7 +38,7 @@ class TreemapUtil {
 
   /**
    * @param {LH.Treemap.Node} node
-   * @param {(node: NodeWithElement, path: string[]) => void} fn
+   * @param {(node: import('./main.js').NodeWithElement, path: string[]) => void} fn
    * @param {string[]=} path
    */
   static walk(node, fn, path) {
diff --git a/treemap/types/treemap.d.ts b/treemap/types/treemap.d.ts
index a56a6f3e41bd..09dc0a466e95 100644
--- a/treemap/types/treemap.d.ts
+++ b/treemap/types/treemap.d.ts
@@ -38,11 +38,6 @@ declare global {
     viewMode: LH.Treemap.ViewMode;
   }
 
-  interface NodeWithElement extends LH.Treemap.Node {
-    /** webtreemap adds dom to node data. */
-    dom?: HTMLElement;
-  }
-
   var webtreemap: {
     TreeMap: typeof WebTreeMap;
     render(el: HTMLElement, data: any, options: WebTreeMapOptions): void;

From 9562c85da9a4773a2d66179cc6e19144cbb0ba74 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 5 May 2022 15:25:41 -0700
Subject: [PATCH 07/96] lok ok sure

---
 lighthouse-core/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lighthouse-core/index.js b/lighthouse-core/index.js
index f4a6b5d8a4d2..ce9bf39cc8a1 100644
--- a/lighthouse-core/index.js
+++ b/lighthouse-core/index.js
@@ -91,7 +91,7 @@ function generateConfig(configJson, flags) {
 
 lighthouse.legacyNavigation = legacyNavigation;
 lighthouse.generateConfig = generateConfig;
-lighthouse.getAuditList = Runner.getAuditList;
+lighthouse.getAuditList = () => Runner.getAuditList();
 lighthouse.traceCategories = require('./gather/driver.js').traceCategories;
 lighthouse.Audit = require('./audits/audit.js');
 lighthouse.Gatherer = require('./fraggle-rock/gather/base-gatherer.js');

From b70a80d214ab66da27086044f97be57ea625a3fc Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 5 May 2022 15:27:05 -0700
Subject: [PATCH 08/96] Apply suggestions from code review

Co-authored-by: Adam Raine <6752989+adamraine@users.noreply.github.com>
---
 build/.eslintrc.cjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/.eslintrc.cjs b/build/.eslintrc.cjs
index d88a09d9d26c..bba28fbc9b4b 100644
--- a/build/.eslintrc.cjs
+++ b/build/.eslintrc.cjs
@@ -1,5 +1,5 @@
 /**
- * @license Copyright 2021 The Lighthouse Authors. All Rights Reserved.
+ * @license Copyright 2022 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.
  */

From 2be7c4ed5828adb4a6da5119f3becb476f361259 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 5 May 2022 15:32:24 -0700
Subject: [PATCH 09/96] fi

---
 build/build-sample-reports.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/build/build-sample-reports.js b/build/build-sample-reports.js
index 5ed6b734b24a..e3f1edb44802 100644
--- a/build/build-sample-reports.js
+++ b/build/build-sample-reports.js
@@ -18,9 +18,7 @@ import lighthouse from '../lighthouse-core/index.js';
 import {LH_ROOT, readJson} from '../root.js';
 
 /** @type {LH.Result} */
-const lhr = readJson(
-  `${LH_ROOT}/lighthouse-core/test/fixtures/fraggle-rock/reports/sample_v2.json`
-);
+const lhr = readJson(`${LH_ROOT}/lighthouse-core/test/results/sample_v2.json`);
 
 /** @type {LH.FlowResult} */
 const flowResult = readJson(

From 0e75155676302177d243f560a4a53b3925f45819 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 5 May 2022 16:01:28 -0700
Subject: [PATCH 10/96] wip

---
 build/build-bundle.js                         |  2 +-
 clients/devtools/devtools-entry.js            |  2 +-
 .../test/lightrider/lightrider-entry-test.js  |  2 +-
 lighthouse-core/audits/audit.js               |  2 +-
 lighthouse-core/computed/computed-artifact.js |  4 ++--
 .../computed/critical-request-chains.js       |  2 +-
 lighthouse-core/computed/image-records.js     |  2 +-
 lighthouse-core/computed/js-bundles.js        |  2 +-
 lighthouse-core/computed/load-simulator.js    |  6 ++---
 lighthouse-core/computed/main-resource.js     |  2 +-
 lighthouse-core/computed/main-thread-tasks.js |  2 +-
 lighthouse-core/computed/manifest-values.js   |  2 +-
 .../metrics/cumulative-layout-shift.js        |  2 +-
 .../first-contentful-paint-all-frames.js      |  2 +-
 .../metrics/first-contentful-paint.js         |  2 +-
 .../metrics/first-meaningful-paint.js         |  2 +-
 .../computed/metrics/interactive.js           |  2 +-
 .../metrics/lantern-first-contentful-paint.js |  2 +-
 .../metrics/lantern-first-meaningful-paint.js |  2 +-
 .../computed/metrics/lantern-interactive.js   |  2 +-
 .../lantern-largest-contentful-paint.js       |  2 +-
 .../metrics/lantern-max-potential-fid.js      |  2 +-
 .../computed/metrics/lantern-speed-index.js   |  2 +-
 .../metrics/lantern-total-blocking-time.js    |  2 +-
 .../largest-contentful-paint-all-frames.js    |  2 +-
 .../metrics/largest-contentful-paint.js       |  2 +-
 .../computed/metrics/max-potential-fid.js     |  2 +-
 .../computed/metrics/responsiveness.js        |  2 +-
 .../computed/metrics/speed-index.js           |  2 +-
 .../computed/metrics/timing-summary.js        |  2 +-
 .../computed/metrics/total-blocking-time.js   |  2 +-
 .../computed/module-duplication.js            |  2 +-
 lighthouse-core/computed/network-analysis.js  |  2 +-
 lighthouse-core/computed/network-records.js   |  4 ++--
 .../computed/page-dependency-graph.js         |  2 +-
 .../computed/processed-navigation.js          |  2 +-
 lighthouse-core/computed/processed-trace.js   |  2 +-
 lighthouse-core/computed/resource-summary.js  |  8 +++----
 lighthouse-core/computed/screenshots.js       |  2 +-
 lighthouse-core/computed/speedline.js         |  2 +-
 lighthouse-core/computed/trace-of-tab.js      |  2 +-
 lighthouse-core/computed/unused-css.js        |  2 +-
 .../computed/unused-javascript-summary.js     |  2 +-
 lighthouse-core/computed/user-timings.js      |  2 +-
 lighthouse-core/computed/viewport-meta.js     |  2 +-
 lighthouse-core/config/config-helpers.js      |  4 ++--
 lighthouse-core/config/config.js              |  9 ++++----
 lighthouse-core/config/constants.js           |  2 +-
 lighthouse-core/config/default-config.js      |  6 ++++-
 lighthouse-core/config/desktop-config.js      |  2 +-
 lighthouse-core/config/lr-desktop-config.js   |  2 +-
 lighthouse-core/fraggle-rock/api.js           |  6 ++---
 lighthouse-core/fraggle-rock/config/config.js |  4 ++--
 .../fraggle-rock/config/filters.js            |  4 ++--
 lighthouse-core/fraggle-rock/gather/driver.js |  6 ++---
 .../fraggle-rock/gather/navigation-runner.js  | 10 ++++-----
 .../fraggle-rock/gather/runner-helpers.js     |  2 +-
 .../fraggle-rock/gather/session.js            | 10 +++++----
 .../fraggle-rock/gather/snapshot-runner.js    |  4 ++--
 .../fraggle-rock/gather/timespan-runner.js    |  4 ++--
 lighthouse-core/fraggle-rock/user-flow.js     |  4 ++--
 .../gather/connections/connection.js          |  4 ++--
 lighthouse-core/gather/connections/cri.js     |  2 +-
 lighthouse-core/gather/driver.js              |  4 ++--
 lighthouse-core/gather/driver/environment.js  |  7 ++++--
 lighthouse-core/gather/driver/navigation.js   |  6 ++++-
 .../gather/driver/network-monitor.js          |  4 ++--
 lighthouse-core/gather/driver/network.js      |  2 +-
 lighthouse-core/gather/driver/storage.js      |  3 +++
 .../gather/driver/wait-for-condition.js       |  6 ++---
 lighthouse-core/gather/gather-runner.js       |  2 +-
 .../gather/gatherers/devtools-log.js          |  4 ++--
 lighthouse-core/gather/gatherers/stacks.js    |  5 +++++
 .../gather/gatherers/web-app-manifest.js      |  4 ++--
 lighthouse-core/lib/asset-saver.js            | 14 ++++++------
 .../dependency-graph/simulator/simulator.js   |  4 +++-
 lighthouse-core/lib/emulation.js              |  2 +-
 lighthouse-core/lib/lh-env.js                 | 10 +++++----
 lighthouse-core/lib/lh-error.js               |  3 +++
 lighthouse-core/lib/manifest-parser.js        |  2 +-
 lighthouse-core/lib/navigation-error.js       | 22 ++++++++++---------
 lighthouse-core/lib/network-recorder.js       |  4 ++--
 lighthouse-core/lib/page-functions.js         |  1 +
 lighthouse-core/lib/url-shim.js               |  6 ++---
 lighthouse-core/package.json                  |  4 ++++
 lighthouse-core/runner.js                     | 16 ++++++++------
 .../scripts/i18n/collect-strings.js           |  2 +-
 ...ssert-baseline-lantern-values-unchanged.js |  2 +-
 lighthouse-core/scripts/lantern/debug-url.js  |  2 +-
 .../scripts/lantern/print-correlations.js     |  2 +-
 .../scripts/lantern/run-on-all-assets.js      |  2 +-
 .../lantern/update-baseline-lantern-values.js |  2 +-
 .../render-blocking-resources-test.js         |  2 +-
 .../test/audits/content-width-test.js         |  2 +-
 .../metrics/first-contentful-paint-test.js    |  2 +-
 .../metrics/first-meaningful-paint-test.js    |  2 +-
 .../test/audits/metrics/interactive-test.js   |  2 +-
 .../metrics/largest-contentful-paint-test.js  |  2 +-
 .../test/audits/metrics/speed-index-test.js   |  2 +-
 .../metrics/total-blocking-time-test.js       |  2 +-
 .../test/audits/seo/font-size-test.js         |  2 +-
 .../test/audits/seo/tap-targets-test.js       |  2 +-
 .../test/computed/computed-artifact-test.js   |  2 +-
 .../metrics/lantern-speed-index-test.js       |  2 +-
 .../test/config/config-helpers-test.js        |  2 +-
 lighthouse-core/test/config/config-test.js    |  2 +-
 .../test/fraggle-rock/config/config-test.js   |  2 +-
 .../test/fraggle-rock/gather/mock-driver.js   |  2 +-
 .../gather/navigation-runner-test.js          |  2 +-
 .../test/gather/driver/prepare-test.js        |  2 +-
 lighthouse-core/test/lib/emulation-test.js    |  2 +-
 lighthouse-core/test/runner-test.js           |  2 +-
 .../test/scripts/lantern/constants-test.js    |  2 +-
 .../{util-commonjs.js => util-commonjs.cjs}   |  0
 root.js                                       |  1 +
 tsconfig.json                                 |  3 ++-
 types/cssstyle/index.d.ts                     |  2 +-
 117 files changed, 212 insertions(+), 172 deletions(-)
 create mode 100644 lighthouse-core/package.json
 rename lighthouse-core/{util-commonjs.js => util-commonjs.cjs} (100%)

diff --git a/build/build-bundle.js b/build/build-bundle.js
index f14172faef48..3a36857497cc 100644
--- a/build/build-bundle.js
+++ b/build/build-bundle.js
@@ -19,7 +19,7 @@ import {rollup} from 'rollup';
 import PubAdsPlugin from 'lighthouse-plugin-publisher-ads/plugin.js';
 
 import * as rollupPlugins from './rollup-plugins.js';
-import Runner from '../lighthouse-core/runner.js';
+import {Runner} from '../lighthouse-core/runner.js';
 import {LH_ROOT, readJson} from '../root.js';
 import {createCommonjsRefs} from '../lighthouse-core/scripts/esm-utils.js';
 
diff --git a/clients/devtools/devtools-entry.js b/clients/devtools/devtools-entry.js
index fe8fc47bc341..a3599022bc6d 100644
--- a/clients/devtools/devtools-entry.js
+++ b/clients/devtools/devtools-entry.js
@@ -15,7 +15,7 @@ import RawProtocol from '../../lighthouse-core/gather/connections/raw.js';
 import log from 'lighthouse-logger';
 import {lookupLocale} from '../../lighthouse-core/lib/i18n/i18n.js';
 import {registerLocaleData, getCanonicalLocales} from '../../shared/localization/format.js';
-import constants from '../../lighthouse-core/config/constants.js';
+import * as constants from '../../lighthouse-core/config/constants.js';
 
 /** @typedef {import('../../lighthouse-core/gather/connections/connection.js')} Connection */
 
diff --git a/clients/test/lightrider/lightrider-entry-test.js b/clients/test/lightrider/lightrider-entry-test.js
index ffabf3ed6dc3..3a15865b4e12 100644
--- a/clients/test/lightrider/lightrider-entry-test.js
+++ b/clients/test/lightrider/lightrider-entry-test.js
@@ -8,7 +8,7 @@
 import {jest} from '@jest/globals';
 import {strict as assert} from 'assert';
 import {runLighthouseInLR} from '../../lightrider/lightrider-entry.js';
-import Runner from '../../../lighthouse-core/runner.js';
+import {Runner} from '../../../lighthouse-core/runner.js';
 import LHError from '../../../lighthouse-core/lib/lh-error.js';
 
 /* eslint-env jest */
diff --git a/lighthouse-core/audits/audit.js b/lighthouse-core/audits/audit.js
index f432ba154c5b..a8c9912fd613 100644
--- a/lighthouse-core/audits/audit.js
+++ b/lighthouse-core/audits/audit.js
@@ -7,7 +7,7 @@
 
 import {isUnderTest} from '../lib/lh-env.js';
 import statistics from '../lib/statistics.js';
-import {Util} from '../util-commonjs.js';
+import {Util} from '../util-commonjs.cjs';
 
 const DEFAULT_PASS = 'defaultPass';
 
diff --git a/lighthouse-core/computed/computed-artifact.js b/lighthouse-core/computed/computed-artifact.js
index 98b7e0614e06..8425c17eefae 100644
--- a/lighthouse-core/computed/computed-artifact.js
+++ b/lighthouse-core/computed/computed-artifact.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import ArbitraryEqualityMap from '../lib/arbitrary-equality-map.js';
+import {ArbitraryEqualityMap} from '../lib/arbitrary-equality-map.js';
 import log from 'lighthouse-logger';
 
 /**
@@ -59,4 +59,4 @@ function makeComputedArtifact(computableArtifact, keys) {
   return Object.assign(computableArtifact, {request});
 }
 
-export default makeComputedArtifact;
+export {makeComputedArtifact};
diff --git a/lighthouse-core/computed/critical-request-chains.js b/lighthouse-core/computed/critical-request-chains.js
index 1ebaf603a88d..06b1e726e395 100644
--- a/lighthouse-core/computed/critical-request-chains.js
+++ b/lighthouse-core/computed/critical-request-chains.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 import NetworkRequest from '../lib/network-request.js';
 import MainResource from './main-resource.js';
 import PageDependencyGraph from './page-dependency-graph.js';
diff --git a/lighthouse-core/computed/image-records.js b/lighthouse-core/computed/image-records.js
index f573044723c3..5473d7c5c7a0 100644
--- a/lighthouse-core/computed/image-records.js
+++ b/lighthouse-core/computed/image-records.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import URL from '../lib/url-shim.js';
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 
 class ImageRecords {
   /**
diff --git a/lighthouse-core/computed/js-bundles.js b/lighthouse-core/computed/js-bundles.js
index 8c039b1823d5..edea2fe0d459 100644
--- a/lighthouse-core/computed/js-bundles.js
+++ b/lighthouse-core/computed/js-bundles.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import log from 'lighthouse-logger';
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 import SDK from '../lib/cdt/SDK.js';
 
 /**
diff --git a/lighthouse-core/computed/load-simulator.js b/lighthouse-core/computed/load-simulator.js
index cea5e4a9b2f8..c833d058fd2f 100644
--- a/lighthouse-core/computed/load-simulator.js
+++ b/lighthouse-core/computed/load-simulator.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-import makeComputedArtifact from './computed-artifact.js';
-import constants from '../config/constants.js';
-import Simulator from '../lib/dependency-graph/simulator/simulator.js';
+import {makeComputedArtifact} from './computed-artifact.js';
+import * as constants from '../config/constants.js';
+import {Simulator} from '../lib/dependency-graph/simulator/simulator.js';
 import NetworkAnalysis from './network-analysis.js';
 
 class LoadSimulator {
diff --git a/lighthouse-core/computed/main-resource.js b/lighthouse-core/computed/main-resource.js
index 18ac8a181f4b..9988f0fc637e 100644
--- a/lighthouse-core/computed/main-resource.js
+++ b/lighthouse-core/computed/main-resource.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 import NetworkAnalyzer from '../lib/dependency-graph/simulator/network-analyzer.js';
 import NetworkRecords from './network-records.js';
 
diff --git a/lighthouse-core/computed/main-thread-tasks.js b/lighthouse-core/computed/main-thread-tasks.js
index 4be5bf733541..9f3e570a5542 100644
--- a/lighthouse-core/computed/main-thread-tasks.js
+++ b/lighthouse-core/computed/main-thread-tasks.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 import MainThreadTasks_ from '../lib/tracehouse/main-thread-tasks.js';
 import ProcessedTrace from './processed-trace.js';
 
diff --git a/lighthouse-core/computed/manifest-values.js b/lighthouse-core/computed/manifest-values.js
index 0b4dc7f85878..2763438f20f4 100644
--- a/lighthouse-core/computed/manifest-values.js
+++ b/lighthouse-core/computed/manifest-values.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 import icons from '../lib/icons.js';
 
 const PWA_DISPLAY_VALUES = ['minimal-ui', 'fullscreen', 'standalone'];
diff --git a/lighthouse-core/computed/metrics/cumulative-layout-shift.js b/lighthouse-core/computed/metrics/cumulative-layout-shift.js
index 0f555465105e..8342f1073d72 100644
--- a/lighthouse-core/computed/metrics/cumulative-layout-shift.js
+++ b/lighthouse-core/computed/metrics/cumulative-layout-shift.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 import ProcessedTrace from '../processed-trace.js';
 import LHError from '../../lib/lh-error.js';
 
diff --git a/lighthouse-core/computed/metrics/first-contentful-paint-all-frames.js b/lighthouse-core/computed/metrics/first-contentful-paint-all-frames.js
index a0cb5f2cccbb..dc42b30af0ba 100644
--- a/lighthouse-core/computed/metrics/first-contentful-paint-all-frames.js
+++ b/lighthouse-core/computed/metrics/first-contentful-paint-all-frames.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 import NavigationMetric from './navigation-metric.js';
 
 class FirstContentfulPaintAllFrames extends NavigationMetric {
diff --git a/lighthouse-core/computed/metrics/first-contentful-paint.js b/lighthouse-core/computed/metrics/first-contentful-paint.js
index 322a32a12e57..49746bf9da8b 100644
--- a/lighthouse-core/computed/metrics/first-contentful-paint.js
+++ b/lighthouse-core/computed/metrics/first-contentful-paint.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 import NavigationMetric from './navigation-metric.js';
 import LanternFirstContentfulPaint from './lantern-first-contentful-paint.js';
 
diff --git a/lighthouse-core/computed/metrics/first-meaningful-paint.js b/lighthouse-core/computed/metrics/first-meaningful-paint.js
index 71c9a3c30cfa..ca727063e2df 100644
--- a/lighthouse-core/computed/metrics/first-meaningful-paint.js
+++ b/lighthouse-core/computed/metrics/first-meaningful-paint.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 import NavigationMetric from './navigation-metric.js';
 import LHError from '../../lib/lh-error.js';
 import LanternFirstMeaningfulPaint from './lantern-first-meaningful-paint.js';
diff --git a/lighthouse-core/computed/metrics/interactive.js b/lighthouse-core/computed/metrics/interactive.js
index 2083f308502d..cd34f5d2d402 100644
--- a/lighthouse-core/computed/metrics/interactive.js
+++ b/lighthouse-core/computed/metrics/interactive.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 import NavigationMetric from './navigation-metric.js';
 import LanternInteractive from './lantern-interactive.js';
 import NetworkMonitor from '../../gather/driver/network-monitor.js';
diff --git a/lighthouse-core/computed/metrics/lantern-first-contentful-paint.js b/lighthouse-core/computed/metrics/lantern-first-contentful-paint.js
index d23c2a0fbca1..a39d6aa5361e 100644
--- a/lighthouse-core/computed/metrics/lantern-first-contentful-paint.js
+++ b/lighthouse-core/computed/metrics/lantern-first-contentful-paint.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 import LanternMetric from './lantern-metric.js';
 import BaseNode from '../../lib/dependency-graph/base-node.js';
 
diff --git a/lighthouse-core/computed/metrics/lantern-first-meaningful-paint.js b/lighthouse-core/computed/metrics/lantern-first-meaningful-paint.js
index e86722a0f370..ea90af594171 100644
--- a/lighthouse-core/computed/metrics/lantern-first-meaningful-paint.js
+++ b/lighthouse-core/computed/metrics/lantern-first-meaningful-paint.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 import LanternMetric from './lantern-metric.js';
 import LHError from '../../lib/lh-error.js';
 import LanternFirstContentfulPaint from './lantern-first-contentful-paint.js';
diff --git a/lighthouse-core/computed/metrics/lantern-interactive.js b/lighthouse-core/computed/metrics/lantern-interactive.js
index f3af9f667008..baa2f1b358f2 100644
--- a/lighthouse-core/computed/metrics/lantern-interactive.js
+++ b/lighthouse-core/computed/metrics/lantern-interactive.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 import LanternMetric from './lantern-metric.js';
 import BaseNode from '../../lib/dependency-graph/base-node.js';
 import NetworkRequest from '../../lib/network-request.js';
diff --git a/lighthouse-core/computed/metrics/lantern-largest-contentful-paint.js b/lighthouse-core/computed/metrics/lantern-largest-contentful-paint.js
index bb66793e4780..3cbeda111788 100644
--- a/lighthouse-core/computed/metrics/lantern-largest-contentful-paint.js
+++ b/lighthouse-core/computed/metrics/lantern-largest-contentful-paint.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 import LanternMetric from './lantern-metric.js';
 import LHError from '../../lib/lh-error.js';
 import LanternFirstContentfulPaint from './lantern-first-contentful-paint.js';
diff --git a/lighthouse-core/computed/metrics/lantern-max-potential-fid.js b/lighthouse-core/computed/metrics/lantern-max-potential-fid.js
index 633df576dd51..6934561dbe18 100644
--- a/lighthouse-core/computed/metrics/lantern-max-potential-fid.js
+++ b/lighthouse-core/computed/metrics/lantern-max-potential-fid.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 import LanternMetricArtifact from './lantern-metric.js';
 import BaseNode from '../../lib/dependency-graph/base-node.js';
 import LanternFirstContentfulPaint from './lantern-first-contentful-paint.js';
diff --git a/lighthouse-core/computed/metrics/lantern-speed-index.js b/lighthouse-core/computed/metrics/lantern-speed-index.js
index 7215274b259b..32014cb409c5 100644
--- a/lighthouse-core/computed/metrics/lantern-speed-index.js
+++ b/lighthouse-core/computed/metrics/lantern-speed-index.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 import LanternMetric from './lantern-metric.js';
 import BaseNode from '../../lib/dependency-graph/base-node.js';
 import Speedline from '../speedline.js';
diff --git a/lighthouse-core/computed/metrics/lantern-total-blocking-time.js b/lighthouse-core/computed/metrics/lantern-total-blocking-time.js
index 1ec37b8b317e..eab57ef9850d 100644
--- a/lighthouse-core/computed/metrics/lantern-total-blocking-time.js
+++ b/lighthouse-core/computed/metrics/lantern-total-blocking-time.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 import LanternMetric from './lantern-metric.js';
 import BaseNode from '../../lib/dependency-graph/base-node.js';
 import LanternFirstContentfulPaint from './lantern-first-contentful-paint.js';
diff --git a/lighthouse-core/computed/metrics/largest-contentful-paint-all-frames.js b/lighthouse-core/computed/metrics/largest-contentful-paint-all-frames.js
index ab43a46fe6c7..e029c7963429 100644
--- a/lighthouse-core/computed/metrics/largest-contentful-paint-all-frames.js
+++ b/lighthouse-core/computed/metrics/largest-contentful-paint-all-frames.js
@@ -9,7 +9,7 @@
  * @fileoverview Computed Largest Contentful Paint (LCP) for all frames.
  */
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 
 import NavigationMetric from './navigation-metric.js';
 import LHError from '../../lib/lh-error.js';
diff --git a/lighthouse-core/computed/metrics/largest-contentful-paint.js b/lighthouse-core/computed/metrics/largest-contentful-paint.js
index 34b2c2d6d362..21a0886d7da7 100644
--- a/lighthouse-core/computed/metrics/largest-contentful-paint.js
+++ b/lighthouse-core/computed/metrics/largest-contentful-paint.js
@@ -13,7 +13,7 @@
  * @see https://web.dev/largest-contentful-paint
  */
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 
 import NavigationMetric from './navigation-metric.js';
 import LHError from '../../lib/lh-error.js';
diff --git a/lighthouse-core/computed/metrics/max-potential-fid.js b/lighthouse-core/computed/metrics/max-potential-fid.js
index f08a454e6c4d..8b1d03c1637b 100644
--- a/lighthouse-core/computed/metrics/max-potential-fid.js
+++ b/lighthouse-core/computed/metrics/max-potential-fid.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 import NavigationMetric from './navigation-metric.js';
 import LanternMaxPotentialFID from './lantern-max-potential-fid.js';
 import TracingProcessor from '../../lib/tracehouse/trace-processor.js';
diff --git a/lighthouse-core/computed/metrics/responsiveness.js b/lighthouse-core/computed/metrics/responsiveness.js
index 6a0a56250401..2687a743de2b 100644
--- a/lighthouse-core/computed/metrics/responsiveness.js
+++ b/lighthouse-core/computed/metrics/responsiveness.js
@@ -11,7 +11,7 @@
  * user input in the provided trace).
  */
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 
 import ProcessedTrace from '../processed-trace.js';
 
diff --git a/lighthouse-core/computed/metrics/speed-index.js b/lighthouse-core/computed/metrics/speed-index.js
index d13992b1313c..3760bff79b26 100644
--- a/lighthouse-core/computed/metrics/speed-index.js
+++ b/lighthouse-core/computed/metrics/speed-index.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 import NavigationMetric from './navigation-metric.js';
 import LanternSpeedIndex from './lantern-speed-index.js';
 import Speedline from '../speedline.js';
diff --git a/lighthouse-core/computed/metrics/timing-summary.js b/lighthouse-core/computed/metrics/timing-summary.js
index 66815eaf5857..5a3cad8d4593 100644
--- a/lighthouse-core/computed/metrics/timing-summary.js
+++ b/lighthouse-core/computed/metrics/timing-summary.js
@@ -18,7 +18,7 @@ import CumulativeLayoutShift from './cumulative-layout-shift.js';
 import SpeedIndex from './speed-index.js';
 import MaxPotentialFID from './max-potential-fid.js';
 import TotalBlockingTime from './total-blocking-time.js';
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 
 class TimingSummary {
   /**
diff --git a/lighthouse-core/computed/metrics/total-blocking-time.js b/lighthouse-core/computed/metrics/total-blocking-time.js
index 8eb00cd5f02d..d9be09fc39a1 100644
--- a/lighthouse-core/computed/metrics/total-blocking-time.js
+++ b/lighthouse-core/computed/metrics/total-blocking-time.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from '../computed-artifact.js';
+import {makeComputedArtifact} from '../computed-artifact.js';
 import ComputedMetric from './metric.js';
 import TraceProcessor from '../../lib/tracehouse/trace-processor.js';
 import LanternTotalBlockingTime from './lantern-total-blocking-time.js';
diff --git a/lighthouse-core/computed/module-duplication.js b/lighthouse-core/computed/module-duplication.js
index d353962a15e8..9ad61262f53f 100644
--- a/lighthouse-core/computed/module-duplication.js
+++ b/lighthouse-core/computed/module-duplication.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 import JsBundles from './js-bundles.js';
 
 const RELATIVE_SIZE_THRESHOLD = 0.1;
diff --git a/lighthouse-core/computed/network-analysis.js b/lighthouse-core/computed/network-analysis.js
index 8f8b9961eab6..982381ebe2f5 100644
--- a/lighthouse-core/computed/network-analysis.js
+++ b/lighthouse-core/computed/network-analysis.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 import NetworkAnalyzer from '../lib/dependency-graph/simulator/network-analyzer.js';
 import NetworkRecords from './network-records.js';
 
diff --git a/lighthouse-core/computed/network-records.js b/lighthouse-core/computed/network-records.js
index 74c4a3718b3e..e0a02e7aa0f0 100644
--- a/lighthouse-core/computed/network-records.js
+++ b/lighthouse-core/computed/network-records.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-import makeComputedArtifact from './computed-artifact.js';
-import NetworkRecorder from '../lib/network-recorder.js';
+import {makeComputedArtifact} from './computed-artifact.js';
+import {NetworkRecorder} from '../lib/network-recorder.js';
 
 class NetworkRecords {
   /**
diff --git a/lighthouse-core/computed/page-dependency-graph.js b/lighthouse-core/computed/page-dependency-graph.js
index 3b50e8e10b50..29cc57a6b9cb 100644
--- a/lighthouse-core/computed/page-dependency-graph.js
+++ b/lighthouse-core/computed/page-dependency-graph.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 import NetworkNode from '../lib/dependency-graph/network-node.js';
 import CPUNode from '../lib/dependency-graph/cpu-node.js';
 import TracingProcessor from '../lib/tracehouse/trace-processor.js';
diff --git a/lighthouse-core/computed/processed-navigation.js b/lighthouse-core/computed/processed-navigation.js
index df8f4ef945c1..58b5413c3704 100644
--- a/lighthouse-core/computed/processed-navigation.js
+++ b/lighthouse-core/computed/processed-navigation.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 import LHTraceProcessor from '../lib/lh-trace-processor.js';
 
 class ProcessedNavigation {
diff --git a/lighthouse-core/computed/processed-trace.js b/lighthouse-core/computed/processed-trace.js
index ee90435ca87e..8b88241f9c39 100644
--- a/lighthouse-core/computed/processed-trace.js
+++ b/lighthouse-core/computed/processed-trace.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 import LHTraceProcessor from '../lib/lh-trace-processor.js';
 
 class ProcessedTrace {
diff --git a/lighthouse-core/computed/resource-summary.js b/lighthouse-core/computed/resource-summary.js
index 267d4dd9e0f9..ea787cc4f6d5 100644
--- a/lighthouse-core/computed/resource-summary.js
+++ b/lighthouse-core/computed/resource-summary.js
@@ -5,12 +5,12 @@
  */
 'use strict';
 
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 import NetworkRecords from './network-records.js';
 import URL from '../lib/url-shim.js';
-import NetworkRequest from '../lib/network-request.js';
-import Budget from '../config/budget.js';
-import {Util} from '../util-commonjs.js';
+import {NetworkRequest} from '../lib/network-request.js';
+import {Budget} from '../config/budget.js';
+import Util from '../util-commonjs.cjs';
 
 /** @typedef {{count: number, resourceSize: number, transferSize: number}} ResourceEntry */
 
diff --git a/lighthouse-core/computed/screenshots.js b/lighthouse-core/computed/screenshots.js
index 3988916da9bf..e114e0fbf8ed 100644
--- a/lighthouse-core/computed/screenshots.js
+++ b/lighthouse-core/computed/screenshots.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 
 const SCREENSHOT_TRACE_NAME = 'Screenshot';
 
diff --git a/lighthouse-core/computed/speedline.js b/lighthouse-core/computed/speedline.js
index aa11a5cdcc23..b96b2681346e 100644
--- a/lighthouse-core/computed/speedline.js
+++ b/lighthouse-core/computed/speedline.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 import speedline from 'speedline-core';
 import LHError from '../lib/lh-error.js';
 import ProcessedTrace from './processed-trace.js';
diff --git a/lighthouse-core/computed/trace-of-tab.js b/lighthouse-core/computed/trace-of-tab.js
index 1a5ac2ea50d2..48ff48b42437 100644
--- a/lighthouse-core/computed/trace-of-tab.js
+++ b/lighthouse-core/computed/trace-of-tab.js
@@ -9,7 +9,7 @@
 
 import log from 'lighthouse-logger';
 
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 import ProcessedTrace from './processed-trace.js';
 import ProcessedNavigation from './processed-navigation.js';
 
diff --git a/lighthouse-core/computed/unused-css.js b/lighthouse-core/computed/unused-css.js
index ad9d7c8e2e22..f54acc2a06d7 100644
--- a/lighthouse-core/computed/unused-css.js
+++ b/lighthouse-core/computed/unused-css.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 import ByteEfficiencyAudit from '../audits/byte-efficiency/byte-efficiency-audit.js';
 import NetworkRecords from './network-records.js';
 
diff --git a/lighthouse-core/computed/unused-javascript-summary.js b/lighthouse-core/computed/unused-javascript-summary.js
index a90129ba83f6..061221ac5dad 100644
--- a/lighthouse-core/computed/unused-javascript-summary.js
+++ b/lighthouse-core/computed/unused-javascript-summary.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 
 /**
  * @typedef WasteData
diff --git a/lighthouse-core/computed/user-timings.js b/lighthouse-core/computed/user-timings.js
index 76b84a161c28..b602fbd96569 100644
--- a/lighthouse-core/computed/user-timings.js
+++ b/lighthouse-core/computed/user-timings.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 import ProcessedTrace from './processed-trace.js';
 
 /** @typedef {{name: string, isMark: true, args: LH.TraceEvent['args'], startTime: number}} MarkEvent */
diff --git a/lighthouse-core/computed/viewport-meta.js b/lighthouse-core/computed/viewport-meta.js
index a9f21252064f..f8239e4b25f0 100644
--- a/lighthouse-core/computed/viewport-meta.js
+++ b/lighthouse-core/computed/viewport-meta.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import Parser from 'metaviewport-parser';
-import makeComputedArtifact from './computed-artifact.js';
+import {makeComputedArtifact} from './computed-artifact.js';
 
 class ViewportMeta {
   /**
diff --git a/lighthouse-core/config/config-helpers.js b/lighthouse-core/config/config-helpers.js
index da85e5b74295..31907b455502 100644
--- a/lighthouse-core/config/config-helpers.js
+++ b/lighthouse-core/config/config-helpers.js
@@ -7,7 +7,7 @@
 
 import path from 'path';
 import isDeepEqual from 'lodash/isEqual.js';
-import constants from './constants.js';
+import * as constants from './constants.js';
 import {Budget} from './budget.js';
 import ConfigPlugin from './config-plugin.js';
 import {Runner} from '../runner.js';
@@ -576,7 +576,7 @@ function deepCloneConfigJson(json) {
   return cloned;
 }
 
-export default {
+export {
   deepClone,
   deepCloneConfigJson,
   mergeConfigFragment,
diff --git a/lighthouse-core/config/config.js b/lighthouse-core/config/config.js
index e3c8788f150d..f06e19e96cb9 100644
--- a/lighthouse-core/config/config.js
+++ b/lighthouse-core/config/config.js
@@ -5,14 +5,13 @@
  */
 'use strict';
 
-const defaultConfigPath = './default-config.js';
 import defaultConfig from './default-config.js';
-import constants from './constants.js';
+import * as constants from './constants.js';
 import format from '../../shared/localization/format.js';
-import validation from './../fraggle-rock/config/validation.js';
+import * as validation from './../fraggle-rock/config/validation.js';
 import log from 'lighthouse-logger';
 import path from 'path';
-import Runner from '../runner.js';
+import {Runner} from '../runner.js';
 
 import {
   mergePlugins,
@@ -24,6 +23,8 @@ import {
   deepCloneConfigJson,
 } from './config-helpers.js';
 
+const defaultConfigPath = './default-config.js';
+
 /** @typedef {typeof import('../gather/gatherers/gatherer.js')} GathererConstructor */
 /** @typedef {InstanceType<GathererConstructor>} Gatherer */
 
diff --git a/lighthouse-core/config/constants.js b/lighthouse-core/config/constants.js
index 4b37d5785d02..9f2f582410e5 100644
--- a/lighthouse-core/config/constants.js
+++ b/lighthouse-core/config/constants.js
@@ -158,7 +158,7 @@ const nonSimulatedPassConfigOverrides = {
   cpuQuietThresholdMs: 5250,
 };
 
-export default {
+export {
   throttling,
   screenEmulationMetrics,
   userAgents,
diff --git a/lighthouse-core/config/default-config.js b/lighthouse-core/config/default-config.js
index 7bac6013ea03..0d46d7a3e552 100644
--- a/lighthouse-core/config/default-config.js
+++ b/lighthouse-core/config/default-config.js
@@ -7,11 +7,15 @@
 
 /* eslint-disable max-len */
 
-import constants from './constants.js';
+import * as constants from './constants.js';
 
 import i18n from '../lib/i18n/i18n.js';
 import m2a from './metrics-to-audits.js';
 
+import {createCommonjsRefs} from '../scripts/esm-utils.js';
+
+const {require} = createCommonjsRefs(import.meta);
+
 const UIStrings = {
   /** Title of the Performance category of audits. Equivalent to 'Web performance', this term is inclusive of all web page speed and loading optimization topics. Also used as a label of a score gauge; try to limit to 20 characters. */
   performanceCategoryTitle: 'Performance',
diff --git a/lighthouse-core/config/desktop-config.js b/lighthouse-core/config/desktop-config.js
index 6f4329822395..fc8bc4560fac 100644
--- a/lighthouse-core/config/desktop-config.js
+++ b/lighthouse-core/config/desktop-config.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import constants from './constants.js';
+import * as constants from './constants.js';
 
 /** @type {LH.Config.Json} */
 const config = {
diff --git a/lighthouse-core/config/lr-desktop-config.js b/lighthouse-core/config/lr-desktop-config.js
index 5854625e3be0..d25c4969d8f1 100644
--- a/lighthouse-core/config/lr-desktop-config.js
+++ b/lighthouse-core/config/lr-desktop-config.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import constants from './constants.js';
+import * as constants from './constants.js';
 
 /** @type {LH.Config.Json} */
 const config = {
diff --git a/lighthouse-core/fraggle-rock/api.js b/lighthouse-core/fraggle-rock/api.js
index 116a2ce2c1cb..7d1fcc9dbbfc 100644
--- a/lighthouse-core/fraggle-rock/api.js
+++ b/lighthouse-core/fraggle-rock/api.js
@@ -9,8 +9,8 @@ import {UserFlow, auditGatherSteps} from './user-flow.js';
 import {snapshotGather} from './gather/snapshot-runner.js';
 import {startTimespanGather} from './gather/timespan-runner.js';
 import {navigationGather} from './gather/navigation-runner.js';
-import {generateFlowReportHtml} from '../../report/generator/report-generator.js';
-import Runner from '../runner.js';
+import ReportGenerator from '../../report/generator/report-generator.js';
+import {Runner} from '../runner.js';
 
 /**
  * @param {LH.Puppeteer.Page} page
@@ -55,7 +55,7 @@ async function startTimespan(...params) {
  * @param {LH.FlowResult} flowResult
  */
 async function generateFlowReport(flowResult) {
-  return generateFlowReportHtml(flowResult);
+  return ReportGenerator.generateFlowReportHtml(flowResult);
 }
 
 /**
diff --git a/lighthouse-core/fraggle-rock/config/config.js b/lighthouse-core/fraggle-rock/config/config.js
index ec01abfc1a8e..08d31df8c98f 100644
--- a/lighthouse-core/fraggle-rock/config/config.js
+++ b/lighthouse-core/fraggle-rock/config/config.js
@@ -7,7 +7,7 @@
 
 import path from 'path';
 import log from 'lighthouse-logger';
-import Runner from '../../runner.js';
+import {Runner} from '../../runner.js';
 import defaultConfig from './default-config.js';
 import {defaultNavigationConfig, nonSimulatedPassConfigOverrides} from '../../config/constants.js'; // eslint-disable-line max-len
 
@@ -282,4 +282,4 @@ function initializeConfig(configJSON, context) {
   return {config, warnings};
 }
 
-export default {resolveWorkingCopy, initializeConfig};
+export {resolveWorkingCopy, initializeConfig};
diff --git a/lighthouse-core/fraggle-rock/config/filters.js b/lighthouse-core/fraggle-rock/config/filters.js
index 508547fc4df1..c169dec47fa7 100644
--- a/lighthouse-core/fraggle-rock/config/filters.js
+++ b/lighthouse-core/fraggle-rock/config/filters.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import log from 'lighthouse-logger';
-import Audit from '../../audits/audit.js';
+import {Audit} from '../../audits/audit.js';
 
 /** @type {Record<keyof LH.FRBaseArtifacts, string>} */
 const baseArtifactKeySource = {
@@ -320,7 +320,7 @@ function filterConfigByExplicitFilters(config, filters) {
   };
 }
 
-export default {
+export {
   filterConfigByGatherMode,
   filterConfigByExplicitFilters,
   filterArtifactsByGatherMode,
diff --git a/lighthouse-core/fraggle-rock/gather/driver.js b/lighthouse-core/fraggle-rock/gather/driver.js
index 7c3c81d17b74..6e86058d400e 100644
--- a/lighthouse-core/fraggle-rock/gather/driver.js
+++ b/lighthouse-core/fraggle-rock/gather/driver.js
@@ -6,9 +6,9 @@
 'use strict';
 
 import log from 'lighthouse-logger';
-import ProtocolSession from './session.js';
-import ExecutionContext from '../../gather/driver/execution-context.js';
-import Fetcher from '../../gather/fetcher.js';
+import {ProtocolSession} from './session.js';
+import {ExecutionContext} from '../../gather/driver/execution-context.js';
+import {Fetcher} from '../../gather/fetcher.js';
 
 /** @return {*} */
 const throwNotConnectedFn = () => {
diff --git a/lighthouse-core/fraggle-rock/gather/navigation-runner.js b/lighthouse-core/fraggle-rock/gather/navigation-runner.js
index 1775a39ebff0..531f0340be6c 100644
--- a/lighthouse-core/fraggle-rock/gather/navigation-runner.js
+++ b/lighthouse-core/fraggle-rock/gather/navigation-runner.js
@@ -8,17 +8,17 @@
 import puppeteer from 'puppeteer-core';
 import log from 'lighthouse-logger';
 import Driver from './driver.js';
-import Runner from '../../runner.js';
+import {Runner} from '../../runner.js';
 import {getEmptyArtifactState, collectPhaseArtifacts, awaitArtifacts} from './runner-helpers.js';
-import prepare from '../../gather/driver/prepare.js';
+import * as prepare from '../../gather/driver/prepare.js';
 import {gotoURL} from '../../gather/driver/navigation.js';
-import storage from '../../gather/driver/storage.js';
+import * as storage from '../../gather/driver/storage.js';
 import emulation from '../../lib/emulation.js';
 import {defaultNavigationConfig} from '../../config/constants.js';
 import {initializeConfig} from '../config/config.js';
 import {getBaseArtifacts, finalizeArtifacts} from './base-artifacts.js';
 import format from '../../../shared/localization/format.js';
-import LighthouseError from '../../lib/lh-error.js';
+import {LighthouseError} from '../../lib/lh-error.js';
 import URL from '../../lib/url-shim.js';
 import {getPageLoadError} from '../../lib/navigation-error.js';
 import Trace from '../../gather/gatherers/trace.js';
@@ -349,7 +349,7 @@ async function navigationGather(requestor, options) {
   return {artifacts, runnerOptions};
 }
 
-export default {
+export {
   navigationGather,
   _setup,
   _setupNavigation,
diff --git a/lighthouse-core/fraggle-rock/gather/runner-helpers.js b/lighthouse-core/fraggle-rock/gather/runner-helpers.js
index 481a1d82788a..488afd130f98 100644
--- a/lighthouse-core/fraggle-rock/gather/runner-helpers.js
+++ b/lighthouse-core/fraggle-rock/gather/runner-helpers.js
@@ -149,7 +149,7 @@ async function awaitArtifacts(artifactState) {
   return artifacts;
 }
 
-export default {
+export {
   getEmptyArtifactState,
   awaitArtifacts,
   collectPhaseArtifacts,
diff --git a/lighthouse-core/fraggle-rock/gather/session.js b/lighthouse-core/fraggle-rock/gather/session.js
index 78dc6597c7d6..74cb1fdd10a8 100644
--- a/lighthouse-core/fraggle-rock/gather/session.js
+++ b/lighthouse-core/fraggle-rock/gather/session.js
@@ -5,7 +5,8 @@
  */
 'use strict';
 
-import LHError from '../../lib/lh-error.js';
+import {LighthouseError} from '../../lib/lh-error.js';
+
 const SessionEmitMonkeypatch = Symbol('monkeypatch');
 
 // Controls how long to wait for a response after sending a DevTools protocol command.
@@ -150,9 +151,10 @@ class ProtocolSession {
     const timeoutPromise = new Promise((resolve, reject) => {
       if (timeoutMs === Infinity) return;
 
-      timeout = setTimeout(reject, timeoutMs, new LHError(LHError.errors.PROTOCOL_TIMEOUT, {
+      const error = new LighthouseError(LighthouseError.errors.PROTOCOL_TIMEOUT, {
         protocolMethod: method,
-      }));
+      });
+      timeout = setTimeout(reject, timeoutMs, error);
     });
 
     const resultPromise = this._session.send(method, ...params);
@@ -179,4 +181,4 @@ class ProtocolSession {
   }
 }
 
-export default ProtocolSession;
+export {ProtocolSession};
diff --git a/lighthouse-core/fraggle-rock/gather/snapshot-runner.js b/lighthouse-core/fraggle-rock/gather/snapshot-runner.js
index 19c85aab256e..bb5a15047235 100644
--- a/lighthouse-core/fraggle-rock/gather/snapshot-runner.js
+++ b/lighthouse-core/fraggle-rock/gather/snapshot-runner.js
@@ -7,7 +7,7 @@
 
 import log from 'lighthouse-logger';
 import Driver from './driver.js';
-import Runner from '../../runner.js';
+import {Runner} from '../../runner.js';
 import {getEmptyArtifactState, collectPhaseArtifacts, awaitArtifacts} from './runner-helpers.js';
 import {initializeConfig} from '../config/config.js';
 import {getBaseArtifacts, finalizeArtifacts} from './base-artifacts.js';
@@ -60,6 +60,6 @@ async function snapshotGather(options) {
   return {artifacts, runnerOptions};
 }
 
-export default {
+export {
   snapshotGather,
 };
diff --git a/lighthouse-core/fraggle-rock/gather/timespan-runner.js b/lighthouse-core/fraggle-rock/gather/timespan-runner.js
index e1d838d29364..8c5624f77bc1 100644
--- a/lighthouse-core/fraggle-rock/gather/timespan-runner.js
+++ b/lighthouse-core/fraggle-rock/gather/timespan-runner.js
@@ -7,7 +7,7 @@
 
 import log from 'lighthouse-logger';
 import Driver from './driver.js';
-import Runner from '../../runner.js';
+import {Runner} from '../../runner.js';
 import {getEmptyArtifactState, collectPhaseArtifacts, awaitArtifacts} from './runner-helpers.js';
 import {prepareTargetForTimespanMode} from '../../gather/driver/prepare.js';
 import {initializeConfig} from '../config/config.js';
@@ -73,6 +73,6 @@ async function startTimespanGather(options) {
   };
 }
 
-export default {
+export {
   startTimespanGather,
 };
diff --git a/lighthouse-core/fraggle-rock/user-flow.js b/lighthouse-core/fraggle-rock/user-flow.js
index 25339859dc79..720012094073 100644
--- a/lighthouse-core/fraggle-rock/user-flow.js
+++ b/lighthouse-core/fraggle-rock/user-flow.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import {generateFlowReportHtml} from '../../report/generator/report-generator.js';
+import ReportGenerator from '../../report/generator/report-generator.js';
 import {snapshotGather} from './gather/snapshot-runner.js';
 import {startTimespanGather} from './gather/timespan-runner.js';
 import {navigationGather} from './gather/navigation-runner.js';
@@ -170,7 +170,7 @@ class UserFlow {
    */
   async generateReport() {
     const flowResult = await this.createFlowResult();
-    return generateFlowReportHtml(flowResult);
+    return ReportGenerator.generateFlowReportHtml(flowResult);
   }
 
   /**
diff --git a/lighthouse-core/gather/connections/connection.js b/lighthouse-core/gather/connections/connection.js
index dab478269a02..eb22a7b08a00 100644
--- a/lighthouse-core/gather/connections/connection.js
+++ b/lighthouse-core/gather/connections/connection.js
@@ -7,7 +7,7 @@
 
 import {EventEmitter} from 'events';
 import log from 'lighthouse-logger';
-import LHError from '../../lib/lh-error.js';
+import {LighthouseError} from '../../lib/lh-error.js';
 
 // TODO(bckenny): CommandCallback properties should be tied by command type after
 // https://github.com/Microsoft/TypeScript/pull/22348. See driver.js TODO.
@@ -138,7 +138,7 @@ class Connection {
       callback.resolve(Promise.resolve().then(_ => {
         if (object.error) {
           log.formatProtocol('method <= browser ERR', {method: callback.method}, 'error');
-          throw LHError.fromProtocolMessage(callback.method, object.error);
+          throw LighthouseError.fromProtocolMessage(callback.method, object.error);
         }
 
         log.formatProtocol('method <= browser OK',
diff --git a/lighthouse-core/gather/connections/cri.js b/lighthouse-core/gather/connections/cri.js
index b2dd08dffef8..078ab98d9c22 100644
--- a/lighthouse-core/gather/connections/cri.js
+++ b/lighthouse-core/gather/connections/cri.js
@@ -9,7 +9,7 @@ import {Connection} from './connection.js';
 import WebSocket from 'ws';
 import http from 'http';
 import log from 'lighthouse-logger';
-import LighthouseError from '../../lib/lh-error.js';
+import {LighthouseError} from '../../lib/lh-error.js';
 
 const DEFAULT_HOSTNAME = '127.0.0.1';
 const CONNECT_TIMEOUT = 10000;
diff --git a/lighthouse-core/gather/driver.js b/lighthouse-core/gather/driver.js
index 85f25be6ff31..39b6c2064807 100644
--- a/lighthouse-core/gather/driver.js
+++ b/lighthouse-core/gather/driver.js
@@ -7,7 +7,7 @@
 
 import {Fetcher} from './fetcher.js';
 import {ExecutionContext} from './driver/execution-context.js';
-import LHError from '../lib/lh-error.js';
+import {LighthouseError} from '../lib/lh-error.js';
 import {fetchResponseBodyFromCache} from '../gather/driver/network.js';
 import {EventEmitter} from 'events';
 import log from 'lighthouse-logger';
@@ -333,7 +333,7 @@ class Driver {
     let asyncTimeout;
     const timeoutPromise = new Promise((resolve, reject) => {
       if (timeout === Infinity) return;
-      asyncTimeout = setTimeout(reject, timeout, new LHError(LHError.errors.PROTOCOL_TIMEOUT, {
+      asyncTimeout = setTimeout(reject, timeout, new LighthouseError(LighthouseError.errors.PROTOCOL_TIMEOUT, {
         protocolMethod: method,
       }));
     });
diff --git a/lighthouse-core/gather/driver/environment.js b/lighthouse-core/gather/driver/environment.js
index e3446e316c86..6a5654ba0ede 100644
--- a/lighthouse-core/gather/driver/environment.js
+++ b/lighthouse-core/gather/driver/environment.js
@@ -6,9 +6,12 @@
 'use strict';
 
 import log from 'lighthouse-logger';
-import constants from '../../config/constants.js';
-import pageFunctions from '../../lib/page-functions.js';
+import * as constants from '../../config/constants.js';
+import {pageFunctions} from '../../lib/page-functions.js';
 import i18n from '../../lib/i18n/i18n.js';
+import { createCommonjsRefs } from '../../scripts/esm-utils.js';
+
+const {__filename} = createCommonjsRefs(import.meta);
 
 const UIStrings = {
   /**
diff --git a/lighthouse-core/gather/driver/navigation.js b/lighthouse-core/gather/driver/navigation.js
index 130a2b67ac62..1562cdf4074a 100644
--- a/lighthouse-core/gather/driver/navigation.js
+++ b/lighthouse-core/gather/driver/navigation.js
@@ -8,10 +8,14 @@
 import log from 'lighthouse-logger';
 import {NetworkMonitor} from './network-monitor.js';
 import {waitForFullyLoaded, waitForFrameNavigated, waitForUserToContinue} from './wait-for-condition.js'; // eslint-disable-line max-len
-import constants from '../../config/constants.js';
+import * as constants from '../../config/constants.js';
 import i18n from '../../lib/i18n/i18n.js';
 import URL from '../../lib/url-shim.js';
 
+import { createCommonjsRefs } from '../../scripts/esm-utils.js';
+
+const {__filename} = createCommonjsRefs(import.meta);
+
 const UIStrings = {
   /**
    * @description Warning that the web page redirected during testing and that may have affected the load.
diff --git a/lighthouse-core/gather/driver/network-monitor.js b/lighthouse-core/gather/driver/network-monitor.js
index ddca4b2c3a37..f5ff00287eaf 100644
--- a/lighthouse-core/gather/driver/network-monitor.js
+++ b/lighthouse-core/gather/driver/network-monitor.js
@@ -13,8 +13,8 @@
 import log from 'lighthouse-logger';
 
 import {EventEmitter} from 'events';
-import NetworkRecorder from '../../lib/network-recorder.js';
-import NetworkRequest from '../../lib/network-request.js';
+import {NetworkRecorder} from '../../lib/network-recorder.js';
+import {NetworkRequest} from '../../lib/network-request.js';
 import URL from '../../lib/url-shim.js';
 import {TargetManager} from './target-manager.js';
 
diff --git a/lighthouse-core/gather/driver/network.js b/lighthouse-core/gather/driver/network.js
index 5d94fd085f70..ccf165eb934f 100644
--- a/lighthouse-core/gather/driver/network.js
+++ b/lighthouse-core/gather/driver/network.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import NetworkRequest from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/network-request.js';
 
 /**
  * Return the body of the response with the given ID. Rejects if getting the
diff --git a/lighthouse-core/gather/driver/storage.js b/lighthouse-core/gather/driver/storage.js
index 97a708bb1bc6..3b69598a7c61 100644
--- a/lighthouse-core/gather/driver/storage.js
+++ b/lighthouse-core/gather/driver/storage.js
@@ -7,6 +7,9 @@
 
 import log from 'lighthouse-logger';
 import i18n from '../../lib/i18n/i18n.js';
+import { createCommonjsRefs } from '../../scripts/esm-utils.js';
+
+const {__filename} = createCommonjsRefs(import.meta);
 
 const UIStrings = {
   /**
diff --git a/lighthouse-core/gather/driver/wait-for-condition.js b/lighthouse-core/gather/driver/wait-for-condition.js
index 3d10c8e79c3f..1986ea744d94 100644
--- a/lighthouse-core/gather/driver/wait-for-condition.js
+++ b/lighthouse-core/gather/driver/wait-for-condition.js
@@ -9,7 +9,7 @@
 
 import log from 'lighthouse-logger';
 
-import LHError from '../../lib/lh-error.js';
+import {LighthouseError} from '../../lib/lh-error.js';
 import {ExecutionContext} from './execution-context.js';
 
 /** @typedef {InstanceType<import('./network-monitor.js')['NetworkMonitor']>} NetworkMonitor */
@@ -76,7 +76,7 @@ function waitForFcp(session, pauseAfterFcpMs, maxWaitForFcpMs) {
   /** @type {Promise<void>} */
   const promise = new Promise((resolve, reject) => {
     const maxWaitTimeout = setTimeout(() => {
-      reject(new LHError(LHError.errors.NO_FCP));
+      reject(new {LighthouseError}({LighthouseError}.errors.NO_FCP));
     }, maxWaitForFcpMs);
     /** @type {NodeJS.Timeout|undefined} */
     let loadTimeout;
@@ -476,7 +476,7 @@ async function waitForFullyLoaded(session, networkMonitor, options) {
         log.warn('waitFor', 'Page appears to be hung, killing JavaScript...');
         await session.sendCommand('Emulation.setScriptExecutionDisabled', {value: true});
         await session.sendCommand('Runtime.terminateExecution');
-        throw new LHError(LHError.errors.PAGE_HUNG);
+        throw new LighthouseError(LighthouseError.errors.PAGE_HUNG);
       }
 
       return {timedOut: true};
diff --git a/lighthouse-core/gather/gather-runner.js b/lighthouse-core/gather/gather-runner.js
index 62f92b8791e4..a52207fa14a4 100644
--- a/lighthouse-core/gather/gather-runner.js
+++ b/lighthouse-core/gather/gather-runner.js
@@ -9,7 +9,7 @@ import log from 'lighthouse-logger';
 import NetworkRecords from '../computed/network-records.js';
 import {getPageLoadError} from '../lib/navigation-error.js';
 import emulation from '../lib/emulation.js';
-import constants from '../config/constants.js';
+import * as constants from '../config/constants.js';
 import format from '../../shared/localization/format.js';
 import {getBenchmarkIndex, getEnvironmentWarnings} from './driver/environment.js';
 import * as prepare from './driver/prepare.js';
diff --git a/lighthouse-core/gather/gatherers/devtools-log.js b/lighthouse-core/gather/gatherers/devtools-log.js
index 3a7fd27f4269..bcb1b45fecb0 100644
--- a/lighthouse-core/gather/gatherers/devtools-log.js
+++ b/lighthouse-core/gather/gatherers/devtools-log.js
@@ -11,9 +11,9 @@
  * This protocol log can be used to recreate the network records using lib/network-recorder.js.
  */
 
-import NetworkMonitor from '../driver/network-monitor.js';
+import {NetworkMonitor} from '../driver/network-monitor.js';
 
-import MessageLog from '../devtools-log.js';
+import {DevtoolsLog as MessageLog} from '../devtools-log.js';
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 class DevtoolsLog extends FRGatherer {
diff --git a/lighthouse-core/gather/gatherers/stacks.js b/lighthouse-core/gather/gatherers/stacks.js
index 43b5b0d607ba..30f0dc3da817 100644
--- a/lighthouse-core/gather/gatherers/stacks.js
+++ b/lighthouse-core/gather/gatherers/stacks.js
@@ -16,6 +16,11 @@ import fs from 'fs';
 
 import log from 'lighthouse-logger';
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+
+import { createCommonjsRefs } from '../../scripts/esm-utils.js';
+
+const {require} = createCommonjsRefs(import.meta);
+
 const libDetectorSource = fs.readFileSync(
   require.resolve('js-library-detector/library/libraries.js'), 'utf8');
 
diff --git a/lighthouse-core/gather/gatherers/web-app-manifest.js b/lighthouse-core/gather/gatherers/web-app-manifest.js
index a0637247affe..655991d1a89c 100644
--- a/lighthouse-core/gather/gatherers/web-app-manifest.js
+++ b/lighthouse-core/gather/gatherers/web-app-manifest.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import log from 'lighthouse-logger';
-import manifestParser from '../../lib/manifest-parser.js';
+import {parseManifest} from '../../lib/manifest-parser.js';
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 class WebAppManifest extends FRGatherer {
@@ -83,7 +83,7 @@ class WebAppManifest extends FRGatherer {
     log.time(status);
     const response = await WebAppManifest.fetchAppManifest(session);
     if (!response) return null;
-    const manifest = manifestParser(response.data, response.url, pageUrl);
+    const manifest = parseManifest(response.data, response.url, pageUrl);
     log.timeEnd(status);
     return manifest;
   }
diff --git a/lighthouse-core/lib/asset-saver.js b/lighthouse-core/lib/asset-saver.js
index 86e87dc2df25..d664b48e07d4 100644
--- a/lighthouse-core/lib/asset-saver.js
+++ b/lighthouse-core/lib/asset-saver.js
@@ -10,12 +10,12 @@ import path from 'path';
 import log from 'lighthouse-logger';
 import stream from 'stream';
 import {promisify} from 'util';
-import Simulator from './dependency-graph/simulator/simulator.js';
+import {Simulator} from './dependency-graph/simulator/simulator.js';
 import lanternTraceSaver from './lantern-trace-saver.js';
 import Metrics from './traces/pwmetrics-events.js';
 import NetworkAnalysisComputed from '../computed/network-analysis.js';
 import LoadSimulatorComputed from '../computed/load-simulator.js';
-import LHError from '../lib/lh-error.js';
+import {LighthouseError} from '../lib/lh-error.js';
 // 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.
@@ -48,10 +48,10 @@ function loadArtifacts(basePath) {
     throw new Error('No saved artifacts found at ' + basePath);
   }
 
-  // load artifacts.json using a reviver to deserialize any LHErrors in artifacts.
+  // load artifacts.json using a reviver to deserialize any LighthouseErrors in artifacts.
   const artifactsStr = fs.readFileSync(path.join(basePath, artifactsFilename), 'utf8');
   /** @type {LH.Artifacts} */
-  const artifacts = JSON.parse(artifactsStr, LHError.parseReviver);
+  const artifacts = JSON.parse(artifactsStr, LighthouseError.parseReviver);
 
   const filenames = fs.readdirSync(basePath);
 
@@ -87,9 +87,9 @@ function loadArtifacts(basePath) {
  * @param {any} value
  */
 function stringifyReplacer(key, value) {
-  // Currently only handle LHError and other Error types.
+  // Currently only handle LighthouseError and other Error types.
   if (value instanceof Error) {
-    return LHError.stringifyReplacer(value);
+    return LighthouseError.stringifyReplacer(value);
   }
 
   return value;
@@ -128,7 +128,7 @@ async function saveArtifacts(artifacts, basePath) {
     await saveDevtoolsLog(devtoolsLog, `${basePath}/${passName}${devtoolsLogSuffix}`);
   }
 
-  // save everything else, using a replacer to serialize LHErrors in the artifacts.
+  // save everything else, using a replacer to serialize LighthouseErrors in the artifacts.
   const restArtifactsString = JSON.stringify(restArtifacts, stringifyReplacer, 2) + '\n';
   fs.writeFileSync(`${basePath}/${artifactsFilename}`, restArtifactsString, 'utf8');
   log.log('Artifacts saved to disk in folder:', basePath);
diff --git a/lighthouse-core/lib/dependency-graph/simulator/simulator.js b/lighthouse-core/lib/dependency-graph/simulator/simulator.js
index e4983ae8a3dd..1fb9438662a1 100644
--- a/lighthouse-core/lib/dependency-graph/simulator/simulator.js
+++ b/lighthouse-core/lib/dependency-graph/simulator/simulator.js
@@ -9,8 +9,10 @@ import {BaseNode} from '../base-node.js';
 import TcpConnection from './tcp-connection.js';
 import ConnectionPool from './connection-pool.js';
 import DNSCache from './dns-cache.js';
-const mobileSlow4G = require('../../../config/constants.js').throttling.mobileSlow4G;
 import SimulatorTimingMap from './simulator-timing-map.js';
+import * as constants from '../../../config/constants.js';
+
+const mobileSlow4G = constants.throttling.mobileSlow4G;
 
 /** @typedef {import('../base-node.js').Node} Node */
 /** @typedef {import('../network-node').NetworkNode} NetworkNode */
diff --git a/lighthouse-core/lib/emulation.js b/lighthouse-core/lib/emulation.js
index 03cb80537261..d2dbcd3c7daf 100644
--- a/lighthouse-core/lib/emulation.js
+++ b/lighthouse-core/lib/emulation.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import {version as lighthouseVersion} from '../../package.json';
+import { lighthouseVersion } from "../../root.js";
 
 const NO_THROTTLING_METRICS = {
   latency: 0,
diff --git a/lighthouse-core/lib/lh-env.js b/lighthouse-core/lib/lh-env.js
index 341901e6d7e1..04597ac97825 100644
--- a/lighthouse-core/lib/lh-env.js
+++ b/lighthouse-core/lib/lh-env.js
@@ -7,8 +7,10 @@
 
 import process from 'process';
 
-export default {
-  // NODE_ENV is set to test by jest and by smokehouse CLI runner
-  // CI as a catchall for everything we do in GitHub Actions
-  isUnderTest: !!process.env.CI || process.env.NODE_ENV === 'test',
+// NODE_ENV is set to test by jest and by smokehouse CLI runner
+// CI as a catchall for everything we do in GitHub Actions
+const isUnderTest = !!process.env.CI || process.env.NODE_ENV === 'test';
+
+export {
+  isUnderTest,
 };
diff --git a/lighthouse-core/lib/lh-error.js b/lighthouse-core/lib/lh-error.js
index 2f66e2e2fcc3..b54cc4295acb 100644
--- a/lighthouse-core/lib/lh-error.js
+++ b/lighthouse-core/lib/lh-error.js
@@ -5,8 +5,11 @@
  */
 'use strict';
 
+import { createCommonjsRefs } from '../scripts/esm-utils.js';
 import i18n from './i18n/i18n.js';
 
+const {__filename} = createCommonjsRefs(import.meta);
+
 /* eslint-disable max-len */
 const UIStrings = {
   /**
diff --git a/lighthouse-core/lib/manifest-parser.js b/lighthouse-core/lib/manifest-parser.js
index 299511a7e9fa..d79173fa29b7 100644
--- a/lighthouse-core/lib/manifest-parser.js
+++ b/lighthouse-core/lib/manifest-parser.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import URL from './url-shim.js';
-import cssParsers from 'cssstyle/lib/parsers';
+import cssParsers from 'cssstyle/lib/parsers.js';
 
 const ALLOWED_DISPLAY_VALUES = [
   'fullscreen',
diff --git a/lighthouse-core/lib/navigation-error.js b/lighthouse-core/lib/navigation-error.js
index abee53444414..2ba516b48074 100644
--- a/lighthouse-core/lib/navigation-error.js
+++ b/lighthouse-core/lib/navigation-error.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-import LHError from './lh-error.js';
+import {LighthouseError} from './lh-error.js';
 import NetworkAnalyzer from './dependency-graph/simulator/network-analyzer.js';
-import NetworkRequest from './network-request.js';
+import {NetworkRequest} from './network-request.js';
 
 /**
  * Returns an error if the original network request failed or wasn't found.
@@ -16,7 +16,7 @@ import NetworkRequest from './network-request.js';
  */
 function getNetworkError(mainRecord) {
   if (!mainRecord) {
-    return new LHError(LHError.errors.NO_DOCUMENT_REQUEST);
+    return new LighthouseError(LighthouseError.errors.NO_DOCUMENT_REQUEST);
   } else if (mainRecord.failed) {
     const netErr = mainRecord.localizedFailDescription;
     // Match all resolution and DNS failures
@@ -26,12 +26,14 @@ function getNetworkError(mainRecord) {
       netErr === 'net::ERR_NAME_RESOLUTION_FAILED' ||
       netErr.startsWith('net::ERR_DNS_')
     ) {
-      return new LHError(LHError.errors.DNS_FAILURE);
+      return new LighthouseError(LighthouseError.errors.DNS_FAILURE);
     } else {
-      return new LHError(LHError.errors.FAILED_DOCUMENT_REQUEST, {errorDetails: netErr});
+      return new LighthouseError(LighthouseError.errors.FAILED_DOCUMENT_REQUEST, {
+        errorDetails: netErr,
+      });
     }
   } else if (mainRecord.hasErrorStatusCode()) {
-    return new LHError(LHError.errors.ERRORED_DOCUMENT_REQUEST, {
+    return new LighthouseError(LighthouseError.errors.ERRORED_DOCUMENT_REQUEST, {
       statusCode: `${mainRecord.statusCode}`,
     });
   }
@@ -60,13 +62,13 @@ function getInterstitialError(mainRecord, networkRecords) {
 
   // If a request failed with the `net::ERR_CERT_*` collection of errors, then it's a security issue.
   if (mainRecord.localizedFailDescription.startsWith('net::ERR_CERT')) {
-    return new LHError(LHError.errors.INSECURE_DOCUMENT_REQUEST, {
+    return new LighthouseError(LighthouseError.errors.INSECURE_DOCUMENT_REQUEST, {
       securityMessages: mainRecord.localizedFailDescription,
     });
   }
 
   // If we made it this far, it's a generic Chrome interstitial error.
-  return new LHError(LHError.errors.CHROME_INTERSTITIAL_ERROR);
+  return new LighthouseError(LighthouseError.errors.CHROME_INTERSTITIAL_ERROR);
 }
 
 /**
@@ -85,7 +87,7 @@ function getNonHtmlError(finalRecord) {
   // mimeType is determined by the browser, we assume Chrome is determining mimeType correctly,
   // independently of 'Content-Type' response headers, and always sending mimeType if well-formed.
   if (HTML_MIME_TYPE !== finalRecord.mimeType) {
-    return new LHError(LHError.errors.NOT_HTML, {mimeType: finalRecord.mimeType});
+    return new LighthouseError(LighthouseError.errors.NOT_HTML, {mimeType: finalRecord.mimeType});
   }
 
   return undefined;
@@ -146,7 +148,7 @@ function getPageLoadError(navigationError, context) {
 }
 
 
-export default {
+export {
   getNetworkError,
   getInterstitialError,
   getPageLoadError,
diff --git a/lighthouse-core/lib/network-recorder.js b/lighthouse-core/lib/network-recorder.js
index 246b41615935..f6b90e076712 100644
--- a/lighthouse-core/lib/network-recorder.js
+++ b/lighthouse-core/lib/network-recorder.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import log from 'lighthouse-logger';
-import NetworkRequest from './network-request.js';
+import {NetworkRequest} from './network-request.js';
 import {EventEmitter} from 'events';
 
 /** @typedef {'requeststarted'|'requestloaded'} NetworkRecorderEvent */
@@ -334,4 +334,4 @@ class NetworkRecorder extends EventEmitter {
   }
 }
 
-export default NetworkRecorder;
+export {NetworkRecorder};
diff --git a/lighthouse-core/lib/page-functions.js b/lighthouse-core/lib/page-functions.js
index 316abfae9a1f..ba22a7ed9db6 100644
--- a/lighthouse-core/lib/page-functions.js
+++ b/lighthouse-core/lib/page-functions.js
@@ -535,6 +535,7 @@ const getNodeDetailsString = `function getNodeDetails(element) {
   return (${getNodeDetails.toString()})(element);
 }`;
 
+// TODO(esmodules): should this be refactored to export each function individually?
 export const pageFunctions = {
   wrapRuntimeEvalErrorInBrowserString: wrapRuntimeEvalErrorInBrowser.toString(),
   wrapRuntimeEvalErrorInBrowser,
diff --git a/lighthouse-core/lib/url-shim.js b/lighthouse-core/lib/url-shim.js
index 49002363d6c9..26886e29e8cf 100644
--- a/lighthouse-core/lib/url-shim.js
+++ b/lighthouse-core/lib/url-shim.js
@@ -9,9 +9,9 @@
  * URL shim so we keep our code DRY
  */
 
-import {Util} from '../util-commonjs.js';
+import {Util} from '../util-commonjs.cjs';
 
-import LHError from '../lib/lh-error.js';
+import {LighthouseError} from '../lib/lh-error.js';
 
 /** @typedef {import('./network-request.js')} NetworkRequest */
 
@@ -261,7 +261,7 @@ class URLShim extends URL {
       // Use canonicalized URL (with trailing slashes and such)
       return new URL(url).href;
     } else {
-      throw new LHError(LHError.errors.INVALID_URL);
+      throw new LighthouseError(LighthouseError.errors.INVALID_URL);
     }
   }
 }
diff --git a/lighthouse-core/package.json b/lighthouse-core/package.json
new file mode 100644
index 000000000000..bd346284783c
--- /dev/null
+++ b/lighthouse-core/package.json
@@ -0,0 +1,4 @@
+{
+  "type": "module",
+  "//": "Any directory that uses `import ... from` or `export ...` must be type module. Temporary file until root package.json is type: module"
+}
\ No newline at end of file
diff --git a/lighthouse-core/runner.js b/lighthouse-core/runner.js
index 073c8445531f..304293e1ed93 100644
--- a/lighthouse-core/runner.js
+++ b/lighthouse-core/runner.js
@@ -17,9 +17,9 @@ import assetSaver from './lib/asset-saver.js';
 import fs from 'fs';
 import path from 'path';
 import Sentry from './lib/sentry.js';
-import {generateReport} from '../report/generator/report-generator.js';
-import LHError from './lib/lh-error.js';
-import {version as lighthouseVersion} from '../package.json';
+import ReportGenerator from '../report/generator/report-generator.js';
+import {LighthouseError} from './lib/lh-error.js';
+import {lighthouseVersion} from '../root.js';
 
 /** @typedef {import('./gather/connections/connection.js').Connection} Connection */
 /** @typedef {import('./lib/arbitrary-equality-map.js').ArbitraryEqualityMap} ArbitraryEqualityMap */
@@ -122,7 +122,7 @@ class Runner {
       }
 
       // Create the HTML, JSON, and/or CSV string
-      const report = generateReport(lhr, settings.output);
+      const report = ReportGenerator.generateReport(lhr, settings.output);
 
       return {lhr, artifacts, report};
     } catch (err) {
@@ -356,7 +356,8 @@ class Runner {
         if (noArtifact || noRequiredTrace || noRequiredDevtoolsLog) {
           log.warn('Runner',
               `${artifactName} gatherer, required by audit ${audit.meta.id}, did not run.`);
-          throw new LHError(LHError.errors.MISSING_REQUIRED_ARTIFACT, {artifactName});
+          throw new LighthouseError(
+            LighthouseError.errors.MISSING_REQUIRED_ARTIFACT, {artifactName});
         }
 
         // If artifact was an error, output error result on behalf of audit.
@@ -373,7 +374,7 @@ class Runner {
             ` encountered an error: ${artifactError.message}`);
 
           // Create a friendlier display error and mark it as expected to avoid duplicates in Sentry
-          const error = new LHError(LHError.errors.ERRORED_REQUIRED_ARTIFACT,
+          const error = new LighthouseError(LighthouseError.errors.ERRORED_REQUIRED_ARTIFACT,
               {artifactName, errorMessage: artifactError.message});
           // @ts-expect-error Non-standard property added to Error
           error.expected = true;
@@ -433,7 +434,8 @@ class Runner {
     ];
 
     for (const possibleErrorArtifact of possibleErrorArtifacts) {
-      if (possibleErrorArtifact instanceof LHError && possibleErrorArtifact.lhrRuntimeError) {
+      // eslint-disable-next-line max-len
+      if (possibleErrorArtifact instanceof LighthouseError && possibleErrorArtifact.lhrRuntimeError) {
         const errorMessage = possibleErrorArtifact.friendlyMessage || possibleErrorArtifact.message;
 
         return {
diff --git a/lighthouse-core/scripts/i18n/collect-strings.js b/lighthouse-core/scripts/i18n/collect-strings.js
index 22a7913a3c27..d332f970d070 100644
--- a/lighthouse-core/scripts/i18n/collect-strings.js
+++ b/lighthouse-core/scripts/i18n/collect-strings.js
@@ -16,7 +16,7 @@ import tsc from 'typescript';
 import MessageParser from 'intl-messageformat-parser';
 import esMain from 'es-main';
 
-import {Util} from '../../../lighthouse-core/util-commonjs.js';
+import {Util} from '../../util-commonjs.cjs';
 import {collectAndBakeCtcStrings} from './bake-ctc-to-lhl.js';
 import {pruneObsoleteLhlMessages} from './prune-obsolete-lhl-messages.js';
 import {countTranslatedMessages} from './count-translated.js';
diff --git a/lighthouse-core/scripts/lantern/assert-baseline-lantern-values-unchanged.js b/lighthouse-core/scripts/lantern/assert-baseline-lantern-values-unchanged.js
index 22bc03ecaee4..c8a28bb40686 100755
--- a/lighthouse-core/scripts/lantern/assert-baseline-lantern-values-unchanged.js
+++ b/lighthouse-core/scripts/lantern/assert-baseline-lantern-values-unchanged.js
@@ -13,7 +13,7 @@ import path from 'path';
 
 import chalk from 'chalk';
 
-import constants from './constants.js';
+import * as constants from './constants.js';
 import {readJson} from '../../../root.js';
 
 const INPUT_PATH = process.argv[2] || constants.SITE_INDEX_WITH_GOLDEN_WITH_COMPUTED_PATH;
diff --git a/lighthouse-core/scripts/lantern/debug-url.js b/lighthouse-core/scripts/lantern/debug-url.js
index 1ebd9bd84a63..0f39bc8b485f 100755
--- a/lighthouse-core/scripts/lantern/debug-url.js
+++ b/lighthouse-core/scripts/lantern/debug-url.js
@@ -10,7 +10,7 @@
 import path from 'path';
 import {execFileSync} from 'child_process';
 
-import constants from './constants.js';
+import * as constants from './constants.js';
 import {LH_ROOT, readJson} from '../../../root.js';
 
 const INPUT_URL = process.argv[2];
diff --git a/lighthouse-core/scripts/lantern/print-correlations.js b/lighthouse-core/scripts/lantern/print-correlations.js
index 4538f5816cd4..68665c5f419b 100755
--- a/lighthouse-core/scripts/lantern/print-correlations.js
+++ b/lighthouse-core/scripts/lantern/print-correlations.js
@@ -18,7 +18,7 @@ import path from 'path';
 
 import chalk from 'chalk';
 
-import constants from './constants.js';
+import * as constants from './constants.js';
 import {readJson} from '../../../root.js';
 
 const GOOD_DIFF_AS_PERCENT_THRESHOLD = 0.2;
diff --git a/lighthouse-core/scripts/lantern/run-on-all-assets.js b/lighthouse-core/scripts/lantern/run-on-all-assets.js
index 4fecfbc7473d..a08d3eec9b5b 100755
--- a/lighthouse-core/scripts/lantern/run-on-all-assets.js
+++ b/lighthouse-core/scripts/lantern/run-on-all-assets.js
@@ -24,7 +24,7 @@ import fs from 'fs';
 import path from 'path';
 import {execFileSync} from 'child_process';
 
-import constants from './constants.js';
+import * as constants from './constants.js';
 import {LH_ROOT, readJson} from '../../../root.js';
 
 const INPUT_PATH = process.argv[2] || constants.SITE_INDEX_WITH_GOLDEN_PATH;
diff --git a/lighthouse-core/scripts/lantern/update-baseline-lantern-values.js b/lighthouse-core/scripts/lantern/update-baseline-lantern-values.js
index 3f1718b9112f..05878427fb67 100755
--- a/lighthouse-core/scripts/lantern/update-baseline-lantern-values.js
+++ b/lighthouse-core/scripts/lantern/update-baseline-lantern-values.js
@@ -13,7 +13,7 @@ import {execFileSync} from 'child_process';
 
 import prettyJSONStringify from 'pretty-json-stringify';
 
-import constants from './constants.js';
+import * as constants from './constants.js';
 import {LH_ROOT, readJson} from '../../../root.js';
 
 const INPUT_PATH = process.argv[2] || constants.SITE_INDEX_WITH_GOLDEN_PATH;
diff --git a/lighthouse-core/test/audits/byte-efficiency/render-blocking-resources-test.js b/lighthouse-core/test/audits/byte-efficiency/render-blocking-resources-test.js
index 8a06460bc482..55384cc81ee3 100644
--- a/lighthouse-core/test/audits/byte-efficiency/render-blocking-resources-test.js
+++ b/lighthouse-core/test/audits/byte-efficiency/render-blocking-resources-test.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import RenderBlockingResourcesAudit from '../../../audits/byte-efficiency/render-blocking-resources.js'; // eslint-disable-line max-len
-import constants from '../../../config/constants.js';
+import * as constants from '../../../config/constants.js';
 import NetworkNode from '../../../lib/dependency-graph/network-node.js';
 import CPUNode from '../../../lib/dependency-graph/cpu-node.js';
 import Simulator from '../../../lib/dependency-graph/simulator/simulator.js';
diff --git a/lighthouse-core/test/audits/content-width-test.js b/lighthouse-core/test/audits/content-width-test.js
index 4b8c445f689f..19bb38d27e38 100644
--- a/lighthouse-core/test/audits/content-width-test.js
+++ b/lighthouse-core/test/audits/content-width-test.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import Audit from '../../audits/content-width.js';
-import constants from '../../config/constants.js';
+import * as constants from '../../config/constants.js';
 import {strict as assert} from 'assert';
 
 /* eslint-env jest */
diff --git a/lighthouse-core/test/audits/metrics/first-contentful-paint-test.js b/lighthouse-core/test/audits/metrics/first-contentful-paint-test.js
index 0bd11b6edc9d..8beb4df09d0f 100644
--- a/lighthouse-core/test/audits/metrics/first-contentful-paint-test.js
+++ b/lighthouse-core/test/audits/metrics/first-contentful-paint-test.js
@@ -7,7 +7,7 @@
 import FcpAudit from '../../../audits/metrics/first-contentful-paint.js';
 import {strict as assert} from 'assert';
 const options = FcpAudit.defaultOptions;
-import constants from '../../../config/constants.js';
+import * as constants from '../../../config/constants.js';
 import pwaTrace from '../../fixtures/traces/progressive-app-m60.json';
 import pwaDevtoolsLog from '../../fixtures/traces/progressive-app-m60.devtools.log.json';
 import frameTrace from '../../fixtures/traces/frame-metrics-m90.json';
diff --git a/lighthouse-core/test/audits/metrics/first-meaningful-paint-test.js b/lighthouse-core/test/audits/metrics/first-meaningful-paint-test.js
index 448a1ec61a77..d8ddc2a18e8f 100644
--- a/lighthouse-core/test/audits/metrics/first-meaningful-paint-test.js
+++ b/lighthouse-core/test/audits/metrics/first-meaningful-paint-test.js
@@ -7,7 +7,7 @@
 
 import FMPAudit from '../../../audits/metrics/first-meaningful-paint.js';
 import Audit from '../../../audits/audit.js';
-import constants from '../../../config/constants.js';
+import * as constants from '../../../config/constants.js';
 import {strict as assert} from 'assert';
 import trace from '../../fixtures/traces/progressive-app-m60.json';
 import devtoolsLogs from '../../fixtures/traces/progressive-app-m60.devtools.log.json';
diff --git a/lighthouse-core/test/audits/metrics/interactive-test.js b/lighthouse-core/test/audits/metrics/interactive-test.js
index 87d52401b6c9..fb322140a826 100644
--- a/lighthouse-core/test/audits/metrics/interactive-test.js
+++ b/lighthouse-core/test/audits/metrics/interactive-test.js
@@ -8,7 +8,7 @@
 import Interactive from '../../../audits/metrics/interactive.js';
 import {strict as assert} from 'assert';
 const options = Interactive.defaultOptions;
-import constants from '../../../config/constants.js';
+import * as constants from '../../../config/constants.js';
 import acceptableTrace from '../../fixtures/traces/progressive-app-m60.json';
 import acceptableDevToolsLog from '../../fixtures/traces/progressive-app-m60.devtools.log.json';
 import redirectTrace from '../../fixtures/traces/site-with-redirect.json';
diff --git a/lighthouse-core/test/audits/metrics/largest-contentful-paint-test.js b/lighthouse-core/test/audits/metrics/largest-contentful-paint-test.js
index c7c3ba7d6fb0..9d7d412c581f 100644
--- a/lighthouse-core/test/audits/metrics/largest-contentful-paint-test.js
+++ b/lighthouse-core/test/audits/metrics/largest-contentful-paint-test.js
@@ -7,7 +7,7 @@
 
 import LCPAudit from '../../../audits/metrics/largest-contentful-paint.js';
 const defaultOptions = LCPAudit.defaultOptions;
-import constants from '../../../config/constants.js';
+import * as constants from '../../../config/constants.js';
 import trace from '../../fixtures/traces/lcp-m78.json';
 import devtoolsLog from '../../fixtures/traces/lcp-m78.devtools.log.json';
 import preLcpTrace from '../../fixtures/traces/progressive-app-m60.json';
diff --git a/lighthouse-core/test/audits/metrics/speed-index-test.js b/lighthouse-core/test/audits/metrics/speed-index-test.js
index 213c910e0925..da6774724fa8 100644
--- a/lighthouse-core/test/audits/metrics/speed-index-test.js
+++ b/lighthouse-core/test/audits/metrics/speed-index-test.js
@@ -11,7 +11,7 @@ import Audit from '../../../audits/metrics/speed-index.js';
 
 import {strict as assert} from 'assert';
 const options = Audit.defaultOptions;
-import constants from '../../../config/constants.js';
+import * as constants from '../../../config/constants.js';
 import pwaTrace from '../../fixtures/traces/progressive-app-m60.json';
 import pwaDevtoolsLog from '../../fixtures/traces/progressive-app-m60.devtools.log.json';
 
diff --git a/lighthouse-core/test/audits/metrics/total-blocking-time-test.js b/lighthouse-core/test/audits/metrics/total-blocking-time-test.js
index f11fa7b69109..a0969fc21579 100644
--- a/lighthouse-core/test/audits/metrics/total-blocking-time-test.js
+++ b/lighthouse-core/test/audits/metrics/total-blocking-time-test.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import TBTAudit from '../../../audits/metrics/total-blocking-time.js';
-import constants from '../../../config/constants.js';
+import * as constants from '../../../config/constants.js';
 import trace from '../../fixtures/traces/progressive-app-m60.json';
 import devtoolsLog from '../../fixtures/traces/progressive-app-m60.devtools.log.json';
 import lcpTrace from '../../fixtures/traces/lcp-m78.json';
diff --git a/lighthouse-core/test/audits/seo/font-size-test.js b/lighthouse-core/test/audits/seo/font-size-test.js
index 7300cd39a146..5994ed4e49e6 100644
--- a/lighthouse-core/test/audits/seo/font-size-test.js
+++ b/lighthouse-core/test/audits/seo/font-size-test.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import FontSizeAudit from '../../../audits/seo/font-size.js';
-import constants from '../../../config/constants.js';
+import * as constants from '../../../config/constants.js';
 import {strict as assert} from 'assert';
 
 const URL = {
diff --git a/lighthouse-core/test/audits/seo/tap-targets-test.js b/lighthouse-core/test/audits/seo/tap-targets-test.js
index cc04e89d7a9f..4feb8a9457e9 100644
--- a/lighthouse-core/test/audits/seo/tap-targets-test.js
+++ b/lighthouse-core/test/audits/seo/tap-targets-test.js
@@ -9,7 +9,7 @@
 
 import TapTargetsAudit from '../../../audits/seo/tap-targets.js';
 
-import constants from '../../../config/constants.js';
+import * as constants from '../../../config/constants.js';
 import {strict as assert} from 'assert';
 
 /** @param {LH.SharedFlagsSettings['formFactor']} formFactor */
diff --git a/lighthouse-core/test/computed/computed-artifact-test.js b/lighthouse-core/test/computed/computed-artifact-test.js
index d0c94dc8be17..cb5203adc915 100644
--- a/lighthouse-core/test/computed/computed-artifact-test.js
+++ b/lighthouse-core/test/computed/computed-artifact-test.js
@@ -9,7 +9,7 @@
 
 import {strict as assert} from 'assert';
 
-import makeComputedArtifact from '../../computed/computed-artifact.js';
+import {makeComputedArtifact} from '../../computed/computed-artifact.js';
 
 describe('ComputedArtifact base class', () => {
   it('caches computed artifacts by strict equality', async () => {
diff --git a/lighthouse-core/test/computed/metrics/lantern-speed-index-test.js b/lighthouse-core/test/computed/metrics/lantern-speed-index-test.js
index 60ff7b72fc63..901c436d4be3 100644
--- a/lighthouse-core/test/computed/metrics/lantern-speed-index-test.js
+++ b/lighthouse-core/test/computed/metrics/lantern-speed-index-test.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import constants from '../../../config/constants.js';
+import * as constants from '../../../config/constants.js';
 import LanternSpeedIndex from '../../../computed/metrics/lantern-speed-index.js';
 import {getURLArtifactFromDevtoolsLog} from '../../test-utils.js';
 import trace from '../../fixtures/traces/progressive-app-m60.json';
diff --git a/lighthouse-core/test/config/config-helpers-test.js b/lighthouse-core/test/config/config-helpers-test.js
index f2f3eced73a9..41075941e67c 100644
--- a/lighthouse-core/test/config/config-helpers-test.js
+++ b/lighthouse-core/test/config/config-helpers-test.js
@@ -21,7 +21,7 @@ import {
   mergeConfigFragment,
   mergeConfigFragmentArrayByKey,
 } from '../../config/config-helpers.js';
-import Runner from '../../runner.js';
+import {Runner} from '../../runner.js';
 import Gatherer from '../../gather/gatherers/gatherer.js';
 import ImageElementsGatherer from '../../gather/gatherers/image-elements.js';
 import UserTimingsAudit from '../../audits/user-timings.js';
diff --git a/lighthouse-core/test/config/config-test.js b/lighthouse-core/test/config/config-test.js
index 6a8f84ccf3c8..5908bf37be1e 100644
--- a/lighthouse-core/test/config/config-test.js
+++ b/lighthouse-core/test/config/config-test.js
@@ -11,7 +11,7 @@ import Config from '../../config/config.js';
 import {strict as assert} from 'assert';
 import path from 'path';
 import defaultConfig from '../../config/default-config.js';
-import constants from '../../config/constants.js';
+import * as constants from '../../config/constants.js';
 import log from 'lighthouse-logger';
 import Gatherer from '../../gather/gatherers/gatherer.js';
 import Audit from '../../audits/audit.js';
diff --git a/lighthouse-core/test/fraggle-rock/config/config-test.js b/lighthouse-core/test/fraggle-rock/config/config-test.js
index 7976f84eaf4f..feec460b289b 100644
--- a/lighthouse-core/test/fraggle-rock/config/config-test.js
+++ b/lighthouse-core/test/fraggle-rock/config/config-test.js
@@ -7,7 +7,7 @@
 
 import {jest} from '@jest/globals';
 import BaseAudit from '../../../audits/audit.js';
-import constants from '../../../config/constants.js';
+import * as constants from '../../../config/constants.js';
 import BaseGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
 import {initializeConfig} from '../../../fraggle-rock/config/config.js';
 import {LH_ROOT} from '../../../../root.js';
diff --git a/lighthouse-core/test/fraggle-rock/gather/mock-driver.js b/lighthouse-core/test/fraggle-rock/gather/mock-driver.js
index acc2cb229148..b08afcb628f0 100644
--- a/lighthouse-core/test/fraggle-rock/gather/mock-driver.js
+++ b/lighthouse-core/test/fraggle-rock/gather/mock-driver.js
@@ -17,7 +17,7 @@ import {
   createMockOnceFn,
   createMockSendCommandFn,
 } from '../../gather/mock-commands.js';
-import constants from '../../../config/constants.js';
+import * as constants from '../../../config/constants.js';
 import {fnAny} from '../../test-utils.js';
 import {LH_ROOT} from '../../../../root.js';
 
diff --git a/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js b/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
index f928768cf674..b588056c2b05 100644
--- a/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
+++ b/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
@@ -21,7 +21,7 @@ import DevtoolsLogGatherer from '../../../gather/gatherers/devtools-log.js';
 import TraceGatherer from '../../../gather/gatherers/trace.js';
 import toDevtoolsLog from '../../network-records-to-devtools-log.js';
 import {fnAny} from '../../test-utils.js';
-// import runner from '../../../fraggle-rock/gather/navigation-runner.js';
+// import {Runner} from '../../../fraggle-rock/gather/navigation-runner.js';
 
 // Some imports needs to be done dynamically, so that their dependencies will be mocked.
 // See: https://jestjs.io/docs/ecmascript-modules#differences-between-esm-and-commonjs
diff --git a/lighthouse-core/test/gather/driver/prepare-test.js b/lighthouse-core/test/gather/driver/prepare-test.js
index d781ccda9518..1310cb603ca9 100644
--- a/lighthouse-core/test/gather/driver/prepare-test.js
+++ b/lighthouse-core/test/gather/driver/prepare-test.js
@@ -11,7 +11,7 @@ import {jest} from '@jest/globals';
 import {createMockSession, createMockDriver} from '../../fraggle-rock/gather/mock-driver.js';
 import {flushAllTimersAndMicrotasks, fnAny} from '../../test-utils.js';
 // import prepare from '../../../gather/driver/prepare.js';
-import constants from '../../../config/constants.js';
+import * as constants from '../../../config/constants.js';
 
 // Some imports needs to be done dynamically, so that their dependencies will be mocked.
 // See: https://jestjs.io/docs/ecmascript-modules#differences-between-esm-and-commonjs
diff --git a/lighthouse-core/test/lib/emulation-test.js b/lighthouse-core/test/lib/emulation-test.js
index 19c73bb513e7..677e1dcff99e 100644
--- a/lighthouse-core/test/lib/emulation-test.js
+++ b/lighthouse-core/test/lib/emulation-test.js
@@ -7,7 +7,7 @@
 
 import emulation from '../../lib/emulation.js';
 import Driver from '../../gather/driver.js';
-import constants from '../../config/constants.js';
+import * as constants from '../../config/constants.js';
 import Connection from '../../gather/connections/connection.js';
 import {createMockSendCommandFn} from '../gather/mock-commands.js';
 
diff --git a/lighthouse-core/test/runner-test.js b/lighthouse-core/test/runner-test.js
index 0c52ec7b81ed..a136acbdedc4 100644
--- a/lighthouse-core/test/runner-test.js
+++ b/lighthouse-core/test/runner-test.js
@@ -8,7 +8,7 @@
 /* eslint-env jest */
 
 import {jest} from '@jest/globals';
-// import Runner from '../runner.js';
+// import {Runner} from '../runner.js';
 // import GatherRunner from '../gather/gather-runner.js';
 import driverMock from './gather/fake-driver.js';
 // import Config from '../config/config.js';
diff --git a/lighthouse-core/test/scripts/lantern/constants-test.js b/lighthouse-core/test/scripts/lantern/constants-test.js
index 0d15a975a839..ef10c38a3787 100644
--- a/lighthouse-core/test/scripts/lantern/constants-test.js
+++ b/lighthouse-core/test/scripts/lantern/constants-test.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import constants from '../../../scripts/lantern/constants.js';
+import * as constants from '../../../scripts/lantern/constants.js';
 
 /* eslint-env jest */
 
diff --git a/lighthouse-core/util-commonjs.js b/lighthouse-core/util-commonjs.cjs
similarity index 100%
rename from lighthouse-core/util-commonjs.js
rename to lighthouse-core/util-commonjs.cjs
diff --git a/root.js b/root.js
index 8e450d427851..dfc061655040 100644
--- a/root.js
+++ b/root.js
@@ -14,6 +14,7 @@ const url = require('url');
 
 module.exports = {
   LH_ROOT: __dirname,
+  lighthouseVersion: require('./package.json').version,
   /**
    * Return parsed json object.
    * Resolves path relative to importMeta.url (if provided) or LH_ROOT (if not provided).
diff --git a/tsconfig.json b/tsconfig.json
index 30fe9a02db7e..6be3f3b3d111 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,6 +16,7 @@
     "root.js",
     "lighthouse-cli/**/*.js",
     "lighthouse-core/**/*.js",
+    "lighthouse-core/util-commonjs.cjs",
     "clients/**/*.js",
     "./types/**/*.d.ts",
     "eslint-local-rules.js",
@@ -29,7 +30,7 @@
     "lighthouse-core/test/fixtures/traces/lcp-m78.devtools.log.json",
     "third-party/snyk/snapshot.json",
     "lighthouse-core/audits/byte-efficiency/polyfill-graph-data.json",
-    "shared/localization/locales/en-US.json",
+    "shared/localization/locales/en-US.json", "lighthouse-core/util-commonjs.cjs",
   ],
   "exclude": [
     "lighthouse-core/test/audits/**/*.js",
diff --git a/types/cssstyle/index.d.ts b/types/cssstyle/index.d.ts
index dd490d99626d..3cf2f0030a32 100644
--- a/types/cssstyle/index.d.ts
+++ b/types/cssstyle/index.d.ts
@@ -4,7 +4,7 @@
  * 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.
  */
 
-declare module 'cssstyle/lib/parsers' {
+declare module 'cssstyle/lib/parsers.js' {
   interface TYPES {
     INTEGER: 1;
     NUMBER: 2;

From 938ea735a24f8f786a731aa28d1ed557a03adab3 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 6 May 2022 09:18:08 -0700
Subject: [PATCH 11/96] fix

---
 build/build-bundle.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build-bundle.js b/build/build-bundle.js
index f14172faef48..40c90d26b1f8 100644
--- a/build/build-bundle.js
+++ b/build/build-bundle.js
@@ -124,7 +124,7 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
   }
 
   shimsObj[require.resolve('../package.json')] =
-    `export const version = ${pkg.version}`;
+    `export const version = '${pkg.version}';`;
 
   const bundle = await rollup({
     input: entryPath,

From bc4b2b931fa564f01bd9c2796dfeb372235aa820 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 6 May 2022 11:25:30 -0700
Subject: [PATCH 12/96] fix

---
 build/test/plugins/inline-fs-test.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build/test/plugins/inline-fs-test.js b/build/test/plugins/inline-fs-test.js
index 5fc7f3c05778..952e2c18f6fa 100644
--- a/build/test/plugins/inline-fs-test.js
+++ b/build/test/plugins/inline-fs-test.js
@@ -12,6 +12,10 @@ import path from 'path';
 
 import {inlineFs} from '../../plugins/inline-fs.js';
 import {LH_ROOT} from '../../../root.js';
+import {createCommonjsRefs} from '../../../lighthouse-core/scripts/esm-utils.js';
+
+const {require} = createCommonjsRefs(import.meta);
+
 const filepath = `${LH_ROOT}/lighthouse-core/index.js`;
 
 describe('inline-fs', () => {

From c564757b5ad61d152f26eb3b21ee8b9ec0f7d9c8 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 6 May 2022 12:26:11 -0700
Subject: [PATCH 13/96] cli --version working now

---
 lighthouse-cli/bin.js                         | 10 +++------
 .../audits/accessibility/accesskeys.js        |  2 +-
 .../audits/accessibility/aria-allowed-attr.js |  2 +-
 .../audits/accessibility/aria-command-name.js |  2 +-
 .../audits/accessibility/aria-hidden-body.js  |  2 +-
 .../audits/accessibility/aria-hidden-focus.js |  2 +-
 .../accessibility/aria-input-field-name.js    |  2 +-
 .../audits/accessibility/aria-meter-name.js   |  2 +-
 .../accessibility/aria-progressbar-name.js    |  2 +-
 .../accessibility/aria-required-attr.js       |  2 +-
 .../accessibility/aria-required-children.js   |  2 +-
 .../accessibility/aria-required-parent.js     |  2 +-
 .../audits/accessibility/aria-roles.js        |  2 +-
 .../accessibility/aria-toggle-field-name.js   |  2 +-
 .../audits/accessibility/aria-tooltip-name.js |  2 +-
 .../accessibility/aria-treeitem-name.js       |  2 +-
 .../accessibility/aria-valid-attr-value.js    |  2 +-
 .../audits/accessibility/aria-valid-attr.js   |  2 +-
 .../audits/accessibility/axe-audit.js         |  2 +-
 .../audits/accessibility/button-name.js       |  2 +-
 .../audits/accessibility/bypass.js            |  2 +-
 .../audits/accessibility/color-contrast.js    |  2 +-
 .../audits/accessibility/definition-list.js   |  2 +-
 .../audits/accessibility/dlitem.js            |  2 +-
 .../audits/accessibility/document-title.js    |  2 +-
 .../accessibility/duplicate-id-active.js      |  2 +-
 .../audits/accessibility/duplicate-id-aria.js |  2 +-
 .../form-field-multiple-labels.js             |  2 +-
 .../audits/accessibility/frame-title.js       |  2 +-
 .../audits/accessibility/heading-order.js     |  2 +-
 .../audits/accessibility/html-has-lang.js     |  2 +-
 .../audits/accessibility/html-lang-valid.js   |  2 +-
 .../audits/accessibility/image-alt.js         |  2 +-
 .../audits/accessibility/input-image-alt.js   |  2 +-
 lighthouse-core/audits/accessibility/label.js |  2 +-
 .../audits/accessibility/link-name.js         |  2 +-
 lighthouse-core/audits/accessibility/list.js  |  2 +-
 .../audits/accessibility/listitem.js          |  2 +-
 .../audits/accessibility/meta-refresh.js      |  2 +-
 .../audits/accessibility/meta-viewport.js     |  2 +-
 .../audits/accessibility/object-alt.js        |  2 +-
 .../audits/accessibility/tabindex.js          |  2 +-
 .../audits/accessibility/td-headers-attr.js   |  2 +-
 .../audits/accessibility/th-has-data-cells.js |  2 +-
 .../audits/accessibility/valid-lang.js        |  2 +-
 .../audits/accessibility/video-caption.js     |  2 +-
 lighthouse-core/audits/apple-touch-icon.js    |  2 +-
 lighthouse-core/audits/autocomplete.js        |  2 +-
 lighthouse-core/audits/bootup-time.js         |  2 +-
 .../byte-efficiency/byte-efficiency-audit.js  |  2 +-
 .../byte-efficiency/duplicated-javascript.js  |  2 +-
 .../efficient-animated-content.js             |  2 +-
 .../byte-efficiency/legacy-javascript.js      |  2 +-
 .../byte-efficiency/modern-image-formats.js   |  2 +-
 .../byte-efficiency/offscreen-images.js       |  2 +-
 .../render-blocking-resources.js              |  2 +-
 .../byte-efficiency/total-byte-weight.js      |  2 +-
 .../audits/byte-efficiency/unminified-css.js  |  2 +-
 .../byte-efficiency/unminified-javascript.js  |  2 +-
 .../byte-efficiency/unused-css-rules.js       |  2 +-
 .../byte-efficiency/unused-javascript.js      |  2 +-
 .../byte-efficiency/uses-long-cache-ttl.js    |  2 +-
 .../byte-efficiency/uses-optimized-images.js  |  2 +-
 .../uses-responsive-images-snapshot.js        |  2 +-
 .../byte-efficiency/uses-responsive-images.js |  2 +-
 .../byte-efficiency/uses-text-compression.js  |  2 +-
 lighthouse-core/audits/content-width.js       |  2 +-
 .../audits/critical-request-chains.js         |  2 +-
 lighthouse-core/audits/csp-xss.js             |  2 +-
 lighthouse-core/audits/deprecations.js        |  2 +-
 lighthouse-core/audits/dobetterweb/charset.js |  2 +-
 lighthouse-core/audits/dobetterweb/doctype.js |  2 +-
 .../audits/dobetterweb/dom-size.js            |  2 +-
 .../dobetterweb/geolocation-on-start.js       |  2 +-
 .../audits/dobetterweb/inspector-issues.js    |  2 +-
 .../audits/dobetterweb/js-libraries.js        |  2 +-
 .../audits/dobetterweb/no-document-write.js   |  2 +-
 .../dobetterweb/no-vulnerable-libraries.js    |  2 +-
 .../dobetterweb/notification-on-start.js      |  2 +-
 .../password-inputs-can-be-pasted-into.js     |  2 +-
 .../audits/dobetterweb/uses-http2.js          |  2 +-
 .../uses-passive-event-listeners.js           |  2 +-
 lighthouse-core/audits/errors-in-console.js   |  2 +-
 lighthouse-core/audits/font-display.js        |  2 +-
 lighthouse-core/audits/image-aspect-ratio.js  |  2 +-
 .../audits/image-size-responsive.js           |  2 +-
 .../audits/installable-manifest.js            |  2 +-
 lighthouse-core/audits/is-on-https.js         |  2 +-
 .../largest-contentful-paint-element.js       |  2 +-
 .../audits/layout-shift-elements.js           |  2 +-
 lighthouse-core/audits/lcp-lazy-loaded.js     |  2 +-
 lighthouse-core/audits/long-tasks.js          |  2 +-
 .../audits/mainthread-work-breakdown.js       |  2 +-
 .../audits/manual/pwa-cross-browser.js        |  2 +-
 .../audits/manual/pwa-each-page-has-url.js    |  2 +-
 .../audits/manual/pwa-page-transitions.js     |  2 +-
 lighthouse-core/audits/maskable-icon.js       |  2 +-
 .../audits/metrics/cumulative-layout-shift.js |  2 +-
 .../experimental-interaction-to-next-paint.js |  2 +-
 .../audits/metrics/first-contentful-paint.js  |  2 +-
 .../audits/metrics/first-meaningful-paint.js  |  2 +-
 lighthouse-core/audits/metrics/interactive.js |  2 +-
 .../metrics/largest-contentful-paint.js       |  2 +-
 .../audits/metrics/max-potential-fid.js       |  2 +-
 lighthouse-core/audits/metrics/speed-index.js |  2 +-
 .../audits/metrics/total-blocking-time.js     |  2 +-
 lighthouse-core/audits/network-rtt.js         |  2 +-
 .../audits/network-server-latency.js          |  2 +-
 lighthouse-core/audits/no-unload-listeners.js |  2 +-
 .../audits/non-composited-animations.js       |  2 +-
 lighthouse-core/audits/performance-budget.js  |  2 +-
 lighthouse-core/audits/predictive-perf.js     |  2 +-
 lighthouse-core/audits/preload-fonts.js       |  2 +-
 lighthouse-core/audits/preload-lcp-image.js   |  2 +-
 lighthouse-core/audits/redirects.js           |  2 +-
 lighthouse-core/audits/resource-summary.js    |  2 +-
 lighthouse-core/audits/seo/canonical.js       |  2 +-
 .../audits/seo/crawlable-anchors.js           |  2 +-
 lighthouse-core/audits/seo/font-size.js       |  2 +-
 lighthouse-core/audits/seo/hreflang.js        |  2 +-
 .../audits/seo/http-status-code.js            |  2 +-
 lighthouse-core/audits/seo/is-crawlable.js    |  2 +-
 lighthouse-core/audits/seo/link-text.js       |  2 +-
 .../audits/seo/manual/structured-data.js      |  2 +-
 .../audits/seo/meta-description.js            |  2 +-
 lighthouse-core/audits/seo/plugins.js         |  2 +-
 lighthouse-core/audits/seo/robots-txt.js      |  2 +-
 lighthouse-core/audits/seo/tap-targets.js     |  2 +-
 .../audits/server-response-time.js            |  2 +-
 lighthouse-core/audits/service-worker.js      |  2 +-
 lighthouse-core/audits/splash-screen.js       |  2 +-
 lighthouse-core/audits/themed-omnibox.js      |  2 +-
 lighthouse-core/audits/third-party-facades.js |  2 +-
 lighthouse-core/audits/third-party-summary.js |  2 +-
 lighthouse-core/audits/timing-budget.js       |  2 +-
 lighthouse-core/audits/unsized-images.js      |  2 +-
 lighthouse-core/audits/user-timings.js        |  2 +-
 lighthouse-core/audits/uses-rel-preconnect.js |  2 +-
 lighthouse-core/audits/uses-rel-preload.js    |  2 +-
 lighthouse-core/audits/valid-source-maps.js   |  2 +-
 lighthouse-core/audits/viewport.js            |  2 +-
 lighthouse-core/config/default-config.js      |  8 ++-----
 lighthouse-core/fraggle-rock/config/config.js |  3 +++
 lighthouse-core/gather/driver.js              |  6 +++--
 lighthouse-core/gather/driver/environment.js  |  5 +----
 lighthouse-core/gather/driver/navigation.js   |  6 +----
 lighthouse-core/gather/driver/storage.js      |  5 +----
 lighthouse-core/gather/gatherers/stacks.js    |  2 +-
 lighthouse-core/index.js                      | 22 ++++++++++++-------
 lighthouse-core/lib/csp-evaluator.js          |  2 +-
 lighthouse-core/lib/emulation.js              |  2 +-
 lighthouse-core/lib/i18n/README.md            |  2 +-
 lighthouse-core/lib/i18n/i18n.js              |  2 ++
 lighthouse-core/lib/lh-error.js               |  5 +----
 lighthouse-core/lib/sentry.js                 |  2 +-
 lighthouse-core/runner.js                     |  2 +-
 .../test/config/config-plugin-test.js         |  5 +----
 lighthouse-core/test/runner-test.js           |  5 ++---
 shared/test/localization/format-test.js       | 12 +++++-----
 159 files changed, 187 insertions(+), 199 deletions(-)

diff --git a/lighthouse-cli/bin.js b/lighthouse-cli/bin.js
index 1d25c5b58cd4..743a2f201ae7 100644
--- a/lighthouse-cli/bin.js
+++ b/lighthouse-cli/bin.js
@@ -20,7 +20,6 @@
 import fs from 'fs';
 import path from 'path';
 import url from 'url';
-import module from 'module';
 
 import log from 'lighthouse-logger';
 
@@ -28,16 +27,13 @@ import * as commands from './commands/commands.js';
 import * as Printer from './printer.js';
 import {getFlags} from './cli-flags.js';
 import {runLighthouse} from './run.js';
-import lighthouse from '../lighthouse-core/index.js';
+import {generateConfig} from '../lighthouse-core/index.js';
 import {askPermission} from './sentry-prompt.js';
 import {LH_ROOT} from '../root.js';
+import {Sentry} from '../lighthouse-core/lib/sentry.js';
 
 const pkg = JSON.parse(fs.readFileSync(LH_ROOT + '/package.json', 'utf-8'));
 
-// TODO(esmodules): use regular import when this file is esm.
-const require = module.createRequire(import.meta.url);
-const Sentry = require('../lighthouse-core/lib/sentry.js');
-
 /**
  * @return {boolean}
  */
@@ -120,7 +116,7 @@ async function begin() {
   }
 
   if (cliFlags.printConfig) {
-    const config = lighthouse.generateConfig(configJson, cliFlags);
+    const config = generateConfig(configJson, cliFlags);
     process.stdout.write(config.getPrintString());
     return;
   }
diff --git a/lighthouse-core/audits/accessibility/accesskeys.js b/lighthouse-core/audits/accessibility/accesskeys.js
index 75e9f9652a18..20f319b15bd9 100644
--- a/lighthouse-core/audits/accessibility/accesskeys.js
+++ b/lighthouse-core/audits/accessibility/accesskeys.js
@@ -25,7 +25,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/accesskeys).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class Accesskeys extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/aria-allowed-attr.js b/lighthouse-core/audits/accessibility/aria-allowed-attr.js
index 89d4fc7e70c1..6d982bcf5f3b 100644
--- a/lighthouse-core/audits/accessibility/aria-allowed-attr.js
+++ b/lighthouse-core/audits/accessibility/aria-allowed-attr.js
@@ -25,7 +25,7 @@ const UIStrings = {
       'more](https://dequeuniversity.com/rules/axe/4.4/aria-allowed-attr).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class ARIAAllowedAttr extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/aria-command-name.js b/lighthouse-core/audits/accessibility/aria-command-name.js
index 743324cdf416..d81fb025e73f 100644
--- a/lighthouse-core/audits/accessibility/aria-command-name.js
+++ b/lighthouse-core/audits/accessibility/aria-command-name.js
@@ -23,7 +23,7 @@ const UIStrings = {
   description: 'When an element doesn\'t have an accessible name, screen readers announce it with a generic name, making it unusable for users who rely on screen readers. [Learn more](https://dequeuniversity.com/rules/axe/4.4/aria-command-name).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class AriaCommandName extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/aria-hidden-body.js b/lighthouse-core/audits/accessibility/aria-hidden-body.js
index ac013411d847..72e4690dd557 100644
--- a/lighthouse-core/audits/accessibility/aria-hidden-body.js
+++ b/lighthouse-core/audits/accessibility/aria-hidden-body.js
@@ -23,7 +23,7 @@ const UIStrings = {
   description: 'Assistive technologies, like screen readers, work inconsistently when `aria-hidden="true"` is set on the document `<body>`. [Learn more](https://dequeuniversity.com/rules/axe/4.4/aria-hidden-body).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class AriaHiddenBody extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/aria-hidden-focus.js b/lighthouse-core/audits/accessibility/aria-hidden-focus.js
index 50353f10e080..67f98bed3ab6 100644
--- a/lighthouse-core/audits/accessibility/aria-hidden-focus.js
+++ b/lighthouse-core/audits/accessibility/aria-hidden-focus.js
@@ -23,7 +23,7 @@ const UIStrings = {
   description: 'Focusable descendents within an `[aria-hidden="true"]` element prevent those interactive elements from being available to users of assistive technologies like screen readers. [Learn more](https://dequeuniversity.com/rules/axe/4.4/aria-hidden-focus).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class AriaHiddenFocus extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/aria-input-field-name.js b/lighthouse-core/audits/accessibility/aria-input-field-name.js
index 41b78b50fa1b..7e5bf6c46759 100644
--- a/lighthouse-core/audits/accessibility/aria-input-field-name.js
+++ b/lighthouse-core/audits/accessibility/aria-input-field-name.js
@@ -23,7 +23,7 @@ const UIStrings = {
   description: 'When an input field doesn\'t have an accessible name, screen readers announce it with a generic name, making it unusable for users who rely on screen readers. [Learn more](https://dequeuniversity.com/rules/axe/4.4/aria-input-field-name).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class AriaInputFieldName extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/aria-meter-name.js b/lighthouse-core/audits/accessibility/aria-meter-name.js
index 6722397deb3b..f9a199dbde3c 100644
--- a/lighthouse-core/audits/accessibility/aria-meter-name.js
+++ b/lighthouse-core/audits/accessibility/aria-meter-name.js
@@ -23,7 +23,7 @@ const UIStrings = {
   description: 'When an element doesn\'t have an accessible name, screen readers announce it with a generic name, making it unusable for users who rely on screen readers. [Learn more](https://dequeuniversity.com/rules/axe/4.4/aria-meter-name).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class AriaMeterName extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/aria-progressbar-name.js b/lighthouse-core/audits/accessibility/aria-progressbar-name.js
index 8c97360aecdc..6d4652337234 100644
--- a/lighthouse-core/audits/accessibility/aria-progressbar-name.js
+++ b/lighthouse-core/audits/accessibility/aria-progressbar-name.js
@@ -23,7 +23,7 @@ const UIStrings = {
   description: 'When a `progressbar` element doesn\'t have an accessible name, screen readers announce it with a generic name, making it unusable for users who rely on screen readers. [Learn more](https://dequeuniversity.com/rules/axe/4.4/aria-progressbar-name).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class AriaProgressbarName extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/aria-required-attr.js b/lighthouse-core/audits/accessibility/aria-required-attr.js
index 2b512f246ffd..6c5ba1f49568 100644
--- a/lighthouse-core/audits/accessibility/aria-required-attr.js
+++ b/lighthouse-core/audits/accessibility/aria-required-attr.js
@@ -24,7 +24,7 @@ const UIStrings = {
       'of the element to screen readers. [Learn more](https://dequeuniversity.com/rules/axe/4.4/aria-required-attr).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class ARIARequiredAttr extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/aria-required-children.js b/lighthouse-core/audits/accessibility/aria-required-children.js
index b0c0172ad67b..f51de5a78a2f 100644
--- a/lighthouse-core/audits/accessibility/aria-required-children.js
+++ b/lighthouse-core/audits/accessibility/aria-required-children.js
@@ -28,7 +28,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/aria-required-children).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class AriaRequiredChildren extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/aria-required-parent.js b/lighthouse-core/audits/accessibility/aria-required-parent.js
index f3e5e514a767..173b50e98cfd 100644
--- a/lighthouse-core/audits/accessibility/aria-required-parent.js
+++ b/lighthouse-core/audits/accessibility/aria-required-parent.js
@@ -26,7 +26,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/aria-required-parent).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class AriaRequiredParent extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/aria-roles.js b/lighthouse-core/audits/accessibility/aria-roles.js
index 75e67561ebf2..a66d3a744edd 100644
--- a/lighthouse-core/audits/accessibility/aria-roles.js
+++ b/lighthouse-core/audits/accessibility/aria-roles.js
@@ -25,7 +25,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/aria-roles).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class AriaRoles extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/aria-toggle-field-name.js b/lighthouse-core/audits/accessibility/aria-toggle-field-name.js
index dc7112ecf32d..17c353f9e0aa 100644
--- a/lighthouse-core/audits/accessibility/aria-toggle-field-name.js
+++ b/lighthouse-core/audits/accessibility/aria-toggle-field-name.js
@@ -23,7 +23,7 @@ const UIStrings = {
   description: 'When a toggle field doesn\'t have an accessible name, screen readers announce it with a generic name, making it unusable for users who rely on screen readers. [Learn more](https://dequeuniversity.com/rules/axe/4.4/aria-toggle-field-name).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class AriaToggleFieldName extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/aria-tooltip-name.js b/lighthouse-core/audits/accessibility/aria-tooltip-name.js
index 79c4b283bb2a..a96db496f147 100644
--- a/lighthouse-core/audits/accessibility/aria-tooltip-name.js
+++ b/lighthouse-core/audits/accessibility/aria-tooltip-name.js
@@ -23,7 +23,7 @@ const UIStrings = {
   description: 'When an element doesn\'t have an accessible name, screen readers announce it with a generic name, making it unusable for users who rely on screen readers. [Learn more](https://dequeuniversity.com/rules/axe/4.4/aria-tooltip-name).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class AriaTooltipName extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/aria-treeitem-name.js b/lighthouse-core/audits/accessibility/aria-treeitem-name.js
index 378eadf40e5d..e42c66ad4b96 100644
--- a/lighthouse-core/audits/accessibility/aria-treeitem-name.js
+++ b/lighthouse-core/audits/accessibility/aria-treeitem-name.js
@@ -23,7 +23,7 @@ const UIStrings = {
   description: 'When an element doesn\'t have an accessible name, screen readers announce it with a generic name, making it unusable for users who rely on screen readers. [Learn more](https://dequeuniversity.com/rules/axe/4.4/aria-treeitem-name).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class AriaTreeitemName extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/aria-valid-attr-value.js b/lighthouse-core/audits/accessibility/aria-valid-attr-value.js
index 5cfb9fa96716..e98106915b10 100644
--- a/lighthouse-core/audits/accessibility/aria-valid-attr-value.js
+++ b/lighthouse-core/audits/accessibility/aria-valid-attr-value.js
@@ -25,7 +25,7 @@ const UIStrings = {
       'more](https://dequeuniversity.com/rules/axe/4.4/aria-valid-attr-value).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class ARIAValidAttr extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/aria-valid-attr.js b/lighthouse-core/audits/accessibility/aria-valid-attr.js
index 97d7b82539a0..0deede7a0d01 100644
--- a/lighthouse-core/audits/accessibility/aria-valid-attr.js
+++ b/lighthouse-core/audits/accessibility/aria-valid-attr.js
@@ -25,7 +25,7 @@ const UIStrings = {
       'more](https://dequeuniversity.com/rules/axe/4.4/aria-valid-attr).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class ARIAValidAttr extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/axe-audit.js b/lighthouse-core/audits/accessibility/axe-audit.js
index 61f8b63e51f6..9611ee781f40 100644
--- a/lighthouse-core/audits/accessibility/axe-audit.js
+++ b/lighthouse-core/audits/accessibility/axe-audit.js
@@ -19,7 +19,7 @@ const UIStrings = {
   failingElementsHeader: 'Failing Elements',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class AxeAudit extends Audit {
   /**
diff --git a/lighthouse-core/audits/accessibility/button-name.js b/lighthouse-core/audits/accessibility/button-name.js
index ee04929f82dd..c131e8360e00 100644
--- a/lighthouse-core/audits/accessibility/button-name.js
+++ b/lighthouse-core/audits/accessibility/button-name.js
@@ -25,7 +25,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/button-name).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class ButtonName extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/bypass.js b/lighthouse-core/audits/accessibility/bypass.js
index 62a79538b867..ed5931ae09af 100644
--- a/lighthouse-core/audits/accessibility/bypass.js
+++ b/lighthouse-core/audits/accessibility/bypass.js
@@ -26,7 +26,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/bypass).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class Bypass extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/color-contrast.js b/lighthouse-core/audits/accessibility/color-contrast.js
index 8cddfc4e2cd5..d161f58d7cd5 100644
--- a/lighthouse-core/audits/accessibility/color-contrast.js
+++ b/lighthouse-core/audits/accessibility/color-contrast.js
@@ -26,7 +26,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/color-contrast).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class ColorContrast extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/definition-list.js b/lighthouse-core/audits/accessibility/definition-list.js
index 2bdccff7e59c..17d93816269a 100644
--- a/lighthouse-core/audits/accessibility/definition-list.js
+++ b/lighthouse-core/audits/accessibility/definition-list.js
@@ -27,7 +27,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/definition-list).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class DefinitionList extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/dlitem.js b/lighthouse-core/audits/accessibility/dlitem.js
index 425e63678197..99c50c7498ec 100644
--- a/lighthouse-core/audits/accessibility/dlitem.js
+++ b/lighthouse-core/audits/accessibility/dlitem.js
@@ -25,7 +25,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/dlitem).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class DLItem extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/document-title.js b/lighthouse-core/audits/accessibility/document-title.js
index 0418af15493c..f21cf5d9cc25 100644
--- a/lighthouse-core/audits/accessibility/document-title.js
+++ b/lighthouse-core/audits/accessibility/document-title.js
@@ -25,7 +25,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/document-title).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class DocumentTitle extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/duplicate-id-active.js b/lighthouse-core/audits/accessibility/duplicate-id-active.js
index b1805a82e393..ca5ed97400ee 100644
--- a/lighthouse-core/audits/accessibility/duplicate-id-active.js
+++ b/lighthouse-core/audits/accessibility/duplicate-id-active.js
@@ -23,7 +23,7 @@ const UIStrings = {
   description: 'All focusable elements must have a unique `id` to ensure that they\'re visible to assistive technologies. [Learn more](https://dequeuniversity.com/rules/axe/4.4/duplicate-id-active).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class DuplicateIdActive extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/duplicate-id-aria.js b/lighthouse-core/audits/accessibility/duplicate-id-aria.js
index b5a94332a1c2..133e2e9aeb24 100644
--- a/lighthouse-core/audits/accessibility/duplicate-id-aria.js
+++ b/lighthouse-core/audits/accessibility/duplicate-id-aria.js
@@ -23,7 +23,7 @@ const UIStrings = {
   description: 'The value of an ARIA ID must be unique to prevent other instances from being overlooked by assistive technologies. [Learn more](https://dequeuniversity.com/rules/axe/4.4/duplicate-id-aria).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class DuplicateIdAria extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/form-field-multiple-labels.js b/lighthouse-core/audits/accessibility/form-field-multiple-labels.js
index 645a884f1133..e2e482c9cf43 100644
--- a/lighthouse-core/audits/accessibility/form-field-multiple-labels.js
+++ b/lighthouse-core/audits/accessibility/form-field-multiple-labels.js
@@ -23,7 +23,7 @@ const UIStrings = {
   description: 'Form fields with multiple labels can be confusingly announced by assistive technologies like screen readers which use either the first, the last, or all of the labels. [Learn more](https://dequeuniversity.com/rules/axe/4.4/form-field-multiple-labels).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class FormFieldMultipleLabels extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/frame-title.js b/lighthouse-core/audits/accessibility/frame-title.js
index 8b31bec491d8..871e666008f2 100644
--- a/lighthouse-core/audits/accessibility/frame-title.js
+++ b/lighthouse-core/audits/accessibility/frame-title.js
@@ -24,7 +24,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/frame-title).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class FrameTitle extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/heading-order.js b/lighthouse-core/audits/accessibility/heading-order.js
index 84a314f89598..57925904a387 100644
--- a/lighthouse-core/audits/accessibility/heading-order.js
+++ b/lighthouse-core/audits/accessibility/heading-order.js
@@ -23,7 +23,7 @@ const UIStrings = {
   description: 'Properly ordered headings that do not skip levels convey the semantic structure of the page, making it easier to navigate and understand when using assistive technologies. [Learn more](https://dequeuniversity.com/rules/axe/4.4/heading-order).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class HeadingOrder extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/html-has-lang.js b/lighthouse-core/audits/accessibility/html-has-lang.js
index 0d4f83285063..5a13ddfd9101 100644
--- a/lighthouse-core/audits/accessibility/html-has-lang.js
+++ b/lighthouse-core/audits/accessibility/html-has-lang.js
@@ -27,7 +27,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/html-has-lang).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class HTMLHasLang extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/html-lang-valid.js b/lighthouse-core/audits/accessibility/html-lang-valid.js
index 4bc2c1534de4..1f19320bf859 100644
--- a/lighthouse-core/audits/accessibility/html-lang-valid.js
+++ b/lighthouse-core/audits/accessibility/html-lang-valid.js
@@ -26,7 +26,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/html-lang-valid).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class HTMLLangValid extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/image-alt.js b/lighthouse-core/audits/accessibility/image-alt.js
index a9a8ffe29ea1..354018a8e10f 100644
--- a/lighthouse-core/audits/accessibility/image-alt.js
+++ b/lighthouse-core/audits/accessibility/image-alt.js
@@ -25,7 +25,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/image-alt).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class ImageAlt extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/input-image-alt.js b/lighthouse-core/audits/accessibility/input-image-alt.js
index 696e58e40554..98ef5270a5f4 100644
--- a/lighthouse-core/audits/accessibility/input-image-alt.js
+++ b/lighthouse-core/audits/accessibility/input-image-alt.js
@@ -25,7 +25,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/input-image-alt).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class InputImageAlt extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/label.js b/lighthouse-core/audits/accessibility/label.js
index 16cf7c4c2c76..6a431a0b6c14 100644
--- a/lighthouse-core/audits/accessibility/label.js
+++ b/lighthouse-core/audits/accessibility/label.js
@@ -25,7 +25,7 @@ const UIStrings = {
       'more](https://dequeuniversity.com/rules/axe/4.4/label).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class Label extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/link-name.js b/lighthouse-core/audits/accessibility/link-name.js
index 1a36a979d9c0..62738a48b3f0 100644
--- a/lighthouse-core/audits/accessibility/link-name.js
+++ b/lighthouse-core/audits/accessibility/link-name.js
@@ -26,7 +26,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/link-name).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class LinkName extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/list.js b/lighthouse-core/audits/accessibility/list.js
index 020f97e815c7..36f1f65c0f3e 100644
--- a/lighthouse-core/audits/accessibility/list.js
+++ b/lighthouse-core/audits/accessibility/list.js
@@ -27,7 +27,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/list).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class List extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/listitem.js b/lighthouse-core/audits/accessibility/listitem.js
index a66c136e4028..1a9daa4775a2 100644
--- a/lighthouse-core/audits/accessibility/listitem.js
+++ b/lighthouse-core/audits/accessibility/listitem.js
@@ -26,7 +26,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/listitem).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class ListItem extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/meta-refresh.js b/lighthouse-core/audits/accessibility/meta-refresh.js
index 415a2beb933d..0c07c06c67bc 100644
--- a/lighthouse-core/audits/accessibility/meta-refresh.js
+++ b/lighthouse-core/audits/accessibility/meta-refresh.js
@@ -26,7 +26,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/meta-refresh).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class MetaRefresh extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/meta-viewport.js b/lighthouse-core/audits/accessibility/meta-viewport.js
index 3be716728797..f4a330db5ca2 100644
--- a/lighthouse-core/audits/accessibility/meta-viewport.js
+++ b/lighthouse-core/audits/accessibility/meta-viewport.js
@@ -27,7 +27,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/meta-viewport).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class MetaViewport extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/object-alt.js b/lighthouse-core/audits/accessibility/object-alt.js
index 4bdffa78b5a5..b3f239b332b7 100644
--- a/lighthouse-core/audits/accessibility/object-alt.js
+++ b/lighthouse-core/audits/accessibility/object-alt.js
@@ -25,7 +25,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/object-alt).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class ObjectAlt extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/tabindex.js b/lighthouse-core/audits/accessibility/tabindex.js
index b73317e2b2a0..d9a2bd5d7be3 100644
--- a/lighthouse-core/audits/accessibility/tabindex.js
+++ b/lighthouse-core/audits/accessibility/tabindex.js
@@ -25,7 +25,7 @@ const UIStrings = {
       'for users who rely on assistive technologies. [Learn more](https://dequeuniversity.com/rules/axe/4.4/tabindex).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class TabIndex extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/td-headers-attr.js b/lighthouse-core/audits/accessibility/td-headers-attr.js
index aae97106a4d8..bbb35ea7cdba 100644
--- a/lighthouse-core/audits/accessibility/td-headers-attr.js
+++ b/lighthouse-core/audits/accessibility/td-headers-attr.js
@@ -29,7 +29,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/td-headers-attr).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class TDHeadersAttr extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/th-has-data-cells.js b/lighthouse-core/audits/accessibility/th-has-data-cells.js
index 047e599519aa..1d5a90dd9d6f 100644
--- a/lighthouse-core/audits/accessibility/th-has-data-cells.js
+++ b/lighthouse-core/audits/accessibility/th-has-data-cells.js
@@ -28,7 +28,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/th-has-data-cells).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class THHasDataCells extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/valid-lang.js b/lighthouse-core/audits/accessibility/valid-lang.js
index 5a90a6e4825a..85df523e40b1 100644
--- a/lighthouse-core/audits/accessibility/valid-lang.js
+++ b/lighthouse-core/audits/accessibility/valid-lang.js
@@ -25,7 +25,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/valid-lang).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class ValidLang extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/accessibility/video-caption.js b/lighthouse-core/audits/accessibility/video-caption.js
index f2c16fb2016f..bb2f0f5738e6 100644
--- a/lighthouse-core/audits/accessibility/video-caption.js
+++ b/lighthouse-core/audits/accessibility/video-caption.js
@@ -26,7 +26,7 @@ const UIStrings = {
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/video-caption).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class VideoCaption extends AxeAudit {
   /**
diff --git a/lighthouse-core/audits/apple-touch-icon.js b/lighthouse-core/audits/apple-touch-icon.js
index 213e661feb40..1faca5aa4df3 100644
--- a/lighthouse-core/audits/apple-touch-icon.js
+++ b/lighthouse-core/audits/apple-touch-icon.js
@@ -26,7 +26,7 @@ const UIStrings = {
     '`apple-touch-icon` is preferred.',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class AppleTouchIcon extends Audit {
   /**
diff --git a/lighthouse-core/audits/autocomplete.js b/lighthouse-core/audits/autocomplete.js
index 319aac5c25f9..7d6bb18f1c00 100644
--- a/lighthouse-core/audits/autocomplete.js
+++ b/lighthouse-core/audits/autocomplete.js
@@ -48,7 +48,7 @@ const UIStrings = {
   manualReview: 'Requires manual review',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /** @type {string[]} This array contains all acceptable autocomplete attributes from the WHATWG standard. More found at https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#autofill */
 const validAutocompleteTokens = ['name', 'honorific-prefix', 'given-name',
diff --git a/lighthouse-core/audits/bootup-time.js b/lighthouse-core/audits/bootup-time.js
index db27952de9c3..1c8faf92167e 100644
--- a/lighthouse-core/audits/bootup-time.js
+++ b/lighthouse-core/audits/bootup-time.js
@@ -32,7 +32,7 @@ const UIStrings = {
     'Try auditing the page in incognito mode or from a Chrome profile without extensions.',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 // These trace events, when not triggered by a script inside a particular task, are just general Chrome overhead.
 const BROWSER_TASK_NAMES_SET = new Set([
diff --git a/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js b/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js
index 958166c03fa4..e452177ad1bb 100644
--- a/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js
+++ b/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js
@@ -13,7 +13,7 @@ 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.createMessageInstanceIdFn(__filename, {});
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, {});
 
 /** @typedef {import('../../lib/dependency-graph/simulator/simulator')} Simulator */
 /** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
diff --git a/lighthouse-core/audits/byte-efficiency/duplicated-javascript.js b/lighthouse-core/audits/byte-efficiency/duplicated-javascript.js
index 4a734f888429..0f77280e4aba 100644
--- a/lighthouse-core/audits/byte-efficiency/duplicated-javascript.js
+++ b/lighthouse-core/audits/byte-efficiency/duplicated-javascript.js
@@ -25,7 +25,7 @@ const UIStrings = {
   // '[Learn more](https://web.dev/duplicated-javascript/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 const IGNORE_THRESHOLD_IN_BYTES = 1024;
 
diff --git a/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js b/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js
index 09678ccd565e..609651b2f5cf 100644
--- a/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js
+++ b/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js
@@ -21,7 +21,7 @@ const UIStrings = {
     'network bytes. [Learn more](https://web.dev/efficient-animated-content/)',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 // If GIFs are above this size, we'll flag them
 // See https://github.com/GoogleChrome/lighthouse/pull/4885#discussion_r178406623 and https://github.com/GoogleChrome/lighthouse/issues/4696#issuecomment-370979920
diff --git a/lighthouse-core/audits/byte-efficiency/legacy-javascript.js b/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
index dcc6fd763a5a..c9ec89e4d05d 100644
--- a/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
+++ b/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
@@ -34,7 +34,7 @@ const UIStrings = {
   description: 'Polyfills and transforms enable legacy browsers to use new JavaScript features. However, many aren\'t necessary for modern browsers. For your bundled JavaScript, adopt a modern script deployment strategy using module/nomodule feature detection to reduce the amount of code shipped to modern browsers, while retaining support for legacy browsers. [Learn More](https://web.dev/publish-modern-javascript/)',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * Takes a list of patterns (consisting of a name identifier and a RegExp expression string)
diff --git a/lighthouse-core/audits/byte-efficiency/modern-image-formats.js b/lighthouse-core/audits/byte-efficiency/modern-image-formats.js
index 547e24627e0a..04007aea0c97 100644
--- a/lighthouse-core/audits/byte-efficiency/modern-image-formats.js
+++ b/lighthouse-core/audits/byte-efficiency/modern-image-formats.js
@@ -21,7 +21,7 @@ const UIStrings = {
     '[Learn more](https://web.dev/uses-webp-images/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 const IGNORE_THRESHOLD_IN_BYTES = 8192;
 
diff --git a/lighthouse-core/audits/byte-efficiency/offscreen-images.js b/lighthouse-core/audits/byte-efficiency/offscreen-images.js
index 001a8f996427..f9ed88434973 100644
--- a/lighthouse-core/audits/byte-efficiency/offscreen-images.js
+++ b/lighthouse-core/audits/byte-efficiency/offscreen-images.js
@@ -27,7 +27,7 @@ const UIStrings = {
     '[Learn more](https://web.dev/offscreen-images/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 // See https://github.com/GoogleChrome/lighthouse/issues/10471 for discussion about the thresholds here.
 const ALLOWABLE_OFFSCREEN_IN_PX = 100;
diff --git a/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js b/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js
index d05a419625a8..5d9a67d12515 100644
--- a/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js
+++ b/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js
@@ -39,7 +39,7 @@ const UIStrings = {
     'JS/styles. [Learn more](https://web.dev/render-blocking-resources/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * Given a simulation's nodeTimings, return an object with the nodes/timing keyed by network URL
diff --git a/lighthouse-core/audits/byte-efficiency/total-byte-weight.js b/lighthouse-core/audits/byte-efficiency/total-byte-weight.js
index 31721d16ee01..ffc217239f86 100644
--- a/lighthouse-core/audits/byte-efficiency/total-byte-weight.js
+++ b/lighthouse-core/audits/byte-efficiency/total-byte-weight.js
@@ -24,7 +24,7 @@ const UIStrings = {
   displayValue: 'Total size was {totalBytes, number, bytes}\xa0KiB',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class TotalByteWeight extends Audit {
   /**
diff --git a/lighthouse-core/audits/byte-efficiency/unminified-css.js b/lighthouse-core/audits/byte-efficiency/unminified-css.js
index b8ca3250a0f3..420a6096a919 100644
--- a/lighthouse-core/audits/byte-efficiency/unminified-css.js
+++ b/lighthouse-core/audits/byte-efficiency/unminified-css.js
@@ -18,7 +18,7 @@ const UIStrings = {
     '[Learn more](https://web.dev/unminified-css/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 const IGNORE_THRESHOLD_IN_PERCENT = 5;
 const IGNORE_THRESHOLD_IN_BYTES = 2048;
diff --git a/lighthouse-core/audits/byte-efficiency/unminified-javascript.js b/lighthouse-core/audits/byte-efficiency/unminified-javascript.js
index f0764ae48638..f2b0516e92ee 100644
--- a/lighthouse-core/audits/byte-efficiency/unminified-javascript.js
+++ b/lighthouse-core/audits/byte-efficiency/unminified-javascript.js
@@ -18,7 +18,7 @@ const UIStrings = {
     '[Learn more](https://web.dev/unminified-javascript/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 const IGNORE_THRESHOLD_IN_PERCENT = 10;
 const IGNORE_THRESHOLD_IN_BYTES = 2048;
diff --git a/lighthouse-core/audits/byte-efficiency/unused-css-rules.js b/lighthouse-core/audits/byte-efficiency/unused-css-rules.js
index ca9c633e953f..e5d79eb9f8ad 100644
--- a/lighthouse-core/audits/byte-efficiency/unused-css-rules.js
+++ b/lighthouse-core/audits/byte-efficiency/unused-css-rules.js
@@ -18,7 +18,7 @@ const UIStrings = {
     '[Learn more](https://web.dev/unused-css-rules/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 // Allow 10KiB of unused CSS to permit `:hover` and other styles not used on a non-interactive load.
 // @see https://github.com/GoogleChrome/lighthouse/issues/9353 for more discussion.
diff --git a/lighthouse-core/audits/byte-efficiency/unused-javascript.js b/lighthouse-core/audits/byte-efficiency/unused-javascript.js
index 34983fa76405..5473d05be7a5 100644
--- a/lighthouse-core/audits/byte-efficiency/unused-javascript.js
+++ b/lighthouse-core/audits/byte-efficiency/unused-javascript.js
@@ -19,7 +19,7 @@ const UIStrings = {
     'decrease bytes consumed by network activity. [Learn more](https://web.dev/unused-javascript/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 const UNUSED_BYTES_IGNORE_THRESHOLD = 20 * 1024;
 const UNUSED_BYTES_IGNORE_BUNDLE_SOURCE_THRESHOLD = 512;
diff --git a/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js b/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js
index d61a7d2e267d..c7c0c9228fbc 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js
@@ -29,7 +29,7 @@ const UIStrings = {
     }`,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 // Ignore assets that have very high likelihood of cache hit
 const IGNORE_THRESHOLD_IN_PERCENT = 0.925;
diff --git a/lighthouse-core/audits/byte-efficiency/uses-optimized-images.js b/lighthouse-core/audits/byte-efficiency/uses-optimized-images.js
index 7ec7288e5a75..3212c8a23326 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-optimized-images.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-optimized-images.js
@@ -21,7 +21,7 @@ const UIStrings = {
   '[Learn more](https://web.dev/uses-optimized-images/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 const IGNORE_THRESHOLD_IN_BYTES = 4096;
 
diff --git a/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js b/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js
index 292abdd1cbdf..604f0f447d36 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js
@@ -27,7 +27,7 @@ const UIStrings = {
   columnActualDimensions: 'Actual dimensions',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 // Based on byte threshold of 4096, with 3 bytes per pixel.
 const IGNORE_THRESHOLD_IN_PIXELS = 1365;
diff --git a/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js b/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js
index 064b7eb697f6..f40f36d076b6 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js
@@ -29,7 +29,7 @@ const UIStrings = {
   '[Learn more](https://web.dev/uses-responsive-images/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 const IGNORE_THRESHOLD_IN_BYTES = 4096;
 
diff --git a/lighthouse-core/audits/byte-efficiency/uses-text-compression.js b/lighthouse-core/audits/byte-efficiency/uses-text-compression.js
index f621c9858c33..8c7070c06b46 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-text-compression.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-text-compression.js
@@ -22,7 +22,7 @@ const UIStrings = {
     ' [Learn more](https://web.dev/uses-text-compression/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 const IGNORE_THRESHOLD_IN_BYTES = 1400;
 const IGNORE_THRESHOLD_IN_PERCENT = 0.1;
diff --git a/lighthouse-core/audits/content-width.js b/lighthouse-core/audits/content-width.js
index d12890861e60..8a6bb809476c 100644
--- a/lighthouse-core/audits/content-width.js
+++ b/lighthouse-core/audits/content-width.js
@@ -26,7 +26,7 @@ const UIStrings = {
     'size of {outerWidth}px.',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class ContentWidth extends Audit {
   /**
diff --git a/lighthouse-core/audits/critical-request-chains.js b/lighthouse-core/audits/critical-request-chains.js
index fe4f377c0bdc..f0eea7662554 100644
--- a/lighthouse-core/audits/critical-request-chains.js
+++ b/lighthouse-core/audits/critical-request-chains.js
@@ -25,7 +25,7 @@ const UIStrings = {
     }`,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class CriticalRequestChains extends Audit {
   /**
diff --git a/lighthouse-core/audits/csp-xss.js b/lighthouse-core/audits/csp-xss.js
index 93af42ee340e..7ffe32642fe9 100644
--- a/lighthouse-core/audits/csp-xss.js
+++ b/lighthouse-core/audits/csp-xss.js
@@ -32,7 +32,7 @@ const UIStrings = {
   itemSeveritySyntax: 'Syntax',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class CspXss extends Audit {
   /**
diff --git a/lighthouse-core/audits/deprecations.js b/lighthouse-core/audits/deprecations.js
index 920f45bd37a3..f9b17dd58c2b 100644
--- a/lighthouse-core/audits/deprecations.js
+++ b/lighthouse-core/audits/deprecations.js
@@ -33,7 +33,7 @@ const UIStrings = {
   columnLine: 'Line',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class Deprecations extends Audit {
   /**
diff --git a/lighthouse-core/audits/dobetterweb/charset.js b/lighthouse-core/audits/dobetterweb/charset.js
index acee3da6c835..632b48db4526 100644
--- a/lighthouse-core/audits/dobetterweb/charset.js
+++ b/lighthouse-core/audits/dobetterweb/charset.js
@@ -27,7 +27,7 @@ const UIStrings = {
     '[Learn more](https://web.dev/charset/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 const CONTENT_TYPE_HEADER = 'content-type';
 // /^[a-zA-Z0-9-_:.()]{2,}$/ matches all known IANA charset names (https://www.iana.org/assignments/character-sets/character-sets.xhtml)
diff --git a/lighthouse-core/audits/dobetterweb/doctype.js b/lighthouse-core/audits/dobetterweb/doctype.js
index 513c2425019a..20e9485f407b 100644
--- a/lighthouse-core/audits/dobetterweb/doctype.js
+++ b/lighthouse-core/audits/dobetterweb/doctype.js
@@ -29,7 +29,7 @@ const UIStrings = {
   explanationBadDoctype: 'Doctype name must be the string `html`',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class Doctype extends Audit {
   /**
diff --git a/lighthouse-core/audits/dobetterweb/dom-size.js b/lighthouse-core/audits/dobetterweb/dom-size.js
index a931b5186290..1902d729b290 100644
--- a/lighthouse-core/audits/dobetterweb/dom-size.js
+++ b/lighthouse-core/audits/dobetterweb/dom-size.js
@@ -41,7 +41,7 @@ const UIStrings = {
   statisticDOMWidth: 'Maximum Child Elements',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class DOMSize extends Audit {
   /**
diff --git a/lighthouse-core/audits/dobetterweb/geolocation-on-start.js b/lighthouse-core/audits/dobetterweb/geolocation-on-start.js
index 1fe92677cac9..83d9e04096d1 100644
--- a/lighthouse-core/audits/dobetterweb/geolocation-on-start.js
+++ b/lighthouse-core/audits/dobetterweb/geolocation-on-start.js
@@ -25,7 +25,7 @@ const UIStrings = {
     '[Learn more](https://web.dev/geolocation-on-start/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class GeolocationOnStart extends ViolationAudit {
   /**
diff --git a/lighthouse-core/audits/dobetterweb/inspector-issues.js b/lighthouse-core/audits/dobetterweb/inspector-issues.js
index 07e6c33f7071..fbbd0fc7b3b2 100644
--- a/lighthouse-core/audits/dobetterweb/inspector-issues.js
+++ b/lighthouse-core/audits/dobetterweb/inspector-issues.js
@@ -36,7 +36,7 @@ const UIStrings = {
   issueTypeHeavyAds: 'Heavy resource usage by ads',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class IssuesPanelEntries extends Audit {
   /**
diff --git a/lighthouse-core/audits/dobetterweb/js-libraries.js b/lighthouse-core/audits/dobetterweb/js-libraries.js
index dddbc10298a5..ec9c0386e6ff 100644
--- a/lighthouse-core/audits/dobetterweb/js-libraries.js
+++ b/lighthouse-core/audits/dobetterweb/js-libraries.js
@@ -22,7 +22,7 @@ const UIStrings = {
   columnVersion: 'Version',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class JsLibrariesAudit extends Audit {
   /**
diff --git a/lighthouse-core/audits/dobetterweb/no-document-write.js b/lighthouse-core/audits/dobetterweb/no-document-write.js
index 5ac171a4c874..8680b91144d6 100644
--- a/lighthouse-core/audits/dobetterweb/no-document-write.js
+++ b/lighthouse-core/audits/dobetterweb/no-document-write.js
@@ -42,7 +42,7 @@ const UIStrings = {
       '[Learn more](https://web.dev/no-document-write/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class NoDocWriteAudit extends ViolationAudit {
   /**
diff --git a/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js b/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
index 20a208cd72e3..b5db1e32c87e 100644
--- a/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
+++ b/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
@@ -42,7 +42,7 @@ const UIStrings = {
   columnSeverity: 'Highest Severity',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 const SEMVER_REGEX = /^(\d+\.\d+\.\d+)[^-0-9]+/;
 
diff --git a/lighthouse-core/audits/dobetterweb/notification-on-start.js b/lighthouse-core/audits/dobetterweb/notification-on-start.js
index cea112037094..24674f63cbb2 100644
--- a/lighthouse-core/audits/dobetterweb/notification-on-start.js
+++ b/lighthouse-core/audits/dobetterweb/notification-on-start.js
@@ -25,7 +25,7 @@ const UIStrings = {
       'instead. [Learn more](https://web.dev/notification-on-start/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class NotificationOnStart extends ViolationAudit {
   /**
diff --git a/lighthouse-core/audits/dobetterweb/password-inputs-can-be-pasted-into.js b/lighthouse-core/audits/dobetterweb/password-inputs-can-be-pasted-into.js
index a6c839497aca..4665ba9d92d8 100644
--- a/lighthouse-core/audits/dobetterweb/password-inputs-can-be-pasted-into.js
+++ b/lighthouse-core/audits/dobetterweb/password-inputs-can-be-pasted-into.js
@@ -18,7 +18,7 @@ const UIStrings = {
       '[Learn more](https://web.dev/password-inputs-can-be-pasted-into/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class PasswordInputsCanBePastedIntoAudit extends Audit {
   /**
diff --git a/lighthouse-core/audits/dobetterweb/uses-http2.js b/lighthouse-core/audits/dobetterweb/uses-http2.js
index 44f6cc3ea856..df068b8ffba3 100644
--- a/lighthouse-core/audits/dobetterweb/uses-http2.js
+++ b/lighthouse-core/audits/dobetterweb/uses-http2.js
@@ -40,7 +40,7 @@ const UIStrings = {
   columnProtocol: 'Protocol',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /** @type {Set<LH.Artifacts.NetworkRequest['resourceType']>} */
 const STATIC_RESOURCE_TYPES = new Set([
diff --git a/lighthouse-core/audits/dobetterweb/uses-passive-event-listeners.js b/lighthouse-core/audits/dobetterweb/uses-passive-event-listeners.js
index 12a46f14b257..834d07b4715f 100644
--- a/lighthouse-core/audits/dobetterweb/uses-passive-event-listeners.js
+++ b/lighthouse-core/audits/dobetterweb/uses-passive-event-listeners.js
@@ -25,7 +25,7 @@ const UIStrings = {
       '[Learn more](https://web.dev/uses-passive-event-listeners/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class PassiveEventsAudit extends ViolationAudit {
   /**
diff --git a/lighthouse-core/audits/errors-in-console.js b/lighthouse-core/audits/errors-in-console.js
index 6387336c2912..39b716b33478 100644
--- a/lighthouse-core/audits/errors-in-console.js
+++ b/lighthouse-core/audits/errors-in-console.js
@@ -27,7 +27,7 @@ const UIStrings = {
     '[Learn more](https://web.dev/errors-in-console/)',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /** @typedef {{ignoredPatterns?: Array<RegExp|string>}} AuditOptions */
 
diff --git a/lighthouse-core/audits/font-display.js b/lighthouse-core/audits/font-display.js
index 587f4d956bee..adc5705c02cf 100644
--- a/lighthouse-core/audits/font-display.js
+++ b/lighthouse-core/audits/font-display.js
@@ -36,7 +36,7 @@ const UIStrings = {
     'other {Lighthouse was unable to automatically check the `font-display` values for the origin {fontOrigin}.}}',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class FontDisplay extends Audit {
   /**
diff --git a/lighthouse-core/audits/image-aspect-ratio.js b/lighthouse-core/audits/image-aspect-ratio.js
index e67abc11da25..17f85618f3e8 100644
--- a/lighthouse-core/audits/image-aspect-ratio.js
+++ b/lighthouse-core/audits/image-aspect-ratio.js
@@ -29,7 +29,7 @@ const UIStrings = {
   columnActual: 'Aspect Ratio (Actual)',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 const THRESHOLD_PX = 2;
 
diff --git a/lighthouse-core/audits/image-size-responsive.js b/lighthouse-core/audits/image-size-responsive.js
index 838a9ff911ba..0305daedd882 100644
--- a/lighthouse-core/audits/image-size-responsive.js
+++ b/lighthouse-core/audits/image-size-responsive.js
@@ -32,7 +32,7 @@ const UIStrings = {
   columnExpected: 'Expected size',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 // Factors used to allow for smaller effective density.
 // A factor of 1 means the actual device pixel density will be used.
diff --git a/lighthouse-core/audits/installable-manifest.js b/lighthouse-core/audits/installable-manifest.js
index 7ed7411f0920..d2ce97295158 100644
--- a/lighthouse-core/audits/installable-manifest.js
+++ b/lighthouse-core/audits/installable-manifest.js
@@ -105,7 +105,7 @@ const UIStrings = {
 };
 /* eslint-enable max-len */
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview
diff --git a/lighthouse-core/audits/is-on-https.js b/lighthouse-core/audits/is-on-https.js
index cd7b9c77a507..b85305d7d353 100644
--- a/lighthouse-core/audits/is-on-https.js
+++ b/lighthouse-core/audits/is-on-https.js
@@ -49,7 +49,7 @@ const resolutionToString = {
   MixedContentWarning: UIStrings.warning,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 
 class HTTPS extends Audit {
diff --git a/lighthouse-core/audits/largest-contentful-paint-element.js b/lighthouse-core/audits/largest-contentful-paint-element.js
index 440410d6658e..7e714e273e1e 100644
--- a/lighthouse-core/audits/largest-contentful-paint-element.js
+++ b/lighthouse-core/audits/largest-contentful-paint-element.js
@@ -16,7 +16,7 @@ const UIStrings = {
     '[Learn More](https://web.dev/lighthouse-largest-contentful-paint/)',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class LargestContentfulPaintElement extends Audit {
   /**
diff --git a/lighthouse-core/audits/layout-shift-elements.js b/lighthouse-core/audits/layout-shift-elements.js
index b300e2647a12..14c6677ad2b4 100644
--- a/lighthouse-core/audits/layout-shift-elements.js
+++ b/lighthouse-core/audits/layout-shift-elements.js
@@ -17,7 +17,7 @@ const UIStrings = {
   columnContribution: 'CLS Contribution',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class LayoutShiftElements extends Audit {
   /**
diff --git a/lighthouse-core/audits/lcp-lazy-loaded.js b/lighthouse-core/audits/lcp-lazy-loaded.js
index bba892517a62..496baaa5761d 100644
--- a/lighthouse-core/audits/lcp-lazy-loaded.js
+++ b/lighthouse-core/audits/lcp-lazy-loaded.js
@@ -17,7 +17,7 @@ const UIStrings = {
   description: 'Above-the-fold images that are lazily loaded render later in the page lifecycle, which can delay the largest contentful paint. [Learn more](https://web.dev/lcp-lazy-loading/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class LargestContentfulPaintLazyLoaded extends Audit {
   /**
diff --git a/lighthouse-core/audits/long-tasks.js b/lighthouse-core/audits/long-tasks.js
index 1648d10a7adc..06bc1b90dc01 100644
--- a/lighthouse-core/audits/long-tasks.js
+++ b/lighthouse-core/audits/long-tasks.js
@@ -30,7 +30,7 @@ const UIStrings = {
   }`,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class LongTasks extends Audit {
   /**
diff --git a/lighthouse-core/audits/mainthread-work-breakdown.js b/lighthouse-core/audits/mainthread-work-breakdown.js
index 73f29e00f4e3..57c9e4ca6009 100644
--- a/lighthouse-core/audits/mainthread-work-breakdown.js
+++ b/lighthouse-core/audits/mainthread-work-breakdown.js
@@ -28,7 +28,7 @@ const UIStrings = {
   columnCategory: 'Category',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /** @typedef {import('../lib/tracehouse/task-groups.js').TaskGroupIds} TaskGroupIds */
 
diff --git a/lighthouse-core/audits/manual/pwa-cross-browser.js b/lighthouse-core/audits/manual/pwa-cross-browser.js
index e225407452ae..768e7d1e2086 100644
--- a/lighthouse-core/audits/manual/pwa-cross-browser.js
+++ b/lighthouse-core/audits/manual/pwa-cross-browser.js
@@ -17,7 +17,7 @@ const UIStrings = {
   'every major browser. [Learn more](https://web.dev/pwa-cross-browser/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview Manual PWA audit for cross browser support.
diff --git a/lighthouse-core/audits/manual/pwa-each-page-has-url.js b/lighthouse-core/audits/manual/pwa-each-page-has-url.js
index 473cfd3ca2e0..c04fd1a5bc10 100644
--- a/lighthouse-core/audits/manual/pwa-each-page-has-url.js
+++ b/lighthouse-core/audits/manual/pwa-each-page-has-url.js
@@ -16,7 +16,7 @@ const UIStrings = {
       'unique for the purpose of shareability on social media. [Learn more](https://web.dev/pwa-each-page-has-url/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview Manual PWA audit to ensure every page has a deep link.
diff --git a/lighthouse-core/audits/manual/pwa-page-transitions.js b/lighthouse-core/audits/manual/pwa-page-transitions.js
index 5396ca0edbf7..c9574107075c 100644
--- a/lighthouse-core/audits/manual/pwa-page-transitions.js
+++ b/lighthouse-core/audits/manual/pwa-page-transitions.js
@@ -16,7 +16,7 @@ const UIStrings = {
     'This experience is key to a user\'s perception of performance. [Learn more](https://web.dev/pwa-page-transitions/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview Manual PWA audit for janky-free page transitions.
diff --git a/lighthouse-core/audits/maskable-icon.js b/lighthouse-core/audits/maskable-icon.js
index 7fd1619af19e..de2fea229fd0 100644
--- a/lighthouse-core/audits/maskable-icon.js
+++ b/lighthouse-core/audits/maskable-icon.js
@@ -20,7 +20,7 @@ const UIStrings = {
     'the app on a device. [Learn more](https://web.dev/maskable-icon-audit/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview
diff --git a/lighthouse-core/audits/metrics/cumulative-layout-shift.js b/lighthouse-core/audits/metrics/cumulative-layout-shift.js
index 62fefdf343f1..27c243a3ef27 100644
--- a/lighthouse-core/audits/metrics/cumulative-layout-shift.js
+++ b/lighthouse-core/audits/metrics/cumulative-layout-shift.js
@@ -15,7 +15,7 @@ const UIStrings = {
                'elements within the viewport. [Learn more](https://web.dev/cls/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview This metric represents the amount of visual shifting of DOM elements during page load.
diff --git a/lighthouse-core/audits/metrics/experimental-interaction-to-next-paint.js b/lighthouse-core/audits/metrics/experimental-interaction-to-next-paint.js
index b71666a77ff7..e0cffac4772c 100644
--- a/lighthouse-core/audits/metrics/experimental-interaction-to-next-paint.js
+++ b/lighthouse-core/audits/metrics/experimental-interaction-to-next-paint.js
@@ -15,7 +15,7 @@ const UIStrings = {
                'takes the page to visibly respond to user input. [Learn more](https://web.dev/inp/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview This metric gives a high-percentile measure of responsiveness to input.
diff --git a/lighthouse-core/audits/metrics/first-contentful-paint.js b/lighthouse-core/audits/metrics/first-contentful-paint.js
index 5c103e1cc98a..a59a6d008de4 100644
--- a/lighthouse-core/audits/metrics/first-contentful-paint.js
+++ b/lighthouse-core/audits/metrics/first-contentful-paint.js
@@ -15,7 +15,7 @@ const UIStrings = {
       `painted. [Learn more](https://web.dev/first-contentful-paint/).`,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class FirstContentfulPaint extends Audit {
   /**
diff --git a/lighthouse-core/audits/metrics/first-meaningful-paint.js b/lighthouse-core/audits/metrics/first-meaningful-paint.js
index 6c8574bdae8f..fa7634ddda19 100644
--- a/lighthouse-core/audits/metrics/first-meaningful-paint.js
+++ b/lighthouse-core/audits/metrics/first-meaningful-paint.js
@@ -15,7 +15,7 @@ const UIStrings = {
       'visible. [Learn more](https://web.dev/first-meaningful-paint/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class FirstMeaningfulPaint extends Audit {
   /**
diff --git a/lighthouse-core/audits/metrics/interactive.js b/lighthouse-core/audits/metrics/interactive.js
index ac4c32112e81..a83b89916aaf 100644
--- a/lighthouse-core/audits/metrics/interactive.js
+++ b/lighthouse-core/audits/metrics/interactive.js
@@ -15,7 +15,7 @@ const UIStrings = {
     'interactive. [Learn more](https://web.dev/interactive/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview This audit identifies the time the page is "consistently interactive".
diff --git a/lighthouse-core/audits/metrics/largest-contentful-paint.js b/lighthouse-core/audits/metrics/largest-contentful-paint.js
index ca63cade4fb1..57d77bff9536 100644
--- a/lighthouse-core/audits/metrics/largest-contentful-paint.js
+++ b/lighthouse-core/audits/metrics/largest-contentful-paint.js
@@ -16,7 +16,7 @@ const UIStrings = {
       `painted. [Learn more](https://web.dev/lighthouse-largest-contentful-paint/)`,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class LargestContentfulPaint extends Audit {
   /**
diff --git a/lighthouse-core/audits/metrics/max-potential-fid.js b/lighthouse-core/audits/metrics/max-potential-fid.js
index fcd4dbca35e5..832a56938302 100644
--- a/lighthouse-core/audits/metrics/max-potential-fid.js
+++ b/lighthouse-core/audits/metrics/max-potential-fid.js
@@ -15,7 +15,7 @@ const UIStrings = {
       'duration of the longest task. [Learn more](https://web.dev/lighthouse-max-potential-fid/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview This metric is the duration of the longest task after FCP. It is meant to capture
diff --git a/lighthouse-core/audits/metrics/speed-index.js b/lighthouse-core/audits/metrics/speed-index.js
index 70577cbbc8a3..cc77ffd2d5dd 100644
--- a/lighthouse-core/audits/metrics/speed-index.js
+++ b/lighthouse-core/audits/metrics/speed-index.js
@@ -15,7 +15,7 @@ const UIStrings = {
       '[Learn more](https://web.dev/speed-index/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class SpeedIndex extends Audit {
   /**
diff --git a/lighthouse-core/audits/metrics/total-blocking-time.js b/lighthouse-core/audits/metrics/total-blocking-time.js
index 41eb5786c662..ae07e0b02fd6 100644
--- a/lighthouse-core/audits/metrics/total-blocking-time.js
+++ b/lighthouse-core/audits/metrics/total-blocking-time.js
@@ -15,7 +15,7 @@ const UIStrings = {
       'when task length exceeded 50ms, expressed in milliseconds. [Learn more](https://web.dev/lighthouse-total-blocking-time/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class TotalBlockingTime extends Audit {
   /**
diff --git a/lighthouse-core/audits/network-rtt.js b/lighthouse-core/audits/network-rtt.js
index 0d49395c8692..e6240545944f 100644
--- a/lighthouse-core/audits/network-rtt.js
+++ b/lighthouse-core/audits/network-rtt.js
@@ -19,7 +19,7 @@ const UIStrings = {
     'improve performance. [Learn more](https://hpbn.co/primer-on-latency-and-bandwidth/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class NetworkRTT extends Audit {
   /**
diff --git a/lighthouse-core/audits/network-server-latency.js b/lighthouse-core/audits/network-server-latency.js
index 578bf87bc769..ccabc53b44c9 100644
--- a/lighthouse-core/audits/network-server-latency.js
+++ b/lighthouse-core/audits/network-server-latency.js
@@ -19,7 +19,7 @@ const UIStrings = {
     'or has poor backend performance. [Learn more](https://hpbn.co/primer-on-web-performance/#analyzing-the-resource-waterfall).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class NetworkServerLatency extends Audit {
   /**
diff --git a/lighthouse-core/audits/no-unload-listeners.js b/lighthouse-core/audits/no-unload-listeners.js
index 8f6a24ce5821..b3ca945f1fa5 100644
--- a/lighthouse-core/audits/no-unload-listeners.js
+++ b/lighthouse-core/audits/no-unload-listeners.js
@@ -18,7 +18,7 @@ const UIStrings = {
   description: 'The `unload` event does not fire reliably and listening for it can prevent browser optimizations like the Back-Forward Cache. Use `pagehide` or `visibilitychange` events instead. [Learn more](https://web.dev/bfcache/#never-use-the-unload-event)',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class NoUnloadListeners extends Audit {
   /**
diff --git a/lighthouse-core/audits/non-composited-animations.js b/lighthouse-core/audits/non-composited-animations.js
index f167db93d278..f462c3585b05 100644
--- a/lighthouse-core/audits/non-composited-animations.js
+++ b/lighthouse-core/audits/non-composited-animations.js
@@ -46,7 +46,7 @@ const UIStrings = {
   unsupportedTimingParameters: 'Effect has unsupported timing parameters',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * Each failure reason is represented by a bit flag. The bit shift operator '<<' is used to define which bit corresponds to each failure reason.
diff --git a/lighthouse-core/audits/performance-budget.js b/lighthouse-core/audits/performance-budget.js
index 0262b90a5257..b9c998f70089 100644
--- a/lighthouse-core/audits/performance-budget.js
+++ b/lighthouse-core/audits/performance-budget.js
@@ -24,7 +24,7 @@ const UIStrings = {
    }`,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /** @typedef {import('../computed/resource-summary.js').ResourceEntry} ResourceEntry */
 /** @typedef {{resourceType: LH.Budget.ResourceType, label: LH.IcuMessage, requestCount: number, transferSize: number, sizeOverBudget: number | undefined, countOverBudget: LH.IcuMessage | undefined}} BudgetItem */
diff --git a/lighthouse-core/audits/predictive-perf.js b/lighthouse-core/audits/predictive-perf.js
index ec525b60b34b..83ae5bc26bd5 100644
--- a/lighthouse-core/audits/predictive-perf.js
+++ b/lighthouse-core/audits/predictive-perf.js
@@ -18,7 +18,7 @@ import LanternLcp from '../computed/metrics/lantern-largest-contentful-paint.js'
 const SCORING_P10 = 3651;
 const SCORING_MEDIAN = 10000;
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, {});
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, {});
 
 class PredictivePerf extends Audit {
   /**
diff --git a/lighthouse-core/audits/preload-fonts.js b/lighthouse-core/audits/preload-fonts.js
index ef81b3a98426..1a483d0131c6 100644
--- a/lighthouse-core/audits/preload-fonts.js
+++ b/lighthouse-core/audits/preload-fonts.js
@@ -26,7 +26,7 @@ const UIStrings = {
   description: 'Preload `optional` fonts so first-time visitors may use them. [Learn more](https://web.dev/preload-optional-fonts/)',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class PreloadFontsAudit extends Audit {
   /**
diff --git a/lighthouse-core/audits/preload-lcp-image.js b/lighthouse-core/audits/preload-lcp-image.js
index 1a3c15bf28c8..95c185183615 100644
--- a/lighthouse-core/audits/preload-lcp-image.js
+++ b/lighthouse-core/audits/preload-lcp-image.js
@@ -21,7 +21,7 @@ const UIStrings = {
     'image in order to improve LCP. [Learn more](https://web.dev/optimize-lcp/#preload-important-resources).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class PreloadLCPImageAudit extends Audit {
   /**
diff --git a/lighthouse-core/audits/redirects.js b/lighthouse-core/audits/redirects.js
index a56c0dc2557c..8f36a81bd49a 100644
--- a/lighthouse-core/audits/redirects.js
+++ b/lighthouse-core/audits/redirects.js
@@ -20,7 +20,7 @@ const UIStrings = {
   description: 'Redirects introduce additional delays before the page can be loaded. [Learn more](https://web.dev/redirects/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class Redirects extends Audit {
   /**
diff --git a/lighthouse-core/audits/resource-summary.js b/lighthouse-core/audits/resource-summary.js
index 197a0344df65..4ab9a3c2796a 100644
--- a/lighthouse-core/audits/resource-summary.js
+++ b/lighthouse-core/audits/resource-summary.js
@@ -21,7 +21,7 @@ const UIStrings = {
     `other {# requests • {byteCount, number, bytes} KiB}}`,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class ResourceSummary extends Audit {
   /**
diff --git a/lighthouse-core/audits/seo/canonical.js b/lighthouse-core/audits/seo/canonical.js
index 057819e973cb..cac0ffccfaea 100644
--- a/lighthouse-core/audits/seo/canonical.js
+++ b/lighthouse-core/audits/seo/canonical.js
@@ -43,7 +43,7 @@ const UIStrings = {
     'instead of an equivalent page of content',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @typedef CanonicalURLData
diff --git a/lighthouse-core/audits/seo/crawlable-anchors.js b/lighthouse-core/audits/seo/crawlable-anchors.js
index 7966aa446126..02d66e9ed761 100644
--- a/lighthouse-core/audits/seo/crawlable-anchors.js
+++ b/lighthouse-core/audits/seo/crawlable-anchors.js
@@ -19,7 +19,7 @@ const UIStrings = {
   columnFailingLink: 'Uncrawlable Link',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class CrawlableAnchors extends Audit {
   /**
diff --git a/lighthouse-core/audits/seo/font-size.js b/lighthouse-core/audits/seo/font-size.js
index bf66f605a055..32563c26de9d 100644
--- a/lighthouse-core/audits/seo/font-size.js
+++ b/lighthouse-core/audits/seo/font-size.js
@@ -37,7 +37,7 @@ const UIStrings = {
   columnFontSize: 'Font Size',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @param {Array<FailingNodeData>} fontSizeArtifact
diff --git a/lighthouse-core/audits/seo/hreflang.js b/lighthouse-core/audits/seo/hreflang.js
index a6383ce796b6..95432cdab4d4 100644
--- a/lighthouse-core/audits/seo/hreflang.js
+++ b/lighthouse-core/audits/seo/hreflang.js
@@ -31,7 +31,7 @@ const UIStrings = {
   notFullyQualified: 'Relative href value',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @param {string} href
diff --git a/lighthouse-core/audits/seo/http-status-code.js b/lighthouse-core/audits/seo/http-status-code.js
index 08d150c8c36e..dae83bda9faf 100644
--- a/lighthouse-core/audits/seo/http-status-code.js
+++ b/lighthouse-core/audits/seo/http-status-code.js
@@ -21,7 +21,7 @@ const UIStrings = {
   '[Learn more](https://web.dev/http-status-code/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class HTTPStatusCode extends Audit {
   /**
diff --git a/lighthouse-core/audits/seo/is-crawlable.js b/lighthouse-core/audits/seo/is-crawlable.js
index 731024ef25f0..9e9f727c41d0 100644
--- a/lighthouse-core/audits/seo/is-crawlable.js
+++ b/lighthouse-core/audits/seo/is-crawlable.js
@@ -30,7 +30,7 @@ const UIStrings = {
       'if they don\'t have permission to crawl them. [Learn more](https://web.dev/is-crawable/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * Checks if given directive is a valid unavailable_after directive with a date in the past
diff --git a/lighthouse-core/audits/seo/link-text.js b/lighthouse-core/audits/seo/link-text.js
index 880f1955453b..4834cc145e9d 100644
--- a/lighthouse-core/audits/seo/link-text.js
+++ b/lighthouse-core/audits/seo/link-text.js
@@ -91,7 +91,7 @@ const UIStrings = {
     }`,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class LinkText extends Audit {
   /**
diff --git a/lighthouse-core/audits/seo/manual/structured-data.js b/lighthouse-core/audits/seo/manual/structured-data.js
index b4ec57a7ead7..09eac24b11a4 100644
--- a/lighthouse-core/audits/seo/manual/structured-data.js
+++ b/lighthouse-core/audits/seo/manual/structured-data.js
@@ -15,7 +15,7 @@ const UIStrings = {
   title: 'Structured data is valid',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview Manual SEO audit to check if structured data on page is valid.
diff --git a/lighthouse-core/audits/seo/meta-description.js b/lighthouse-core/audits/seo/meta-description.js
index 658d60c17aef..8539386185eb 100644
--- a/lighthouse-core/audits/seo/meta-description.js
+++ b/lighthouse-core/audits/seo/meta-description.js
@@ -21,7 +21,7 @@ const UIStrings = {
   explanation: 'Description text is empty.',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class Description extends Audit {
   /**
diff --git a/lighthouse-core/audits/seo/plugins.js b/lighthouse-core/audits/seo/plugins.js
index 35db743a8225..4817ef6cc870 100644
--- a/lighthouse-core/audits/seo/plugins.js
+++ b/lighthouse-core/audits/seo/plugins.js
@@ -44,7 +44,7 @@ const UIStrings = {
     '[Learn more](https://web.dev/plugins/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * Verifies if given MIME type matches any known plugin MIME type
diff --git a/lighthouse-core/audits/seo/robots-txt.js b/lighthouse-core/audits/seo/robots-txt.js
index ea9528401c9b..c7b9320a8331 100644
--- a/lighthouse-core/audits/seo/robots-txt.js
+++ b/lighthouse-core/audits/seo/robots-txt.js
@@ -56,7 +56,7 @@ const UIStrings = {
   explanation: 'Lighthouse was unable to download a robots.txt file',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @param {string} directiveName
diff --git a/lighthouse-core/audits/seo/tap-targets.js b/lighthouse-core/audits/seo/tap-targets.js
index 6e77565d623e..82bf8df586ad 100644
--- a/lighthouse-core/audits/seo/tap-targets.js
+++ b/lighthouse-core/audits/seo/tap-targets.js
@@ -43,7 +43,7 @@ const UIStrings = {
   displayValue: '{decimalProportion, number, percent} appropriately sized tap targets',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 const FINGER_SIZE_PX = 48;
 // Ratio of the finger area tapping on an unintended element
diff --git a/lighthouse-core/audits/server-response-time.js b/lighthouse-core/audits/server-response-time.js
index 850fba433ef5..014ecad6eff0 100644
--- a/lighthouse-core/audits/server-response-time.js
+++ b/lighthouse-core/audits/server-response-time.js
@@ -20,7 +20,7 @@ const UIStrings = {
   displayValue: `Root document took {timeInMs, number, milliseconds}\xa0ms`,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 // Due to the way that DevTools throttling works we cannot see if server response took less than ~570ms.
 // We set our failure threshold to 600ms to avoid those false positives but we want devs to shoot for 100ms.
diff --git a/lighthouse-core/audits/service-worker.js b/lighthouse-core/audits/service-worker.js
index 0449166495f0..5bb5a46141d2 100644
--- a/lighthouse-core/audits/service-worker.js
+++ b/lighthouse-core/audits/service-worker.js
@@ -39,7 +39,7 @@ const UIStrings = {
     'the `start_url` ({startUrl}) is not in the service worker\'s scope ({scopeUrl})',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class ServiceWorker extends Audit {
   /**
diff --git a/lighthouse-core/audits/splash-screen.js b/lighthouse-core/audits/splash-screen.js
index c02285c50bbd..812c29c0b5bd 100644
--- a/lighthouse-core/audits/splash-screen.js
+++ b/lighthouse-core/audits/splash-screen.js
@@ -20,7 +20,7 @@ const UIStrings = {
     'more](https://web.dev/splash-screen/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview
diff --git a/lighthouse-core/audits/themed-omnibox.js b/lighthouse-core/audits/themed-omnibox.js
index 6698372bbf29..c2effe657ff1 100644
--- a/lighthouse-core/audits/themed-omnibox.js
+++ b/lighthouse-core/audits/themed-omnibox.js
@@ -20,7 +20,7 @@ const UIStrings = {
     '[Learn more](https://web.dev/themed-omnibox/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview
diff --git a/lighthouse-core/audits/third-party-facades.js b/lighthouse-core/audits/third-party-facades.js
index e16cf6ea1943..d192f4b3fa2d 100644
--- a/lighthouse-core/audits/third-party-facades.js
+++ b/lighthouse-core/audits/third-party-facades.js
@@ -66,7 +66,7 @@ const UIStrings = {
   categorySocial: '{productName} (Social)',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /** @type {Record<string, string>} */
 const CATEGORY_UI_MAP = {
diff --git a/lighthouse-core/audits/third-party-summary.js b/lighthouse-core/audits/third-party-summary.js
index 14173e7f165c..1cd8e13c0bbf 100644
--- a/lighthouse-core/audits/third-party-summary.js
+++ b/lighthouse-core/audits/third-party-summary.js
@@ -28,7 +28,7 @@ const UIStrings = {
     `{timeInMs, number, milliseconds}\xa0ms`,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 // A page passes when all third-party code blocks for less than 250 ms.
 const PASS_THRESHOLD_IN_MS = 250;
diff --git a/lighthouse-core/audits/timing-budget.js b/lighthouse-core/audits/timing-budget.js
index 4fd27f75d9fc..268a6551f051 100644
--- a/lighthouse-core/audits/timing-budget.js
+++ b/lighthouse-core/audits/timing-budget.js
@@ -22,7 +22,7 @@ const UIStrings = {
   columnMeasurement: 'Measurement',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /** @typedef {{metric: LH.Budget.TimingMetric, label: LH.IcuMessage, measurement?: LH.Audit.Details.NumericValue|number, overBudget?: LH.Audit.Details.NumericValue|number}} BudgetItem */
 
diff --git a/lighthouse-core/audits/unsized-images.js b/lighthouse-core/audits/unsized-images.js
index 16a01614aace..52c7762bcf79 100644
--- a/lighthouse-core/audits/unsized-images.js
+++ b/lighthouse-core/audits/unsized-images.js
@@ -23,7 +23,7 @@ const UIStrings = {
   description: 'Set an explicit width and height on image elements to reduce layout shifts and improve CLS. [Learn more](https://web.dev/optimize-cls/#images-without-dimensions)',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class UnsizedImages extends Audit {
   /**
diff --git a/lighthouse-core/audits/user-timings.js b/lighthouse-core/audits/user-timings.js
index feb204dd8631..39c94e23ba8b 100644
--- a/lighthouse-core/audits/user-timings.js
+++ b/lighthouse-core/audits/user-timings.js
@@ -25,7 +25,7 @@ const UIStrings = {
   columnType: 'Type',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /** @typedef {{name: string, isMark: true, args: LH.TraceEvent['args'], startTime: number}} MarkEvent */
 /** @typedef {{name: string, isMark: false, args: LH.TraceEvent['args'], startTime: number, endTime: number, duration: number}} MeasureEvent */
diff --git a/lighthouse-core/audits/uses-rel-preconnect.js b/lighthouse-core/audits/uses-rel-preconnect.js
index 2292b35471e4..005744802480 100644
--- a/lighthouse-core/audits/uses-rel-preconnect.js
+++ b/lighthouse-core/audits/uses-rel-preconnect.js
@@ -52,7 +52,7 @@ const UIStrings = {
    'These should be used sparingly and only to the most important origins.',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class UsesRelPreconnectAudit extends Audit {
   /**
diff --git a/lighthouse-core/audits/uses-rel-preload.js b/lighthouse-core/audits/uses-rel-preload.js
index 1777b73dd6cd..6ea5adc0153c 100644
--- a/lighthouse-core/audits/uses-rel-preload.js
+++ b/lighthouse-core/audits/uses-rel-preload.js
@@ -29,7 +29,7 @@ const UIStrings = {
     'by the browser. Check that you are using the `crossorigin` attribute properly.',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 const THRESHOLD_IN_MS = 100;
 
diff --git a/lighthouse-core/audits/valid-source-maps.js b/lighthouse-core/audits/valid-source-maps.js
index 66d8eff4e174..d782c930f1fb 100644
--- a/lighthouse-core/audits/valid-source-maps.js
+++ b/lighthouse-core/audits/valid-source-maps.js
@@ -30,7 +30,7 @@ const UIStrings = {
     }`,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 const LARGE_JS_BYTE_THRESHOLD = 500 * 1024;
 
diff --git a/lighthouse-core/audits/viewport.js b/lighthouse-core/audits/viewport.js
index d2018c596677..d909de03c0c1 100644
--- a/lighthouse-core/audits/viewport.js
+++ b/lighthouse-core/audits/viewport.js
@@ -23,7 +23,7 @@ const UIStrings = {
   explanationNoTag: 'No `<meta name="viewport">` tag found',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 class Viewport extends Audit {
   /**
diff --git a/lighthouse-core/config/default-config.js b/lighthouse-core/config/default-config.js
index 0d46d7a3e552..cf009bce1e42 100644
--- a/lighthouse-core/config/default-config.js
+++ b/lighthouse-core/config/default-config.js
@@ -12,10 +12,6 @@ import * as constants from './constants.js';
 import i18n from '../lib/i18n/i18n.js';
 import m2a from './metrics-to-audits.js';
 
-import {createCommonjsRefs} from '../scripts/esm-utils.js';
-
-const {require} = createCommonjsRefs(import.meta);
-
 const UIStrings = {
   /** Title of the Performance category of audits. Equivalent to 'Web performance', this term is inclusive of all web page speed and loading optimization topics. Also used as a label of a score gauge; try to limit to 20 characters. */
   performanceCategoryTitle: 'Performance',
@@ -125,7 +121,7 @@ const UIStrings = {
   pwaOptimizedGroupTitle: 'PWA Optimized',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /** @type {LH.Config.Json} */
 const defaultConfig = {
@@ -632,7 +628,7 @@ const defaultConfig = {
 export default defaultConfig;
 
 // Use `defineProperty` so that the strings are accesible from original but ignored when we copy it
-Object.defineProperty(module.exports, 'UIStrings', {
+Object.defineProperty(defaultConfig, 'UIStrings', {
   enumerable: false,
   get: () => UIStrings,
 });
diff --git a/lighthouse-core/fraggle-rock/config/config.js b/lighthouse-core/fraggle-rock/config/config.js
index 08d31df8c98f..d239e2cd244c 100644
--- a/lighthouse-core/fraggle-rock/config/config.js
+++ b/lighthouse-core/fraggle-rock/config/config.js
@@ -32,6 +32,9 @@ import {
   mergeConfigFragmentArrayByKey,
 } from '../../config/config-helpers.js';
 
+import {createCommonjsRefs} from '../../scripts/esm-utils.js';
+
+const {__dirname} = createCommonjsRefs(import.meta);
 const defaultConfigPath = path.join(__dirname, './default-config.js');
 
 /** @typedef {LH.Config.FRContext & {gatherMode: LH.Gatherer.GatherMode}} ConfigContext */
diff --git a/lighthouse-core/gather/driver.js b/lighthouse-core/gather/driver.js
index 39b6c2064807..f6263b8e1366 100644
--- a/lighthouse-core/gather/driver.js
+++ b/lighthouse-core/gather/driver.js
@@ -333,9 +333,11 @@ class Driver {
     let asyncTimeout;
     const timeoutPromise = new Promise((resolve, reject) => {
       if (timeout === Infinity) return;
-      asyncTimeout = setTimeout(reject, timeout, new LighthouseError(LighthouseError.errors.PROTOCOL_TIMEOUT, {
+
+      const error = new LighthouseError(LighthouseError.errors.PROTOCOL_TIMEOUT, {
         protocolMethod: method,
-      }));
+      });
+      asyncTimeout = setTimeout(reject, timeout, error);
     });
 
     return Promise.race([
diff --git a/lighthouse-core/gather/driver/environment.js b/lighthouse-core/gather/driver/environment.js
index 6a5654ba0ede..69e4f244765e 100644
--- a/lighthouse-core/gather/driver/environment.js
+++ b/lighthouse-core/gather/driver/environment.js
@@ -9,9 +9,6 @@ import log from 'lighthouse-logger';
 import * as constants from '../../config/constants.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 import i18n from '../../lib/i18n/i18n.js';
-import { createCommonjsRefs } from '../../scripts/esm-utils.js';
-
-const {__filename} = createCommonjsRefs(import.meta);
 
 const UIStrings = {
   /**
@@ -30,7 +27,7 @@ const UIStrings = {
  */
 const SLOW_CPU_BENCHMARK_INDEX_THRESHOLD = 1000;
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @param {LH.Gatherer.FRProtocolSession} session
diff --git a/lighthouse-core/gather/driver/navigation.js b/lighthouse-core/gather/driver/navigation.js
index 1562cdf4074a..6292c45701e8 100644
--- a/lighthouse-core/gather/driver/navigation.js
+++ b/lighthouse-core/gather/driver/navigation.js
@@ -12,10 +12,6 @@ import * as constants from '../../config/constants.js';
 import i18n from '../../lib/i18n/i18n.js';
 import URL from '../../lib/url-shim.js';
 
-import { createCommonjsRefs } from '../../scripts/esm-utils.js';
-
-const {__filename} = createCommonjsRefs(import.meta);
-
 const UIStrings = {
   /**
    * @description Warning that the web page redirected during testing and that may have affected the load.
@@ -32,7 +28,7 @@ const UIStrings = {
   'Results may be incomplete.',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 
 // Controls how long to wait after FCP before continuing
diff --git a/lighthouse-core/gather/driver/storage.js b/lighthouse-core/gather/driver/storage.js
index 3b69598a7c61..1789d34578b0 100644
--- a/lighthouse-core/gather/driver/storage.js
+++ b/lighthouse-core/gather/driver/storage.js
@@ -7,9 +7,6 @@
 
 import log from 'lighthouse-logger';
 import i18n from '../../lib/i18n/i18n.js';
-import { createCommonjsRefs } from '../../scripts/esm-utils.js';
-
-const {__filename} = createCommonjsRefs(import.meta);
 
 const UIStrings = {
   /**
@@ -27,7 +24,7 @@ const UIStrings = {
   }`,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 
 /**
diff --git a/lighthouse-core/gather/gatherers/stacks.js b/lighthouse-core/gather/gatherers/stacks.js
index 30f0dc3da817..8eb7f3f0f61d 100644
--- a/lighthouse-core/gather/gatherers/stacks.js
+++ b/lighthouse-core/gather/gatherers/stacks.js
@@ -17,7 +17,7 @@ import fs from 'fs';
 import log from 'lighthouse-logger';
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
-import { createCommonjsRefs } from '../../scripts/esm-utils.js';
+import {createCommonjsRefs} from '../../scripts/esm-utils.js';
 
 const {require} = createCommonjsRefs(import.meta);
 
diff --git a/lighthouse-core/index.js b/lighthouse-core/index.js
index 4058f1db83c4..5a19eba0b1a1 100644
--- a/lighthouse-core/index.js
+++ b/lighthouse-core/index.js
@@ -90,16 +90,22 @@ function generateConfig(configJson, flags) {
   return new Config(configJson, flags);
 }
 
-lighthouse.legacyNavigation = legacyNavigation;
-lighthouse.generateConfig = generateConfig;
-lighthouse.getAuditList = () => Runner.getAuditList();
-lighthouse.traceCategories = Driver.traceCategories;
-lighthouse.Audit = require('./audits/audit.js');
-lighthouse.Gatherer = require('./fraggle-rock/gather/base-gatherer.js');
+function getAuditList() {
+  return Runner.getAuditList();
+}
 
 // Explicit type reference (hidden by makeComputedArtifact) for d.ts export.
 // TODO(esmodules): should be a workaround for module.export and can be removed when in esm.
-/** @type {typeof import('./computed/network-records.js')} */
-lighthouse.NetworkRecords = require('./computed/network-records.js');
+// /** @type {typeof import('./computed/network-records.js')} */
+// lighthouse.NetworkRecords = require('./computed/network-records.js');
 
 export default lighthouse;
+export {Audit} from './audits/audit.js';
+export {default as Gatherer} from './fraggle-rock/gather/base-gatherer.js';
+export {default as NetworkRecords} from './computed/network-records.js';
+export {
+  legacyNavigation,
+  generateConfig,
+  getAuditList,
+};
+export const traceCategories = Driver.traceCategories;
diff --git a/lighthouse-core/lib/csp-evaluator.js b/lighthouse-core/lib/csp-evaluator.js
index 12662f3ba665..cbb529f61a0d 100644
--- a/lighthouse-core/lib/csp-evaluator.js
+++ b/lighthouse-core/lib/csp-evaluator.js
@@ -88,7 +88,7 @@ const UIStrings = {
     'Plain URL schemes allow scripts to be sourced from an unsafe domain.',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /** @type {Record<number, string|LH.IcuMessage|Record<string, LH.IcuMessage>>} */
 const FINDING_TO_UI_STRING = {
diff --git a/lighthouse-core/lib/emulation.js b/lighthouse-core/lib/emulation.js
index d2dbcd3c7daf..7cc96853029c 100644
--- a/lighthouse-core/lib/emulation.js
+++ b/lighthouse-core/lib/emulation.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import { lighthouseVersion } from "../../root.js";
+import {lighthouseVersion} from '../../root.js';
 
 const NO_THROTTLING_METRICS = {
   latency: 0,
diff --git a/lighthouse-core/lib/i18n/README.md b/lighthouse-core/lib/i18n/README.md
index 09aee90feb4e..aaaea6245ec3 100644
--- a/lighthouse-core/lib/i18n/README.md
+++ b/lighthouse-core/lib/i18n/README.md
@@ -232,7 +232,7 @@ CTC is a name that is distinct and identifies this as the Chrome translation for
     };
 
     // Init the strings in this file with the i18n system.
-    const str_ = i18n.createIcuMessageFn(__filename, UIStrings);
+    const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
     // Create an IcuMessage instance with a replacement value for our localizable string.
     const icuMessage = str_(UIStrings.totalSize, {totalBytes: 10240});
diff --git a/lighthouse-core/lib/i18n/i18n.js b/lighthouse-core/lib/i18n/i18n.js
index 535f1a192187..fafd6fe5ae02 100644
--- a/lighthouse-core/lib/i18n/i18n.js
+++ b/lighthouse-core/lib/i18n/i18n.js
@@ -169,6 +169,8 @@ function lookupLocale(locales, possibleLocales) {
  * @param {Record<string, string>} fileStrings
  */
 function createIcuMessageFn(filename, fileStrings) {
+  filename = filename.replace('file://', '');
+
   /**
    * Combined so fn can access both caller's strings and i18n.UIStrings shared across LH.
    * @type {Record<string, string>}
diff --git a/lighthouse-core/lib/lh-error.js b/lighthouse-core/lib/lh-error.js
index b54cc4295acb..62901ee8716c 100644
--- a/lighthouse-core/lib/lh-error.js
+++ b/lighthouse-core/lib/lh-error.js
@@ -5,11 +5,8 @@
  */
 'use strict';
 
-import { createCommonjsRefs } from '../scripts/esm-utils.js';
 import i18n from './i18n/i18n.js';
 
-const {__filename} = createCommonjsRefs(import.meta);
-
 /* eslint-disable max-len */
 const UIStrings = {
   /**
@@ -92,7 +89,7 @@ const UIStrings = {
   oldChromeDoesNotSupportFeature: 'This version of Chrome is too old to support \'{featureName}\'. Use a newer version to see full results.',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 
 /**
diff --git a/lighthouse-core/lib/sentry.js b/lighthouse-core/lib/sentry.js
index b665ca9d8110..ab5229ba0c81 100644
--- a/lighthouse-core/lib/sentry.js
+++ b/lighthouse-core/lib/sentry.js
@@ -141,4 +141,4 @@ function init(opts) {
   }
 }
 
-export default sentryDelegate;
+export const Sentry = sentryDelegate;
diff --git a/lighthouse-core/runner.js b/lighthouse-core/runner.js
index 304293e1ed93..96fc6d537287 100644
--- a/lighthouse-core/runner.js
+++ b/lighthouse-core/runner.js
@@ -16,7 +16,7 @@ import stackPacks from './lib/stack-packs.js';
 import assetSaver from './lib/asset-saver.js';
 import fs from 'fs';
 import path from 'path';
-import Sentry from './lib/sentry.js';
+import {Sentry} from './lib/sentry.js';
 import ReportGenerator from '../report/generator/report-generator.js';
 import {LighthouseError} from './lib/lh-error.js';
 import {lighthouseVersion} from '../root.js';
diff --git a/lighthouse-core/test/config/config-plugin-test.js b/lighthouse-core/test/config/config-plugin-test.js
index ca1c4fc03692..b625d390addd 100644
--- a/lighthouse-core/test/config/config-plugin-test.js
+++ b/lighthouse-core/test/config/config-plugin-test.js
@@ -10,9 +10,6 @@
 import {strict as assert} from 'assert';
 import ConfigPlugin from '../../config/config-plugin.js';
 import i18n from '../../lib/i18n/i18n.js';
-import {createCommonjsRefs} from '../../scripts/esm-utils.js';
-
-const {__filename} = createCommonjsRefs(import.meta);
 
 /**
  * @param {any} val
@@ -74,7 +71,7 @@ describe('ConfigPlugin', () => {
       title: 'this is a title',
       description: 'this is a description',
     };
-    const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+    const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
     const localizedPlugin = {
       groups: {
diff --git a/lighthouse-core/test/runner-test.js b/lighthouse-core/test/runner-test.js
index a136acbdedc4..5ee275a6ed51 100644
--- a/lighthouse-core/test/runner-test.js
+++ b/lighthouse-core/test/runner-test.js
@@ -23,7 +23,7 @@ import i18n from '../lib/i18n/i18n.js';
 import {makeMocksForGatherRunner} from './test-utils.js';
 import {createCommonjsRefs} from '../scripts/esm-utils.js';
 
-const {require, __dirname, __filename} = createCommonjsRefs(import.meta);
+const {require, __dirname} = createCommonjsRefs(import.meta);
 
 // Some imports needs to be done dynamically, so that their dependencies will be mocked.
 // See: https://jestjs.io/docs/ecmascript-modules#differences-between-esm-and-commonjs
@@ -162,7 +162,6 @@ describe('Runner', () => {
       const config = new Config({
         settings: {
           auditMode: __dirname + '/fixtures/artifacts/perflog/',
-
         },
         audits: [
           'content-width',
@@ -199,7 +198,7 @@ describe('Runner', () => {
     it('serializes IcuMessages in gatherMode and is able to use them in auditMode', async () => {
       // Can use this to access shared UIStrings in i18n.js.
       // For future changes: exact messages aren't important, just choose ones with replacements.
-      const str_ = i18n.createMessageInstanceIdFn(__filename, {});
+      const str_ = i18n.createMessageInstanceIdFn(import.meta.url, {});
 
       // A gatherer that produces an IcuMessage runWarning and LighthouseError artifact.
       class WarningAndErrorGatherer extends Gatherer {
diff --git a/shared/test/localization/format-test.js b/shared/test/localization/format-test.js
index 7c75605082e3..245fa094b5de 100644
--- a/shared/test/localization/format-test.js
+++ b/shared/test/localization/format-test.js
@@ -111,14 +111,14 @@ describe('format', () => {
   describe('#getFormatted', () => {
     it('returns the formatted string', () => {
       const UIStrings = {testMessage: 'happy test'};
-      const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+      const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
       const formattedStr = format.getFormatted(str_(UIStrings.testMessage), 'en');
       expect(formattedStr).toEqual('happy test');
     });
 
     it('returns the formatted string with replacements', () => {
       const UIStrings = {testMessage: 'replacement test ({errorCode})'};
-      const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+      const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
       const formattedStr = format.getFormatted(str_(UIStrings.testMessage,
           {errorCode: 'BOO'}), 'en');
       expect(formattedStr).toEqual('replacement test (BOO)');
@@ -127,7 +127,7 @@ describe('format', () => {
     it('throws an error for invalid locales', () => {
       // Populate a string to try to localize to a bad locale.
       const UIStrings = {testMessage: 'testy test'};
-      const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+      const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
       expect(_ => format.getFormatted(str_(UIStrings.testMessage), 'still-not-a-locale'))
         .toThrow(`Unsupported locale 'still-not-a-locale'`);
@@ -137,7 +137,7 @@ describe('format', () => {
       const UIStrings = {
         testMessage: 'needs {count, number, bytes}KB test {str} in {timeInMs, number, seconds}s',
       };
-      const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+      const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
       const replacements = {
         count: 2555,
@@ -180,7 +180,7 @@ describe('format', () => {
       format.registerLocaleData('en-XZ', localeData);
 
       const UIStrings = {testString: 'en-US string!'};
-      const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+      const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
       const formattedStr = format.getFormatted(str_(UIStrings.testString), 'en-XZ');
       expect(formattedStr).toEqual('en-XZ cuerda!');
     });
@@ -317,7 +317,7 @@ describe('format', () => {
           '=1{hellos 1 goodbye {in, number, bytes}} ' +
           'other{hellos, goodbyes {in, number, bytes}}}}}',
     };
-    const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+    const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
     it('formats a basic message', () => {
       const helloStr = str_(UIStrings.helloWorld);

From 90fd8551da927a36c38364b10b1f7ebab77359ce Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 6 May 2022 12:40:51 -0700
Subject: [PATCH 14/96] wip

---
 lighthouse-core/config/config-helpers.js | 3 +++
 lighthouse-core/runner.js                | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/lighthouse-core/config/config-helpers.js b/lighthouse-core/config/config-helpers.js
index 31907b455502..a197c01bfa2e 100644
--- a/lighthouse-core/config/config-helpers.js
+++ b/lighthouse-core/config/config-helpers.js
@@ -13,6 +13,9 @@ import ConfigPlugin from './config-plugin.js';
 import {Runner} from '../runner.js';
 import i18n from '../lib/i18n/i18n.js';
 import * as validation from '../fraggle-rock/config/validation.js';
+import {createCommonjsRefs} from '../scripts/esm-utils.js';
+
+const {require} = createCommonjsRefs(import.meta);
 
 /** @typedef {typeof import('../gather/gatherers/gatherer.js')['Gatherer']} GathererConstructor */
 /** @typedef {typeof import('../audits/audit.js')['Audit']} Audit */
diff --git a/lighthouse-core/runner.js b/lighthouse-core/runner.js
index 96fc6d537287..7ad4ab497e9e 100644
--- a/lighthouse-core/runner.js
+++ b/lighthouse-core/runner.js
@@ -20,6 +20,9 @@ import {Sentry} from './lib/sentry.js';
 import ReportGenerator from '../report/generator/report-generator.js';
 import {LighthouseError} from './lib/lh-error.js';
 import {lighthouseVersion} from '../root.js';
+import {createCommonjsRefs} from './scripts/esm-utils.js';
+
+const {__dirname} = createCommonjsRefs(import.meta);
 
 /** @typedef {import('./gather/connections/connection.js').Connection} Connection */
 /** @typedef {import('./lib/arbitrary-equality-map.js').ArbitraryEqualityMap} ArbitraryEqualityMap */

From dc75dae38213ef4843332c67588a503de17ca626 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 6 May 2022 13:56:32 -0700
Subject: [PATCH 15/96] wip

---
 lighthouse-cli/bin.js                         |   2 +-
 lighthouse-core/config/config-helpers.js      |  30 +-
 lighthouse-core/config/config.js              |  50 ++-
 lighthouse-core/fraggle-rock/config/config.js |  19 +-
 .../fraggle-rock/gather/navigation-runner.js  |   3 +-
 .../fraggle-rock/gather/snapshot-runner.js    |   3 +-
 .../fraggle-rock/gather/timespan-runner.js    |   3 +-
 lighthouse-core/fraggle-rock/user-flow.js     |   2 +-
 lighthouse-core/index.js                      |   6 +-
 lighthouse-core/scripts/print-a11y-scoring.js |   3 +-
 lighthouse-core/test/config/config-test.js    | 417 +++++++++---------
 .../test/fraggle-rock/config/config-test.js   | 119 +++--
 .../gather/navigation-runner-test.js          |  20 +-
 .../test/gather/gather-runner-test.js         |  66 +--
 lighthouse-core/test/runner-test.js           | 122 +++--
 tsconfig-base.json                            |   2 +-
 16 files changed, 446 insertions(+), 421 deletions(-)

diff --git a/lighthouse-cli/bin.js b/lighthouse-cli/bin.js
index 1d25c5b58cd4..c1637015bd69 100644
--- a/lighthouse-cli/bin.js
+++ b/lighthouse-cli/bin.js
@@ -120,7 +120,7 @@ async function begin() {
   }
 
   if (cliFlags.printConfig) {
-    const config = lighthouse.generateConfig(configJson, cliFlags);
+    const config = await lighthouse.generateConfig(configJson, cliFlags);
     process.stdout.write(config.getPrintString());
     return;
   }
diff --git a/lighthouse-core/config/config-helpers.js b/lighthouse-core/config/config-helpers.js
index 090ddb2b5253..2d9be28f2fb1 100644
--- a/lighthouse-core/config/config-helpers.js
+++ b/lighthouse-core/config/config-helpers.js
@@ -211,7 +211,8 @@ const bundledModules = new Map(/* BUILD_REPLACE_BUNDLED_MODULES */);
  * See build-bundle.js
  * @param {string} requirePath
  */
-function requireWrapper(requirePath) {
+async function requireWrapper(requirePath) {
+  // This is async because eventually this function needs to do async dynamic imports.
   return bundledModules.get(requirePath) || require(requirePath);
 }
 
@@ -219,9 +220,9 @@ function requireWrapper(requirePath) {
  * @param {string} gathererPath
  * @param {Array<string>} coreGathererList
  * @param {string=} configDir
- * @return {LH.Config.GathererDefn}
+ * @return {Promise<LH.Config.GathererDefn>}
  */
-function requireGatherer(gathererPath, coreGathererList, configDir) {
+async function requireGatherer(gathererPath, coreGathererList, configDir) {
   const coreGatherer = coreGathererList.find(a => a === `${gathererPath}.js`);
 
   let requirePath = `../gather/gatherers/${gathererPath}`;
@@ -230,7 +231,7 @@ function requireGatherer(gathererPath, coreGathererList, configDir) {
     requirePath = resolveModulePath(gathererPath, configDir, 'gatherer');
   }
 
-  const GathererClass = /** @type {GathererConstructor} */ (requireWrapper(requirePath));
+  const GathererClass = /** @type {GathererConstructor} */ (await requireWrapper(requirePath));
 
   return {
     instance: new GathererClass(),
@@ -243,7 +244,7 @@ function requireGatherer(gathererPath, coreGathererList, configDir) {
  * @param {string} auditPath
  * @param {Array<string>} coreAuditList
  * @param {string=} configDir
- * @return {LH.Config.AuditDefn['implementation']}
+ * @return {Promise<LH.Config.AuditDefn['implementation']>}
  */
 function requireAudit(auditPath, coreAuditList, configDir) {
   // See if the audit is a Lighthouse core audit.
@@ -328,9 +329,9 @@ function resolveSettings(settingsJson = {}, overrides = undefined) {
  * @param {LH.Config.Json} configJSON
  * @param {string | undefined} configDir
  * @param {{plugins?: string[]} | undefined} flags
- * @return {LH.Config.Json}
+ * @return {Promise<LH.Config.Json>}
  */
-function mergePlugins(configJSON, configDir, flags) {
+async function mergePlugins(configJSON, configDir, flags) {
   const configPlugins = configJSON.plugins || [];
   const flagPlugins = flags?.plugins || [];
   const pluginNames = new Set([...configPlugins, ...flagPlugins]);
@@ -342,7 +343,7 @@ function mergePlugins(configJSON, configDir, flags) {
     const pluginPath = isBundledEnvironment() ?
         pluginName :
         resolveModulePath(pluginName, configDir, 'plugin');
-    const rawPluginJson = requireWrapper(pluginPath);
+    const rawPluginJson = await requireWrapper(pluginPath);
     const pluginJson = ConfigPlugin.parsePlugin(rawPluginJson, pluginName);
 
     configJSON = mergeConfigFragment(configJSON, pluginJson);
@@ -360,9 +361,9 @@ function mergePlugins(configJSON, configDir, flags) {
  * @param {LH.Config.GathererJson} gathererJson
  * @param {Array<string>} coreGathererList
  * @param {string=} configDir
- * @return {LH.Config.GathererDefn}
+ * @return {Promise<LH.Config.GathererDefn>}
  */
-function resolveGathererToDefn(gathererJson, coreGathererList, configDir) {
+async function resolveGathererToDefn(gathererJson, coreGathererList, configDir) {
   const gathererDefn = expandGathererShorthand(gathererJson);
   if (gathererDefn.instance) {
     return {
@@ -391,21 +392,21 @@ function resolveGathererToDefn(gathererJson, coreGathererList, configDir) {
  * leaving only an array of AuditDefns.
  * @param {LH.Config.Json['audits']} audits
  * @param {string=} configDir
- * @return {Array<LH.Config.AuditDefn>|null}
+ * @return {Promise<Array<LH.Config.AuditDefn>|null>}
  */
-function resolveAuditsToDefns(audits, configDir) {
+async function resolveAuditsToDefns(audits, configDir) {
   if (!audits) {
     return null;
   }
 
   const coreList = Runner.getAuditList();
-  const auditDefns = audits.map(auditJson => {
+  const auditDefnsPromises = audits.map(async (auditJson) => {
     const auditDefn = expandAuditShorthand(auditJson);
     let implementation;
     if ('implementation' in auditDefn) {
       implementation = auditDefn.implementation;
     } else {
-      implementation = requireAudit(auditDefn.path, coreList, configDir);
+      implementation = await requireAudit(auditDefn.path, coreList, configDir);
     }
 
     return {
@@ -414,6 +415,7 @@ function resolveAuditsToDefns(audits, configDir) {
       options: auditDefn.options || {},
     };
   });
+  const auditDefns = await Promise.all(auditDefnsPromises);
 
   const mergedAuditDefns = mergeOptionsOfItems(auditDefns);
   mergedAuditDefns.forEach(audit => validation.assertValidAudit(audit));
diff --git a/lighthouse-core/config/config.js b/lighthouse-core/config/config.js
index dd2fd420a1f7..d9adf8283bde 100644
--- a/lighthouse-core/config/config.js
+++ b/lighthouse-core/config/config.js
@@ -148,17 +148,15 @@ function assertValidFlags(flags) {
   }
 }
 
-
 /**
  * @implements {LH.Config.Config}
  */
 class Config {
   /**
-   * @constructor
    * @param {LH.Config.Json=} configJSON
    * @param {LH.Flags=} flags
    */
-  constructor(configJSON, flags) {
+  static async createConfigFromJson(configJSON, flags) {
     const status = {msg: 'Create config', id: 'lh:init:config'};
     log.time(status, 'verbose');
     let configPath = flags?.configPath;
@@ -187,7 +185,7 @@ class Config {
     const configDir = configPath ? path.dirname(configPath) : undefined;
 
     // Validate and merge in plugins (if any).
-    configJSON = mergePlugins(configJSON, configDir, flags);
+    configJSON = await mergePlugins(configJSON, configDir, flags);
 
     if (flags) {
       assertValidFlags(flags);
@@ -197,14 +195,28 @@ class Config {
     // Augment passes with necessary defaults and require gatherers.
     const passesWithDefaults = Config.augmentPassesWithDefaults(configJSON.passes);
     Config.adjustDefaultPassForThrottling(settings, passesWithDefaults);
-    const passes = Config.requireGatherers(passesWithDefaults, configDir);
+    const passes = await Config.requireGatherers(passesWithDefaults, configDir);
 
+    const audits = await Config.requireAudits(configJSON.audits, configDir);
+
+    const config = new Config(configJSON, {settings, passes, audits});
+    log.timeEnd(status);
+    return config;
+  }
+
+  /**
+   * @deprecated `Config.createConfigFromJson` should be used instead.
+   * @constructor
+   * @param {LH.Config.Json} configJSON
+   * @param {{settings: LH.Config.Settings, passes: ?LH.Config.Pass[], audits: ?LH.Config.AuditDefn[]}} opts
+   */
+  constructor(configJSON, opts) {
     /** @type {LH.Config.Settings} */
-    this.settings = settings;
+    this.settings = opts.settings;
     /** @type {?Array<LH.Config.Pass>} */
-    this.passes = passes;
+    this.passes = opts.passes;
     /** @type {?Array<LH.Config.AuditDefn>} */
-    this.audits = Config.requireAudits(configJSON.audits, configDir);
+    this.audits = opts.audits;
     /** @type {?Record<string, LH.Config.Category>} */
     this.categories = configJSON.categories || null;
     /** @type {?Record<string, LH.Config.Group>} */
@@ -214,8 +226,6 @@ class Config {
 
     assertValidPasses(this.passes, this.audits);
     validation.assertValidCategories(this.categories, this.audits, this.groups);
-
-    log.timeEnd(status);
   }
 
   /**
@@ -498,12 +508,12 @@ class Config {
    * leaving only an array of AuditDefns.
    * @param {LH.Config.Json['audits']} audits
    * @param {string=} configDir
-   * @return {Config['audits']}
+   * @return {Promise<Config['audits']>}
    */
-  static requireAudits(audits, configDir) {
+  static async requireAudits(audits, configDir) {
     const status = {msg: 'Requiring audits', id: 'lh:config:requireAudits'};
     log.time(status, 'verbose');
-    const auditDefns = resolveAuditsToDefns(audits, configDir);
+    const auditDefns = await resolveAuditsToDefns(audits, configDir);
     log.timeEnd(status);
     return auditDefns;
   }
@@ -514,9 +524,9 @@ class Config {
    * provided) using `resolveModulePath`, returning an array of full Passes.
    * @param {?Array<Required<LH.Config.PassJson>>} passes
    * @param {string=} configDir
-   * @return {Config['passes']}
+   * @return {Promise<Config['passes']>}
    */
-  static requireGatherers(passes, configDir) {
+  static async requireGatherers(passes, configDir) {
     if (!passes) {
       return null;
     }
@@ -524,9 +534,11 @@ class Config {
     log.time(status, 'verbose');
 
     const coreList = Runner.getGathererList();
-    const fullPasses = passes.map(pass => {
-      const gathererDefns = pass.gatherers
-        .map(gatherer => resolveGathererToDefn(gatherer, coreList, configDir));
+    const fullPassesPromises = passes.map(async (pass) => {
+      const gathererDefns = await Promise.all(
+        pass.gatherers
+          .map(gatherer => resolveGathererToDefn(gatherer, coreList, configDir))
+      );
 
       // De-dupe gatherers by artifact name because artifact IDs must be unique at runtime.
       const uniqueDefns = Array.from(
@@ -536,6 +548,8 @@ class Config {
 
       return Object.assign(pass, {gatherers: uniqueDefns});
     });
+    const fullPasses = await Promise.all(fullPassesPromises);
+
     log.timeEnd(status);
     return fullPasses;
   }
diff --git a/lighthouse-core/fraggle-rock/config/config.js b/lighthouse-core/fraggle-rock/config/config.js
index 1d1480b77032..2fece7796b58 100644
--- a/lighthouse-core/fraggle-rock/config/config.js
+++ b/lighthouse-core/fraggle-rock/config/config.js
@@ -121,9 +121,9 @@ function resolveArtifactDependencies(artifact, gatherer, artifactDefnsBySymbol)
  *
  * @param {LH.Config.ArtifactJson[]|null|undefined} artifacts
  * @param {string|undefined} configDir
- * @return {LH.Config.AnyArtifactDefn[] | null}
+ * @return {Promise<LH.Config.AnyArtifactDefn[] | null>}
  */
-function resolveArtifactsToDefns(artifacts, configDir) {
+async function resolveArtifactsToDefns(artifacts, configDir) {
   if (!artifacts) return null;
 
   const status = {msg: 'Resolve artifact definitions', id: 'lh:config:resolveArtifactsToDefns'};
@@ -133,12 +133,12 @@ function resolveArtifactsToDefns(artifacts, configDir) {
   const artifactDefnsBySymbol = new Map();
 
   const coreGathererList = Runner.getGathererList();
-  const artifactDefns = artifacts.map(artifactJson => {
+  const artifactDefnsPromises = artifacts.map(async (artifactJson) => {
     /** @type {LH.Config.GathererJson} */
     // @ts-expect-error - remove when legacy runner path is removed.
     const gathererJson = artifactJson.gatherer;
 
-    const gatherer = resolveGathererToDefn(gathererJson, coreGathererList, configDir);
+    const gatherer = await resolveGathererToDefn(gathererJson, coreGathererList, configDir);
     if (!isFRGathererDefn(gatherer)) {
       throw new Error(`${gatherer.instance.name} gatherer does not have a Fraggle Rock meta obj`);
     }
@@ -156,6 +156,7 @@ function resolveArtifactsToDefns(artifacts, configDir) {
     if (symbol) artifactDefnsBySymbol.set(symbol, artifact);
     return artifact;
   });
+  const artifactDefns = await Promise.all(artifactDefnsPromises);
 
   log.timeEnd(status);
   return artifactDefns;
@@ -242,28 +243,28 @@ function resolveNavigationsToDefns(navigations, artifactDefns, settings) {
 /**
  * @param {LH.Config.Json|undefined} configJSON
  * @param {ConfigContext} context
- * @return {{config: LH.Config.FRConfig, warnings: string[]}}
+ * @return {Promise<{config: LH.Config.FRConfig, warnings: string[]}>}
  */
-function initializeConfig(configJSON, context) {
+async function initializeConfig(configJSON, context) {
   const status = {msg: 'Initialize config', id: 'lh:config'};
   log.time(status, 'verbose');
 
   let {configWorkingCopy, configDir} = resolveWorkingCopy(configJSON, context); // eslint-disable-line prefer-const
 
   configWorkingCopy = resolveExtensions(configWorkingCopy);
-  configWorkingCopy = mergePlugins(configWorkingCopy, configDir, context.settingsOverrides);
+  configWorkingCopy = await mergePlugins(configWorkingCopy, configDir, context.settingsOverrides);
 
   const settings = resolveSettings(configWorkingCopy.settings || {}, context.settingsOverrides);
   overrideSettingsForGatherMode(settings, context);
 
-  const artifacts = resolveArtifactsToDefns(configWorkingCopy.artifacts, configDir);
+  const artifacts = await resolveArtifactsToDefns(configWorkingCopy.artifacts, configDir);
   const navigations = resolveNavigationsToDefns(configWorkingCopy.navigations, artifacts, settings);
 
   /** @type {LH.Config.FRConfig} */
   let config = {
     artifacts,
     navigations,
-    audits: resolveAuditsToDefns(configWorkingCopy.audits, configDir),
+    audits: await resolveAuditsToDefns(configWorkingCopy.audits, configDir),
     categories: configWorkingCopy.categories || null,
     groups: configWorkingCopy.groups || null,
     settings,
diff --git a/lighthouse-core/fraggle-rock/gather/navigation-runner.js b/lighthouse-core/fraggle-rock/gather/navigation-runner.js
index cc799b745224..bdcefbc27a80 100644
--- a/lighthouse-core/fraggle-rock/gather/navigation-runner.js
+++ b/lighthouse-core/fraggle-rock/gather/navigation-runner.js
@@ -310,7 +310,8 @@ async function navigationGather(requestor, options) {
   const {configContext = {}} = options;
   log.setLevel(configContext.logLevel || 'error');
 
-  const {config} = initializeConfig(options.config, {...configContext, gatherMode: 'navigation'});
+  const {config} =
+    await initializeConfig(options.config, {...configContext, gatherMode: 'navigation'});
   const computedCache = new Map();
   const internalOptions = {
     skipAboutBlank: configContext.skipAboutBlank,
diff --git a/lighthouse-core/fraggle-rock/gather/snapshot-runner.js b/lighthouse-core/fraggle-rock/gather/snapshot-runner.js
index 92a60a564777..c4038448b336 100644
--- a/lighthouse-core/fraggle-rock/gather/snapshot-runner.js
+++ b/lighthouse-core/fraggle-rock/gather/snapshot-runner.js
@@ -24,7 +24,8 @@ async function snapshotGather(options) {
   const {configContext = {}} = options;
   log.setLevel(configContext.logLevel || 'error');
 
-  const {config} = initializeConfig(options.config, {...configContext, gatherMode: 'snapshot'});
+  const {config} =
+    await initializeConfig(options.config, {...configContext, gatherMode: 'snapshot'});
   const driver = new Driver(options.page);
   await driver.connect();
 
diff --git a/lighthouse-core/fraggle-rock/gather/timespan-runner.js b/lighthouse-core/fraggle-rock/gather/timespan-runner.js
index 25ceab578caa..8daeb1da225e 100644
--- a/lighthouse-core/fraggle-rock/gather/timespan-runner.js
+++ b/lighthouse-core/fraggle-rock/gather/timespan-runner.js
@@ -25,7 +25,8 @@ async function startTimespanGather(options) {
   const {configContext = {}} = options;
   log.setLevel(configContext.logLevel || 'error');
 
-  const {config} = initializeConfig(options.config, {...configContext, gatherMode: 'timespan'});
+  const {config} =
+    await initializeConfig(options.config, {...configContext, gatherMode: 'timespan'});
   const driver = new Driver(options.page);
   await driver.connect();
 
diff --git a/lighthouse-core/fraggle-rock/user-flow.js b/lighthouse-core/fraggle-rock/user-flow.js
index 552879e24fc5..ebbee466c780 100644
--- a/lighthouse-core/fraggle-rock/user-flow.js
+++ b/lighthouse-core/fraggle-rock/user-flow.js
@@ -205,7 +205,7 @@ async function auditGatherSteps(gatherSteps, options) {
       // Step specific configs take precedence over a config for the entire flow.
       const configJson = gatherStep.config || options.config;
       const {gatherMode} = artifacts.GatherContext;
-      const {config} = initializeConfig(configJson, {...configContext, gatherMode});
+      const {config} = await initializeConfig(configJson, {...configContext, gatherMode});
       runnerOptions = {
         config,
         computedCache: new Map(),
diff --git a/lighthouse-core/index.js b/lighthouse-core/index.js
index f4a6b5d8a4d2..eb163a5bcb5e 100644
--- a/lighthouse-core/index.js
+++ b/lighthouse-core/index.js
@@ -64,7 +64,7 @@ async function legacyNavigation(url, flags = {}, configJSON, userConnection) {
   flags.logLevel = flags.logLevel || 'error';
   log.setLevel(flags.logLevel);
 
-  const config = generateConfig(configJSON, flags);
+  const config = await generateConfig(configJSON, flags);
   const computedCache = new Map();
   const options = {config, computedCache};
   const connection = userConnection || new ChromeProtocol(flags.port, flags.hostname);
@@ -83,10 +83,10 @@ async function legacyNavigation(url, flags = {}, configJSON, userConnection) {
  *   not present, the default config is used.
  * @param {LH.Flags=} flags Optional settings for the Lighthouse run. If present,
  *   they will override any settings in the config.
- * @return {Config}
+ * @return {Promise<Config>}
  */
 function generateConfig(configJson, flags) {
-  return new Config(configJson, flags);
+  return Config.createConfigFromJson(configJson, flags);
 }
 
 lighthouse.legacyNavigation = legacyNavigation;
diff --git a/lighthouse-core/scripts/print-a11y-scoring.js b/lighthouse-core/scripts/print-a11y-scoring.js
index c613d2fc20c1..30349938e4e6 100644
--- a/lighthouse-core/scripts/print-a11y-scoring.js
+++ b/lighthouse-core/scripts/print-a11y-scoring.js
@@ -7,9 +7,8 @@
 // node lighthouse-core/scripts/print-a11y-scoring.js
 
 import Config from '../config/config.js';
-import defaultConfig from '../config/default-config.js';
 
-const config = new Config(defaultConfig);
+const config = await Config.createConfigFromJson();
 if (!config.categories || !config.audits) throw new Error('wut');
 
 const auditRefs = config.categories.accessibility.auditRefs;
diff --git a/lighthouse-core/test/config/config-test.js b/lighthouse-core/test/config/config-test.js
index e83002cdb834..05c6bf0d3552 100644
--- a/lighthouse-core/test/config/config-test.js
+++ b/lighthouse-core/test/config/config-test.js
@@ -29,15 +29,15 @@ describe('Config', () => {
     origConfig = JSON.parse(JSON.stringify(defaultConfig));
   });
 
-  it('returns new object', () => {
+  it('returns new object', async () => {
     const config = {
       audits: ['is-on-https'],
     };
-    const newConfig = new Config(config);
+    const newConfig = Config.createConfigFromJson(config, {});
     assert.notEqual(config, newConfig);
   });
 
-  it('doesn\'t change directly injected gatherer implementations', () => {
+  it('doesn\'t change directly injected gatherer implementations', async () => {
     class MyGatherer extends Gatherer {}
     class MyAudit extends Audit {
       static get meta() {
@@ -60,12 +60,12 @@ describe('Config', () => {
       }],
       audits: [MyAudit],
     };
-    const newConfig = new Config(config);
+    const newConfig = await Config.createConfigFromJson(config);
     assert.equal(MyGatherer, newConfig.passes[0].gatherers[0].implementation);
     assert.equal(MyAudit, newConfig.audits[0].implementation);
   });
 
-  it('doesn\'t change directly injected gatherer instances', () => {
+  it('doesn\'t change directly injected gatherer instances', async () => {
     class MyGatherer extends Gatherer {
       constructor(secretVal) {
         super();
@@ -87,7 +87,7 @@ describe('Config', () => {
         ],
       }],
     };
-    const newConfig = new Config(config);
+    const newConfig = await Config.createConfigFromJson(config);
     const configGatherers = newConfig.passes[0].gatherers;
     assert(configGatherers[0].instance instanceof MyGatherer);
     assert.equal(configGatherers[0].instance.secret, 1729);
@@ -95,13 +95,13 @@ describe('Config', () => {
     assert.equal(configGatherers[1].instance.secret, 6);
   });
 
-  it('uses the default config when no config is provided', () => {
-    const config = new Config();
+  it('uses the default config when no config is provided', async () => {
+    const config = await Config.createConfigFromJson();
     assert.deepStrictEqual(config.categories, origConfig.categories);
     assert.deepStrictEqual(config.audits.map(a => a.path), origConfig.audits);
   });
 
-  it('throws when a passName is used twice', () => {
+  it('throws when a passName is used twice', async () => {
     const unlikelyPassName = 'unlikelyPassName';
     const configJson = {
       passes: [{
@@ -113,10 +113,10 @@ describe('Config', () => {
       }],
     };
 
-    assert.throws(_ => new Config(configJson), /unique/);
+    await assert.rejects(Config.createConfigFromJson(configJson), /unique/);
   });
 
-  it('defaults passName to defaultPass', () => {
+  it('defaults passName to defaultPass', async () => {
     class MyGatherer extends Gatherer {}
     const configJson = {
       passes: [{
@@ -124,7 +124,7 @@ describe('Config', () => {
       }],
     };
 
-    const config = new Config(configJson);
+    const config = await Config.createConfigFromJson(configJson);
     const defaultPass = config.passes.find(pass => pass.passName === 'defaultPass');
     assert.ok(
       defaultPass.gatherers.find(gatherer => gatherer.implementation === MyGatherer),
@@ -132,7 +132,7 @@ describe('Config', () => {
     );
   });
 
-  it('throws when an audit requires an artifact with no gatherer supplying it', async () => {
+  it('throws when an audit requires an artifact with no gatherer supplying it', () => {
     class NeedsWhatYouCantGive extends Audit {
       static get meta() {
         return {
@@ -153,11 +153,11 @@ describe('Config', () => {
       static audit() {}
     }
 
-    expect(() => new Config({
+    expect(Config.createConfigFromJson({
       extends: 'lighthouse:default',
       audits: [NeedsWhatYouCantGive],
     // eslint-disable-next-line max-len
-    })).toThrow('VRMLElements gatherer, required by audit missing-artifact-audit, was not found in config');
+    })).rejects.toThrow('VRMLElements gatherer, required by audit missing-artifact-audit, was not found in config');
   });
 
   // eslint-disable-next-line max-len
@@ -183,7 +183,7 @@ describe('Config', () => {
     }
 
     // Shouldn't throw.
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       extends: 'lighthouse:default',
       audits: [DoesntNeedYourCrap],
     }, {
@@ -214,7 +214,7 @@ describe('Config', () => {
       static audit() {}
     }
 
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       extends: 'lighthouse:default',
       audits: [ButWillStillTakeYourCrap],
     }, {
@@ -246,7 +246,7 @@ describe('Config', () => {
       static audit() {}
     }
 
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       extends: 'lighthouse:default',
       audits: [ButWillStillTakeYourCrap],
     }, {
@@ -278,7 +278,7 @@ describe('Config', () => {
       static audit() {}
     }
 
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       extends: 'lighthouse:default',
       audits: [ButWillStillTakeYourCrap],
     }, {
@@ -289,7 +289,7 @@ describe('Config', () => {
       .toEqual(['viewport-dimensions', 'source-maps']);
   });
 
-  it('does not throw when an audit requires only base artifacts', () => {
+  it('does not throw when an audit requires only base artifacts', async () => {
     class BaseArtifactsAudit extends Audit {
       static get meta() {
         return {
@@ -304,7 +304,7 @@ describe('Config', () => {
       static audit() {}
     }
 
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       extends: 'lighthouse:default',
       audits: [BaseArtifactsAudit],
     }, {onlyAudits: ['base-artifacts-audit']});
@@ -313,7 +313,7 @@ describe('Config', () => {
     assert.strictEqual(config.audits[0].implementation.meta.id, 'base-artifacts-audit');
   });
 
-  it('throws for unknown gatherers', () => {
+  it('throws for unknown gatherers', async () => {
     const config = {
       passes: [{
         gatherers: ['fuzz'],
@@ -323,11 +323,10 @@ describe('Config', () => {
       ],
     };
 
-    return assert.throws(_ => new Config(config),
-        /Unable to locate/);
+    await assert.rejects(Config.createConfigFromJson(config), /Unable to locate/);
   });
 
-  it('doesn\'t mutate old gatherers when filtering passes', () => {
+  it('doesn\'t mutate old gatherers when filtering passes', async () => {
     const configJSON = {
       passes: [{
         gatherers: [
@@ -339,12 +338,12 @@ describe('Config', () => {
       audits: ['is-on-https'],
     };
 
-    const _ = new Config(configJSON);
+    const _ = await Config.createConfigFromJson(configJSON);
     assert.equal(configJSON.passes[0].gatherers.length, 3);
   });
 
-  it('expands audits', () => {
-    const config = new Config({
+  it('expands audits', async () => {
+    const config = await Config.createConfigFromJson({
       audits: ['user-timings'],
     });
 
@@ -355,30 +354,30 @@ describe('Config', () => {
     assert.deepEqual(config.audits[0].options, {});
   });
 
-  it('throws when an audit is not found', () => {
-    return assert.throws(_ => new Config({
+  it('throws when an audit is not found', async () => {
+    await assert.rejects(Config.createConfigFromJson({
       audits: ['/fake-path/non-existent-audit'],
     }), /locate audit/);
   });
 
-  it('throws on a non-absolute config path', () => {
+  it('throws on a non-absolute config path', async () => {
     const configPath = '../../config/default-config.js';
 
-    return assert.throws(_ => new Config({
+    await assert.rejects(Config.createConfigFromJson({
       audits: [],
     }, {configPath}), /absolute path/);
   });
 
-  it('loads an audit relative to a config path', () => {
+  it('loads an audit relative to a config path', async () => {
     const configPath = __filename;
 
-    return assert.doesNotThrow(_ => new Config({
+    return assert.doesNotThrow(_ => Config.createConfigFromJson({
       audits: ['../fixtures/valid-custom-audit'],
     }, {configPath}));
   });
 
-  it('loads an audit from node_modules/', () => {
-    return assert.throws(_ => new Config({
+  it('loads an audit from node_modules/', async () => {
+    await assert.rejects(Config.createConfigFromJson({
       // Use a lighthouse dep as a stand in for a module.
       audits: ['lighthouse-logger'],
     }), function(err) {
@@ -387,20 +386,20 @@ describe('Config', () => {
     });
   });
 
-  it('loads an audit relative to the working directory', () => {
+  it('loads an audit relative to the working directory', async () => {
     // Construct an audit URL relative to current working directory, regardless
     // of where test was started from.
     const absoluteAuditPath = path.resolve(__dirname, '../fixtures/valid-custom-audit');
     assert.doesNotThrow(_ => require.resolve(absoluteAuditPath));
     const relativePath = path.relative(process.cwd(), absoluteAuditPath);
 
-    return assert.doesNotThrow(_ => new Config({
+    return assert.doesNotThrow(_ => Config.createConfigFromJson({
       audits: [relativePath],
     }));
   });
 
-  it('throws but not for missing audit when audit has a dependency error', () => {
-    return assert.throws(_ => new Config({
+  it('throws but not for missing audit when audit has a dependency error', async () => {
+    await assert.rejects(Config.createConfigFromJson({
       audits: [path.resolve(__dirname, '../fixtures/invalid-audits/require-error.js')],
     }), function(err) {
       // We're expecting not to find parent class Audit, so only reject on our
@@ -409,21 +408,21 @@ describe('Config', () => {
     });
   });
 
-  it('throws when it finds invalid audits', () => {
+  it('throws when it finds invalid audits', async () => {
     const basePath = path.resolve(__dirname, '../fixtures/invalid-audits');
-    assert.throws(_ => new Config({
+    await assert.rejects(Config.createConfigFromJson({
       audits: [basePath + '/missing-audit'],
     }), /audit\(\) method/);
 
-    assert.throws(_ => new Config({
+    await assert.rejects(Config.createConfigFromJson({
       audits: [basePath + '/missing-id'],
     }), /meta.id property/);
 
-    assert.throws(_ => new Config({
+    await assert.rejects(Config.createConfigFromJson({
       audits: [basePath + '/missing-title'],
     }), /meta.title property/);
 
-    assert.throws(_ => new Config({
+    await assert.rejects(Config.createConfigFromJson({
       audits: [
         class BinaryButNoFailureTitleAudit extends Audit {
           static get meta() {
@@ -443,11 +442,11 @@ describe('Config', () => {
       ],
     }), /no meta.failureTitle and should/);
 
-    assert.throws(_ => new Config({
+    await assert.rejects(Config.createConfigFromJson({
       audits: [basePath + '/missing-description'],
     }), /meta.description property/);
 
-    assert.throws(_ => new Config({
+    await assert.rejects(Config.createConfigFromJson({
       audits: [
         class EmptyStringDescriptionAudit extends Audit {
           static get meta() {
@@ -467,13 +466,13 @@ describe('Config', () => {
       ],
     }), /empty meta.description string/);
 
-    assert.throws(_ => new Config({
+    await assert.rejects(Config.createConfigFromJson({
       audits: [basePath + '/missing-required-artifacts'],
     }), /meta.requiredArtifacts property/);
   });
 
-  it('throws when a category references a non-existent audit', () => {
-    return assert.throws(_ => new Config({
+  it('throws when a category references a non-existent audit', async () => {
+    await assert.rejects(Config.createConfigFromJson({
       audits: [],
       categories: {
         pwa: {
@@ -485,8 +484,8 @@ describe('Config', () => {
     }), /could not find missing-audit/);
   });
 
-  it('throws when a category fails to specify an audit id', () => {
-    return assert.throws(_ => new Config({
+  it('throws when a category fails to specify an audit id', async () => {
+    await assert.rejects(Config.createConfigFromJson({
       audits: [],
       categories: {
         pwa: {
@@ -498,8 +497,8 @@ describe('Config', () => {
     }), /missing an audit id at pwa\[0\]/);
   });
 
-  it('throws when an accessibility audit does not have a group', () => {
-    return assert.throws(_ => new Config({
+  it('throws when an accessibility audit does not have a group', async () => {
+    await assert.rejects(Config.createConfigFromJson({
       audits: ['accessibility/color-contrast'],
       categories: {
         accessibility: {
@@ -511,8 +510,8 @@ describe('Config', () => {
     }), /does not have a group/);
   });
 
-  it('throws when an audit references an unknown group', () => {
-    return assert.throws(_ => new Config({
+  it('throws when an audit references an unknown group', async () => {
+    await assert.rejects(Config.createConfigFromJson({
       groups: {
         'group-a': {
           title: 'Group A',
@@ -531,8 +530,8 @@ describe('Config', () => {
     }), /unknown group missing-group/);
   });
 
-  it('throws when a manual audit has weight', () => {
-    return assert.throws(_ => new Config({
+  it('throws when a manual audit has weight', async () => {
+    await assert.rejects(Config.createConfigFromJson({
       audits: ['manual/pwa-cross-browser'],
       categories: {
         accessibility: {
@@ -544,8 +543,8 @@ describe('Config', () => {
     }), /cross-browser .*has a positive weight/);
   });
 
-  it('filters the config', () => {
-    const config = new Config({
+  it('filters the config', async () => {
+    const config = await Config.createConfigFromJson({
       settings: {
         onlyCategories: ['needed-category'],
         onlyAudits: ['color-contrast'],
@@ -589,8 +588,8 @@ describe('Config', () => {
     assert.equal(config.categories['other-category'].auditRefs.length, 1);
   });
 
-  it('filters the config w/ skipAudits', () => {
-    const config = new Config({
+  it('filters the config w/ skipAudits', async () => {
+    const config = await Config.createConfigFromJson({
       settings: {
         skipAudits: ['first-meaningful-paint'],
       },
@@ -629,11 +628,11 @@ describe('Config', () => {
   });
 
 
-  it('filtering filters out traces when not needed', () => {
+  it('filtering filters out traces when not needed', async () => {
     const warnings = [];
     const saveWarning = evt => warnings.push(evt);
     log.events.addListener('warning', saveWarning);
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       extends: 'lighthouse:default',
       settings: {
         onlyCategories: ['accessibility'],
@@ -647,11 +646,11 @@ describe('Config', () => {
     assert.equal(config.passes[0].recordTrace, false, 'turns off tracing if not needed');
   });
 
-  it('forces the first pass to have a fatal loadFailureMode', () => {
+  it('forces the first pass to have a fatal loadFailureMode', async () => {
     const warnings = [];
     const saveWarning = evt => warnings.push(evt);
     log.events.addListener('warning', saveWarning);
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       extends: 'lighthouse:default',
       settings: {
         onlyCategories: ['performance', 'pwa'],
@@ -667,8 +666,8 @@ describe('Config', () => {
     expect(config.passes[0]).toHaveProperty('loadFailureMode', 'fatal');
   });
 
-  it('filters works with extension', () => {
-    const config = new Config({
+  it('filters works with extension', async () => {
+    const config = await Config.createConfigFromJson({
       extends: 'lighthouse:default',
       settings: {
         onlyCategories: ['performance'],
@@ -684,11 +683,11 @@ describe('Config', () => {
     assert.ok(config.audits.find(a => a.implementation.meta.id === 'full-page-screenshot'));
   });
 
-  it('warns for invalid filters', () => {
+  it('warns for invalid filters', async () => {
     const warnings = [];
     const saveWarning = evt => warnings.push(evt);
     log.events.addListener('warning', saveWarning);
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       extends: 'lighthouse:default',
       settings: {
         onlyCategories: ['performance', 'missing-category'],
@@ -701,9 +700,9 @@ describe('Config', () => {
     assert.equal(warnings.length, 3, 'did not warn enough');
   });
 
-  it('throws for invalid use of skipAudits and onlyAudits', () => {
-    assert.throws(() => {
-      new Config({
+  it('throws for invalid use of skipAudits and onlyAudits', async () => {
+    await assert.rejects(() => {
+      return Config.createConfigFromJson({
         extends: 'lighthouse:default',
         settings: {
           onlyAudits: ['first-meaningful-paint'],
@@ -713,19 +712,22 @@ describe('Config', () => {
     });
   });
 
-  it('cleans up flags for settings', () => {
-    const config = new Config({extends: 'lighthouse:default'},
+  it('cleans up flags for settings', async () => {
+    const config = await Config.createConfigFromJson({extends: 'lighthouse:default'},
       {nonsense: 1, foo: 2, throttlingMethod: 'provided'});
     assert.equal(config.settings.throttlingMethod, 'provided');
     assert.ok(config.settings.nonsense === undefined, 'did not cleanup settings');
   });
 
-  it('allows overriding of array-typed settings', () => {
-    const config = new Config({extends: 'lighthouse:default'}, {output: ['html']});
+  it('allows overriding of array-typed settings', async () => {
+    const config = await Config.createConfigFromJson(
+      {extends: 'lighthouse:default'},
+      {output: ['html']}
+    );
     assert.deepStrictEqual(config.settings.output, ['html']);
   });
 
-  it('extends the config', () => {
+  it('extends the config', async () => {
     class CustomAudit extends Audit {
       static get meta() {
         return {
@@ -742,7 +744,7 @@ describe('Config', () => {
       }
     }
 
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       extends: 'lighthouse:default',
       audits: [
         CustomAudit,
@@ -756,8 +758,8 @@ describe('Config', () => {
     assert.ok(auditNames.has('first-meaningful-paint'), 'did not include default audits');
   });
 
-  it('ensures quiet thresholds are sufficient when using devtools', () => {
-    const config = new Config({
+  it('ensures quiet thresholds are sufficient when using devtools', async () => {
+    const config = await Config.createConfigFromJson({
       extends: 'lighthouse:default',
       settings: {
         throttlingMethod: 'devtools',
@@ -773,8 +775,8 @@ describe('Config', () => {
     assert.equal(config.passes[1].pauseAfterLoadMs, 0, 'should not have touched non-defaultPass');
   });
 
-  it('does nothing when thresholds for devtools are already sufficient', () => {
-    const config = new Config({
+  it('does nothing when thresholds for devtools are already sufficient', async () => {
+    const config = await Config.createConfigFromJson({
       extends: 'lighthouse:default',
       settings: {
         throttlingMethod: 'devtools',
@@ -796,15 +798,15 @@ describe('Config', () => {
   });
 
   it('only supports `lighthouse:default` extension', () => {
-    const createConfig = extendsValue => new Config({extends: extendsValue});
+    const createConfig = extendsValue => Config.createConfigFromJson({extends: extendsValue});
 
-    expect(() => createConfig(true)).toThrowError(/default` is the only valid extension/);
-    expect(() => createConfig('lighthouse')).toThrowError(/default` is the only valid/);
-    expect(() => createConfig('lighthouse:full')).toThrowError(/default` is the only valid/);
+    expect(createConfig(true)).rejects.toThrow(/default` is the only valid extension/);
+    expect(createConfig('lighthouse')).rejects.toThrow(/default` is the only valid/);
+    expect(createConfig('lighthouse:full')).rejects.toThrow(/default` is the only valid/);
   });
 
-  it('merges settings with correct priority', () => {
-    const config = new Config(
+  it('merges settings with correct priority', async () => {
+    const config = await Config.createConfigFromJson(
       {
         extends: 'lighthouse:default',
         settings: {
@@ -824,42 +826,45 @@ describe('Config', () => {
     assert.ok(config.settings.formFactor === 'desktop', 'missing setting from flags');
   });
 
-  it('inherits default settings when undefined', () => {
-    const config = new Config({settings: undefined});
+  it('inherits default settings when undefined', async () => {
+    const config = await Config.createConfigFromJson({settings: undefined});
     assert.ok(typeof config.settings.maxWaitForLoad === 'number', 'missing setting from default');
   });
 
   describe('locale', () => {
-    it('falls back to default locale if none specified', () => {
-      const config = new Config({settings: undefined});
+    it('falls back to default locale if none specified', async () => {
+      const config = await Config.createConfigFromJson({settings: undefined});
       // Don't assert specific locale so it isn't tied to where tests are run, but
       // check that it's valid and available.
       assert.ok(config.settings.locale);
       assert.strictEqual(config.settings.locale, i18n.lookupLocale(config.settings.locale));
     });
 
-    it('uses config setting for locale if set', () => {
+    it('uses config setting for locale if set', async () => {
       const locale = 'ar-XB';
-      const config = new Config({settings: {locale}});
+      const config = await Config.createConfigFromJson({settings: {locale}});
       assert.strictEqual(config.settings.locale, locale);
     });
 
-    it('uses flag setting for locale if set', () => {
+    it('uses flag setting for locale if set', async () => {
       const settingsLocale = 'en-XA';
       const flagsLocale = 'ar-XB';
-      const config = new Config({settings: {locale: settingsLocale}}, {locale: flagsLocale});
+      const config = await Config.createConfigFromJson({
+        settings: {locale: settingsLocale}},
+        {locale: flagsLocale}
+      );
       assert.strictEqual(config.settings.locale, flagsLocale);
     });
   });
 
   describe('emulatedUserAgent', () => {
-    it('uses the default UA string when emulatedUserAgent is undefined', () => {
-      const config = new Config({});
+    it('uses the default UA string when emulatedUserAgent is undefined', async () => {
+      const config = await Config.createConfigFromJson({});
       expect(config.settings.emulatedUserAgent).toMatch(/^Mozilla\/5.*Chrome-Lighthouse$/);
     });
 
-    it('uses the default UA string when emulatedUserAgent is true', () => {
-      const config = new Config({
+    it('uses the default UA string when emulatedUserAgent is true', async () => {
+      const config = await Config.createConfigFromJson({
         settings: {
           emulatedUserAgent: true,
         },
@@ -867,8 +872,8 @@ describe('Config', () => {
       expect(config.settings.emulatedUserAgent).toMatch(/^Mozilla\/5.*Chrome-Lighthouse$/);
     });
 
-    it('does not use a UA string when emulatedUserAgent is false', () => {
-      const config = new Config({
+    it('does not use a UA string when emulatedUserAgent is false', async () => {
+      const config = await Config.createConfigFromJson({
         settings: {
           emulatedUserAgent: false,
         },
@@ -876,9 +881,9 @@ describe('Config', () => {
       expect(config.settings.emulatedUserAgent).toEqual(false);
     });
 
-    it('uses the UA string provided if it is a string', () => {
+    it('uses the UA string provided if it is a string', async () => {
       const emulatedUserAgent = 'one weird trick to get a perfect LH score';
-      const config = new Config({
+      const config = await Config.createConfigFromJson({
         settings: {
           emulatedUserAgent,
         },
@@ -887,29 +892,30 @@ describe('Config', () => {
     });
   });
 
-  it('is idempotent when accepting a canonicalized Config as valid ConfigJson input', () => {
-    const config = new Config(defaultConfig);
-    const configAgain = new Config(config);
+  it('is idempotent when accepting a canonicalized Config as valid ConfigJson input', async () => {
+    const config = await Config.createConfigFromJson(defaultConfig);
+    const configAgain = await Config.createConfigFromJson(config);
     assert.deepEqual(config, configAgain);
   });
 
-  it('is idempotent accepting a canonicalized filtered Config as valid ConfigJson input', () => {
+  // eslint-disable-next-line max-len
+  it('is idempotent accepting a canonicalized filtered Config as valid ConfigJson input', async () => {
     const extendedJson = {
       extends: 'lighthouse:default',
       settings: {
         onlyCategories: ['pwa'],
       },
     };
-    const config = new Config(extendedJson);
+    const config = await Config.createConfigFromJson(extendedJson);
     assert.equal(config.passes.length, 2, 'did not filter config');
     assert.equal(Object.keys(config.categories).length, 1, 'did not filter config');
     assert.deepEqual(config.settings.onlyCategories, ['pwa']);
-    const configAgain = new Config(config);
+    const configAgain = await Config.createConfigFromJson(config);
     assert.deepEqual(config, configAgain);
   });
 
   describe('#extendConfigJSON', () => {
-    it('should merge passes', () => {
+    it('should merge passes', async () => {
       const configA = {
         passes: [
           {passName: 'passA', gatherers: ['a']},
@@ -931,14 +937,14 @@ describe('Config', () => {
       assert.deepEqual(merged.passes[3].gatherers, ['e']);
     });
 
-    it('should merge audits', () => {
+    it('should merge audits', async () => {
       const configA = {audits: ['a', 'b']};
       const configB = {audits: ['c']};
       const merged = Config.extendConfigJSON(configA, configB);
       assert.deepEqual(merged.audits, ['a', 'b', 'c']);
     });
 
-    it('should merge categories', () => {
+    it('should merge categories', async () => {
       const configA = {categories: {A: {title: 'Acat'}, B: {title: 'Bcat'}}};
       const configB = {categories: {C: {title: 'Ccat'}}};
       const merged = Config.extendConfigJSON(configA, configB);
@@ -949,7 +955,7 @@ describe('Config', () => {
       });
     });
 
-    it('should merge other values', () => {
+    it('should merge other values', async () => {
       const artifacts = {
         traces: {defaultPass: '../some/long/path'},
         devtoolsLogs: {defaultPass: 'path/to/devtools/log'},
@@ -966,17 +972,17 @@ describe('Config', () => {
     // Include a configPath flag so that config.js looks for the plugins in the fixtures dir.
     const configFixturePath = __dirname + '/../fixtures/config-plugins/';
 
-    it('should append audits', () => {
+    it('should append audits', async () => {
       const configJson = {
         audits: ['installable-manifest', 'metrics'],
         plugins: ['lighthouse-plugin-simple'],
       };
-      const config = new Config(configJson, {configPath: configFixturePath});
+      const config = await Config.createConfigFromJson(configJson, {configPath: configFixturePath});
       assert.deepStrictEqual(config.audits.map(a => a.path),
         ['installable-manifest', 'metrics', 'redirects', 'user-timings']);
     });
 
-    it('should append and use plugin-prefixed groups', () => {
+    it('should append and use plugin-prefixed groups', async () => {
       const configJson = {
         audits: ['installable-manifest', 'metrics'],
         plugins: ['lighthouse-plugin-simple'],
@@ -984,7 +990,7 @@ describe('Config', () => {
           configGroup: {title: 'This is a group in the base config'},
         },
       };
-      const config = new Config(configJson, {configPath: configFixturePath});
+      const config = await Config.createConfigFromJson(configJson, {configPath: configFixturePath});
 
       const groupIds = Object.keys(config.groups);
       assert.ok(groupIds.length === 2);
@@ -995,12 +1001,12 @@ describe('Config', () => {
         'lighthouse-plugin-simple-new-group');
     });
 
-    it('should append a category', () => {
+    it('should append a category', async () => {
       const configJson = {
         extends: 'lighthouse:default',
         plugins: ['lighthouse-plugin-simple'],
       };
-      const config = new Config(configJson, {configPath: configFixturePath});
+      const config = await Config.createConfigFromJson(configJson, {configPath: configFixturePath});
       const categoryNames = Object.keys(config.categories);
       assert.ok(categoryNames.length > 1);
       assert.strictEqual(categoryNames[categoryNames.length - 1], 'lighthouse-plugin-simple');
@@ -1008,7 +1014,7 @@ describe('Config', () => {
     });
 
     describe('budget setting', () => {
-      it('should be initialized', () => {
+      it('should be initialized', async () => {
         const configJson = {
           settings: {
             budgets: [{
@@ -1020,19 +1026,20 @@ describe('Config', () => {
             }],
           },
         };
-        const config = new Config(configJson);
+        const config = await Config.createConfigFromJson(configJson);
         assert.equal(config.settings.budgets[0].resourceCounts.length, 1);
         assert.equal(config.settings.budgets[0].resourceCounts[0].resourceType, 'image');
         assert.equal(config.settings.budgets[0].resourceCounts[0].budget, 500);
       });
 
-      it('should throw when provided an invalid budget', () => {
-        assert.throws(() => new Config({settings: {budgets: ['invalid123']}}),
+      it('should throw when provided an invalid budget', async () => {
+        await assert.rejects(
+          () => Config.createConfigFromJson({settings: {budgets: ['invalid123']}}),
           /Budget file is not defined as an array of budgets/);
       });
     });
 
-    it('should load plugins from the config and from passed-in flags', () => {
+    it('should load plugins from the config and from passed-in flags', async () => {
       const baseConfigJson = {
         audits: ['installable-manifest'],
         categories: {
@@ -1047,14 +1054,14 @@ describe('Config', () => {
 
       const allConfigConfigJson = {...baseConfigJson, plugins: [simplePluginName,
         noGroupsPluginName]};
-      const allPluginsInConfigConfig = new Config(allConfigConfigJson, baseFlags);
+      const allPluginsInConfigConfig = await Config.createConfigFromJson(allConfigConfigJson, baseFlags);
 
       const allFlagsFlags = {...baseFlags, plugins: [simplePluginName, noGroupsPluginName]};
-      const allPluginsInFlagsConfig = new Config(baseConfigJson, allFlagsFlags);
+      const allPluginsInFlagsConfig = await Config.createConfigFromJson(baseConfigJson, allFlagsFlags);
 
       const mixedConfigJson = {...baseConfigJson, plugins: [simplePluginName]};
       const mixedFlags = {...baseFlags, plugins: [noGroupsPluginName]};
-      const pluginsInConfigAndFlagsConfig = new Config(mixedConfigJson, mixedFlags);
+      const pluginsInConfigAndFlagsConfig = await Config.createConfigFromJson(mixedConfigJson, mixedFlags);
 
       // Double check that we're not comparing empty objects.
       const categoryNames = Object.keys(allPluginsInConfigConfig.categories);
@@ -1065,35 +1072,38 @@ describe('Config', () => {
       assert.deepStrictEqual(allPluginsInConfigConfig, pluginsInConfigAndFlagsConfig);
     });
 
-    it('should throw if the plugin is invalid', () => {
+    it('should throw if the plugin is invalid', async () => {
       const configJson = {
         extends: 'lighthouse:default',
         plugins: ['lighthouse-plugin-no-category'],
       };
       // Required to have a `category`, so plugin is invalid.
-      assert.throws(() => new Config(configJson, {configPath: configFixturePath}),
+      await assert.rejects(
+        () => Config.createConfigFromJson(configJson, {configPath: configFixturePath}),
         /^Error: lighthouse-plugin-no-category has no valid category/);
     });
 
-    it('should throw if the plugin is not found', () => {
+    it('should throw if the plugin is not found', async () => {
       const configJson = {
         extends: 'lighthouse:default',
         plugins: ['lighthouse-plugin-not-a-plugin'],
       };
-      assert.throws(() => new Config(configJson, {configPath: configFixturePath}),
+      await assert.rejects(
+        () => Config.createConfigFromJson(configJson, {configPath: configFixturePath}),
         /^Error: Unable to locate plugin: `lighthouse-plugin-not-a-plugin/);
     });
 
-    it('should throw if the plugin name does not begin with "lighthouse-plugin-"', () => {
+    it('should throw if the plugin name does not begin with "lighthouse-plugin-"', async () => {
       const configJson = {
         extends: 'lighthouse:default',
         plugins: ['just-let-me-be-a-plugin'],
       };
-      assert.throws(() => new Config(configJson, {configPath: configFixturePath}),
+      await assert.rejects(
+        () => Config.createConfigFromJson(configJson, {configPath: configFixturePath}),
         /^Error: plugin name 'just-let-me-be-a-plugin' does not start with 'lighthouse-plugin-'/);
     });
 
-    it('should throw if the plugin name would shadow a category id', () => {
+    it('should throw if the plugin name would shadow a category id', async () => {
       const configJson = {
         extends: 'lighthouse:default',
         plugins: ['lighthouse-plugin-simple'],
@@ -1101,25 +1111,26 @@ describe('Config', () => {
           'lighthouse-plugin-simple': {auditRefs: [{id: 'missing-audit'}]},
         },
       };
-      assert.throws(() => new Config(configJson, {configPath: configFixturePath}),
+      await assert.rejects(
+        () => Config.createConfigFromJson(configJson, {configPath: configFixturePath}),
         /^Error: plugin name 'lighthouse-plugin-simple' not allowed because it is the id of a category/); // eslint-disable-line max-len
     });
   });
 
   describe('filterConfigIfNeeded', () => {
-    it('should not mutate the original config', () => {
+    it('should not mutate the original config', async () => {
       const configCopy = JSON.parse(JSON.stringify(origConfig));
       configCopy.settings.onlyCategories = ['performance'];
-      const config = new Config(configCopy);
+      const config = await Config.createConfigFromJson(configCopy);
       configCopy.settings.onlyCategories = null;
       assert.equal(config.passes.length, 1, 'did not filter config');
       assert.deepStrictEqual(configCopy, origConfig, 'had mutations');
     });
 
-    it('should generate the same filtered config, extended or original', () => {
+    it('should generate the same filtered config, extended or original', async () => {
       const configCopy = JSON.parse(JSON.stringify(origConfig));
       configCopy.settings.onlyCategories = ['performance'];
-      const config = new Config(configCopy);
+      const config = await Config.createConfigFromJson(configCopy);
 
       const extended = {
         extends: 'lighthouse:default',
@@ -1127,7 +1138,7 @@ describe('Config', () => {
           onlyCategories: ['performance'],
         },
       };
-      const extendedConfig = new Config(extended);
+      const extendedConfig = await Config.createConfigFromJson(extended);
 
       // When gatherers have instance properties that are bind()'d, they'll not match.
       // Gatherers in each config will still be compared via the constructor on .implementation.
@@ -1146,7 +1157,7 @@ describe('Config', () => {
       expect(config).toEqual(extendedConfig); // ensure we didn't have mutations
     });
 
-    it('should filter out other passes if passed Performance', () => {
+    it('should filter out other passes if passed Performance', async () => {
       const totalAuditCount = origConfig.audits.length;
       const extended = {
         extends: 'lighthouse:default',
@@ -1154,13 +1165,13 @@ describe('Config', () => {
           onlyCategories: ['performance'],
         },
       };
-      const config = new Config(extended);
+      const config = await Config.createConfigFromJson(extended);
       assert.equal(Object.keys(config.categories).length, 1, 'other categories are present');
       assert.equal(config.passes.length, 1, 'incorrect # of passes');
       assert.ok(config.audits.length < totalAuditCount, 'audit filtering probably failed');
     });
 
-    it('should filter out other passes if passed PWA', () => {
+    it('should filter out other passes if passed PWA', async () => {
       const totalAuditCount = origConfig.audits.length;
       const extended = {
         extends: 'lighthouse:default',
@@ -1168,12 +1179,12 @@ describe('Config', () => {
           onlyCategories: ['pwa'],
         },
       };
-      const config = new Config(extended);
+      const config = await Config.createConfigFromJson(extended);
       assert.equal(Object.keys(config.categories).length, 1, 'other categories are present');
       assert.ok(config.audits.length < totalAuditCount, 'audit filtering probably failed');
     });
 
-    it('should filter out other passes if passed Best Practices', () => {
+    it('should filter out other passes if passed Best Practices', async () => {
       const totalAuditCount = origConfig.audits.length;
       const extended = {
         extends: 'lighthouse:default',
@@ -1181,20 +1192,20 @@ describe('Config', () => {
           onlyCategories: ['best-practices'],
         },
       };
-      const config = new Config(extended);
+      const config = await Config.createConfigFromJson(extended);
       assert.equal(Object.keys(config.categories).length, 1, 'other categories are present');
       assert.equal(config.passes.length, 1, 'incorrect # of passes');
       assert.ok(config.audits.length < totalAuditCount, 'audit filtering probably failed');
     });
 
-    it('should only run audits for ones named by the category', () => {
+    it('should only run audits for ones named by the category', async () => {
       const extended = {
         extends: 'lighthouse:default',
         settings: {
           onlyCategories: ['performance'],
         },
       };
-      const config = new Config(extended);
+      const config = await Config.createConfigFromJson(extended);
       const selectedCategory = origConfig.categories.performance;
       // +1 for `full-page-screenshot`.
       const auditCount = Object.keys(selectedCategory.auditRefs).length + 1;
@@ -1203,19 +1214,19 @@ describe('Config', () => {
       assert.ok(config.audits.find(a => a.implementation.meta.id === 'full-page-screenshot'));
     });
 
-    it('should only run specified audits', () => {
+    it('should only run specified audits', async () => {
       const extended = {
         extends: 'lighthouse:default',
         settings: {
           onlyAudits: ['service-worker'], // something from non-defaultPass
         },
       };
-      const config = new Config(extended);
+      const config = await Config.createConfigFromJson(extended);
       assert.equal(config.passes.length, 2, 'incorrect # of passes');
       assert.equal(config.audits.length, 1, 'audit filtering failed');
     });
 
-    it('should combine audits and categories additively', () => {
+    it('should combine audits and categories additively', async () => {
       const extended = {
         extends: 'lighthouse:default',
         settings: {
@@ -1223,7 +1234,7 @@ describe('Config', () => {
           onlyAudits: ['service-worker'], // something from non-defaultPass
         },
       };
-      const config = new Config(extended);
+      const config = await Config.createConfigFromJson(extended);
       const selectedCategory = origConfig.categories.performance;
       // +1 for `service-worker`, +1 for `full-page-screenshot`.
       const auditCount = Object.keys(selectedCategory.auditRefs).length + 2;
@@ -1233,7 +1244,7 @@ describe('Config', () => {
       assert.ok(config.audits.find(a => a.implementation.meta.id === 'full-page-screenshot'));
     });
 
-    it('should support redundant filtering', () => {
+    it('should support redundant filtering', async () => {
       const extended = {
         extends: 'lighthouse:default',
         settings: {
@@ -1241,7 +1252,7 @@ describe('Config', () => {
           onlyAudits: ['apple-touch-icon'],
         },
       };
-      const config = new Config(extended);
+      const config = await Config.createConfigFromJson(extended);
       const selectedCategory = origConfig.categories.pwa;
       // +1 for `full-page-screenshot`.
       const auditCount = Object.keys(selectedCategory.auditRefs).length + 1;
@@ -1250,7 +1261,7 @@ describe('Config', () => {
       assert.ok(config.audits.find(a => a.implementation.meta.id === 'full-page-screenshot'));
     });
 
-    it('should keep full-page-screenshot even if onlyCategories is set', () => {
+    it('should keep full-page-screenshot even if onlyCategories is set', async () => {
       assert.ok(origConfig.audits.includes('full-page-screenshot'));
       // full-page-screenshot does not belong to a category.
       const matchCategories = Object.values(origConfig.categories).filter(cat =>
@@ -1263,55 +1274,55 @@ describe('Config', () => {
           onlyCategories: ['accessibility'],
         },
       };
-      const config = new Config(extended);
+      const config = await Config.createConfigFromJson(extended);
 
       assert.ok(config.audits.find(a => a.implementation.meta.id === 'full-page-screenshot'));
     });
 
-    it('should keep full-page-screenshot even if skipAudits is set', () => {
+    it('should keep full-page-screenshot even if skipAudits is set', async () => {
       const extended = {
         extends: 'lighthouse:default',
         settings: {
           skipAudits: ['font-size'],
         },
       };
-      const config = new Config(extended);
+      const config = await Config.createConfigFromJson(extended);
       assert.ok(config.audits.find(a => a.implementation.meta.id === 'full-page-screenshot'));
     });
   });
 
   describe('#requireAudits', () => {
-    it('should merge audits', () => {
+    it('should merge audits', async () => {
       const audits = [
         'user-timings',
         {path: 'is-on-https', options: {x: 1, y: 1}},
         {path: 'is-on-https', options: {x: 2}},
       ];
-      const merged = Config.requireAudits(audits);
+      const merged = await Config.requireAudits(audits);
       // Round-trip through JSON to drop live 'implementation' prop.
       const mergedJson = JSON.parse(JSON.stringify(merged));
       assert.deepEqual(mergedJson,
         [{path: 'user-timings', options: {}}, {path: 'is-on-https', options: {x: 2, y: 1}}]);
     });
 
-    it('throws for invalid auditDefns', () => {
+    it('throws for invalid auditDefns', async () => {
       const configJson = {
         audits: [
           new Gatherer(),
         ],
       };
-      assert.throws(_ => new Config(configJson), /Invalid Audit type/);
+      await assert.rejects(Config.createConfigFromJson(configJson), /Invalid Audit type/);
     });
   });
 
   describe('#requireGatherers', () => {
-    it('should deduplicate gatherers', () => {
+    it('should deduplicate gatherers', async () => {
       const gatherers = [
         'viewport-dimensions',
         {path: 'viewport-dimensions'},
       ];
 
-      const merged = Config.requireGatherers([{gatherers}]);
+      const merged = await Config.requireGatherers([{gatherers}]);
       // Round-trip through JSON to drop live 'instance'/'implementation' props.
       const mergedJson = JSON.parse(JSON.stringify(merged));
 
@@ -1324,26 +1335,26 @@ describe('Config', () => {
         [{path: 'viewport-dimensions', instance: expectedInstance}]);
     });
 
-    function loadGatherer(gathererEntry) {
-      const config = new Config({passes: [{gatherers: [gathererEntry]}]});
+    async function loadGatherer(gathererEntry) {
+      const config = await Config.createConfigFromJson({passes: [{gatherers: [gathererEntry]}]});
       return config.passes[0].gatherers[0];
     }
 
-    it('loads a core gatherer', () => {
-      const gatherer = loadGatherer('viewport-dimensions');
+    it('loads a core gatherer', async () => {
+      const gatherer = await loadGatherer('viewport-dimensions');
       assert.equal(gatherer.instance.name, 'ViewportDimensions');
       assert.equal(typeof gatherer.instance.beforePass, 'function');
     });
 
-    it('loads gatherers from custom paths', () => {
+    it('loads gatherers from custom paths', async () => {
       const customPath = path.resolve(__dirname, '../fixtures/valid-custom-gatherer');
-      const gatherer = loadGatherer(customPath);
+      const gatherer = await loadGatherer(customPath);
       assert.equal(gatherer.instance.name, 'CustomGatherer');
       assert.equal(typeof gatherer.instance.beforePass, 'function');
     });
 
-    it('loads a gatherer relative to a config path', () => {
-      const config = new Config({
+    it('loads a gatherer relative to a config path', async () => {
+      const config = await Config.createConfigFromJson({
         passes: [{gatherers: ['../fixtures/valid-custom-gatherer']}],
       }, {configPath: __filename});
       const gatherer = config.passes[0].gatherers[0];
@@ -1352,54 +1363,55 @@ describe('Config', () => {
       assert.equal(typeof gatherer.instance.beforePass, 'function');
     });
 
-    it('returns gatherer when gatherer class, not package-name string, is provided', () => {
+    it('returns gatherer when gatherer class, not package-name string, is provided', async () => {
       class TestGatherer extends Gatherer {}
-      const gatherer = loadGatherer(TestGatherer);
+      const gatherer = await loadGatherer(TestGatherer);
       assert.equal(gatherer.instance.name, 'TestGatherer');
       assert.equal(typeof gatherer.instance.beforePass, 'function');
     });
 
-    it('returns gatherer when gatherer instance, not package-name string, is provided', () => {
+    // eslint-disable-next-line max-len
+    it('returns gatherer when gatherer instance, not package-name string, is provided', async () => {
       class TestGatherer extends Gatherer {}
-      const gatherer = loadGatherer(new TestGatherer());
+      const gatherer = await loadGatherer(new TestGatherer());
       assert.equal(gatherer.instance.name, 'TestGatherer');
       assert.equal(typeof gatherer.instance.beforePass, 'function');
     });
 
-    it('returns gatherer when `gathererDefn` with instance is provided', () => {
+    it('returns gatherer when `gathererDefn` with instance is provided', async () => {
       class TestGatherer extends Gatherer {}
-      const gatherer = loadGatherer({instance: new TestGatherer()});
+      const gatherer = await loadGatherer({instance: new TestGatherer()});
       assert.equal(gatherer.instance.name, 'TestGatherer');
       assert.equal(typeof gatherer.instance.beforePass, 'function');
     });
 
-    it('throws when a gatherer is not found', () => {
-      assert.throws(_ => loadGatherer('/fake-non-existent-gatherer'), /locate gatherer/);
+    it('throws when a gatherer is not found', async () => {
+      await assert.rejects(loadGatherer('/fake-non-existent-gatherer'), /locate gatherer/);
     });
 
-    it('loads a gatherer from node_modules/', () => {
+    it('loads a gatherer from node_modules/', async () => {
       // Use a lighthouse dep as a stand in for a module.
-      assert.throws(_ => loadGatherer('lighthouse-logger'), function(err) {
+      await assert.rejects(loadGatherer('lighthouse-logger'), function(err) {
         // Should throw a gatherer validation error, but *not* a gatherer not found error.
         return !/locate gatherer/.test(err) && /beforePass\(\) method/.test(err);
       });
     });
 
-    it('loads a gatherer relative to the working directory', () => {
+    it('loads a gatherer relative to the working directory', async () => {
       // Construct a gatherer URL relative to current working directory,
       // regardless of where test was started from.
       const absoluteGathererPath = path.resolve(__dirname, '../fixtures/valid-custom-gatherer');
       assert.doesNotThrow(_ => require.resolve(absoluteGathererPath));
       const relativeGathererPath = path.relative(process.cwd(), absoluteGathererPath);
 
-      const gatherer = loadGatherer(relativeGathererPath);
+      const gatherer = await loadGatherer(relativeGathererPath);
       assert.equal(gatherer.instance.name, 'CustomGatherer');
       assert.equal(typeof gatherer.instance.beforePass, 'function');
     });
 
-    it('throws but not for missing gatherer when it has a dependency error', () => {
+    it('throws but not for missing gatherer when it has a dependency error', async () => {
       const gathererPath = path.resolve(__dirname, '../fixtures/invalid-gatherers/require-error');
-      return assert.throws(_ => loadGatherer(gathererPath),
+      await assert.rejects(loadGatherer(gathererPath),
           function(err) {
             // We're expecting not to find parent class Gatherer, so only reject on
             // our own custom locate gatherer error, not the usual MODULE_NOT_FOUND.
@@ -1407,28 +1419,27 @@ describe('Config', () => {
           });
     });
 
-    it('throws for invalid gathererDefns', () => {
-      assert.throws(_ => loadGatherer({path: 55}), /Invalid Gatherer type/);
-
-      assert.throws(_ => loadGatherer(new Audit()), /Invalid Gatherer type/);
+    it('throws for invalid gathererDefns', async () => {
+      await assert.rejects(loadGatherer({path: 55}), /Invalid Gatherer type/);
+      await assert.rejects(loadGatherer(new Audit()), /Invalid Gatherer type/);
     });
 
-    it('throws for invalid gatherers', () => {
+    it('throws for invalid gatherers', async () => {
       const root = path.resolve(__dirname, '../fixtures/invalid-gatherers');
 
-      assert.throws(_ => loadGatherer(`${root}/missing-before-pass`),
+      await assert.rejects(loadGatherer(`${root}/missing-before-pass`),
         /beforePass\(\) method/);
 
-      assert.throws(_ => loadGatherer(`${root}/missing-pass`),
+      await assert.rejects(loadGatherer(`${root}/missing-pass`),
         /pass\(\) method/);
 
-      assert.throws(_ => loadGatherer(`${root}/missing-after-pass`),
+      await assert.rejects(loadGatherer(`${root}/missing-after-pass`),
         /afterPass\(\) method/);
     });
   });
 
   describe('#getPrintString', () => {
-    it('doesn\'t include empty audit options in output', () => {
+    it('doesn\'t include empty audit options in output', async () => {
       const aOpt = 'auditOption';
       const configJson = {
         extends: 'lighthouse:default',
@@ -1444,7 +1455,7 @@ describe('Config', () => {
         ],
       };
 
-      const printed = new Config(configJson).getPrintString();
+      const printed = (await Config.createConfigFromJson(configJson)).getPrintString();
       const printedConfig = JSON.parse(printed);
 
       // Check that options weren't completely eliminated.
@@ -1458,8 +1469,8 @@ describe('Config', () => {
       }
     });
 
-    it('prints localized category titles', () => {
-      const printed = new Config(defaultConfig).getPrintString();
+    it('prints localized category titles', async () => {
+      const printed = (await Config.createConfigFromJson(defaultConfig)).getPrintString();
       const printedConfig = JSON.parse(printed);
       let localizableCount = 0;
 
@@ -1475,12 +1486,12 @@ describe('Config', () => {
       assert.ok(localizableCount > 0);
     });
 
-    it('prints a valid ConfigJson that can make an identical Config', () => {
+    it('prints a valid ConfigJson that can make an identical Config', async () => {
       // depends on defaultConfig having a `path` for all gatherers and audits.
-      const firstConfig = new Config(defaultConfig);
+      const firstConfig = await Config.createConfigFromJson(defaultConfig);
       const firstPrint = firstConfig.getPrintString();
 
-      const secondConfig = new Config(JSON.parse(firstPrint));
+      const secondConfig = await Config.createConfigFromJson(JSON.parse(firstPrint));
       const secondPrint = secondConfig.getPrintString();
 
       assert.strictEqual(firstPrint, secondPrint);
diff --git a/lighthouse-core/test/fraggle-rock/config/config-test.js b/lighthouse-core/test/fraggle-rock/config/config-test.js
index bf214e384410..0ef3fa87d3a1 100644
--- a/lighthouse-core/test/fraggle-rock/config/config-test.js
+++ b/lighthouse-core/test/fraggle-rock/config/config-test.js
@@ -25,30 +25,29 @@ describe('Fraggle Rock Config', () => {
     gatherMode = 'snapshot';
   });
 
-  it('should throw if the config path is not absolute', () => {
-    const configFn = () =>
-      initializeConfig(undefined, {gatherMode, configPath: '../relative/path'});
-    expect(configFn).toThrow(/must be an absolute path/);
+  it('should throw if the config path is not absolute', async () => {
+    expect(initializeConfig(undefined, {gatherMode, configPath: '../relative/path'}))
+      .rejects.toThrow(/must be an absolute path/);
   });
 
-  it('should not mutate the original input', () => {
+  it('should not mutate the original input', async () => {
     const configJson = {artifacts: [{id: 'Accessibility', gatherer: 'accessibility'}]};
-    const {config} = initializeConfig(configJson, {gatherMode});
+    const {config} = await initializeConfig(configJson, {gatherMode});
     expect(configJson).toEqual({artifacts: [{id: 'Accessibility', gatherer: 'accessibility'}]});
     expect(config).not.toBe(configJson);
     expect(config).not.toEqual(configJson);
     expect(config.artifacts).toMatchObject([{gatherer: {path: 'accessibility'}}]);
   });
 
-  it('should use default config when none passed in', () => {
-    const {config} = initializeConfig(undefined, {gatherMode});
+  it('should use default config when none passed in', async () => {
+    const {config} = await initializeConfig(undefined, {gatherMode});
     expect(config.settings).toMatchObject({formFactor: 'mobile'});
     if (!config.audits) throw new Error('Did not define audits');
     expect(config.audits.length).toBeGreaterThan(0);
   });
 
-  it('should resolve settings with defaults', () => {
-    const {config} = initializeConfig(
+  it('should resolve settings with defaults', async () => {
+    const {config} = await initializeConfig(
       {settings: {output: 'csv', maxWaitForFcp: 1234}},
       {settingsOverrides: {maxWaitForFcp: 12345}, gatherMode}
     );
@@ -60,8 +59,8 @@ describe('Fraggle Rock Config', () => {
     });
   });
 
-  it('should override throttlingMethod in timespan mode', () => {
-    const {config} = initializeConfig(
+  it('should override throttlingMethod in timespan mode', async () => {
+    const {config} = await initializeConfig(
       undefined,
       {settingsOverrides: {throttlingMethod: 'simulate'}, gatherMode: 'timespan'}
     );
@@ -71,9 +70,9 @@ describe('Fraggle Rock Config', () => {
     });
   });
 
-  it('should resolve artifact definitions', () => {
+  it('should resolve artifact definitions', async () => {
     const configJson = {artifacts: [{id: 'Accessibility', gatherer: 'accessibility'}]};
-    const {config} = initializeConfig(configJson, {gatherMode});
+    const {config} = await initializeConfig(configJson, {gatherMode});
 
     expect(config).toMatchObject({
       artifacts: [{id: 'Accessibility', gatherer: {path: 'accessibility'}}],
@@ -84,10 +83,10 @@ describe('Fraggle Rock Config', () => {
     const nonFRGatherer = new BaseGatherer();
     nonFRGatherer.getArtifact = jest.fn();
     const configJson = {artifacts: [{id: 'LegacyGather', gatherer: {instance: nonFRGatherer}}]};
-    expect(() => initializeConfig(configJson, {gatherMode})).toThrow(/FRGatherer gatherer/);
+    expect(initializeConfig(configJson, {gatherMode})).rejects.toThrow(/FRGatherer gatherer/);
   });
 
-  it('should filter configuration by gatherMode', () => {
+  it('should filter configuration by gatherMode', async () => {
     const timespanGatherer = new BaseGatherer();
     timespanGatherer.getArtifact = jest.fn();
     timespanGatherer.meta = {supportedModes: ['timespan']};
@@ -99,14 +98,14 @@ describe('Fraggle Rock Config', () => {
       ],
     };
 
-    const {config} = initializeConfig(configJson, {gatherMode: 'snapshot'});
+    const {config} = await initializeConfig(configJson, {gatherMode: 'snapshot'});
     expect(config).toMatchObject({
       artifacts: [{id: 'Accessibility', gatherer: {path: 'accessibility'}}],
     });
   });
 
-  it('should filter configuration by only/skip filters', () => {
-    const {config} = initializeConfig(undefined, {
+  it('should filter configuration by only/skip filters', async () => {
+    const {config} = await initializeConfig(undefined, {
       gatherMode: 'navigation',
       settingsOverrides: {
         onlyAudits: ['color-contrast'],
@@ -122,8 +121,8 @@ describe('Fraggle Rock Config', () => {
     expect(auditIds).not.toContain('robots-txt'); // from skipAudits
   });
 
-  it('should support plugins', () => {
-    const {config} = initializeConfig(undefined, {
+  it('should support plugins', async () => {
+    const {config} = await initializeConfig(undefined, {
       gatherMode: 'navigation',
       configPath: `${LH_ROOT}/lighthouse-core/test/fixtures/config-plugins/`,
       settingsOverrides: {plugins: ['lighthouse-plugin-simple']},
@@ -172,8 +171,8 @@ describe('Fraggle Rock Config', () => {
       };
     });
 
-    it('should resolve artifact dependencies', () => {
-      const {config} = initializeConfig(configJson, {gatherMode: 'snapshot'});
+    it('should resolve artifact dependencies', async () => {
+      const {config} = await initializeConfig(configJson, {gatherMode: 'snapshot'});
       expect(config).toMatchObject({
         artifacts: [
           {id: 'Dependency', gatherer: {instance: dependencyGatherer}},
@@ -190,8 +189,8 @@ describe('Fraggle Rock Config', () => {
       });
     });
 
-    it('should resolve artifact dependencies in navigations', () => {
-      const {config} = initializeConfig(configJson, {gatherMode: 'snapshot'});
+    it('should resolve artifact dependencies in navigations', async () => {
+      const {config} = await initializeConfig(configJson, {gatherMode: 'snapshot'});
       expect(config).toMatchObject({
         navigations: [
           {artifacts: [{id: 'Dependency'}]},
@@ -212,49 +211,49 @@ describe('Fraggle Rock Config', () => {
     it('should throw when dependencies are out of order in artifacts', () => {
       if (!configJson.artifacts) throw new Error('Failed to run beforeEach');
       configJson.artifacts = [configJson.artifacts[1], configJson.artifacts[0]];
-      expect(() => initializeConfig(configJson, {gatherMode: 'snapshot'}))
-        .toThrow(/Failed to find dependency/);
+      expect(initializeConfig(configJson, {gatherMode: 'snapshot'}))
+        .rejects.toThrow(/Failed to find dependency/);
     });
 
     it('should throw when dependencies are out of order within a navigation', () => {
       if (!configJson.navigations) throw new Error('Failed to run beforeEach');
       const invalidNavigation = {id: 'default', artifacts: ['Dependent', 'Dependency']};
       configJson.navigations = [invalidNavigation];
-      expect(() => initializeConfig(configJson, {gatherMode: 'snapshot'}))
-        .toThrow(/Failed to find dependency/);
+      expect(initializeConfig(configJson, {gatherMode: 'snapshot'}))
+        .rejects.toThrow(/Failed to find dependency/);
     });
 
     it('should throw when dependencies are out of order between navigations', () => {
       if (!configJson.navigations) throw new Error('Failed to run beforeEach');
       const invalidNavigation = {id: 'default', artifacts: ['Dependent']};
       configJson.navigations = [invalidNavigation];
-      expect(() => initializeConfig(configJson, {gatherMode: 'snapshot'}))
-        .toThrow(/Failed to find dependency/);
+      expect(initializeConfig(configJson, {gatherMode: 'snapshot'}))
+        .rejects.toThrow(/Failed to find dependency/);
     });
 
     it('should throw when timespan needs snapshot', () => {
       dependentGatherer.meta.supportedModes = ['timespan'];
       dependencyGatherer.meta.supportedModes = ['snapshot'];
-      expect(() => initializeConfig(configJson, {gatherMode: 'navigation'}))
-        .toThrow(/Dependency.*is invalid/);
+      expect(initializeConfig(configJson, {gatherMode: 'navigation'}))
+        .rejects.toThrow(/Dependency.*is invalid/);
     });
 
     it('should throw when timespan needs navigation', () => {
       dependentGatherer.meta.supportedModes = ['timespan'];
       dependencyGatherer.meta.supportedModes = ['navigation'];
-      expect(() => initializeConfig(configJson, {gatherMode: 'navigation'}))
-        .toThrow(/Dependency.*is invalid/);
+      expect(initializeConfig(configJson, {gatherMode: 'navigation'}))
+        .rejects.toThrow(/Dependency.*is invalid/);
     });
   });
 
   describe('.resolveNavigationsToDefns', () => {
-    it('should resolve navigation definitions', () => {
+    it('should resolve navigation definitions', async () => {
       gatherMode = 'navigation';
       const configJson = {
         artifacts: [{id: 'Accessibility', gatherer: 'accessibility'}],
         navigations: [{id: 'default', artifacts: ['Accessibility']}],
       };
-      const {config} = initializeConfig(configJson, {gatherMode});
+      const {config} = await initializeConfig(configJson, {gatherMode});
 
       expect(config).toMatchObject({
         artifacts: [{id: 'Accessibility', gatherer: {path: 'accessibility'}}],
@@ -269,7 +268,7 @@ describe('Fraggle Rock Config', () => {
         navigations: [{id: 'default', artifacts: ['Accessibility']}],
       };
 
-      expect(() => initializeConfig(configJson, {gatherMode})).toThrow(/Cannot use navigations/);
+      expect(initializeConfig(configJson, {gatherMode})).rejects.toThrow(/Cannot use navigations/);
     });
 
     it('should throw when navigations use unrecognized artifacts', () => {
@@ -278,16 +277,16 @@ describe('Fraggle Rock Config', () => {
         navigations: [{id: 'default', artifacts: ['Accessibility']}],
       };
 
-      expect(() => initializeConfig(configJson, {gatherMode})).toThrow(/Unrecognized artifact/);
+      expect(initializeConfig(configJson, {gatherMode})).rejects.toThrow(/Unrecognized artifact/);
     });
 
-    it('should set default properties on navigations', () => {
+    it('should set default properties on navigations', async () => {
       gatherMode = 'navigation';
       const configJson = {
         artifacts: [{id: 'Accessibility', gatherer: 'accessibility'}],
         navigations: [{id: 'default', artifacts: ['Accessibility']}],
       };
-      const {config} = initializeConfig(configJson, {gatherMode});
+      const {config} = await initializeConfig(configJson, {gatherMode});
 
       expect(config).toMatchObject({
         navigations: [
@@ -304,7 +303,7 @@ describe('Fraggle Rock Config', () => {
       });
     });
 
-    it('should ensure minimum quiet thresholds when throttlingMethod is devtools', () => {
+    it('should ensure minimum quiet thresholds when throttlingMethod is devtools', async () => {
       gatherMode = 'navigation';
       const configJson = {
         artifacts: [{id: 'Accessibility', gatherer: 'accessibility'}],
@@ -315,7 +314,7 @@ describe('Fraggle Rock Config', () => {
         ],
       };
 
-      const {config} = initializeConfig(configJson, {
+      const {config} = await initializeConfig(configJson, {
         gatherMode,
         settingsOverrides: {throttlingMethod: 'devtools'},
       });
@@ -383,8 +382,8 @@ describe('Fraggle Rock Config', () => {
       };
     });
 
-    it('should do nothing when not extending', () => {
-      const {config} = initializeConfig({
+    it('should do nothing when not extending', async () => {
+      const {config} = await initializeConfig({
         artifacts: [
           {id: 'Accessibility', gatherer: 'accessibility'},
         ],
@@ -405,9 +404,9 @@ describe('Fraggle Rock Config', () => {
       });
     });
 
-    it('should extend the default config with filters', () => {
+    it('should extend the default config with filters', async () => {
       const gatherMode = 'navigation';
-      const {config} = initializeConfig({
+      const {config} = await initializeConfig({
         extends: 'lighthouse:default',
         settings: {onlyCategories: ['accessibility']},
       }, {gatherMode});
@@ -425,16 +424,16 @@ describe('Fraggle Rock Config', () => {
       expect(config.categories).not.toHaveProperty('performance');
     });
 
-    it('should merge in artifacts', () => {
-      const {config} = initializeConfig(extensionConfig, {gatherMode: 'navigation'});
+    it('should merge in artifacts', async () => {
+      const {config} = await initializeConfig(extensionConfig, {gatherMode: 'navigation'});
       if (!config.artifacts) throw new Error(`No artifacts created`);
 
       const hasExtraArtifact = config.artifacts.some(a => a.id === 'ExtraArtifact');
       if (!hasExtraArtifact) expect(config.artifacts).toContain('ExtraArtifact');
     });
 
-    it('should merge in navigations', () => {
-      const {config} = initializeConfig(extensionConfig, {gatherMode: 'navigation'});
+    it('should merge in navigations', async () => {
+      const {config} = await initializeConfig(extensionConfig, {gatherMode: 'navigation'});
       if (!config.navigations) throw new Error(`No navigations created`);
 
       expect(config.navigations).toHaveLength(1);
@@ -443,8 +442,8 @@ describe('Fraggle Rock Config', () => {
       if (!hasNavigation) expect(config.navigations[0].artifacts).toContain('ExtraArtifact');
     });
 
-    it('should merge in audits', () => {
-      const {config} = initializeConfig(extensionConfig, {gatherMode: 'navigation'});
+    it('should merge in audits', async () => {
+      const {config} = await initializeConfig(extensionConfig, {gatherMode: 'navigation'});
       if (!config.audits) throw new Error(`No audits created`);
 
       const hasExtraAudit = config.audits.
@@ -452,8 +451,8 @@ describe('Fraggle Rock Config', () => {
       if (!hasExtraAudit) expect(config.audits).toContain('extra-audit');
     });
 
-    it('should merge in categories', () => {
-      const {config} = initializeConfig(extensionConfig, {gatherMode: 'navigation'});
+    it('should merge in categories', async () => {
+      const {config} = await initializeConfig(extensionConfig, {gatherMode: 'navigation'});
       if (!config.categories) throw new Error(`No categories created`);
 
       const hasCategory = config.categories.performance.auditRefs.some(a => a.id === 'extra-audit');
@@ -461,28 +460,28 @@ describe('Fraggle Rock Config', () => {
     });
   });
 
-  it('should validate the config with warnings', () => {
+  it('should validate the config with warnings', async () => {
     /** @type {LH.Config.Json} */
     const extensionConfig = {
       extends: 'lighthouse:default',
       navigations: [{id: 'default', loadFailureMode: 'warn'}],
     };
 
-    const {config, warnings} = initializeConfig(extensionConfig, {gatherMode: 'navigation'});
+    const {config, warnings} = await initializeConfig(extensionConfig, {gatherMode: 'navigation'});
     const navigations = config.navigations;
     if (!navigations) throw new Error(`Failed to initialize navigations`);
     expect(warnings).toHaveLength(1);
     expect(navigations[0].loadFailureMode).toEqual('fatal');
   });
 
-  it('should validate the config with fatal errors', () => {
+  it('should validate the config with fatal errors', async () => {
     /** @type {LH.Config.Json} */
     const extensionConfig = {
       extends: 'lighthouse:default',
       artifacts: [{id: 'artifact', gatherer: {instance: new BaseGatherer()}}],
     };
 
-    const invocation = () => initializeConfig(extensionConfig, {gatherMode: 'navigation'});
-    expect(invocation).toThrow(/did not support any gather modes/);
+    expect(initializeConfig(extensionConfig, {gatherMode: 'navigation'}))
+      .rejects.toThrow(/did not support any gather modes/);
   });
 });
diff --git a/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js b/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
index 802b524682a9..615ad347e757 100644
--- a/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
+++ b/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
@@ -107,11 +107,11 @@ describe('NavigationRunner', () => {
     };
   }
 
-  beforeEach(() => {
+  beforeEach(async () => {
     requestedUrl = 'http://example.com';
     requestor = requestedUrl;
     mockRunner.reset();
-    config = initializeConfig(undefined, {gatherMode: 'navigation'}).config;
+    config = (await initializeConfig(undefined, {gatherMode: 'navigation'})).config;
     navigation = createNavigation().navigation;
     computedCache = new Map();
     baseArtifacts = createMockBaseArtifacts();
@@ -190,7 +190,7 @@ describe('NavigationRunner', () => {
     });
 
     it('should navigate as many times as there are navigations', async () => {
-      config = initializeConfig(
+      config = (await initializeConfig(
         {
           ...config,
           navigations: [
@@ -201,7 +201,7 @@ describe('NavigationRunner', () => {
           ],
         },
         {gatherMode: 'navigation'}
-      ).config;
+      )).config;
 
       await run();
       const navigations = mocks.navigationMock.gotoURL.mock.calls;
@@ -212,7 +212,7 @@ describe('NavigationRunner', () => {
     it('should backfill requested URL using a callback requestor', async () => {
       requestedUrl = 'https://backfill.example.com';
       requestor = () => {};
-      config = initializeConfig(
+      config = (await initializeConfig(
         {
           ...config,
           navigations: [
@@ -220,7 +220,7 @@ describe('NavigationRunner', () => {
           ],
         },
         {gatherMode: 'navigation'}
-      ).config;
+      )).config;
       mocks.navigationMock.gotoURL.mockReturnValue({
         requestedUrl,
         mainDocumentUrl: requestedUrl,
@@ -238,7 +238,7 @@ describe('NavigationRunner', () => {
     });
 
     it('should merge artifacts between navigations', async () => {
-      config = initializeConfig(
+      config = (await initializeConfig(
         {
           ...config,
           navigations: [
@@ -247,7 +247,7 @@ describe('NavigationRunner', () => {
           ],
         },
         {gatherMode: 'navigation'}
-      ).config;
+      )).config;
 
       // Both gatherers will error in these test conditions, but artifact errors
       // will be merged into single `artifacts` object.
@@ -258,7 +258,7 @@ describe('NavigationRunner', () => {
     });
 
     it('should retain PageLoadError and associated warnings', async () => {
-      config = initializeConfig(
+      config = (await initializeConfig(
         {
           ...config,
           navigations: [
@@ -267,7 +267,7 @@ describe('NavigationRunner', () => {
           ],
         },
         {gatherMode: 'navigation'}
-      ).config;
+      )).config;
 
       // Ensure the first real page load fails.
       mocks.navigationMock.gotoURL.mockImplementation((driver, url) => {
diff --git a/lighthouse-core/test/gather/gather-runner-test.js b/lighthouse-core/test/gather/gather-runner-test.js
index 6c0c468abd6c..1d913f677170 100644
--- a/lighthouse-core/test/gather/gather-runner-test.js
+++ b/lighthouse-core/test/gather/gather-runner-test.js
@@ -84,8 +84,8 @@ beforeAll(async () => {
 /**
  * @param {LH.Config.Json} json
  */
-function makeConfig(json) {
-  const config = new Config(json);
+async function makeConfig(json) {
+  const config = await Config.createConfigFromJson(json);
 
   // Since the config is for `gather-runner`, ensure it has `passes`.
   if (!config.passes) {
@@ -236,7 +236,7 @@ describe('GatherRunner', function() {
   it('collects benchmark as an artifact', async () => {
     const requestedUrl = 'https://example.com';
     const driver = fakeDriver;
-    const config = makeConfig({passes: [{passName: 'defaultPass'}]});
+    const config = await makeConfig({passes: [{passName: 'defaultPass'}]});
     const options = {requestedUrl, driver, settings: config.settings, computedCache: new Map()};
 
     const results = await GatherRunner.run(config.passes, options);
@@ -246,7 +246,7 @@ describe('GatherRunner', function() {
   it('collects host user agent as an artifact', async () => {
     const requestedUrl = 'https://example.com';
     const driver = fakeDriver;
-    const config = makeConfig({passes: [{passName: 'defaultPass'}]});
+    const config = await makeConfig({passes: [{passName: 'defaultPass'}]});
     const options = {requestedUrl, driver, settings: config.settings, computedCache: new Map()};
 
     const results = await GatherRunner.run(config.passes, options);
@@ -257,19 +257,19 @@ describe('GatherRunner', function() {
   it('collects network user agent as an artifact', async () => {
     const requestedUrl = 'https://example.com';
     const driver = fakeDriver;
-    const config = makeConfig({passes: [{passName: 'defaultPass'}]});
+    const config = await makeConfig({passes: [{passName: 'defaultPass'}]});
     const options = {requestedUrl, driver, settings: config.settings, computedCache: new Map()};
 
     const results = await GatherRunner.run(config.passes, options);
     expect(results.NetworkUserAgent).toContain('Mozilla');
   });
 
-  it('collects requested and final URLs as an artifact', () => {
+  it('collects requested and final URLs as an artifact', async () => {
     const requestedUrl = 'https://example.com';
     const mainDocumentUrl = 'https://example.com/interstitial';
     const gotoURL = requireMockAny('../../gather/driver/navigation.js').gotoURL;
     gotoURL.mockResolvedValue({mainDocumentUrl, timedOut: false, warnings: []});
-    const config = makeConfig({passes: [{passName: 'defaultPass'}]});
+    const config = await makeConfig({passes: [{passName: 'defaultPass'}]});
     const options = {
       requestedUrl,
       driver: fakeDriver,
@@ -300,7 +300,7 @@ describe('GatherRunner', function() {
             return Promise.resolve({userAgent: userAgent});
           },
         });
-        const config = makeConfig({
+        const config = await makeConfig({
           passes: [{passName: 'defaultPass'}],
           settings: {},
         });
@@ -500,7 +500,7 @@ describe('GatherRunner', function() {
       },
     });
 
-    const config = makeConfig({
+    const config = await makeConfig({
       passes: [{
         recordTrace: true,
         passName: 'firstPass',
@@ -539,7 +539,7 @@ describe('GatherRunner', function() {
       (_, url) => url.includes('blank') ? null : Promise.reject(navigationError)
     );
 
-    const config = makeConfig({
+    const config = await makeConfig({
       passes: [{
         recordTrace: true,
         passName: 'firstPass',
@@ -583,7 +583,7 @@ describe('GatherRunner', function() {
       (_, url) => url.includes('blank') ? gotoUrlForAboutBlank() : gotoUrlForRealUrl()
     );
 
-    const config = makeConfig({
+    const config = await makeConfig({
       passes: [{passName: 'defaultPass', recordTrace: true}, {
         loadFailureMode: 'warn',
         recordTrace: true,
@@ -740,11 +740,11 @@ describe('GatherRunner', function() {
     ]);
   });
 
-  it('does as many passes as are required', () => {
+  it('does as many passes as are required', async () => {
     const t1 = new TestGatherer();
     const t2 = new TestGatherer();
 
-    const config = makeConfig({
+    const config = await makeConfig({
       passes: [{
         recordTrace: true,
         passName: 'firstPass',
@@ -770,8 +770,8 @@ describe('GatherRunner', function() {
     });
   });
 
-  it('respects trace names', () => {
-    const config = makeConfig({
+  it('respects trace names', async () => {
+    const config = await makeConfig({
       passes: [{
         recordTrace: true,
         passName: 'firstPass',
@@ -807,7 +807,7 @@ describe('GatherRunner', function() {
       endDevtoolsLog: () => [],
     });
 
-    const config = makeConfig({
+    const config = await makeConfig({
       passes: [{
         passName: 'firstPass',
         recordTrace: true,
@@ -830,7 +830,7 @@ describe('GatherRunner', function() {
     const t1 = new (class Test1 extends TestGatherer {})();
     const t2 = new (class Test2 extends TestGatherer {})();
     const t3 = new (class Test3 extends TestGatherer {})();
-    const config = makeConfig({
+    const config = await makeConfig({
       passes: [{
         passName: 'firstPass',
         recordTrace: true,
@@ -970,7 +970,7 @@ describe('GatherRunner', function() {
           }
         },
       ];
-      const config = makeConfig({
+      const config = await makeConfig({
         passes: [{
           passName: 'defaultPass',
           gatherers: gatherers.map(G => ({instance: new G()})),
@@ -991,7 +991,7 @@ describe('GatherRunner', function() {
       });
     });
 
-    it('supports sync and async return of artifacts from gatherers', () => {
+    it('supports sync and async return of artifacts from gatherers', async () => {
       const gatherers = [
         // sync
         new class BeforeSync extends Gatherer {
@@ -1028,7 +1028,7 @@ describe('GatherRunner', function() {
         })(),
       ].map(instance => ({instance}));
       const gathererNames = gatherers.map(gatherer => gatherer.instance.name);
-      const config = makeConfig({
+      const config = await makeConfig({
         passes: [{
           passName: 'defaultPass',
           gatherers,
@@ -1121,7 +1121,7 @@ describe('GatherRunner', function() {
         }
       }
 
-      const config = makeConfig({
+      const config = await makeConfig({
         passes: [{
           passName: 'defaultPass',
           gatherers: [{instance: new WarningGatherer()}],
@@ -1136,7 +1136,7 @@ describe('GatherRunner', function() {
       assert.deepStrictEqual(artifacts.LighthouseRunWarnings, runWarnings);
     });
 
-    it('supports sync and async throwing of errors from gatherers', () => {
+    it('supports sync and async throwing of errors from gatherers', async () => {
       const gatherers = [
         // sync
         new class BeforeSync extends Gatherer {
@@ -1176,7 +1176,7 @@ describe('GatherRunner', function() {
         })(),
       ].map(instance => ({instance}));
       const gathererNames = gatherers.map(gatherer => gatherer.instance.name);
-      const config = makeConfig({
+      const config = await makeConfig({
         passes: [{
           passName: 'defaultPass',
           gatherers,
@@ -1197,8 +1197,8 @@ describe('GatherRunner', function() {
       });
     });
 
-    it('rejects if a gatherer does not provide an artifact', () => {
-      const config = makeConfig({
+    it('rejects if a gatherer does not provide an artifact', async () => {
+      const config = await makeConfig({
         passes: [{
           recordTrace: true,
           passName: 'firstPass',
@@ -1216,8 +1216,8 @@ describe('GatherRunner', function() {
       }).then(_ => assert.ok(false), _ => assert.ok(true));
     });
 
-    it('rejects when domain name can\'t be resolved', () => {
-      const config = makeConfig({
+    it('rejects when domain name can\'t be resolved', async () => {
+      const config = await makeConfig({
         passes: [{
           recordTrace: true,
           passName: 'firstPass',
@@ -1249,8 +1249,8 @@ describe('GatherRunner', function() {
       });
     });
 
-    it('resolves but warns when page times out', () => {
-      const config = makeConfig({
+    it('resolves but warns when page times out', async () => {
+      const config = await makeConfig({
         passes: [{
           recordTrace: true,
           passName: 'firstPass',
@@ -1276,8 +1276,8 @@ describe('GatherRunner', function() {
       });
     });
 
-    it('resolves and does not warn when page times out on non-fatal pass', () => {
-      const config = makeConfig({
+    it('resolves and does not warn when page times out on non-fatal pass', async () => {
+      const config = await makeConfig({
         passes: [{
           recordTrace: true,
           passName: 'firstPass',
@@ -1310,8 +1310,8 @@ describe('GatherRunner', function() {
       });
     });
 
-    it('resolves when domain name can\'t be resolved but is offline', () => {
-      const config = makeConfig({
+    it('resolves when domain name can\'t be resolved but is offline', async () => {
+      const config = await makeConfig({
         passes: [{
           recordTrace: true,
           passName: 'firstPass',
diff --git a/lighthouse-core/test/runner-test.js b/lighthouse-core/test/runner-test.js
index 8cc0110c535a..1d10e5fab5e0 100644
--- a/lighthouse-core/test/runner-test.js
+++ b/lighthouse-core/test/runner-test.js
@@ -103,7 +103,7 @@ describe('Runner', () => {
 
   describe('Gather Mode & Audit Mode', () => {
     const url = 'https://example.com';
-    const generateConfig = settings => new Config({
+    const generateConfig = settings => Config.createConfigFromJson({
       passes: [{
         gatherers: ['viewport-dimensions'],
       }],
@@ -117,8 +117,8 @@ describe('Runner', () => {
       fs.rmSync(resolvedPath, {recursive: true, force: true});
     });
 
-    it('-G gathers, quits, and doesn\'t run audits', () => {
-      const opts = {config: generateConfig({gatherMode: artifactsPath}), driverMock};
+    it('-G gathers, quits, and doesn\'t run audits', async () => {
+      const opts = {config: await generateConfig({gatherMode: artifactsPath}), driverMock};
       return runGatherAndAudit(createGatherFn(url), opts).then(_ => {
         expect(loadArtifactsSpy).not.toHaveBeenCalled();
         expect(saveArtifactsSpy).toHaveBeenCalled();
@@ -137,8 +137,8 @@ describe('Runner', () => {
     });
 
     // uses the files on disk from the -G test. ;)
-    it('-A audits from saved artifacts and doesn\'t gather', () => {
-      const opts = {config: generateConfig({auditMode: artifactsPath}), driverMock};
+    it('-A audits from saved artifacts and doesn\'t gather', async () => {
+      const opts = {config: await generateConfig({auditMode: artifactsPath}), driverMock};
       return runGatherAndAudit(createGatherFn(), opts).then(_ => {
         expect(loadArtifactsSpy).toHaveBeenCalled();
         expect(gatherRunnerRunSpy).not.toHaveBeenCalled();
@@ -151,7 +151,7 @@ describe('Runner', () => {
     it('-A throws if the settings change', async () => {
       // Change throttlingMethod from its default of 'simulate'
       const settings = {auditMode: artifactsPath, throttlingMethod: 'provided'};
-      const opts = {config: generateConfig(settings), driverMock};
+      const opts = {config: await generateConfig(settings), driverMock};
       try {
         await runGatherAndAudit(createGatherFn(), opts);
         assert.fail('should have thrown');
@@ -161,10 +161,9 @@ describe('Runner', () => {
     });
 
     it('does not include a top-level runtimeError when gatherers were successful', async () => {
-      const config = new Config({
+      const config = await Config.createConfigFromJson({
         settings: {
           auditMode: __dirname + '/fixtures/artifacts/perflog/',
-
         },
         audits: [
           'content-width',
@@ -175,9 +174,9 @@ describe('Runner', () => {
       assert.strictEqual(lhr.runtimeError, undefined);
     });
 
-    it('-GA is a normal run but it saves artifacts and LHR to disk', () => {
+    it('-GA is a normal run but it saves artifacts and LHR to disk', async () => {
       const settings = {auditMode: artifactsPath, gatherMode: artifactsPath};
-      const opts = {config: generateConfig(settings), driverMock};
+      const opts = {config: await generateConfig(settings), driverMock};
       return runGatherAndAudit(createGatherFn(url), opts).then(_ => {
         expect(loadArtifactsSpy).not.toHaveBeenCalled();
         expect(gatherRunnerRunSpy).toHaveBeenCalled();
@@ -187,8 +186,8 @@ describe('Runner', () => {
       });
     });
 
-    it('non -G/-A run doesn\'t save artifacts to disk', () => {
-      const opts = {config: generateConfig(), driverMock};
+    it('non -G/-A run doesn\'t save artifacts to disk', async () => {
+      const opts = {config: await generateConfig(), driverMock};
       return runGatherAndAudit(createGatherFn(url), opts).then(_ => {
         expect(loadArtifactsSpy).not.toHaveBeenCalled();
         expect(gatherRunnerRunSpy).toHaveBeenCalled();
@@ -211,7 +210,7 @@ describe('Runner', () => {
           throw new LHError(LHError.errors.UNSUPPORTED_OLD_CHROME, {featureName: 'VRML'});
         }
       }
-      const gatherConfig = new Config({
+      const gatherConfig = await Config.createConfigFromJson({
         settings: {gatherMode: artifactsPath},
         passes: [{gatherers: [WarningAndErrorGatherer]}],
       });
@@ -241,7 +240,7 @@ describe('Runner', () => {
         }
         static audit() {}
       }
-      const auditConfig = new Config({
+      const auditConfig = await Config.createConfigFromJson({
         settings: {auditMode: artifactsPath},
         audits: [{implementation: DummyAudit}],
       });
@@ -257,9 +256,9 @@ describe('Runner', () => {
     });
   });
 
-  it('expands gatherers', () => {
+  it('expands gatherers', async () => {
     const url = 'https://example.com';
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       passes: [{
         gatherers: ['viewport-dimensions'],
       }],
@@ -274,10 +273,9 @@ describe('Runner', () => {
     });
   });
 
-
-  it('rejects when given neither passes nor artifacts', () => {
+  it('rejects when given neither passes nor artifacts', async () => {
     const url = 'https://example.com';
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       audits: [
         'content-width',
       ],
@@ -291,7 +289,7 @@ describe('Runner', () => {
       });
   });
 
-  it('accepts audit options', () => {
+  it('accepts audit options', async () => {
     const url = 'https://example.com/';
 
     const calls = [];
@@ -311,7 +309,7 @@ describe('Runner', () => {
       }
     }
 
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       settings: {
         auditMode: __dirname + '/fixtures/artifacts/empty-artifacts/',
       },
@@ -329,8 +327,8 @@ describe('Runner', () => {
     });
   });
 
-  it('accepts trace artifacts as paths and outputs appropriate data', () => {
-    const config = new Config({
+  it('accepts trace artifacts as paths and outputs appropriate data', async () => {
+    const config = await Config.createConfigFromJson({
       settings: {
         auditMode: __dirname + '/fixtures/artifacts/perflog/',
       },
@@ -347,9 +345,9 @@ describe('Runner', () => {
     });
   });
 
-  it('rejects when given an invalid trace artifact', () => {
+  it('rejects when given an invalid trace artifact', async () => {
     const url = 'https://example.com';
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       passes: [{
         recordTrace: true,
         gatherers: [],
@@ -374,7 +372,7 @@ describe('Runner', () => {
   });
 
   it('finds correct timings for multiple gather/audit pairs run separately', async () => {
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       passes: [{
         gatherers: ['viewport-dimensions'],
       }],
@@ -402,8 +400,8 @@ describe('Runner', () => {
   });
 
   describe('Bad required artifact handling', () => {
-    it('outputs an error audit result when trace required but not provided', () => {
-      const config = new Config({
+    it('outputs an error audit result when trace required but not provided', async () => {
+      const config = await Config.createConfigFromJson({
         settings: {
           auditMode: __dirname + '/fixtures/artifacts/empty-artifacts/',
         },
@@ -413,16 +411,15 @@ describe('Runner', () => {
         ],
       });
 
-      return runGatherAndAudit({}, {config}).then(results => {
-        const auditResult = results.lhr.audits['user-timings'];
-        assert.strictEqual(auditResult.score, null);
-        assert.strictEqual(auditResult.scoreDisplayMode, 'error');
-        assert.ok(auditResult.errorMessage.includes('traces'));
-      });
+      const results = await runGatherAndAudit({}, {config});
+      const auditResult = results.lhr.audits['user-timings'];
+      assert.strictEqual(auditResult.score, null);
+      assert.strictEqual(auditResult.scoreDisplayMode, 'error');
+      assert.ok(auditResult.errorMessage.includes('traces'));
     });
 
     it('outputs an error audit result when devtoolsLog required but not provided', async () => {
-      const config = new Config({
+      const config = await Config.createConfigFromJson({
         settings: {
           auditMode: __dirname + '/fixtures/artifacts/empty-artifacts/',
         },
@@ -439,8 +436,8 @@ describe('Runner', () => {
       assert.strictEqual(auditResult.errorMessage, 'Required devtoolsLogs gatherer did not run.');
     });
 
-    it('outputs an error audit result when missing a required artifact', () => {
-      const config = new Config({
+    it('outputs an error audit result when missing a required artifact', async () => {
+      const config = await Config.createConfigFromJson({
         settings: {
           auditMode: __dirname + '/fixtures/artifacts/empty-artifacts/',
         },
@@ -474,7 +471,7 @@ describe('Runner', () => {
       await assetSaver.saveArtifacts(artifacts, resolvedPath);
 
       // Load artifacts via auditMode.
-      const config = new Config({
+      const config = await Config.createConfigFromJson({
         settings: {
           auditMode: resolvedPath,
         },
@@ -507,7 +504,7 @@ describe('Runner', () => {
       }
 
       const auditMockFn = SimpleAudit.audit = jest.fn().mockReturnValue({score: 1});
-      const config = new Config({
+      const config = await Config.createConfigFromJson({
         settings: {
           auditMode: __dirname + '/fixtures/artifacts/alphabet-artifacts/',
         },
@@ -540,7 +537,7 @@ describe('Runner', () => {
       }
 
       const auditMockFn = SimpleAudit.audit = jest.fn().mockReturnValue({score: 1});
-      const config = new Config({
+      const config = await Config.createConfigFromJson({
         settings: {
           auditMode: __dirname + '/fixtures/artifacts/alphabet-artifacts/',
         },
@@ -569,9 +566,9 @@ describe('Runner', () => {
       requiredArtifacts: [],
     };
 
-    it('produces an error audit result when an audit throws an Error', () => {
+    it('produces an error audit result when an audit throws an Error', async () => {
       const errorMessage = 'Audit yourself';
-      const config = new Config({
+      const config = await Config.createConfigFromJson({
         settings: {
           auditMode: __dirname + '/fixtures/artifacts/empty-artifacts/',
         },
@@ -596,8 +593,8 @@ describe('Runner', () => {
     });
   });
 
-  it('accepts devtoolsLog in artifacts', () => {
-    const config = new Config({
+  it('accepts devtoolsLog in artifacts', async () => {
+    const config = await Config.createConfigFromJson({
       settings: {
         auditMode: __dirname + '/fixtures/artifacts/perflog/',
       },
@@ -613,9 +610,9 @@ describe('Runner', () => {
     });
   });
 
-  it('rejects when not given audits to run (and not -G)', () => {
+  it('rejects when not given audits to run (and not -G)', async () => {
     const url = 'https://example.com';
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       passes: [{
         gatherers: ['viewport-dimensions'],
       }],
@@ -629,9 +626,9 @@ describe('Runner', () => {
       });
   });
 
-  it('returns data even if no config categories are provided', () => {
+  it('returns data even if no config categories are provided', async () => {
     const url = 'https://example.com/';
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       passes: [{
         gatherers: ['viewport-dimensions'],
       }],
@@ -649,10 +646,9 @@ describe('Runner', () => {
     });
   });
 
-
-  it('returns categories', () => {
+  it('returns categories', async () => {
     const url = 'https://example.com/';
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       passes: [{
         gatherers: ['viewport-dimensions'],
       }],
@@ -692,8 +688,8 @@ describe('Runner', () => {
     });
   });
 
-  it('results include artifacts when given artifacts and audits', () => {
-    const config = new Config({
+  it('results include artifacts when given artifacts and audits', async () => {
+    const config = await Config.createConfigFromJson({
       settings: {
         auditMode: __dirname + '/fixtures/artifacts/perflog/',
       },
@@ -708,9 +704,9 @@ describe('Runner', () => {
     });
   });
 
-  it('results include artifacts when given passes and audits', () => {
+  it('results include artifacts when given passes and audits', async () => {
     const url = 'https://example.com';
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       passes: [{
         passName: 'firstPass',
         gatherers: ['meta-elements', 'viewport-dimensions'],
@@ -732,8 +728,8 @@ describe('Runner', () => {
     });
   });
 
-  it('includes any LighthouseRunWarnings from artifacts in output', () => {
-    const config = new Config({
+  it('includes any LighthouseRunWarnings from artifacts in output', async () => {
+    const config = await Config.createConfigFromJson({
       settings: {
         auditMode: __dirname + '/fixtures/artifacts/perflog/',
       },
@@ -748,10 +744,10 @@ describe('Runner', () => {
     });
   });
 
-  it('includes any LighthouseRunWarnings from audits in LHR', () => {
+  it('includes any LighthouseRunWarnings from audits in LHR', async () => {
     const warningString = 'Really important audit warning!';
 
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       settings: {
         auditMode: __dirname + '/fixtures/artifacts/empty-artifacts/',
       },
@@ -812,7 +808,7 @@ describe('Runner', () => {
     };
 
     it('includes a top-level runtimeError when a gatherer throws one', async () => {
-      const config = new Config(configJson);
+      const config = await Config.createConfigFromJson(configJson);
       const {lhr} = await runGatherAndAudit(createGatherFn('https://example.com/'), {config, driverMock});
 
       // Audit error included the runtimeError
@@ -843,7 +839,7 @@ describe('Runner', () => {
         }
       });
 
-      const config = new Config(configJson);
+      const config = await Config.createConfigFromJson(configJson);
       const {lhr} = await runGatherAndAudit(
         createGatherFn(url),
         {config, driverMock: errorDriverMock}
@@ -871,7 +867,7 @@ describe('Runner', () => {
     };
 
     try {
-      await runGatherAndAudit(createGatherFn('https://example.com/'), {driverMock: erroringDriver, config: new Config()});
+      await runGatherAndAudit(createGatherFn('https://example.com/'), {driverMock: erroringDriver, config: await Config.createConfigFromJson()});
       assert.fail('should have thrown');
     } catch (err) {
       assert.equal(err.code, LHError.errors.PROTOCOL_TIMEOUT.code);
@@ -882,7 +878,7 @@ describe('Runner', () => {
 
   it('can handle array of outputs', async () => {
     const url = 'https://example.com';
-    const config = new Config({
+    const config = await Config.createConfigFromJson({
       extends: 'lighthouse:default',
       settings: {
         onlyCategories: ['performance'],
diff --git a/tsconfig-base.json b/tsconfig-base.json
index 345313f7c05a..e98c7d2bf2ba 100644
--- a/tsconfig-base.json
+++ b/tsconfig-base.json
@@ -7,7 +7,7 @@
     "declarationMap": true,
 
     "target": "es2020",
-    "module": "es2020",
+    "module": "es2022",
     "moduleResolution": "node",
     "esModuleInterop": true,
 

From 4bacbab0ac2ed127f1a5bef2418366a1a4690562 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 6 May 2022 14:11:05 -0700
Subject: [PATCH 16/96] tests

---
 .../test/config/config-helpers-test.js        | 48 +++++++++----------
 .../test/fraggle-rock/config/filters-test.js  |  4 +-
 .../gather/base-artifacts-test.js             |  8 ++--
 lighthouse-core/test/lib/stack-packs-test.js  |  9 ++--
 4 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/lighthouse-core/test/config/config-helpers-test.js b/lighthouse-core/test/config/config-helpers-test.js
index 61c402b9fd5a..fb8994385dc4 100644
--- a/lighthouse-core/test/config/config-helpers-test.js
+++ b/lighthouse-core/test/config/config-helpers-test.js
@@ -197,13 +197,13 @@ describe('.mergePlugins', () => {
   // Include a configPath flag so that config.js looks for the plugins in the fixtures dir.
   const configDir = `${LH_ROOT}/lighthouse-core/test/fixtures/config-plugins/`;
 
-  it('merge plugins from the config', () => {
+  it('merge plugins from the config', async () => {
     const configJson = {
       audits: ['installable-manifest', 'metrics'],
       plugins: ['lighthouse-plugin-simple'],
     };
 
-    const config = mergePlugins(configJson, configDir, {});
+    const config = await mergePlugins(configJson, configDir, {});
     expect(config).toMatchObject({
       audits: [
         'installable-manifest',
@@ -220,13 +220,13 @@ describe('.mergePlugins', () => {
     });
   });
 
-  it('merge plugins from flags', () => {
+  it('merge plugins from flags', async () => {
     const configJson = {
       audits: ['installable-manifest', 'metrics'],
       plugins: ['lighthouse-plugin-simple'],
     };
     const flags = {plugins: ['lighthouse-plugin-no-groups']};
-    const config = mergePlugins(configJson, configDir, flags);
+    const config = await mergePlugins(configJson, configDir, flags);
 
     expect(config.categories).toHaveProperty('lighthouse-plugin-simple');
     expect(config.categories).toHaveProperty('lighthouse-plugin-no-groups');
@@ -235,19 +235,19 @@ describe('.mergePlugins', () => {
   it('validate plugin name', () => {
     const configJson = {audits: ['installable-manifest', 'metrics']};
     const flags = {plugins: ['not-a-plugin']};
-    expect(() => mergePlugins(configJson, configDir, flags)).toThrow(/does not start/);
+    expect(mergePlugins(configJson, configDir, flags)).rejects.toThrow(/does not start/);
   });
 
   it('validate plugin existence', () => {
     const configJson = {audits: ['installable-manifest', 'metrics']};
     const flags = {plugins: ['lighthouse-plugin-missing']};
-    expect(() => mergePlugins(configJson, configDir, flags)).toThrow(/Unable to locate plugin/);
+    expect(mergePlugins(configJson, configDir, flags)).rejects.toThrow(/Unable to locate plugin/);
   });
 
   it('validate plugin structure', () => {
     const configJson = {audits: ['installable-manifest', 'metrics']};
     const flags = {plugins: ['lighthouse-plugin-no-category']};
-    expect(() => mergePlugins(configJson, configDir, flags)).toThrow(/no valid category/);
+    expect(mergePlugins(configJson, configDir, flags)).rejects.toThrow(/no valid category/);
   });
 });
 
@@ -337,11 +337,11 @@ describe('.resolveSettings', () => {
   });
 });
 
-describe('.resolveGathererToDefn', () => {
+describe('.await resolveGathererToDefn', () => {
   const coreList = Runner.getGathererList();
 
-  it('should expand gatherer path short-hand', () => {
-    const result = resolveGathererToDefn('image-elements', coreList);
+  it('should expand gatherer path short-hand', async () => {
+    const result = await resolveGathererToDefn('image-elements', coreList);
     expect(result).toEqual({
       path: 'image-elements',
       implementation: ImageElementsGatherer,
@@ -349,9 +349,9 @@ describe('.resolveGathererToDefn', () => {
     });
   });
 
-  it('should find relative to configDir', () => {
+  it('should find relative to configDir', async () => {
     const configDir = path.resolve(__dirname, '../../gather/');
-    const result = resolveGathererToDefn('gatherers/image-elements', [], configDir);
+    const result = await resolveGathererToDefn('gatherers/image-elements', [], configDir);
     expect(result).toEqual({
       path: 'gatherers/image-elements',
       implementation: ImageElementsGatherer,
@@ -359,8 +359,8 @@ describe('.resolveGathererToDefn', () => {
     });
   });
 
-  it('should expand gatherer impl short-hand', () => {
-    const result = resolveGathererToDefn({implementation: ImageElementsGatherer}, coreList);
+  it('should expand gatherer impl short-hand', async () => {
+    const result = await resolveGathererToDefn({implementation: ImageElementsGatherer}, coreList);
     expect(result).toEqual({
       implementation: ImageElementsGatherer,
       instance: expect.any(ImageElementsGatherer),
@@ -368,39 +368,39 @@ describe('.resolveGathererToDefn', () => {
   });
 
   it('throws for invalid gathererDefn', () => {
-    expect(() => resolveGathererToDefn({})).toThrow(/Invalid Gatherer type/);
+    expect(resolveGathererToDefn({})).rejects.toThrow(/Invalid Gatherer type/);
   });
 });
 
 describe('.resolveAuditsToDefns', () => {
-  it('should expand audit short-hand', () => {
-    const result = resolveAuditsToDefns(['user-timings']);
+  it('should expand audit short-hand', async () => {
+    const result = await resolveAuditsToDefns(['user-timings']);
 
     expect(result).toEqual([{path: 'user-timings', options: {}, implementation: UserTimingsAudit}]);
   });
 
-  it('should find relative to configDir', () => {
+  it('should find relative to configDir', async () => {
     const configDir = path.resolve(__dirname, '../../');
-    const result = resolveAuditsToDefns(['audits/user-timings'], configDir);
+    const result = await resolveAuditsToDefns(['audits/user-timings'], configDir);
 
     expect(result).toEqual([
       {path: 'audits/user-timings', options: {}, implementation: UserTimingsAudit},
     ]);
   });
 
-  it('should handle multiple audit definition styles', () => {
-    const result = resolveAuditsToDefns(['user-timings', {implementation: UserTimingsAudit}]);
+  it('should handle multiple audit definition styles', async () => {
+    const result = await resolveAuditsToDefns(['user-timings', {implementation: UserTimingsAudit}]);
 
     expect(result).toMatchObject([{path: 'user-timings'}, {implementation: UserTimingsAudit}]);
   });
 
-  it('should merge audit options', () => {
+  it('should merge audit options', async () => {
     const audits = [
       'user-timings',
       {path: 'is-on-https', options: {x: 1, y: 1}},
       {path: 'is-on-https', options: {x: 2}},
     ];
-    const merged = resolveAuditsToDefns(audits);
+    const merged = await resolveAuditsToDefns(audits);
     expect(merged).toMatchObject([
       {path: 'user-timings', options: {}},
       {path: 'is-on-https', options: {x: 2, y: 1}},
@@ -408,7 +408,7 @@ describe('.resolveAuditsToDefns', () => {
   });
 
   it('throws for invalid auditDefns', () => {
-    expect(() => resolveAuditsToDefns([new Gatherer()])).toThrow(/Invalid Audit type/);
+    expect(resolveAuditsToDefns([new Gatherer()])).rejects.toThrow(/Invalid Audit type/);
   });
 });
 
diff --git a/lighthouse-core/test/fraggle-rock/config/filters-test.js b/lighthouse-core/test/fraggle-rock/config/filters-test.js
index c59b7ac6062a..f9da956b7f00 100644
--- a/lighthouse-core/test/fraggle-rock/config/filters-test.js
+++ b/lighthouse-core/test/fraggle-rock/config/filters-test.js
@@ -528,8 +528,8 @@ describe('Fraggle Rock Config Filtering', () => {
       });
     });
 
-    it('should preserve full-page-screenshot', () => {
-      config = initializeConfig(undefined, {gatherMode: 'navigation'}).config;
+    it('should preserve full-page-screenshot', async () => {
+      config = (await initializeConfig(undefined, {gatherMode: 'navigation'})).config;
 
       const filtered = filters.filterConfigByExplicitFilters(config, {
         onlyAudits: ['color-contrast'],
diff --git a/lighthouse-core/test/fraggle-rock/gather/base-artifacts-test.js b/lighthouse-core/test/fraggle-rock/gather/base-artifacts-test.js
index 1553df19581b..c1fb26e02898 100644
--- a/lighthouse-core/test/fraggle-rock/gather/base-artifacts-test.js
+++ b/lighthouse-core/test/fraggle-rock/gather/base-artifacts-test.js
@@ -33,20 +33,20 @@ describe('getBaseArtifacts', () => {
   });
 
   it('should fetch benchmark index', async () => {
-    const {config} = initializeConfig(undefined, {gatherMode: 'navigation'});
+    const {config} = await initializeConfig(undefined, {gatherMode: 'navigation'});
     const artifacts = await getBaseArtifacts(config, driverMock.asDriver(), {gatherMode});
     expect(artifacts.BenchmarkIndex).toEqual(500);
   });
 
   it('should fetch host user agent', async () => {
-    const {config} = initializeConfig(undefined, {gatherMode: 'navigation'});
+    const {config} = await initializeConfig(undefined, {gatherMode: 'navigation'});
     const artifacts = await getBaseArtifacts(config, driverMock.asDriver(), {gatherMode});
     expect(artifacts.HostUserAgent).toContain('Macintosh');
     expect(artifacts.HostFormFactor).toEqual('desktop');
   });
 
   it('should return settings', async () => {
-    const {config} = initializeConfig(undefined, {gatherMode: 'navigation'});
+    const {config} = await initializeConfig(undefined, {gatherMode: 'navigation'});
     const artifacts = await getBaseArtifacts(config, driverMock.asDriver(), {gatherMode});
     expect(artifacts.settings).toEqual(config.settings);
   });
@@ -59,7 +59,7 @@ describe('finalizeArtifacts', () => {
   let gathererArtifacts = {};
 
   beforeEach(async () => {
-    const {config} = initializeConfig(undefined, {gatherMode});
+    const {config} = await initializeConfig(undefined, {gatherMode});
     const driver = getMockDriverForArtifacts().asDriver();
     baseArtifacts = await getBaseArtifacts(config, driver, {gatherMode});
     baseArtifacts.URL = {initialUrl: 'about:blank', finalUrl: 'https://example.com'};
diff --git a/lighthouse-core/test/lib/stack-packs-test.js b/lighthouse-core/test/lib/stack-packs-test.js
index 959162485034..cc0b7912453b 100644
--- a/lighthouse-core/test/lib/stack-packs-test.js
+++ b/lighthouse-core/test/lib/stack-packs-test.js
@@ -10,11 +10,10 @@
 import lighthouseStackPacksDep from 'lighthouse-stack-packs';
 
 import stackPacksLib from '../../lib/stack-packs.js';
-import defaultConfig from '../../config/default-config.js';
 import Config from '../../config/config.js';
 
-function getAuditIds() {
-  const config = new Config(defaultConfig);
+async function getAuditIds() {
+  const config = await Config.createConfigFromJson();
   return config.audits.map(a => a.implementation.meta.id);
 }
 
@@ -234,8 +233,8 @@ Array [
 
   // Keys for plugin audits are allowed in this package.
   // Make sure none are typos of core audits.
-  it('snapshot unrecognized keys', () => {
-    const auditIds = getAuditIds();
+  it('snapshot unrecognized keys', async () => {
+    const auditIds = await getAuditIds();
 
     const unrecognizedKeys = new Set();
     for (const pack of lighthouseStackPacksDep) {

From c69ceea330076080121a7bef3f1bb54df6acf736 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 6 May 2022 14:35:08 -0700
Subject: [PATCH 17/96] update

---
 build/changelog-generator/{index.js => index.cjs} |  8 ++++----
 build/tsconfig.json                               | 14 --------------
 lighthouse-core/index.js                          |  2 +-
 package.json                                      |  2 +-
 tsconfig-all.json                                 |  1 -
 tsconfig.json                                     |  2 ++
 6 files changed, 8 insertions(+), 21 deletions(-)
 rename build/changelog-generator/{index.js => index.cjs} (96%)
 delete mode 100644 build/tsconfig.json

diff --git a/build/changelog-generator/index.js b/build/changelog-generator/index.cjs
similarity index 96%
rename from build/changelog-generator/index.js
rename to build/changelog-generator/index.cjs
index 3ed06067503e..e3d79163e1fc 100644
--- a/build/changelog-generator/index.js
+++ b/build/changelog-generator/index.cjs
@@ -3,10 +3,10 @@
  * 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';
 
-
-import {readFileSync} from 'fs';
-import {resolve} from 'path';
+const readFileSync = require('fs').readFileSync;
+const resolve = require('path').resolve;
 const mainTemplate = readFileSync(resolve(__dirname, 'templates/template.hbs')).toString();
 const headerPartial = readFileSync(resolve(__dirname, 'templates/header.hbs')).toString();
 const commitPartial = readFileSync(resolve(__dirname, 'templates/commit.hbs')).toString();
@@ -109,7 +109,7 @@ const writerOpts = {
   commitsSort: ['type', 'scope'],
 };
 
-export default {
+module.exports = {
   writerOpts,
   parserOpts,
 };
diff --git a/build/tsconfig.json b/build/tsconfig.json
deleted file mode 100644
index 7a39fd2f7ab8..000000000000
--- a/build/tsconfig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-base.json",
-  "compilerOptions": {
-    "outDir": "../.tmp/tsbuildinfo/build",
-  },
-  "references": [
-    {"path": "../"},
-    {"path": "../treemap/"},
-  ],
-  "include": [
-    "**/*.js",
-    "../types/*.d.ts",
-  ],
-}
diff --git a/lighthouse-core/index.js b/lighthouse-core/index.js
index ce9bf39cc8a1..f4a6b5d8a4d2 100644
--- a/lighthouse-core/index.js
+++ b/lighthouse-core/index.js
@@ -91,7 +91,7 @@ function generateConfig(configJson, flags) {
 
 lighthouse.legacyNavigation = legacyNavigation;
 lighthouse.generateConfig = generateConfig;
-lighthouse.getAuditList = () => Runner.getAuditList();
+lighthouse.getAuditList = Runner.getAuditList;
 lighthouse.traceCategories = require('./gather/driver.js').traceCategories;
 lighthouse.Audit = require('./audits/audit.js');
 lighthouse.Gatherer = require('./fraggle-rock/gather/base-gatherer.js');
diff --git a/package.json b/package.json
index 114d64e49540..6670e09a738e 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "vercel-build": "yarn build-sample-reports && yarn build-viewer && yarn build-treemap",
     "dogfood-lhci": "./lighthouse-core/scripts/dogfood-lhci.sh",
     "timing-trace": "node lighthouse-core/scripts/generate-timing-trace.js",
-    "changelog": "conventional-changelog --config ./build/changelog-generator/index.js --infile changelog.md --same-file",
+    "changelog": "conventional-changelog --config ./build/changelog-generator/index.cjs --infile changelog.md --same-file",
     "type-check": "tsc --build ./tsconfig-all.json",
     "i18n:checks": "./lighthouse-core/scripts/i18n/assert-strings-collected.sh",
     "i18n:collect-strings": "node lighthouse-core/scripts/i18n/collect-strings.js",
diff --git a/tsconfig-all.json b/tsconfig-all.json
index 7e7c57fdbbe4..d38a50f1cea5 100644
--- a/tsconfig-all.json
+++ b/tsconfig-all.json
@@ -10,7 +10,6 @@
     {"path": "./treemap/"},
     {"path": "./flow-report/"},
     {"path": "./shared/"},
-    {"path": "./build/"},
   ],
   "files": [],
   "include": [],
diff --git a/tsconfig.json b/tsconfig.json
index 30fe9a02db7e..4100884a0ba5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,12 +11,14 @@
     {"path": "./report/"},
     {"path": "./report/generator/"},
     {"path": "./shared/"},
+    {"path": "./treemap/"},
   ],
   "include": [
     "root.js",
     "lighthouse-cli/**/*.js",
     "lighthouse-core/**/*.js",
     "clients/**/*.js",
+    "build/**/*.js",
     "./types/**/*.d.ts",
     "eslint-local-rules.js",
     "third-party/axe/valid-langs.js",

From d1e198d790ae2c59b1214132f750fe4adb8a0b94 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 6 May 2022 14:36:35 -0700
Subject: [PATCH 18/96] update

---
 build/build-bundle.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build-bundle.js b/build/build-bundle.js
index 40c90d26b1f8..ee7695e5d7fa 100644
--- a/build/build-bundle.js
+++ b/build/build-bundle.js
@@ -15,7 +15,7 @@ import {execSync} from 'child_process';
 
 import esMain from 'es-main';
 import {rollup} from 'rollup';
-// @ts-expect-error
+// @ts-expect-error: plugin has no types.
 import PubAdsPlugin from 'lighthouse-plugin-publisher-ads/plugin.js';
 
 import * as rollupPlugins from './rollup-plugins.js';

From b512c2cd9c1d0752c4a09c705384f99341bd1d3f Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 6 May 2022 16:16:40 -0700
Subject: [PATCH 19/96] Config.fromJson

---
 lighthouse-core/config/config.js           |   2 +-
 lighthouse-core/test/config/config-test.js | 180 ++++++++++-----------
 lighthouse-core/test/runner-test.js        |  58 +++----
 3 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/lighthouse-core/config/config.js b/lighthouse-core/config/config.js
index d9adf8283bde..261800f5f750 100644
--- a/lighthouse-core/config/config.js
+++ b/lighthouse-core/config/config.js
@@ -156,7 +156,7 @@ class Config {
    * @param {LH.Config.Json=} configJSON
    * @param {LH.Flags=} flags
    */
-  static async createConfigFromJson(configJSON, flags) {
+  static async fromJson(configJSON, flags) {
     const status = {msg: 'Create config', id: 'lh:init:config'};
     log.time(status, 'verbose');
     let configPath = flags?.configPath;
diff --git a/lighthouse-core/test/config/config-test.js b/lighthouse-core/test/config/config-test.js
index a323b1ae2cba..a02d8cc57e97 100644
--- a/lighthouse-core/test/config/config-test.js
+++ b/lighthouse-core/test/config/config-test.js
@@ -30,7 +30,7 @@ describe('Config', () => {
     const config = {
       audits: ['is-on-https'],
     };
-    const newConfig = Config.createConfigFromJson(config, {});
+    const newConfig = Config.fromJson(config, {});
     assert.notEqual(config, newConfig);
   });
 
@@ -57,7 +57,7 @@ describe('Config', () => {
       }],
       audits: [MyAudit],
     };
-    const newConfig = await Config.createConfigFromJson(config);
+    const newConfig = await Config.fromJson(config);
     assert.equal(MyGatherer, newConfig.passes[0].gatherers[0].implementation);
     assert.equal(MyAudit, newConfig.audits[0].implementation);
   });
@@ -84,7 +84,7 @@ describe('Config', () => {
         ],
       }],
     };
-    const newConfig = await Config.createConfigFromJson(config);
+    const newConfig = await Config.fromJson(config);
     const configGatherers = newConfig.passes[0].gatherers;
     assert(configGatherers[0].instance instanceof MyGatherer);
     assert.equal(configGatherers[0].instance.secret, 1729);
@@ -93,7 +93,7 @@ describe('Config', () => {
   });
 
   it('uses the default config when no config is provided', async () => {
-    const config = await Config.createConfigFromJson();
+    const config = await Config.fromJson();
     assert.deepStrictEqual(config.categories, origConfig.categories);
     assert.deepStrictEqual(config.audits.map(a => a.path), origConfig.audits);
   });
@@ -110,7 +110,7 @@ describe('Config', () => {
       }],
     };
 
-    await assert.rejects(Config.createConfigFromJson(configJson), /unique/);
+    await assert.rejects(Config.fromJson(configJson), /unique/);
   });
 
   it('defaults passName to defaultPass', async () => {
@@ -121,7 +121,7 @@ describe('Config', () => {
       }],
     };
 
-    const config = await Config.createConfigFromJson(configJson);
+    const config = await Config.fromJson(configJson);
     const defaultPass = config.passes.find(pass => pass.passName === 'defaultPass');
     assert.ok(
       defaultPass.gatherers.find(gatherer => gatherer.implementation === MyGatherer),
@@ -150,7 +150,7 @@ describe('Config', () => {
       static audit() {}
     }
 
-    expect(Config.createConfigFromJson({
+    expect(Config.fromJson({
       extends: 'lighthouse:default',
       audits: [NeedsWhatYouCantGive],
     // eslint-disable-next-line max-len
@@ -180,7 +180,7 @@ describe('Config', () => {
     }
 
     // Shouldn't throw.
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       extends: 'lighthouse:default',
       audits: [DoesntNeedYourCrap],
     }, {
@@ -211,7 +211,7 @@ describe('Config', () => {
       static audit() {}
     }
 
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       extends: 'lighthouse:default',
       audits: [ButWillStillTakeYourCrap],
     }, {
@@ -243,7 +243,7 @@ describe('Config', () => {
       static audit() {}
     }
 
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       extends: 'lighthouse:default',
       audits: [ButWillStillTakeYourCrap],
     }, {
@@ -275,7 +275,7 @@ describe('Config', () => {
       static audit() {}
     }
 
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       extends: 'lighthouse:default',
       audits: [ButWillStillTakeYourCrap],
     }, {
@@ -301,7 +301,7 @@ describe('Config', () => {
       static audit() {}
     }
 
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       extends: 'lighthouse:default',
       audits: [BaseArtifactsAudit],
     }, {onlyAudits: ['base-artifacts-audit']});
@@ -320,7 +320,7 @@ describe('Config', () => {
       ],
     };
 
-    await assert.rejects(Config.createConfigFromJson(config), /Unable to locate/);
+    await assert.rejects(Config.fromJson(config), /Unable to locate/);
   });
 
   it('doesn\'t mutate old gatherers when filtering passes', async () => {
@@ -335,12 +335,12 @@ describe('Config', () => {
       audits: ['is-on-https'],
     };
 
-    const _ = await Config.createConfigFromJson(configJSON);
+    const _ = await Config.fromJson(configJSON);
     assert.equal(configJSON.passes[0].gatherers.length, 3);
   });
 
   it('expands audits', async () => {
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       audits: ['user-timings'],
     });
 
@@ -352,7 +352,7 @@ describe('Config', () => {
   });
 
   it('throws when an audit is not found', async () => {
-    await assert.rejects(Config.createConfigFromJson({
+    await assert.rejects(Config.fromJson({
       audits: ['/fake-path/non-existent-audit'],
     }), /locate audit/);
   });
@@ -360,7 +360,7 @@ describe('Config', () => {
   it('throws on a non-absolute config path', async () => {
     const configPath = '../../config/default-config.js';
 
-    await assert.rejects(Config.createConfigFromJson({
+    await assert.rejects(Config.fromJson({
       audits: [],
     }, {configPath}), /absolute path/);
   });
@@ -368,13 +368,13 @@ describe('Config', () => {
   it('loads an audit relative to a config path', async () => {
     const configPath = __filename;
 
-    return assert.doesNotThrow(_ => Config.createConfigFromJson({
+    return assert.doesNotThrow(_ => Config.fromJson({
       audits: ['../fixtures/valid-custom-audit'],
     }, {configPath}));
   });
 
   it('loads an audit from node_modules/', async () => {
-    await assert.rejects(Config.createConfigFromJson({
+    await assert.rejects(Config.fromJson({
       // Use a lighthouse dep as a stand in for a module.
       audits: ['lighthouse-logger'],
     }), function(err) {
@@ -390,13 +390,13 @@ describe('Config', () => {
     assert.doesNotThrow(_ => require.resolve(absoluteAuditPath));
     const relativePath = path.relative(process.cwd(), absoluteAuditPath);
 
-    return assert.doesNotThrow(_ => Config.createConfigFromJson({
+    return assert.doesNotThrow(_ => Config.fromJson({
       audits: [relativePath],
     }));
   });
 
   it('throws but not for missing audit when audit has a dependency error', async () => {
-    await assert.rejects(Config.createConfigFromJson({
+    await assert.rejects(Config.fromJson({
       audits: [path.resolve(__dirname, '../fixtures/invalid-audits/require-error.js')],
     }), function(err) {
       // We're expecting not to find parent class Audit, so only reject on our
@@ -407,19 +407,19 @@ describe('Config', () => {
 
   it('throws when it finds invalid audits', async () => {
     const basePath = path.resolve(__dirname, '../fixtures/invalid-audits');
-    await assert.rejects(Config.createConfigFromJson({
+    await assert.rejects(Config.fromJson({
       audits: [basePath + '/missing-audit'],
     }), /audit\(\) method/);
 
-    await assert.rejects(Config.createConfigFromJson({
+    await assert.rejects(Config.fromJson({
       audits: [basePath + '/missing-id'],
     }), /meta.id property/);
 
-    await assert.rejects(Config.createConfigFromJson({
+    await assert.rejects(Config.fromJson({
       audits: [basePath + '/missing-title'],
     }), /meta.title property/);
 
-    await assert.rejects(Config.createConfigFromJson({
+    await assert.rejects(Config.fromJson({
       audits: [
         class BinaryButNoFailureTitleAudit extends Audit {
           static get meta() {
@@ -439,11 +439,11 @@ describe('Config', () => {
       ],
     }), /no meta.failureTitle and should/);
 
-    await assert.rejects(Config.createConfigFromJson({
+    await assert.rejects(Config.fromJson({
       audits: [basePath + '/missing-description'],
     }), /meta.description property/);
 
-    await assert.rejects(Config.createConfigFromJson({
+    await assert.rejects(Config.fromJson({
       audits: [
         class EmptyStringDescriptionAudit extends Audit {
           static get meta() {
@@ -463,13 +463,13 @@ describe('Config', () => {
       ],
     }), /empty meta.description string/);
 
-    await assert.rejects(Config.createConfigFromJson({
+    await assert.rejects(Config.fromJson({
       audits: [basePath + '/missing-required-artifacts'],
     }), /meta.requiredArtifacts property/);
   });
 
   it('throws when a category references a non-existent audit', async () => {
-    await assert.rejects(Config.createConfigFromJson({
+    await assert.rejects(Config.fromJson({
       audits: [],
       categories: {
         pwa: {
@@ -482,7 +482,7 @@ describe('Config', () => {
   });
 
   it('throws when a category fails to specify an audit id', async () => {
-    await assert.rejects(Config.createConfigFromJson({
+    await assert.rejects(Config.fromJson({
       audits: [],
       categories: {
         pwa: {
@@ -495,7 +495,7 @@ describe('Config', () => {
   });
 
   it('throws when an accessibility audit does not have a group', async () => {
-    await assert.rejects(Config.createConfigFromJson({
+    await assert.rejects(Config.fromJson({
       audits: ['accessibility/color-contrast'],
       categories: {
         accessibility: {
@@ -508,7 +508,7 @@ describe('Config', () => {
   });
 
   it('throws when an audit references an unknown group', async () => {
-    await assert.rejects(Config.createConfigFromJson({
+    await assert.rejects(Config.fromJson({
       groups: {
         'group-a': {
           title: 'Group A',
@@ -528,7 +528,7 @@ describe('Config', () => {
   });
 
   it('throws when a manual audit has weight', async () => {
-    await assert.rejects(Config.createConfigFromJson({
+    await assert.rejects(Config.fromJson({
       audits: ['manual/pwa-cross-browser'],
       categories: {
         accessibility: {
@@ -541,7 +541,7 @@ describe('Config', () => {
   });
 
   it('filters the config', async () => {
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       settings: {
         onlyCategories: ['needed-category'],
         onlyAudits: ['color-contrast'],
@@ -586,7 +586,7 @@ describe('Config', () => {
   });
 
   it('filters the config w/ skipAudits', async () => {
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       settings: {
         skipAudits: ['first-meaningful-paint'],
       },
@@ -629,7 +629,7 @@ describe('Config', () => {
     const warnings = [];
     const saveWarning = evt => warnings.push(evt);
     log.events.addListener('warning', saveWarning);
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       extends: 'lighthouse:default',
       settings: {
         onlyCategories: ['accessibility'],
@@ -647,7 +647,7 @@ describe('Config', () => {
     const warnings = [];
     const saveWarning = evt => warnings.push(evt);
     log.events.addListener('warning', saveWarning);
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       extends: 'lighthouse:default',
       settings: {
         onlyCategories: ['performance', 'pwa'],
@@ -664,7 +664,7 @@ describe('Config', () => {
   });
 
   it('filters works with extension', async () => {
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       extends: 'lighthouse:default',
       settings: {
         onlyCategories: ['performance'],
@@ -684,7 +684,7 @@ describe('Config', () => {
     const warnings = [];
     const saveWarning = evt => warnings.push(evt);
     log.events.addListener('warning', saveWarning);
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       extends: 'lighthouse:default',
       settings: {
         onlyCategories: ['performance', 'missing-category'],
@@ -699,7 +699,7 @@ describe('Config', () => {
 
   it('throws for invalid use of skipAudits and onlyAudits', async () => {
     await assert.rejects(() => {
-      return Config.createConfigFromJson({
+      return Config.fromJson({
         extends: 'lighthouse:default',
         settings: {
           onlyAudits: ['first-meaningful-paint'],
@@ -710,14 +710,14 @@ describe('Config', () => {
   });
 
   it('cleans up flags for settings', async () => {
-    const config = await Config.createConfigFromJson({extends: 'lighthouse:default'},
+    const config = await Config.fromJson({extends: 'lighthouse:default'},
       {nonsense: 1, foo: 2, throttlingMethod: 'provided'});
     assert.equal(config.settings.throttlingMethod, 'provided');
     assert.ok(config.settings.nonsense === undefined, 'did not cleanup settings');
   });
 
   it('allows overriding of array-typed settings', async () => {
-    const config = await Config.createConfigFromJson(
+    const config = await Config.fromJson(
       {extends: 'lighthouse:default'},
       {output: ['html']}
     );
@@ -741,7 +741,7 @@ describe('Config', () => {
       }
     }
 
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       extends: 'lighthouse:default',
       audits: [
         CustomAudit,
@@ -756,7 +756,7 @@ describe('Config', () => {
   });
 
   it('ensures quiet thresholds are sufficient when using devtools', async () => {
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       extends: 'lighthouse:default',
       settings: {
         throttlingMethod: 'devtools',
@@ -773,7 +773,7 @@ describe('Config', () => {
   });
 
   it('does nothing when thresholds for devtools are already sufficient', async () => {
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       extends: 'lighthouse:default',
       settings: {
         throttlingMethod: 'devtools',
@@ -795,7 +795,7 @@ describe('Config', () => {
   });
 
   it('only supports `lighthouse:default` extension', () => {
-    const createConfig = extendsValue => Config.createConfigFromJson({extends: extendsValue});
+    const createConfig = extendsValue => Config.fromJson({extends: extendsValue});
 
     expect(createConfig(true)).rejects.toThrow(/default` is the only valid extension/);
     expect(createConfig('lighthouse')).rejects.toThrow(/default` is the only valid/);
@@ -803,7 +803,7 @@ describe('Config', () => {
   });
 
   it('merges settings with correct priority', async () => {
-    const config = await Config.createConfigFromJson(
+    const config = await Config.fromJson(
       {
         extends: 'lighthouse:default',
         settings: {
@@ -824,13 +824,13 @@ describe('Config', () => {
   });
 
   it('inherits default settings when undefined', async () => {
-    const config = await Config.createConfigFromJson({settings: undefined});
+    const config = await Config.fromJson({settings: undefined});
     assert.ok(typeof config.settings.maxWaitForLoad === 'number', 'missing setting from default');
   });
 
   describe('locale', () => {
     it('falls back to default locale if none specified', async () => {
-      const config = await Config.createConfigFromJson({settings: undefined});
+      const config = await Config.fromJson({settings: undefined});
       // Don't assert specific locale so it isn't tied to where tests are run, but
       // check that it's valid and available.
       assert.ok(config.settings.locale);
@@ -839,14 +839,14 @@ describe('Config', () => {
 
     it('uses config setting for locale if set', async () => {
       const locale = 'ar-XB';
-      const config = await Config.createConfigFromJson({settings: {locale}});
+      const config = await Config.fromJson({settings: {locale}});
       assert.strictEqual(config.settings.locale, locale);
     });
 
     it('uses flag setting for locale if set', async () => {
       const settingsLocale = 'en-XA';
       const flagsLocale = 'ar-XB';
-      const config = await Config.createConfigFromJson({
+      const config = await Config.fromJson({
         settings: {locale: settingsLocale}},
         {locale: flagsLocale}
       );
@@ -856,12 +856,12 @@ describe('Config', () => {
 
   describe('emulatedUserAgent', () => {
     it('uses the default UA string when emulatedUserAgent is undefined', async () => {
-      const config = await Config.createConfigFromJson({});
+      const config = await Config.fromJson({});
       expect(config.settings.emulatedUserAgent).toMatch(/^Mozilla\/5.*Chrome-Lighthouse$/);
     });
 
     it('uses the default UA string when emulatedUserAgent is true', async () => {
-      const config = await Config.createConfigFromJson({
+      const config = await Config.fromJson({
         settings: {
           emulatedUserAgent: true,
         },
@@ -870,7 +870,7 @@ describe('Config', () => {
     });
 
     it('does not use a UA string when emulatedUserAgent is false', async () => {
-      const config = await Config.createConfigFromJson({
+      const config = await Config.fromJson({
         settings: {
           emulatedUserAgent: false,
         },
@@ -880,7 +880,7 @@ describe('Config', () => {
 
     it('uses the UA string provided if it is a string', async () => {
       const emulatedUserAgent = 'one weird trick to get a perfect LH score';
-      const config = await Config.createConfigFromJson({
+      const config = await Config.fromJson({
         settings: {
           emulatedUserAgent,
         },
@@ -890,8 +890,8 @@ describe('Config', () => {
   });
 
   it('is idempotent when accepting a canonicalized Config as valid ConfigJson input', async () => {
-    const config = await Config.createConfigFromJson(defaultConfig);
-    const configAgain = await Config.createConfigFromJson(config);
+    const config = await Config.fromJson(defaultConfig);
+    const configAgain = await Config.fromJson(config);
     assert.deepEqual(config, configAgain);
   });
 
@@ -903,11 +903,11 @@ describe('Config', () => {
         onlyCategories: ['pwa'],
       },
     };
-    const config = await Config.createConfigFromJson(extendedJson);
+    const config = await Config.fromJson(extendedJson);
     assert.equal(config.passes.length, 2, 'did not filter config');
     assert.equal(Object.keys(config.categories).length, 1, 'did not filter config');
     assert.deepEqual(config.settings.onlyCategories, ['pwa']);
-    const configAgain = await Config.createConfigFromJson(config);
+    const configAgain = await Config.fromJson(config);
     assert.deepEqual(config, configAgain);
   });
 
@@ -974,7 +974,7 @@ describe('Config', () => {
         audits: ['installable-manifest', 'metrics'],
         plugins: ['lighthouse-plugin-simple'],
       };
-      const config = await Config.createConfigFromJson(configJson, {configPath: configFixturePath});
+      const config = await Config.fromJson(configJson, {configPath: configFixturePath});
       assert.deepStrictEqual(config.audits.map(a => a.path),
         ['installable-manifest', 'metrics', 'redirects', 'user-timings']);
     });
@@ -987,7 +987,7 @@ describe('Config', () => {
           configGroup: {title: 'This is a group in the base config'},
         },
       };
-      const config = await Config.createConfigFromJson(configJson, {configPath: configFixturePath});
+      const config = await Config.fromJson(configJson, {configPath: configFixturePath});
 
       const groupIds = Object.keys(config.groups);
       assert.ok(groupIds.length === 2);
@@ -1003,7 +1003,7 @@ describe('Config', () => {
         extends: 'lighthouse:default',
         plugins: ['lighthouse-plugin-simple'],
       };
-      const config = await Config.createConfigFromJson(configJson, {configPath: configFixturePath});
+      const config = await Config.fromJson(configJson, {configPath: configFixturePath});
       const categoryNames = Object.keys(config.categories);
       assert.ok(categoryNames.length > 1);
       assert.strictEqual(categoryNames[categoryNames.length - 1], 'lighthouse-plugin-simple');
@@ -1023,7 +1023,7 @@ describe('Config', () => {
             }],
           },
         };
-        const config = await Config.createConfigFromJson(configJson);
+        const config = await Config.fromJson(configJson);
         assert.equal(config.settings.budgets[0].resourceCounts.length, 1);
         assert.equal(config.settings.budgets[0].resourceCounts[0].resourceType, 'image');
         assert.equal(config.settings.budgets[0].resourceCounts[0].budget, 500);
@@ -1031,7 +1031,7 @@ describe('Config', () => {
 
       it('should throw when provided an invalid budget', async () => {
         await assert.rejects(
-          () => Config.createConfigFromJson({settings: {budgets: ['invalid123']}}),
+          () => Config.fromJson({settings: {budgets: ['invalid123']}}),
           /Budget file is not defined as an array of budgets/);
       });
     });
@@ -1051,14 +1051,14 @@ describe('Config', () => {
 
       const allConfigConfigJson = {...baseConfigJson, plugins: [simplePluginName,
         noGroupsPluginName]};
-      const allPluginsInConfigConfig = await Config.createConfigFromJson(allConfigConfigJson, baseFlags);
+      const allPluginsInConfigConfig = await Config.fromJson(allConfigConfigJson, baseFlags);
 
       const allFlagsFlags = {...baseFlags, plugins: [simplePluginName, noGroupsPluginName]};
-      const allPluginsInFlagsConfig = await Config.createConfigFromJson(baseConfigJson, allFlagsFlags);
+      const allPluginsInFlagsConfig = await Config.fromJson(baseConfigJson, allFlagsFlags);
 
       const mixedConfigJson = {...baseConfigJson, plugins: [simplePluginName]};
       const mixedFlags = {...baseFlags, plugins: [noGroupsPluginName]};
-      const pluginsInConfigAndFlagsConfig = await Config.createConfigFromJson(mixedConfigJson, mixedFlags);
+      const pluginsInConfigAndFlagsConfig = await Config.fromJson(mixedConfigJson, mixedFlags);
 
       // Double check that we're not comparing empty objects.
       const categoryNames = Object.keys(allPluginsInConfigConfig.categories);
@@ -1076,7 +1076,7 @@ describe('Config', () => {
       };
       // Required to have a `category`, so plugin is invalid.
       await assert.rejects(
-        () => Config.createConfigFromJson(configJson, {configPath: configFixturePath}),
+        () => Config.fromJson(configJson, {configPath: configFixturePath}),
         /^Error: lighthouse-plugin-no-category has no valid category/);
     });
 
@@ -1086,7 +1086,7 @@ describe('Config', () => {
         plugins: ['lighthouse-plugin-not-a-plugin'],
       };
       await assert.rejects(
-        () => Config.createConfigFromJson(configJson, {configPath: configFixturePath}),
+        () => Config.fromJson(configJson, {configPath: configFixturePath}),
         /^Error: Unable to locate plugin: `lighthouse-plugin-not-a-plugin/);
     });
 
@@ -1096,7 +1096,7 @@ describe('Config', () => {
         plugins: ['just-let-me-be-a-plugin'],
       };
       await assert.rejects(
-        () => Config.createConfigFromJson(configJson, {configPath: configFixturePath}),
+        () => Config.fromJson(configJson, {configPath: configFixturePath}),
         /^Error: plugin name 'just-let-me-be-a-plugin' does not start with 'lighthouse-plugin-'/);
     });
 
@@ -1109,7 +1109,7 @@ describe('Config', () => {
         },
       };
       await assert.rejects(
-        () => Config.createConfigFromJson(configJson, {configPath: configFixturePath}),
+        () => Config.fromJson(configJson, {configPath: configFixturePath}),
         /^Error: plugin name 'lighthouse-plugin-simple' not allowed because it is the id of a category/); // eslint-disable-line max-len
     });
   });
@@ -1118,7 +1118,7 @@ describe('Config', () => {
     it('should not mutate the original config', async () => {
       const configCopy = JSON.parse(JSON.stringify(origConfig));
       configCopy.settings.onlyCategories = ['performance'];
-      const config = await Config.createConfigFromJson(configCopy);
+      const config = await Config.fromJson(configCopy);
       configCopy.settings.onlyCategories = null;
       assert.equal(config.passes.length, 1, 'did not filter config');
       assert.deepStrictEqual(configCopy, origConfig, 'had mutations');
@@ -1127,7 +1127,7 @@ describe('Config', () => {
     it('should generate the same filtered config, extended or original', async () => {
       const configCopy = JSON.parse(JSON.stringify(origConfig));
       configCopy.settings.onlyCategories = ['performance'];
-      const config = await Config.createConfigFromJson(configCopy);
+      const config = await Config.fromJson(configCopy);
 
       const extended = {
         extends: 'lighthouse:default',
@@ -1135,7 +1135,7 @@ describe('Config', () => {
           onlyCategories: ['performance'],
         },
       };
-      const extendedConfig = await Config.createConfigFromJson(extended);
+      const extendedConfig = await Config.fromJson(extended);
 
       // When gatherers have instance properties that are bind()'d, they'll not match.
       // Gatherers in each config will still be compared via the constructor on .implementation.
@@ -1162,7 +1162,7 @@ describe('Config', () => {
           onlyCategories: ['performance'],
         },
       };
-      const config = await Config.createConfigFromJson(extended);
+      const config = await Config.fromJson(extended);
       assert.equal(Object.keys(config.categories).length, 1, 'other categories are present');
       assert.equal(config.passes.length, 1, 'incorrect # of passes');
       assert.ok(config.audits.length < totalAuditCount, 'audit filtering probably failed');
@@ -1176,7 +1176,7 @@ describe('Config', () => {
           onlyCategories: ['pwa'],
         },
       };
-      const config = await Config.createConfigFromJson(extended);
+      const config = await Config.fromJson(extended);
       assert.equal(Object.keys(config.categories).length, 1, 'other categories are present');
       assert.ok(config.audits.length < totalAuditCount, 'audit filtering probably failed');
     });
@@ -1189,7 +1189,7 @@ describe('Config', () => {
           onlyCategories: ['best-practices'],
         },
       };
-      const config = await Config.createConfigFromJson(extended);
+      const config = await Config.fromJson(extended);
       assert.equal(Object.keys(config.categories).length, 1, 'other categories are present');
       assert.equal(config.passes.length, 1, 'incorrect # of passes');
       assert.ok(config.audits.length < totalAuditCount, 'audit filtering probably failed');
@@ -1202,7 +1202,7 @@ describe('Config', () => {
           onlyCategories: ['performance'],
         },
       };
-      const config = await Config.createConfigFromJson(extended);
+      const config = await Config.fromJson(extended);
       const selectedCategory = origConfig.categories.performance;
       // +1 for `full-page-screenshot`.
       const auditCount = Object.keys(selectedCategory.auditRefs).length + 1;
@@ -1218,7 +1218,7 @@ describe('Config', () => {
           onlyAudits: ['service-worker'], // something from non-defaultPass
         },
       };
-      const config = await Config.createConfigFromJson(extended);
+      const config = await Config.fromJson(extended);
       assert.equal(config.passes.length, 2, 'incorrect # of passes');
       assert.equal(config.audits.length, 1, 'audit filtering failed');
     });
@@ -1231,7 +1231,7 @@ describe('Config', () => {
           onlyAudits: ['service-worker'], // something from non-defaultPass
         },
       };
-      const config = await Config.createConfigFromJson(extended);
+      const config = await Config.fromJson(extended);
       const selectedCategory = origConfig.categories.performance;
       // +1 for `service-worker`, +1 for `full-page-screenshot`.
       const auditCount = Object.keys(selectedCategory.auditRefs).length + 2;
@@ -1249,7 +1249,7 @@ describe('Config', () => {
           onlyAudits: ['apple-touch-icon'],
         },
       };
-      const config = await Config.createConfigFromJson(extended);
+      const config = await Config.fromJson(extended);
       const selectedCategory = origConfig.categories.pwa;
       // +1 for `full-page-screenshot`.
       const auditCount = Object.keys(selectedCategory.auditRefs).length + 1;
@@ -1271,7 +1271,7 @@ describe('Config', () => {
           onlyCategories: ['accessibility'],
         },
       };
-      const config = await Config.createConfigFromJson(extended);
+      const config = await Config.fromJson(extended);
 
       assert.ok(config.audits.find(a => a.implementation.meta.id === 'full-page-screenshot'));
     });
@@ -1283,7 +1283,7 @@ describe('Config', () => {
           skipAudits: ['font-size'],
         },
       };
-      const config = await Config.createConfigFromJson(extended);
+      const config = await Config.fromJson(extended);
       assert.ok(config.audits.find(a => a.implementation.meta.id === 'full-page-screenshot'));
     });
   });
@@ -1308,7 +1308,7 @@ describe('Config', () => {
           new Gatherer(),
         ],
       };
-      await assert.rejects(Config.createConfigFromJson(configJson), /Invalid Audit type/);
+      await assert.rejects(Config.fromJson(configJson), /Invalid Audit type/);
     });
   });
 
@@ -1333,7 +1333,7 @@ describe('Config', () => {
     });
 
     async function loadGatherer(gathererEntry) {
-      const config = await Config.createConfigFromJson({passes: [{gatherers: [gathererEntry]}]});
+      const config = await Config.fromJson({passes: [{gatherers: [gathererEntry]}]});
       return config.passes[0].gatherers[0];
     }
 
@@ -1351,7 +1351,7 @@ describe('Config', () => {
     });
 
     it('loads a gatherer relative to a config path', async () => {
-      const config = await Config.createConfigFromJson({
+      const config = await Config.fromJson({
         passes: [{gatherers: ['../fixtures/valid-custom-gatherer']}],
       }, {configPath: __filename});
       const gatherer = config.passes[0].gatherers[0];
@@ -1452,7 +1452,7 @@ describe('Config', () => {
         ],
       };
 
-      const printed = (await Config.createConfigFromJson(configJson)).getPrintString();
+      const printed = (await Config.fromJson(configJson)).getPrintString();
       const printedConfig = JSON.parse(printed);
 
       // Check that options weren't completely eliminated.
@@ -1467,7 +1467,7 @@ describe('Config', () => {
     });
 
     it('prints localized category titles', async () => {
-      const printed = (await Config.createConfigFromJson(defaultConfig)).getPrintString();
+      const printed = (await Config.fromJson(defaultConfig)).getPrintString();
       const printedConfig = JSON.parse(printed);
       let localizableCount = 0;
 
@@ -1485,10 +1485,10 @@ describe('Config', () => {
 
     it('prints a valid ConfigJson that can make an identical Config', async () => {
       // depends on defaultConfig having a `path` for all gatherers and audits.
-      const firstConfig = await Config.createConfigFromJson(defaultConfig);
+      const firstConfig = await Config.fromJson(defaultConfig);
       const firstPrint = firstConfig.getPrintString();
 
-      const secondConfig = await Config.createConfigFromJson(JSON.parse(firstPrint));
+      const secondConfig = await Config.fromJson(JSON.parse(firstPrint));
       const secondPrint = secondConfig.getPrintString();
 
       assert.strictEqual(firstPrint, secondPrint);
diff --git a/lighthouse-core/test/runner-test.js b/lighthouse-core/test/runner-test.js
index 45ecdc877572..0931451da54e 100644
--- a/lighthouse-core/test/runner-test.js
+++ b/lighthouse-core/test/runner-test.js
@@ -100,7 +100,7 @@ describe('Runner', () => {
 
   describe('Gather Mode & Audit Mode', () => {
     const url = 'https://example.com';
-    const generateConfig = settings => Config.createConfigFromJson({
+    const generateConfig = settings => Config.fromJson({
       passes: [{
         gatherers: ['viewport-dimensions'],
       }],
@@ -158,7 +158,7 @@ describe('Runner', () => {
     });
 
     it('does not include a top-level runtimeError when gatherers were successful', async () => {
-      const config = await Config.createConfigFromJson({
+      const config = await Config.fromJson({
         settings: {
           auditMode: __dirname + '/fixtures/artifacts/perflog/',
         },
@@ -207,7 +207,7 @@ describe('Runner', () => {
           throw new LHError(LHError.errors.UNSUPPORTED_OLD_CHROME, {featureName: 'VRML'});
         }
       }
-      const gatherConfig = await Config.createConfigFromJson({
+      const gatherConfig = await Config.fromJson({
         settings: {gatherMode: artifactsPath},
         passes: [{gatherers: [WarningAndErrorGatherer]}],
       });
@@ -237,7 +237,7 @@ describe('Runner', () => {
         }
         static audit() {}
       }
-      const auditConfig = await Config.createConfigFromJson({
+      const auditConfig = await Config.fromJson({
         settings: {auditMode: artifactsPath},
         audits: [{implementation: DummyAudit}],
       });
@@ -255,7 +255,7 @@ describe('Runner', () => {
 
   it('expands gatherers', async () => {
     const url = 'https://example.com';
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       passes: [{
         gatherers: ['viewport-dimensions'],
       }],
@@ -272,7 +272,7 @@ describe('Runner', () => {
 
   it('rejects when given neither passes nor artifacts', async () => {
     const url = 'https://example.com';
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       audits: [
         'content-width',
       ],
@@ -306,7 +306,7 @@ describe('Runner', () => {
       }
     }
 
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       settings: {
         auditMode: __dirname + '/fixtures/artifacts/empty-artifacts/',
       },
@@ -325,7 +325,7 @@ describe('Runner', () => {
   });
 
   it('accepts trace artifacts as paths and outputs appropriate data', async () => {
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       settings: {
         auditMode: __dirname + '/fixtures/artifacts/perflog/',
       },
@@ -344,7 +344,7 @@ describe('Runner', () => {
 
   it('rejects when given an invalid trace artifact', async () => {
     const url = 'https://example.com';
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       passes: [{
         recordTrace: true,
         gatherers: [],
@@ -369,7 +369,7 @@ describe('Runner', () => {
   });
 
   it('finds correct timings for multiple gather/audit pairs run separately', async () => {
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       passes: [{
         gatherers: ['viewport-dimensions'],
       }],
@@ -398,7 +398,7 @@ describe('Runner', () => {
 
   describe('Bad required artifact handling', () => {
     it('outputs an error audit result when trace required but not provided', async () => {
-      const config = await Config.createConfigFromJson({
+      const config = await Config.fromJson({
         settings: {
           auditMode: __dirname + '/fixtures/artifacts/empty-artifacts/',
         },
@@ -416,7 +416,7 @@ describe('Runner', () => {
     });
 
     it('outputs an error audit result when devtoolsLog required but not provided', async () => {
-      const config = await Config.createConfigFromJson({
+      const config = await Config.fromJson({
         settings: {
           auditMode: __dirname + '/fixtures/artifacts/empty-artifacts/',
         },
@@ -434,7 +434,7 @@ describe('Runner', () => {
     });
 
     it('outputs an error audit result when missing a required artifact', async () => {
-      const config = await Config.createConfigFromJson({
+      const config = await Config.fromJson({
         settings: {
           auditMode: __dirname + '/fixtures/artifacts/empty-artifacts/',
         },
@@ -468,7 +468,7 @@ describe('Runner', () => {
       await assetSaver.saveArtifacts(artifacts, resolvedPath);
 
       // Load artifacts via auditMode.
-      const config = await Config.createConfigFromJson({
+      const config = await Config.fromJson({
         settings: {
           auditMode: resolvedPath,
         },
@@ -501,7 +501,7 @@ describe('Runner', () => {
       }
 
       const auditMockFn = SimpleAudit.audit = jest.fn().mockReturnValue({score: 1});
-      const config = await Config.createConfigFromJson({
+      const config = await Config.fromJson({
         settings: {
           auditMode: __dirname + '/fixtures/artifacts/alphabet-artifacts/',
         },
@@ -534,7 +534,7 @@ describe('Runner', () => {
       }
 
       const auditMockFn = SimpleAudit.audit = jest.fn().mockReturnValue({score: 1});
-      const config = await Config.createConfigFromJson({
+      const config = await Config.fromJson({
         settings: {
           auditMode: __dirname + '/fixtures/artifacts/alphabet-artifacts/',
         },
@@ -565,7 +565,7 @@ describe('Runner', () => {
 
     it('produces an error audit result when an audit throws an Error', async () => {
       const errorMessage = 'Audit yourself';
-      const config = await Config.createConfigFromJson({
+      const config = await Config.fromJson({
         settings: {
           auditMode: __dirname + '/fixtures/artifacts/empty-artifacts/',
         },
@@ -591,7 +591,7 @@ describe('Runner', () => {
   });
 
   it('accepts devtoolsLog in artifacts', async () => {
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       settings: {
         auditMode: __dirname + '/fixtures/artifacts/perflog/',
       },
@@ -609,7 +609,7 @@ describe('Runner', () => {
 
   it('rejects when not given audits to run (and not -G)', async () => {
     const url = 'https://example.com';
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       passes: [{
         gatherers: ['viewport-dimensions'],
       }],
@@ -625,7 +625,7 @@ describe('Runner', () => {
 
   it('returns data even if no config categories are provided', async () => {
     const url = 'https://example.com/';
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       passes: [{
         gatherers: ['viewport-dimensions'],
       }],
@@ -645,7 +645,7 @@ describe('Runner', () => {
 
   it('returns categories', async () => {
     const url = 'https://example.com/';
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       passes: [{
         gatherers: ['viewport-dimensions'],
       }],
@@ -686,7 +686,7 @@ describe('Runner', () => {
   });
 
   it('results include artifacts when given artifacts and audits', async () => {
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       settings: {
         auditMode: __dirname + '/fixtures/artifacts/perflog/',
       },
@@ -703,7 +703,7 @@ describe('Runner', () => {
 
   it('results include artifacts when given passes and audits', async () => {
     const url = 'https://example.com';
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       passes: [{
         passName: 'firstPass',
         gatherers: ['meta-elements', 'viewport-dimensions'],
@@ -726,7 +726,7 @@ describe('Runner', () => {
   });
 
   it('includes any LighthouseRunWarnings from artifacts in output', async () => {
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       settings: {
         auditMode: __dirname + '/fixtures/artifacts/perflog/',
       },
@@ -744,7 +744,7 @@ describe('Runner', () => {
   it('includes any LighthouseRunWarnings from audits in LHR', async () => {
     const warningString = 'Really important audit warning!';
 
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       settings: {
         auditMode: __dirname + '/fixtures/artifacts/empty-artifacts/',
       },
@@ -805,7 +805,7 @@ describe('Runner', () => {
     };
 
     it('includes a top-level runtimeError when a gatherer throws one', async () => {
-      const config = await Config.createConfigFromJson(configJson);
+      const config = await Config.fromJson(configJson);
       const {lhr} = await runGatherAndAudit(createGatherFn('https://example.com/'), {config, driverMock});
 
       // Audit error included the runtimeError
@@ -836,7 +836,7 @@ describe('Runner', () => {
         }
       });
 
-      const config = await Config.createConfigFromJson(configJson);
+      const config = await Config.fromJson(configJson);
       const {lhr} = await runGatherAndAudit(
         createGatherFn(url),
         {config, driverMock: errorDriverMock}
@@ -864,7 +864,7 @@ describe('Runner', () => {
     };
 
     try {
-      await runGatherAndAudit(createGatherFn('https://example.com/'), {driverMock: erroringDriver, config: await Config.createConfigFromJson()});
+      await runGatherAndAudit(createGatherFn('https://example.com/'), {driverMock: erroringDriver, config: await Config.fromJson()});
       assert.fail('should have thrown');
     } catch (err) {
       assert.equal(err.code, LHError.errors.PROTOCOL_TIMEOUT.code);
@@ -875,7 +875,7 @@ describe('Runner', () => {
 
   it('can handle array of outputs', async () => {
     const url = 'https://example.com';
-    const config = await Config.createConfigFromJson({
+    const config = await Config.fromJson({
       extends: 'lighthouse:default',
       settings: {
         onlyCategories: ['performance'],

From 9a63b38854d0afc8ed4bf31d229e35425dd99af3 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 6 May 2022 16:17:30 -0700
Subject: [PATCH 20/96] comment

---
 lighthouse-core/config/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lighthouse-core/config/config.js b/lighthouse-core/config/config.js
index 261800f5f750..aef8dbda96d7 100644
--- a/lighthouse-core/config/config.js
+++ b/lighthouse-core/config/config.js
@@ -205,7 +205,7 @@ class Config {
   }
 
   /**
-   * @deprecated `Config.createConfigFromJson` should be used instead.
+   * @deprecated `Config.fromJson` should be used instead.
    * @constructor
    * @param {LH.Config.Json} configJSON
    * @param {{settings: LH.Config.Settings, passes: ?LH.Config.Pass[], audits: ?LH.Config.AuditDefn[]}} opts

From c1be47b090921eaf038dcefa94cdd4e1a8c9f4d3 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 6 May 2022 16:45:42 -0700
Subject: [PATCH 21/96] tweak test

---
 lighthouse-core/test/index-test.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lighthouse-core/test/index-test.js b/lighthouse-core/test/index-test.js
index ec24ca511507..0ff4cceb7c65 100644
--- a/lighthouse-core/test/index-test.js
+++ b/lighthouse-core/test/index-test.js
@@ -7,10 +7,9 @@
 import {strict as assert} from 'assert';
 
 import pkg from '../../package.json';
-import lighthouse from '../index.js';
+import lighthouse, {getAuditList, legacyNavigation, traceCategories} from '../index.js';
 import {LH_ROOT} from '../../root.js';
 
-const {legacyNavigation} = lighthouse;
 const TEST_DIR = `${LH_ROOT}/lighthouse-core/test`;
 
 describe('Module Tests', function() {
@@ -27,11 +26,11 @@ describe('Module Tests', function() {
   });
 
   it('should return a list of audits', function() {
-    assert.ok(Array.isArray(lighthouse.getAuditList()));
+    assert.ok(Array.isArray(getAuditList()));
   });
 
   it('should return a list of trace categories required by the driver', function() {
-    const lighthouseTraceCategories = lighthouse.traceCategories;
+    const lighthouseTraceCategories = traceCategories;
     assert.ok(Array.isArray(lighthouseTraceCategories));
     assert.notEqual(lighthouseTraceCategories.length, 0);
   });

From 13a59792ccfbd45eaceaf9a297c71e6c4615389d Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 6 May 2022 16:53:27 -0700
Subject: [PATCH 22/96] rename

---
 lighthouse-core/index.js                          | 2 +-
 lighthouse-core/scripts/print-a11y-scoring.js     | 2 +-
 lighthouse-core/test/gather/gather-runner-test.js | 2 +-
 lighthouse-core/test/lib/stack-packs-test.js      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lighthouse-core/index.js b/lighthouse-core/index.js
index eb163a5bcb5e..4ca5dac2ed93 100644
--- a/lighthouse-core/index.js
+++ b/lighthouse-core/index.js
@@ -86,7 +86,7 @@ async function legacyNavigation(url, flags = {}, configJSON, userConnection) {
  * @return {Promise<Config>}
  */
 function generateConfig(configJson, flags) {
-  return Config.createConfigFromJson(configJson, flags);
+  return Config.fromJson(configJson, flags);
 }
 
 lighthouse.legacyNavigation = legacyNavigation;
diff --git a/lighthouse-core/scripts/print-a11y-scoring.js b/lighthouse-core/scripts/print-a11y-scoring.js
index 30349938e4e6..f179eb4f417f 100644
--- a/lighthouse-core/scripts/print-a11y-scoring.js
+++ b/lighthouse-core/scripts/print-a11y-scoring.js
@@ -8,7 +8,7 @@
 
 import Config from '../config/config.js';
 
-const config = await Config.createConfigFromJson();
+const config = await Config.fromJson();
 if (!config.categories || !config.audits) throw new Error('wut');
 
 const auditRefs = config.categories.accessibility.auditRefs;
diff --git a/lighthouse-core/test/gather/gather-runner-test.js b/lighthouse-core/test/gather/gather-runner-test.js
index 90bff9c5638a..a9f37bb3bdec 100644
--- a/lighthouse-core/test/gather/gather-runner-test.js
+++ b/lighthouse-core/test/gather/gather-runner-test.js
@@ -82,7 +82,7 @@ beforeAll(async () => {
  * @param {LH.Config.Json} json
  */
 async function makeConfig(json) {
-  const config = await Config.createConfigFromJson(json);
+  const config = await Config.fromJson(json);
 
   // Since the config is for `gather-runner`, ensure it has `passes`.
   if (!config.passes) {
diff --git a/lighthouse-core/test/lib/stack-packs-test.js b/lighthouse-core/test/lib/stack-packs-test.js
index 49df5f489093..4a48f1e3d9f3 100644
--- a/lighthouse-core/test/lib/stack-packs-test.js
+++ b/lighthouse-core/test/lib/stack-packs-test.js
@@ -11,7 +11,7 @@ import stackPacksLib from '../../lib/stack-packs.js';
 import Config from '../../config/config.js';
 
 async function getAuditIds() {
-  const config = await Config.createConfigFromJson();
+  const config = await Config.fromJson();
   return config.audits.map(a => a.implementation.meta.id);
 }
 

From ba0283584c60bfba8aaafd230e36b308b1d8b458 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 6 May 2022 17:13:07 -0700
Subject: [PATCH 23/96] index-test passing

---
 build/build-bundle.js                          |  2 +-
 .../audits/accessibility/axe-audit.js          |  2 +-
 lighthouse-core/audits/apple-touch-icon.js     |  2 +-
 lighthouse-core/audits/autocomplete.js         |  2 +-
 lighthouse-core/audits/bootup-time.js          |  2 +-
 .../byte-efficiency/byte-efficiency-audit.js   |  2 +-
 .../efficient-animated-content.js              |  2 +-
 .../audits/byte-efficiency/offscreen-images.js |  2 +-
 .../render-blocking-resources.js               |  4 ++--
 .../byte-efficiency/total-byte-weight.js       |  4 ++--
 .../byte-efficiency/uses-long-cache-ttl.js     |  4 ++--
 .../uses-responsive-images-snapshot.js         |  2 +-
 .../byte-efficiency/uses-responsive-images.js  |  2 +-
 lighthouse-core/audits/content-width.js        |  2 +-
 .../audits/critical-request-chains.js          |  2 +-
 lighthouse-core/audits/csp-xss.js              |  2 +-
 lighthouse-core/audits/diagnostics.js          |  2 +-
 lighthouse-core/audits/dobetterweb/charset.js  |  2 +-
 lighthouse-core/audits/dobetterweb/doctype.js  |  2 +-
 lighthouse-core/audits/dobetterweb/dom-size.js |  2 +-
 .../audits/dobetterweb/inspector-issues.js     |  2 +-
 .../audits/dobetterweb/js-libraries.js         |  2 +-
 .../dobetterweb/no-vulnerable-libraries.js     |  2 +-
 .../password-inputs-can-be-pasted-into.js      |  2 +-
 .../audits/dobetterweb/uses-http2.js           |  4 ++--
 lighthouse-core/audits/errors-in-console.js    |  2 +-
 lighthouse-core/audits/final-screenshot.js     |  2 +-
 lighthouse-core/audits/font-display.js         |  2 +-
 lighthouse-core/audits/full-page-screenshot.js |  2 +-
 lighthouse-core/audits/image-aspect-ratio.js   |  2 +-
 .../audits/image-size-responsive.js            |  2 +-
 lighthouse-core/audits/installable-manifest.js |  2 +-
 lighthouse-core/audits/is-on-https.js          |  4 ++--
 .../audits/largest-contentful-paint-element.js |  2 +-
 .../audits/layout-shift-elements.js            |  2 +-
 lighthouse-core/audits/lcp-lazy-loaded.js      |  2 +-
 lighthouse-core/audits/long-tasks.js           |  2 +-
 lighthouse-core/audits/main-thread-tasks.js    |  2 +-
 .../audits/mainthread-work-breakdown.js        |  2 +-
 lighthouse-core/audits/manual/manual-audit.js  |  2 +-
 lighthouse-core/audits/maskable-icon.js        |  2 +-
 lighthouse-core/audits/metrics.js              |  2 +-
 .../audits/metrics/cumulative-layout-shift.js  |  2 +-
 .../metrics/first-contentful-paint-3g.js       |  2 +-
 .../audits/metrics/first-contentful-paint.js   |  2 +-
 .../audits/metrics/first-meaningful-paint.js   |  2 +-
 lighthouse-core/audits/metrics/interactive.js  |  2 +-
 .../audits/metrics/largest-contentful-paint.js |  2 +-
 .../audits/metrics/max-potential-fid.js        |  2 +-
 lighthouse-core/audits/metrics/speed-index.js  |  2 +-
 .../audits/metrics/total-blocking-time.js      |  2 +-
 lighthouse-core/audits/multi-check-audit.js    |  2 +-
 lighthouse-core/audits/network-requests.js     |  2 +-
 lighthouse-core/audits/network-rtt.js          |  2 +-
 .../audits/network-server-latency.js           |  2 +-
 lighthouse-core/audits/no-unload-listeners.js  |  2 +-
 .../audits/non-composited-animations.js        |  2 +-
 lighthouse-core/audits/performance-budget.js   |  2 +-
 lighthouse-core/audits/predictive-perf.js      |  2 +-
 lighthouse-core/audits/preload-fonts.js        |  2 +-
 lighthouse-core/audits/preload-lcp-image.js    |  4 ++--
 lighthouse-core/audits/redirects.js            |  2 +-
 lighthouse-core/audits/resource-summary.js     |  2 +-
 .../audits/screenshot-thumbnails.js            |  2 +-
 lighthouse-core/audits/script-treemap-data.js  |  2 +-
 lighthouse-core/audits/seo/canonical.js        |  2 +-
 .../audits/seo/crawlable-anchors.js            |  2 +-
 lighthouse-core/audits/seo/font-size.js        |  2 +-
 lighthouse-core/audits/seo/hreflang.js         |  2 +-
 lighthouse-core/audits/seo/http-status-code.js |  2 +-
 lighthouse-core/audits/seo/is-crawlable.js     |  2 +-
 lighthouse-core/audits/seo/link-text.js        |  2 +-
 lighthouse-core/audits/seo/meta-description.js |  2 +-
 lighthouse-core/audits/seo/plugins.js          |  2 +-
 lighthouse-core/audits/seo/robots-txt.js       |  2 +-
 lighthouse-core/audits/seo/tap-targets.js      |  2 +-
 lighthouse-core/audits/server-response-time.js |  2 +-
 lighthouse-core/audits/service-worker.js       |  2 +-
 lighthouse-core/audits/third-party-facades.js  |  2 +-
 lighthouse-core/audits/third-party-summary.js  |  2 +-
 lighthouse-core/audits/timing-budget.js        |  2 +-
 lighthouse-core/audits/unsized-images.js       |  2 +-
 lighthouse-core/audits/user-timings.js         |  2 +-
 lighthouse-core/audits/uses-rel-preconnect.js  |  2 +-
 lighthouse-core/audits/uses-rel-preload.js     |  4 ++--
 lighthouse-core/audits/valid-source-maps.js    |  2 +-
 lighthouse-core/audits/viewport.js             |  2 +-
 lighthouse-core/audits/violation-audit.js      |  2 +-
 .../computed/critical-request-chains.js        |  2 +-
 .../computed/metrics/lantern-interactive.js    |  2 +-
 .../computed/metrics/lantern-metric.js         |  2 +-
 .../computed/page-dependency-graph.js          |  2 +-
 lighthouse-core/config/config-helpers.js       | 18 ++++++++++++++----
 .../gather/gatherers/dobetterweb/domstats.js   |  2 +-
 .../gatherers/dobetterweb/optimized-images.js  |  2 +-
 .../password-inputs-with-prevented-paste.js    |  2 +-
 .../dobetterweb/response-compression.js        |  2 +-
 .../gather/gatherers/full-page-screenshot.js   |  2 +-
 .../gather/gatherers/iframe-elements.js        |  2 +-
 .../gather/gatherers/image-elements.js         |  2 +-
 lighthouse-core/gather/gatherers/inputs.js     |  2 +-
 .../gather/gatherers/link-elements.js          |  2 +-
 .../gather/gatherers/meta-elements.js          |  2 +-
 .../gather/gatherers/script-elements.js        |  4 ++--
 .../gather/gatherers/seo/embedded-content.js   |  2 +-
 .../gather/gatherers/seo/tap-targets.js        |  2 +-
 .../gather/gatherers/trace-elements.js         |  2 +-
 lighthouse-core/lib/network-request.js         |  1 -
 .../scripts/benchmark-plus-extras.js           |  2 +-
 lighthouse-core/scripts/benchmark.js           |  2 +-
 .../accessibility/aria-allowed-attr-test.js    |  2 +-
 .../accessibility/aria-required-attr-test.js   |  2 +-
 .../aria-required-children-test.js             |  2 +-
 .../accessibility/aria-required-parent-test.js |  2 +-
 .../audits/accessibility/aria-roles-test.js    |  2 +-
 .../accessibility/aria-valid-attr-test.js      |  2 +-
 .../aria-valid-attr-value-test.js              |  2 +-
 .../audits/accessibility/button-name-test.js   |  2 +-
 .../test/audits/accessibility/bypass-test.js   |  2 +-
 .../accessibility/color-contrast-test.js       |  2 +-
 .../accessibility/definition-list-test.js      |  2 +-
 .../test/audits/accessibility/dlitem-test.js   |  2 +-
 .../accessibility/document-title-test.js       |  2 +-
 .../audits/accessibility/frame-title-test.js   |  2 +-
 .../audits/accessibility/html-has-lang-test.js |  2 +-
 .../accessibility/html-lang-valid-test.js      |  2 +-
 .../audits/accessibility/image-alt-test.js     |  2 +-
 .../accessibility/input-image-alt-test.js      |  2 +-
 .../test/audits/accessibility/label-test.js    |  2 +-
 .../audits/accessibility/link-name-test.js     |  2 +-
 .../test/audits/accessibility/list-test.js     |  2 +-
 .../test/audits/accessibility/listitem-test.js |  2 +-
 .../audits/accessibility/meta-refresh-test.js  |  2 +-
 .../audits/accessibility/meta-viewport-test.js |  2 +-
 .../audits/accessibility/object-alt-test.js    |  2 +-
 .../test/audits/accessibility/tabindex-test.js |  2 +-
 .../accessibility/td-headers-attr-test.js      |  2 +-
 .../accessibility/th-has-data-cells-test.js    |  2 +-
 .../audits/accessibility/valid-lang-test.js    |  2 +-
 .../audits/accessibility/video-caption-test.js |  2 +-
 lighthouse-core/test/audits/audit-test.js      |  2 +-
 .../efficient-animated-content-test.js         |  2 +-
 .../render-blocking-resources-test.js          |  2 +-
 .../uses-long-cache-ttl-test.js                |  2 +-
 .../test/audits/content-width-test.js          |  2 +-
 .../test/audits/dobetterweb/doctype-test.js    |  2 +-
 .../test/audits/is-on-https-test.js            |  2 +-
 .../metrics/first-meaningful-paint-test.js     |  2 +-
 .../test/audits/metrics/speed-index-test.js    |  2 +-
 .../test/audits/network-requests-test.js       |  2 +-
 .../test/audits/seo/meta-description-test.js   |  2 +-
 lighthouse-core/test/audits/viewport-test.js   |  2 +-
 .../computed/critical-request-chains-test.js   |  2 +-
 .../test/computed/image-records-test.js        |  2 +-
 .../computed/page-dependency-graph-test.js     |  2 +-
 lighthouse-core/test/config/config-test.js     |  2 +-
 .../test/gather/driver/network-monitor-test.js |  2 +-
 .../gather/gatherers/accessibility-test.js     |  2 +-
 .../gather/gatherers/inspector-issues-test.js  |  2 +-
 .../gather/gatherers/script-elements-test.js   |  2 +-
 lighthouse-core/test/lib/asset-saver-test.js   |  2 +-
 .../test/lib/navigation-error-test.js          |  2 +-
 .../test/lib/network-request-test.js           |  2 +-
 .../test/lib/page-functions-test.js            |  2 +-
 lighthouse-core/test/runner-test.js            |  2 +-
 165 files changed, 185 insertions(+), 176 deletions(-)

diff --git a/build/build-bundle.js b/build/build-bundle.js
index 7e4456bfc509..bc37f8c9f60d 100644
--- a/build/build-bundle.js
+++ b/build/build-bundle.js
@@ -159,7 +159,7 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
         ...shimsObj,
         // Allows for plugins to import lighthouse.
         'lighthouse': `
-          import Audit from '${require.resolve('../lighthouse-core/audits/audit.js')}';
+          import {Audit} from '${require.resolve('../lighthouse-core/audits/audit.js')}';
           export {Audit};
         `,
         // Most node 'url' polyfills don't include the WHATWG `URL` property, but
diff --git a/lighthouse-core/audits/accessibility/axe-audit.js b/lighthouse-core/audits/accessibility/axe-audit.js
index 9611ee781f40..295aab6ba828 100644
--- a/lighthouse-core/audits/accessibility/axe-audit.js
+++ b/lighthouse-core/audits/accessibility/axe-audit.js
@@ -10,7 +10,7 @@
  * generate audit results using aXe rule names.
  */
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 
 import i18n from '../../lib/i18n/i18n.js';
 
diff --git a/lighthouse-core/audits/apple-touch-icon.js b/lighthouse-core/audits/apple-touch-icon.js
index 1faca5aa4df3..1f44a97745df 100644
--- a/lighthouse-core/audits/apple-touch-icon.js
+++ b/lighthouse-core/audits/apple-touch-icon.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import i18n from '../lib/i18n/i18n.js';
 
 /**
diff --git a/lighthouse-core/audits/autocomplete.js b/lighthouse-core/audits/autocomplete.js
index 7d6bb18f1c00..1528344a5fb2 100644
--- a/lighthouse-core/audits/autocomplete.js
+++ b/lighthouse-core/audits/autocomplete.js
@@ -12,7 +12,7 @@
 
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import i18n from '../lib/i18n/i18n.js';
 import log from 'lighthouse-logger';
 
diff --git a/lighthouse-core/audits/bootup-time.js b/lighthouse-core/audits/bootup-time.js
index a36588c9b9ff..e6a79ed75268 100644
--- a/lighthouse-core/audits/bootup-time.js
+++ b/lighthouse-core/audits/bootup-time.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import {taskGroups} from '../lib/tracehouse/task-groups.js';
 import i18n from '../lib/i18n/i18n.js';
 import NetworkRecords from '../computed/network-records.js';
diff --git a/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js b/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js
index e452177ad1bb..ba5b705b369a 100644
--- a/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js
+++ b/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import {linearInterpolation} from '../../lib/statistics.js';
 import Interactive from '../../computed/metrics/lantern-interactive.js';
 import i18n from '../../lib/i18n/i18n.js';
diff --git a/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js b/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js
index 609651b2f5cf..b8d21f471c38 100644
--- a/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js
+++ b/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js
@@ -8,7 +8,7 @@
  */
 'use strict';
 
-import NetworkRequest from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/network-request.js';
 import ByteEfficiencyAudit from './byte-efficiency-audit.js';
 import i18n from '../../lib/i18n/i18n.js';
 
diff --git a/lighthouse-core/audits/byte-efficiency/offscreen-images.js b/lighthouse-core/audits/byte-efficiency/offscreen-images.js
index f9ed88434973..85e51f633ea5 100644
--- a/lighthouse-core/audits/byte-efficiency/offscreen-images.js
+++ b/lighthouse-core/audits/byte-efficiency/offscreen-images.js
@@ -10,7 +10,7 @@
 'use strict';
 
 import ByteEfficiencyAudit from './byte-efficiency-audit.js';
-import NetworkRequest from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/network-request.js';
 import Sentry from '../../lib/sentry.js';
 import URL from '../../lib/url-shim.js';
 import i18n from '../../lib/i18n/i18n.js';
diff --git a/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js b/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js
index 5d9a67d12515..8d2829f08181 100644
--- a/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js
+++ b/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js
@@ -9,12 +9,12 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import 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 NetworkRequest from '../../lib/network-request.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';
diff --git a/lighthouse-core/audits/byte-efficiency/total-byte-weight.js b/lighthouse-core/audits/byte-efficiency/total-byte-weight.js
index ffc217239f86..195ff52ac6b9 100644
--- a/lighthouse-core/audits/byte-efficiency/total-byte-weight.js
+++ b/lighthouse-core/audits/byte-efficiency/total-byte-weight.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import i18n from '../../lib/i18n/i18n.js';
-import NetworkRequest from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/network-request.js';
 import NetworkRecords from '../../computed/network-records.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js b/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js
index c7c0c9228fbc..c87903769b80 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js
@@ -6,8 +6,8 @@
 'use strict';
 
 import parseCacheControl from 'parse-cache-control';
-import Audit from '../audit.js';
-import NetworkRequest from '../../lib/network-request.js';
+import {Audit} from '../audit.js';
+import {NetworkRequest} from '../../lib/network-request.js';
 import URL from '../../lib/url-shim.js';
 import {linearInterpolation} from '../../lib/statistics.js';
 import i18n from '../../lib/i18n/i18n.js';
diff --git a/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js b/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js
index 604f0f447d36..58b671b8b035 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js
@@ -11,7 +11,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import UsesResponsiveImages from './uses-responsive-images.js';
 import URL from '../../lib/url-shim.js';
 import i18n from '../../lib/i18n/i18n.js';
diff --git a/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js b/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js
index f40f36d076b6..e3816cfa6402 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js
@@ -14,7 +14,7 @@
 'use strict';
 
 import ByteEfficiencyAudit from './byte-efficiency-audit.js';
-import NetworkRequest from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/network-request.js';
 import ImageRecords from '../../computed/image-records.js';
 import URL from '../../lib/url-shim.js';
 import i18n from '../../lib/i18n/i18n.js';
diff --git a/lighthouse-core/audits/content-width.js b/lighthouse-core/audits/content-width.js
index 8a6bb809476c..72332a585c6a 100644
--- a/lighthouse-core/audits/content-width.js
+++ b/lighthouse-core/audits/content-width.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/critical-request-chains.js b/lighthouse-core/audits/critical-request-chains.js
index f0eea7662554..628fdd244a7b 100644
--- a/lighthouse-core/audits/critical-request-chains.js
+++ b/lighthouse-core/audits/critical-request-chains.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import i18n from '../lib/i18n/i18n.js';
 import ComputedChains from '../computed/critical-request-chains.js';
 
diff --git a/lighthouse-core/audits/csp-xss.js b/lighthouse-core/audits/csp-xss.js
index 7ffe32642fe9..20d80e09b21a 100644
--- a/lighthouse-core/audits/csp-xss.js
+++ b/lighthouse-core/audits/csp-xss.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import MainResource from '../computed/main-resource.js';
 import i18n from '../lib/i18n/i18n.js';
 import {evaluateRawCspsForXss, getTranslatedDescription} from '../lib/csp-evaluator.js';
diff --git a/lighthouse-core/audits/diagnostics.js b/lighthouse-core/audits/diagnostics.js
index b32391b403b6..6b10235791c9 100644
--- a/lighthouse-core/audits/diagnostics.js
+++ b/lighthouse-core/audits/diagnostics.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+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';
diff --git a/lighthouse-core/audits/dobetterweb/charset.js b/lighthouse-core/audits/dobetterweb/charset.js
index 632b48db4526..20738c4d70b0 100644
--- a/lighthouse-core/audits/dobetterweb/charset.js
+++ b/lighthouse-core/audits/dobetterweb/charset.js
@@ -12,7 +12,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import i18n from '../../lib/i18n/i18n.js';
 import MainResource from '../../computed/main-resource.js';
 
diff --git a/lighthouse-core/audits/dobetterweb/doctype.js b/lighthouse-core/audits/dobetterweb/doctype.js
index 20e9485f407b..53b6ae5c28bf 100644
--- a/lighthouse-core/audits/dobetterweb/doctype.js
+++ b/lighthouse-core/audits/dobetterweb/doctype.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/dobetterweb/dom-size.js b/lighthouse-core/audits/dobetterweb/dom-size.js
index 1902d729b290..c956d6c55da7 100644
--- a/lighthouse-core/audits/dobetterweb/dom-size.js
+++ b/lighthouse-core/audits/dobetterweb/dom-size.js
@@ -12,7 +12,7 @@
 
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/dobetterweb/inspector-issues.js b/lighthouse-core/audits/dobetterweb/inspector-issues.js
index fbbd0fc7b3b2..4cff32c88790 100644
--- a/lighthouse-core/audits/dobetterweb/inspector-issues.js
+++ b/lighthouse-core/audits/dobetterweb/inspector-issues.js
@@ -15,7 +15,7 @@
 /** @typedef {{url: string}} IssueSubItem */
 /** @typedef {{issueType: string|LH.IcuMessage, subItems: Array<IssueSubItem>}} IssueItem */
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 
 import i18n from '../../lib/i18n/i18n.js';
 
diff --git a/lighthouse-core/audits/dobetterweb/js-libraries.js b/lighthouse-core/audits/dobetterweb/js-libraries.js
index ec9c0386e6ff..7673ecb87e99 100644
--- a/lighthouse-core/audits/dobetterweb/js-libraries.js
+++ b/lighthouse-core/audits/dobetterweb/js-libraries.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js b/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
index b5db1e32c87e..25a66b8bc0f8 100644
--- a/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
+++ b/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
@@ -12,7 +12,7 @@
 
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import Sentry from '../../lib/sentry.js';
 import semver from 'semver';
 import snykDatabase from '../../../third-party/snyk/snapshot.json';
diff --git a/lighthouse-core/audits/dobetterweb/password-inputs-can-be-pasted-into.js b/lighthouse-core/audits/dobetterweb/password-inputs-can-be-pasted-into.js
index 4665ba9d92d8..846d2e6af692 100644
--- a/lighthouse-core/audits/dobetterweb/password-inputs-can-be-pasted-into.js
+++ b/lighthouse-core/audits/dobetterweb/password-inputs-can-be-pasted-into.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/dobetterweb/uses-http2.js b/lighthouse-core/audits/dobetterweb/uses-http2.js
index df068b8ffba3..dc21e2097052 100644
--- a/lighthouse-core/audits/dobetterweb/uses-http2.js
+++ b/lighthouse-core/audits/dobetterweb/uses-http2.js
@@ -13,13 +13,13 @@
 /** @typedef {import('../../lib/dependency-graph/simulator/simulator')} Simulator */
 /** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 
 import ThirdParty from '../../lib/third-party-web.js';
 import URL from '../../lib/url-shim.js';
 import ByteEfficiencyAudit from '../byte-efficiency/byte-efficiency-audit.js';
 import Interactive from '../../computed/metrics/lantern-interactive.js';
-import NetworkRequest from '../../lib/network-request.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';
diff --git a/lighthouse-core/audits/errors-in-console.js b/lighthouse-core/audits/errors-in-console.js
index 39b716b33478..1b0ef418d7c1 100644
--- a/lighthouse-core/audits/errors-in-console.js
+++ b/lighthouse-core/audits/errors-in-console.js
@@ -12,7 +12,7 @@
 
 import log from 'lighthouse-logger';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import JsBundles from '../computed/js-bundles.js';
 import i18n from '../lib/i18n/i18n.js';
 
diff --git a/lighthouse-core/audits/final-screenshot.js b/lighthouse-core/audits/final-screenshot.js
index b4a8a1e516cd..51c4113ce0c2 100644
--- a/lighthouse-core/audits/final-screenshot.js
+++ b/lighthouse-core/audits/final-screenshot.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import LHError from '../lib/lh-error.js';
 import ProcessedTrace from '../computed/processed-trace.js';
 import Screenshots from '../computed/screenshots.js';
diff --git a/lighthouse-core/audits/font-display.js b/lighthouse-core/audits/font-display.js
index adc5705c02cf..d0fe21732c39 100644
--- a/lighthouse-core/audits/font-display.js
+++ b/lighthouse-core/audits/font-display.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import URL from '../lib/url-shim.js';
 const PASSING_FONT_DISPLAY_REGEX = /^(block|fallback|optional|swap)$/;
 const CSS_URL_REGEX = /url\((.*?)\)/;
diff --git a/lighthouse-core/audits/full-page-screenshot.js b/lighthouse-core/audits/full-page-screenshot.js
index 7a4b3d32f843..ba748ac55f8c 100644
--- a/lighthouse-core/audits/full-page-screenshot.js
+++ b/lighthouse-core/audits/full-page-screenshot.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 
 class FullPageScreenshot extends Audit {
   /**
diff --git a/lighthouse-core/audits/image-aspect-ratio.js b/lighthouse-core/audits/image-aspect-ratio.js
index 17f85618f3e8..727d2926b393 100644
--- a/lighthouse-core/audits/image-aspect-ratio.js
+++ b/lighthouse-core/audits/image-aspect-ratio.js
@@ -11,7 +11,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import URL from '../lib/url-shim.js';
 import i18n from '../lib/i18n/i18n.js';
 
diff --git a/lighthouse-core/audits/image-size-responsive.js b/lighthouse-core/audits/image-size-responsive.js
index 0305daedd882..f56314738b16 100644
--- a/lighthouse-core/audits/image-size-responsive.js
+++ b/lighthouse-core/audits/image-size-responsive.js
@@ -10,7 +10,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import URL from '../lib/url-shim.js';
 import i18n from '../lib/i18n/i18n.js';
 
diff --git a/lighthouse-core/audits/installable-manifest.js b/lighthouse-core/audits/installable-manifest.js
index d2ce97295158..755c1448bfe8 100644
--- a/lighthouse-core/audits/installable-manifest.js
+++ b/lighthouse-core/audits/installable-manifest.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import i18n from '../lib/i18n/i18n.js';
 import ManifestValues from '../computed/manifest-values.js';
 
diff --git a/lighthouse-core/audits/is-on-https.js b/lighthouse-core/audits/is-on-https.js
index b85305d7d353..385b328cb146 100644
--- a/lighthouse-core/audits/is-on-https.js
+++ b/lighthouse-core/audits/is-on-https.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import URL from '../lib/url-shim.js';
-import NetworkRequest from '../lib/network-request.js';
+import {NetworkRequest} from '../lib/network-request.js';
 import NetworkRecords from '../computed/network-records.js';
 import i18n from '../lib/i18n/i18n.js';
 
diff --git a/lighthouse-core/audits/largest-contentful-paint-element.js b/lighthouse-core/audits/largest-contentful-paint-element.js
index 7e714e273e1e..14160a61d4be 100644
--- a/lighthouse-core/audits/largest-contentful-paint-element.js
+++ b/lighthouse-core/audits/largest-contentful-paint-element.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/layout-shift-elements.js b/lighthouse-core/audits/layout-shift-elements.js
index 14c6677ad2b4..d08ff3141518 100644
--- a/lighthouse-core/audits/layout-shift-elements.js
+++ b/lighthouse-core/audits/layout-shift-elements.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/lcp-lazy-loaded.js b/lighthouse-core/audits/lcp-lazy-loaded.js
index 496baaa5761d..f53a972c0466 100644
--- a/lighthouse-core/audits/lcp-lazy-loaded.js
+++ b/lighthouse-core/audits/lcp-lazy-loaded.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/long-tasks.js b/lighthouse-core/audits/long-tasks.js
index 1162787ba045..95ae8e8cca86 100644
--- a/lighthouse-core/audits/long-tasks.js
+++ b/lighthouse-core/audits/long-tasks.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import NetworkRecords from '../computed/network-records.js';
 import i18n from '../lib/i18n/i18n.js';
 import MainThreadTasks from '../computed/main-thread-tasks.js';
diff --git a/lighthouse-core/audits/main-thread-tasks.js b/lighthouse-core/audits/main-thread-tasks.js
index f83a862644d9..001f5dfe78b8 100644
--- a/lighthouse-core/audits/main-thread-tasks.js
+++ b/lighthouse-core/audits/main-thread-tasks.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import MainThreadTasksComputed from '../computed/main-thread-tasks.js';
 
 class MainThreadTasks extends Audit {
diff --git a/lighthouse-core/audits/mainthread-work-breakdown.js b/lighthouse-core/audits/mainthread-work-breakdown.js
index 57c9e4ca6009..9a4d6cf07ac6 100644
--- a/lighthouse-core/audits/mainthread-work-breakdown.js
+++ b/lighthouse-core/audits/mainthread-work-breakdown.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import {taskGroups} from '../lib/tracehouse/task-groups.js';
 import i18n from '../lib/i18n/i18n.js';
 import MainThreadTasks from '../computed/main-thread-tasks.js';
diff --git a/lighthouse-core/audits/manual/manual-audit.js b/lighthouse-core/audits/manual/manual-audit.js
index 041c7f5f1007..a52f8fe94ba7 100644
--- a/lighthouse-core/audits/manual/manual-audit.js
+++ b/lighthouse-core/audits/manual/manual-audit.js
@@ -10,7 +10,7 @@
  * their site.
  */
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 
 class ManualAudit extends Audit {
   /**
diff --git a/lighthouse-core/audits/maskable-icon.js b/lighthouse-core/audits/maskable-icon.js
index de2fea229fd0..1ff14ffe5d35 100644
--- a/lighthouse-core/audits/maskable-icon.js
+++ b/lighthouse-core/audits/maskable-icon.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import ManifestValues from '../computed/manifest-values.js';
 import i18n from '../lib/i18n/i18n.js';
 
diff --git a/lighthouse-core/audits/metrics.js b/lighthouse-core/audits/metrics.js
index d4e943198c11..7d8e8ee4a152 100644
--- a/lighthouse-core/audits/metrics.js
+++ b/lighthouse-core/audits/metrics.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import ComputedTimingSummary from '../computed/metrics/timing-summary.js';
 
 /** @type {Set<keyof LH.Artifacts.TimingSummary>} */
diff --git a/lighthouse-core/audits/metrics/cumulative-layout-shift.js b/lighthouse-core/audits/metrics/cumulative-layout-shift.js
index 27c243a3ef27..3e69fd5ce2c2 100644
--- a/lighthouse-core/audits/metrics/cumulative-layout-shift.js
+++ b/lighthouse-core/audits/metrics/cumulative-layout-shift.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import ComputedCLS from '../../computed/metrics/cumulative-layout-shift.js';
 import i18n from '../../lib/i18n/i18n.js';
 
diff --git a/lighthouse-core/audits/metrics/first-contentful-paint-3g.js b/lighthouse-core/audits/metrics/first-contentful-paint-3g.js
index 8fb222d02642..a5cda315a95a 100644
--- a/lighthouse-core/audits/metrics/first-contentful-paint-3g.js
+++ b/lighthouse-core/audits/metrics/first-contentful-paint-3g.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 const regular3G = require('../../config/constants.js').throttling.mobileRegular3G;
 import ComputedFcp from '../../computed/metrics/first-contentful-paint.js';
 
diff --git a/lighthouse-core/audits/metrics/first-contentful-paint.js b/lighthouse-core/audits/metrics/first-contentful-paint.js
index a59a6d008de4..43af666a3f7f 100644
--- a/lighthouse-core/audits/metrics/first-contentful-paint.js
+++ b/lighthouse-core/audits/metrics/first-contentful-paint.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import i18n from '../../lib/i18n/i18n.js';
 import ComputedFcp from '../../computed/metrics/first-contentful-paint.js';
 
diff --git a/lighthouse-core/audits/metrics/first-meaningful-paint.js b/lighthouse-core/audits/metrics/first-meaningful-paint.js
index fa7634ddda19..b26f8dce9a2a 100644
--- a/lighthouse-core/audits/metrics/first-meaningful-paint.js
+++ b/lighthouse-core/audits/metrics/first-meaningful-paint.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import i18n from '../../lib/i18n/i18n.js';
 import ComputedFmp from '../../computed/metrics/first-meaningful-paint.js';
 
diff --git a/lighthouse-core/audits/metrics/interactive.js b/lighthouse-core/audits/metrics/interactive.js
index a83b89916aaf..f485745edf65 100644
--- a/lighthouse-core/audits/metrics/interactive.js
+++ b/lighthouse-core/audits/metrics/interactive.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import i18n from '../../lib/i18n/i18n.js';
 import Interactive from '../../computed/metrics/interactive.js';
 
diff --git a/lighthouse-core/audits/metrics/largest-contentful-paint.js b/lighthouse-core/audits/metrics/largest-contentful-paint.js
index 57d77bff9536..7f80757f90e9 100644
--- a/lighthouse-core/audits/metrics/largest-contentful-paint.js
+++ b/lighthouse-core/audits/metrics/largest-contentful-paint.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import i18n from '../../lib/i18n/i18n.js';
 import ComputedLcp from '../../computed/metrics/largest-contentful-paint.js';
 import LHError from '../../lib/lh-error.js';
diff --git a/lighthouse-core/audits/metrics/max-potential-fid.js b/lighthouse-core/audits/metrics/max-potential-fid.js
index 832a56938302..9f071eb46eb2 100644
--- a/lighthouse-core/audits/metrics/max-potential-fid.js
+++ b/lighthouse-core/audits/metrics/max-potential-fid.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import ComputedFid from '../../computed/metrics/max-potential-fid.js';
 import i18n from '../../lib/i18n/i18n.js';
 
diff --git a/lighthouse-core/audits/metrics/speed-index.js b/lighthouse-core/audits/metrics/speed-index.js
index cc77ffd2d5dd..fe5f11d9c132 100644
--- a/lighthouse-core/audits/metrics/speed-index.js
+++ b/lighthouse-core/audits/metrics/speed-index.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import i18n from '../../lib/i18n/i18n.js';
 import ComputedSi from '../../computed/metrics/speed-index.js';
 
diff --git a/lighthouse-core/audits/metrics/total-blocking-time.js b/lighthouse-core/audits/metrics/total-blocking-time.js
index ae07e0b02fd6..e6798278d546 100644
--- a/lighthouse-core/audits/metrics/total-blocking-time.js
+++ b/lighthouse-core/audits/metrics/total-blocking-time.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import ComputedTBT from '../../computed/metrics/total-blocking-time.js';
 import i18n from '../../lib/i18n/i18n.js';
 
diff --git a/lighthouse-core/audits/multi-check-audit.js b/lighthouse-core/audits/multi-check-audit.js
index 52670f878b09..6b2203ed7564 100644
--- a/lighthouse-core/audits/multi-check-audit.js
+++ b/lighthouse-core/audits/multi-check-audit.js
@@ -9,7 +9,7 @@
  * @fileoverview Base class for boolean audits that can have multiple reasons for failure
  */
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 
 class MultiCheckAudit extends Audit {
   /**
diff --git a/lighthouse-core/audits/network-requests.js b/lighthouse-core/audits/network-requests.js
index 0832db88a845..48b6d3afac0f 100644
--- a/lighthouse-core/audits/network-requests.js
+++ b/lighthouse-core/audits/network-requests.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import URL from '../lib/url-shim.js';
 import NetworkRecords from '../computed/network-records.js';
 
diff --git a/lighthouse-core/audits/network-rtt.js b/lighthouse-core/audits/network-rtt.js
index e6240545944f..86e8480380be 100644
--- a/lighthouse-core/audits/network-rtt.js
+++ b/lighthouse-core/audits/network-rtt.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import i18n from '../lib/i18n/i18n.js';
 import NetworkRecords from '../computed/network-records.js';
 import NetworkAnalysisComputed from '../computed/network-analysis.js';
diff --git a/lighthouse-core/audits/network-server-latency.js b/lighthouse-core/audits/network-server-latency.js
index ccabc53b44c9..601c3bd31d17 100644
--- a/lighthouse-core/audits/network-server-latency.js
+++ b/lighthouse-core/audits/network-server-latency.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import i18n from '../lib/i18n/i18n.js';
 import NetworkRecords from '../computed/network-records.js';
 import NetworkAnalysisComputed from '../computed/network-analysis.js';
diff --git a/lighthouse-core/audits/no-unload-listeners.js b/lighthouse-core/audits/no-unload-listeners.js
index b3ca945f1fa5..0fcacbcae38e 100644
--- a/lighthouse-core/audits/no-unload-listeners.js
+++ b/lighthouse-core/audits/no-unload-listeners.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import JsBundles from '../computed/js-bundles.js';
 import i18n from './../lib/i18n/i18n.js';
 
diff --git a/lighthouse-core/audits/non-composited-animations.js b/lighthouse-core/audits/non-composited-animations.js
index f462c3585b05..2b8fd89ee76b 100644
--- a/lighthouse-core/audits/non-composited-animations.js
+++ b/lighthouse-core/audits/non-composited-animations.js
@@ -11,7 +11,7 @@
  * https://docs.google.com/document/d/1XKcJP2CKmNKfOcDsVvliAQ-e1H9C1nf2H-pzTdyafAA/edit?usp=sharing
  */
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 
 import i18n from '../lib/i18n/i18n.js';
 
diff --git a/lighthouse-core/audits/performance-budget.js b/lighthouse-core/audits/performance-budget.js
index b9c998f70089..2759ae779456 100644
--- a/lighthouse-core/audits/performance-budget.js
+++ b/lighthouse-core/audits/performance-budget.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import ResourceSummary from '../computed/resource-summary.js';
 import MainResource from '../computed/main-resource.js';
 import Budget from '../config/budget.js';
diff --git a/lighthouse-core/audits/predictive-perf.js b/lighthouse-core/audits/predictive-perf.js
index 83ae5bc26bd5..04366f844cdb 100644
--- a/lighthouse-core/audits/predictive-perf.js
+++ b/lighthouse-core/audits/predictive-perf.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import 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';
diff --git a/lighthouse-core/audits/preload-fonts.js b/lighthouse-core/audits/preload-fonts.js
index 1a483d0131c6..d8eda63ed450 100644
--- a/lighthouse-core/audits/preload-fonts.js
+++ b/lighthouse-core/audits/preload-fonts.js
@@ -10,7 +10,7 @@
  * Audit that checks whether fonts that use `font-display: optional` were preloaded.
  */
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 
 import i18n from './../lib/i18n/i18n.js';
 import FontDisplay from './../audits/font-display.js';
diff --git a/lighthouse-core/audits/preload-lcp-image.js b/lighthouse-core/audits/preload-lcp-image.js
index 95c185183615..37a913a24773 100644
--- a/lighthouse-core/audits/preload-lcp-image.js
+++ b/lighthouse-core/audits/preload-lcp-image.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import i18n from '../lib/i18n/i18n.js';
-import NetworkRequest from '../lib/network-request.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';
diff --git a/lighthouse-core/audits/redirects.js b/lighthouse-core/audits/redirects.js
index 8f36a81bd49a..cac3c339bd48 100644
--- a/lighthouse-core/audits/redirects.js
+++ b/lighthouse-core/audits/redirects.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import UnusedBytes from './byte-efficiency/byte-efficiency-audit.js';
 import i18n from '../lib/i18n/i18n.js';
 import ProcessedTrace from '../computed/processed-trace.js';
diff --git a/lighthouse-core/audits/resource-summary.js b/lighthouse-core/audits/resource-summary.js
index 4ab9a3c2796a..117788dfb56e 100644
--- a/lighthouse-core/audits/resource-summary.js
+++ b/lighthouse-core/audits/resource-summary.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import ComputedResourceSummary from '../computed/resource-summary.js';
 import i18n from '../lib/i18n/i18n.js';
 
diff --git a/lighthouse-core/audits/screenshot-thumbnails.js b/lighthouse-core/audits/screenshot-thumbnails.js
index 8828e78c924d..40ea4c1430bf 100644
--- a/lighthouse-core/audits/screenshot-thumbnails.js
+++ b/lighthouse-core/audits/screenshot-thumbnails.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import LHError from '../lib/lh-error.js';
 import jpeg from 'jpeg-js';
 import Speedline from '../computed/speedline.js';
diff --git a/lighthouse-core/audits/script-treemap-data.js b/lighthouse-core/audits/script-treemap-data.js
index c049bbe74646..ae06d5e6268b 100644
--- a/lighthouse-core/audits/script-treemap-data.js
+++ b/lighthouse-core/audits/script-treemap-data.js
@@ -15,7 +15,7 @@
  * @typedef {Omit<LH.Treemap.Node, 'name'|'children'>} SourceData
  */
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 
 import JsBundles from '../computed/js-bundles.js';
 import UnusedJavaScriptSummary from '../computed/unused-javascript-summary.js';
diff --git a/lighthouse-core/audits/seo/canonical.js b/lighthouse-core/audits/seo/canonical.js
index cac0ffccfaea..3803ac9f79af 100644
--- a/lighthouse-core/audits/seo/canonical.js
+++ b/lighthouse-core/audits/seo/canonical.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import URL from '../../lib/url-shim.js';
 import MainResource from '../../computed/main-resource.js';
 import i18n from '../../lib/i18n/i18n.js';
diff --git a/lighthouse-core/audits/seo/crawlable-anchors.js b/lighthouse-core/audits/seo/crawlable-anchors.js
index 02d66e9ed761..05968dbeb38a 100644
--- a/lighthouse-core/audits/seo/crawlable-anchors.js
+++ b/lighthouse-core/audits/seo/crawlable-anchors.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/seo/font-size.js b/lighthouse-core/audits/seo/font-size.js
index 32563c26de9d..1c5012309a2f 100644
--- a/lighthouse-core/audits/seo/font-size.js
+++ b/lighthouse-core/audits/seo/font-size.js
@@ -9,7 +9,7 @@
 
 import i18n from '../../lib/i18n/i18n.js';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import ComputedViewportMeta from '../../computed/viewport-meta.js';
 const MINIMAL_PERCENTAGE_OF_LEGIBLE_TEXT = 60;
 
diff --git a/lighthouse-core/audits/seo/hreflang.js b/lighthouse-core/audits/seo/hreflang.js
index 95432cdab4d4..d3b8fc67f2ef 100644
--- a/lighthouse-core/audits/seo/hreflang.js
+++ b/lighthouse-core/audits/seo/hreflang.js
@@ -9,7 +9,7 @@
 /** @typedef {{source: Source, subItems: {type: 'subitems', items: SubItem[]}}} InvalidHreflang */
 /** @typedef {{reason: LH.IcuMessage}} SubItem */
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 
 import i18n from '../../lib/i18n/i18n.js';
 import {isValidLang} from '../../../third-party/axe/valid-langs.js';
diff --git a/lighthouse-core/audits/seo/http-status-code.js b/lighthouse-core/audits/seo/http-status-code.js
index dae83bda9faf..737975b82a8a 100644
--- a/lighthouse-core/audits/seo/http-status-code.js
+++ b/lighthouse-core/audits/seo/http-status-code.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 const HTTP_UNSUCCESSFUL_CODE_LOW = 400;
 const HTTP_UNSUCCESSFUL_CODE_HIGH = 599;
 import i18n from '../../lib/i18n/i18n.js';
diff --git a/lighthouse-core/audits/seo/is-crawlable.js b/lighthouse-core/audits/seo/is-crawlable.js
index 9e9f727c41d0..fcea194c067b 100644
--- a/lighthouse-core/audits/seo/is-crawlable.js
+++ b/lighthouse-core/audits/seo/is-crawlable.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 
 // TODO(esmodules): cast can be removed when this switches to import.
 import robotsParser from 'robots-parser'; // eslint-disable-line max-len
diff --git a/lighthouse-core/audits/seo/link-text.js b/lighthouse-core/audits/seo/link-text.js
index 4834cc145e9d..b2fc538641bd 100644
--- a/lighthouse-core/audits/seo/link-text.js
+++ b/lighthouse-core/audits/seo/link-text.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import URL from '../../lib/url-shim.js';
 const BLOCKLIST = new Set([
   // English
diff --git a/lighthouse-core/audits/seo/meta-description.js b/lighthouse-core/audits/seo/meta-description.js
index 8539386185eb..b3037ab29ca8 100644
--- a/lighthouse-core/audits/seo/meta-description.js
+++ b/lighthouse-core/audits/seo/meta-description.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/seo/plugins.js b/lighthouse-core/audits/seo/plugins.js
index 4817ef6cc870..61c059878d99 100644
--- a/lighthouse-core/audits/seo/plugins.js
+++ b/lighthouse-core/audits/seo/plugins.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 import URL from '../../lib/url-shim.js';
 
 const JAVA_APPLET_TYPE = 'application/x-java-applet';
diff --git a/lighthouse-core/audits/seo/robots-txt.js b/lighthouse-core/audits/seo/robots-txt.js
index c7b9320a8331..cd45c6a04d5a 100644
--- a/lighthouse-core/audits/seo/robots-txt.js
+++ b/lighthouse-core/audits/seo/robots-txt.js
@@ -12,7 +12,7 @@
  * https://github.com/GoogleChrome/lighthouse/issues/4356#issuecomment-375489925
  */
 
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 
 import URL from '../../lib/url-shim.js';
 
diff --git a/lighthouse-core/audits/seo/tap-targets.js b/lighthouse-core/audits/seo/tap-targets.js
index 82bf8df586ad..0f38fd6aaa15 100644
--- a/lighthouse-core/audits/seo/tap-targets.js
+++ b/lighthouse-core/audits/seo/tap-targets.js
@@ -9,7 +9,7 @@
  * @fileoverview Checks that links, buttons, etc. are sufficiently large and that there's
  * no other tap target that's too close so that the user might accidentally tap on.
  */
-import Audit from '../audit.js';
+import {Audit} from '../audit.js';
 
 import ComputedViewportMeta from '../../computed/viewport-meta.js';
 
diff --git a/lighthouse-core/audits/server-response-time.js b/lighthouse-core/audits/server-response-time.js
index 014ecad6eff0..4046751818c7 100644
--- a/lighthouse-core/audits/server-response-time.js
+++ b/lighthouse-core/audits/server-response-time.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import i18n from '../lib/i18n/i18n.js';
 import MainResource from '../computed/main-resource.js';
 
diff --git a/lighthouse-core/audits/service-worker.js b/lighthouse-core/audits/service-worker.js
index 5bb5a46141d2..a94cde458b01 100644
--- a/lighthouse-core/audits/service-worker.js
+++ b/lighthouse-core/audits/service-worker.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import URL from '../lib/url-shim.js';
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/third-party-facades.js b/lighthouse-core/audits/third-party-facades.js
index d192f4b3fa2d..c15b71a88e9a 100644
--- a/lighthouse-core/audits/third-party-facades.js
+++ b/lighthouse-core/audits/third-party-facades.js
@@ -20,7 +20,7 @@
 
 /** @typedef {{product: ThirdPartyProduct, entity: ThirdPartyEntity}} FacadableProduct */
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 
 import i18n from '../lib/i18n/i18n.js';
 import thirdPartyWeb from '../lib/third-party-web.js';
diff --git a/lighthouse-core/audits/third-party-summary.js b/lighthouse-core/audits/third-party-summary.js
index 309201ccb666..3c49b55d1376 100644
--- a/lighthouse-core/audits/third-party-summary.js
+++ b/lighthouse-core/audits/third-party-summary.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import i18n from '../lib/i18n/i18n.js';
 import thirdPartyWeb from '../lib/third-party-web.js';
 import NetworkRecords from '../computed/network-records.js';
diff --git a/lighthouse-core/audits/timing-budget.js b/lighthouse-core/audits/timing-budget.js
index 268a6551f051..5c3fb04eea5c 100644
--- a/lighthouse-core/audits/timing-budget.js
+++ b/lighthouse-core/audits/timing-budget.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import TimingSummary from '../computed/metrics/timing-summary.js';
 import MainResource from '../computed/main-resource.js';
 import Budget from '../config/budget.js';
diff --git a/lighthouse-core/audits/unsized-images.js b/lighthouse-core/audits/unsized-images.js
index 52c7762bcf79..5641010eb336 100644
--- a/lighthouse-core/audits/unsized-images.js
+++ b/lighthouse-core/audits/unsized-images.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import i18n from './../lib/i18n/i18n.js';
 import URL from './../lib/url-shim.js';
 
diff --git a/lighthouse-core/audits/user-timings.js b/lighthouse-core/audits/user-timings.js
index 39c94e23ba8b..10853c83e676 100644
--- a/lighthouse-core/audits/user-timings.js
+++ b/lighthouse-core/audits/user-timings.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import i18n from '../lib/i18n/i18n.js';
 import ComputedUserTimings from '../computed/user-timings.js';
 
diff --git a/lighthouse-core/audits/uses-rel-preconnect.js b/lighthouse-core/audits/uses-rel-preconnect.js
index 005744802480..adef563434d5 100644
--- a/lighthouse-core/audits/uses-rel-preconnect.js
+++ b/lighthouse-core/audits/uses-rel-preconnect.js
@@ -6,7 +6,7 @@
 
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import UnusedBytes from './byte-efficiency/byte-efficiency-audit.js';
 import URL from '../lib/url-shim.js';
 import i18n from '../lib/i18n/i18n.js';
diff --git a/lighthouse-core/audits/uses-rel-preload.js b/lighthouse-core/audits/uses-rel-preload.js
index 6ea5adc0153c..429bdbb0913e 100644
--- a/lighthouse-core/audits/uses-rel-preload.js
+++ b/lighthouse-core/audits/uses-rel-preload.js
@@ -6,8 +6,8 @@
 'use strict';
 
 import URL from '../lib/url-shim.js';
-import NetworkRequest from '../lib/network-request.js';
-import Audit from './audit.js';
+import {NetworkRequest} from '../lib/network-request.js';
+import {Audit} from './audit.js';
 import UnusedBytes from './byte-efficiency/byte-efficiency-audit.js';
 import CriticalRequestChains from '../computed/critical-request-chains.js';
 import i18n from '../lib/i18n/i18n.js';
diff --git a/lighthouse-core/audits/valid-source-maps.js b/lighthouse-core/audits/valid-source-maps.js
index d782c930f1fb..7d9e766deacb 100644
--- a/lighthouse-core/audits/valid-source-maps.js
+++ b/lighthouse-core/audits/valid-source-maps.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import thirdPartyWeb from '../lib/third-party-web.js';
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/viewport.js b/lighthouse-core/audits/viewport.js
index d909de03c0c1..0610a00a5869 100644
--- a/lighthouse-core/audits/viewport.js
+++ b/lighthouse-core/audits/viewport.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import ComputedViewportMeta from '../computed/viewport-meta.js';
 import i18n from '../lib/i18n/i18n.js';
 
diff --git a/lighthouse-core/audits/violation-audit.js b/lighthouse-core/audits/violation-audit.js
index 9e2fd6a8383b..c609f0782b05 100644
--- a/lighthouse-core/audits/violation-audit.js
+++ b/lighthouse-core/audits/violation-audit.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import Audit from './audit.js';
+import {Audit} from './audit.js';
 import JsBundles from '../computed/js-bundles.js';
 
 class ViolationAudit extends Audit {
diff --git a/lighthouse-core/computed/critical-request-chains.js b/lighthouse-core/computed/critical-request-chains.js
index 06b1e726e395..76ce47afdae3 100644
--- a/lighthouse-core/computed/critical-request-chains.js
+++ b/lighthouse-core/computed/critical-request-chains.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {makeComputedArtifact} from './computed-artifact.js';
-import NetworkRequest from '../lib/network-request.js';
+import {NetworkRequest} from '../lib/network-request.js';
 import MainResource from './main-resource.js';
 import PageDependencyGraph from './page-dependency-graph.js';
 
diff --git a/lighthouse-core/computed/metrics/lantern-interactive.js b/lighthouse-core/computed/metrics/lantern-interactive.js
index baa2f1b358f2..c28d67bff19a 100644
--- a/lighthouse-core/computed/metrics/lantern-interactive.js
+++ b/lighthouse-core/computed/metrics/lantern-interactive.js
@@ -8,7 +8,7 @@
 import {makeComputedArtifact} from '../computed-artifact.js';
 import LanternMetric from './lantern-metric.js';
 import BaseNode from '../../lib/dependency-graph/base-node.js';
-import NetworkRequest from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/network-request.js';
 import LanternFirstMeaningfulPaint from './lantern-first-meaningful-paint.js';
 
 /** @typedef {BaseNode.Node} Node */
diff --git a/lighthouse-core/computed/metrics/lantern-metric.js b/lighthouse-core/computed/metrics/lantern-metric.js
index 2ff115f6d37d..97b265ee65c5 100644
--- a/lighthouse-core/computed/metrics/lantern-metric.js
+++ b/lighthouse-core/computed/metrics/lantern-metric.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import BaseNode from '../../lib/dependency-graph/base-node.js';
-import NetworkRequest from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/network-request.js';
 import ProcessedTrace from '../processed-trace.js';
 import ProcessedNavigation from '../processed-navigation.js';
 import PageDependencyGraph from '../page-dependency-graph.js';
diff --git a/lighthouse-core/computed/page-dependency-graph.js b/lighthouse-core/computed/page-dependency-graph.js
index 29cc57a6b9cb..080b159170a8 100644
--- a/lighthouse-core/computed/page-dependency-graph.js
+++ b/lighthouse-core/computed/page-dependency-graph.js
@@ -9,7 +9,7 @@ import {makeComputedArtifact} from './computed-artifact.js';
 import NetworkNode from '../lib/dependency-graph/network-node.js';
 import CPUNode from '../lib/dependency-graph/cpu-node.js';
 import TracingProcessor from '../lib/tracehouse/trace-processor.js';
-import NetworkRequest from '../lib/network-request.js';
+import {NetworkRequest} from '../lib/network-request.js';
 import ProcessedTrace from './processed-trace.js';
 import NetworkRecords from './network-records.js';
 import NetworkAnalyzer from '../lib/dependency-graph/simulator/network-analyzer.js';
diff --git a/lighthouse-core/config/config-helpers.js b/lighthouse-core/config/config-helpers.js
index 829aec7eff05..47605e13eeb8 100644
--- a/lighthouse-core/config/config-helpers.js
+++ b/lighthouse-core/config/config-helpers.js
@@ -15,7 +15,7 @@ import i18n from '../lib/i18n/i18n.js';
 import * as validation from '../fraggle-rock/config/validation.js';
 import {createCommonjsRefs} from '../scripts/esm-utils.js';
 
-const {require} = createCommonjsRefs(import.meta);
+const {require, __dirname} = createCommonjsRefs(import.meta);
 
 /** @typedef {typeof import('../gather/gatherers/gatherer.js')['Gatherer']} GathererConstructor */
 /** @typedef {typeof import('../audits/audit.js')['Audit']} Audit */
@@ -210,13 +210,23 @@ function expandAuditShorthand(audit) {
 const bundledModules = new Map(/* BUILD_REPLACE_BUNDLED_MODULES */);
 
 /**
- * Wraps `require` with an entrypoint for bundled dynamic modules.
+ * Wraps `import`/`require` with an entrypoint for bundled dynamic modules.
  * See build-bundle.js
  * @param {string} requirePath
  */
 async function requireWrapper(requirePath) {
-  // This is async because eventually this function needs to do async dynamic imports.
-  return bundledModules.get(requirePath) || require(requirePath);
+  const bundledModule = bundledModules.get(requirePath);
+  if (bundledModule) return bundledModule;
+
+  try {
+    const module = await import(requirePath);
+    return module.default;
+  } catch (err) {
+    // TODO: verify err was "this isn't esm"
+    console.error(err);
+  }
+
+  return require(requirePath);
 }
 
 /**
diff --git a/lighthouse-core/gather/gatherers/dobetterweb/domstats.js b/lighthouse-core/gather/gatherers/dobetterweb/domstats.js
index 2f205ad2e85a..29901cf67b47 100644
--- a/lighthouse-core/gather/gatherers/dobetterweb/domstats.js
+++ b/lighthouse-core/gather/gatherers/dobetterweb/domstats.js
@@ -14,7 +14,7 @@
 'use strict';
 
 import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
-import pageFunctions from '../../../lib/page-functions.js';
+import {pageFunctions} from '../../../lib/page-functions.js';
 
 /**
  * Calculates the maximum tree depth of the DOM.
diff --git a/lighthouse-core/gather/gatherers/dobetterweb/optimized-images.js b/lighthouse-core/gather/gatherers/dobetterweb/optimized-images.js
index 6f0ab94d81e0..e248eaf09f69 100644
--- a/lighthouse-core/gather/gatherers/dobetterweb/optimized-images.js
+++ b/lighthouse-core/gather/gatherers/dobetterweb/optimized-images.js
@@ -13,7 +13,7 @@
 import log from 'lighthouse-logger';
 import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
 import URL from '../../../lib/url-shim.js';
-import NetworkRequest from '../../../lib/network-request.js';
+import {NetworkRequest} from '../../../lib/network-request.js';
 import Sentry from '../../../lib/sentry.js';
 import NetworkRecords from '../../../computed/network-records.js';
 import DevtoolsLog from '../devtools-log.js';
diff --git a/lighthouse-core/gather/gatherers/dobetterweb/password-inputs-with-prevented-paste.js b/lighthouse-core/gather/gatherers/dobetterweb/password-inputs-with-prevented-paste.js
index 3b18135008e1..5bc428f05c93 100644
--- a/lighthouse-core/gather/gatherers/dobetterweb/password-inputs-with-prevented-paste.js
+++ b/lighthouse-core/gather/gatherers/dobetterweb/password-inputs-with-prevented-paste.js
@@ -9,7 +9,7 @@
 
 import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
 
-import pageFunctions from '../../../lib/page-functions.js';
+import {pageFunctions} from '../../../lib/page-functions.js';
 
 /**
  * @return {LH.Artifacts['PasswordInputsWithPreventedPaste']}
diff --git a/lighthouse-core/gather/gatherers/dobetterweb/response-compression.js b/lighthouse-core/gather/gatherers/dobetterweb/response-compression.js
index ff502fb59eb1..8dfdde476587 100644
--- a/lighthouse-core/gather/gatherers/dobetterweb/response-compression.js
+++ b/lighthouse-core/gather/gatherers/dobetterweb/response-compression.js
@@ -14,7 +14,7 @@ import {Buffer} from 'buffer';
 import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
 import URL from '../../../lib/url-shim.js';
 import Sentry from '../../../lib/sentry.js';
-import NetworkRequest from '../../../lib/network-request.js';
+import {NetworkRequest} from '../../../lib/network-request.js';
 import {gzip} from 'zlib';
 import DevtoolsLog from '../devtools-log.js';
 import {fetchResponseBodyFromCache} from '../../driver/network.js';
diff --git a/lighthouse-core/gather/gatherers/full-page-screenshot.js b/lighthouse-core/gather/gatherers/full-page-screenshot.js
index afba7574e806..4d6dc6d7f0bd 100644
--- a/lighthouse-core/gather/gatherers/full-page-screenshot.js
+++ b/lighthouse-core/gather/gatherers/full-page-screenshot.js
@@ -10,7 +10,7 @@
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 import emulation from '../../lib/emulation.js';
-import pageFunctions from '../../lib/page-functions.js';
+import {pageFunctions} from '../../lib/page-functions.js';
 import NetworkMonitor from '../driver/network-monitor.js';
 import {waitForNetworkIdle} from '../driver/wait-for-condition.js';
 
diff --git a/lighthouse-core/gather/gatherers/iframe-elements.js b/lighthouse-core/gather/gatherers/iframe-elements.js
index 2f98ab158b6c..f35b3b541cff 100644
--- a/lighthouse-core/gather/gatherers/iframe-elements.js
+++ b/lighthouse-core/gather/gatherers/iframe-elements.js
@@ -9,7 +9,7 @@
 
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
-import pageFunctions from '../../lib/page-functions.js';
+import {pageFunctions} from '../../lib/page-functions.js';
 
 /* eslint-env browser, node */
 
diff --git a/lighthouse-core/gather/gatherers/image-elements.js b/lighthouse-core/gather/gatherers/image-elements.js
index afee0b0182f7..3bba7bff87cf 100644
--- a/lighthouse-core/gather/gatherers/image-elements.js
+++ b/lighthouse-core/gather/gatherers/image-elements.js
@@ -11,7 +11,7 @@
 
 import log from 'lighthouse-logger';
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
-import pageFunctions from '../../lib/page-functions.js';
+import {pageFunctions} from '../../lib/page-functions.js';
 import FontSize from './seo/font-size.js';
 
 /* global window, getElementsInDocument, Image, getNodeDetails, ShadowRoot */
diff --git a/lighthouse-core/gather/gatherers/inputs.js b/lighthouse-core/gather/gatherers/inputs.js
index 986b90c7bee3..6cfbad151d70 100644
--- a/lighthouse-core/gather/gatherers/inputs.js
+++ b/lighthouse-core/gather/gatherers/inputs.js
@@ -9,7 +9,7 @@
 
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
-import pageFunctions from '../../lib/page-functions.js';
+import {pageFunctions} from '../../lib/page-functions.js';
 
 /* eslint-env browser, node */
 
diff --git a/lighthouse-core/gather/gatherers/link-elements.js b/lighthouse-core/gather/gatherers/link-elements.js
index fc6a6c799009..f1e409a95845 100644
--- a/lighthouse-core/gather/gatherers/link-elements.js
+++ b/lighthouse-core/gather/gatherers/link-elements.js
@@ -8,7 +8,7 @@
 import LinkHeader from 'http-link-header';
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 import {URL} from '../../lib/url-shim.js';
-import pageFunctions from '../../lib/page-functions.js';
+import {pageFunctions} from '../../lib/page-functions.js';
 import DevtoolsLog from './devtools-log.js';
 import MainResource from '../../computed/main-resource.js';
 
diff --git a/lighthouse-core/gather/gatherers/meta-elements.js b/lighthouse-core/gather/gatherers/meta-elements.js
index cfb0654b56a5..4dc91222668f 100644
--- a/lighthouse-core/gather/gatherers/meta-elements.js
+++ b/lighthouse-core/gather/gatherers/meta-elements.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
-import pageFunctions from '../../lib/page-functions.js';
+import {pageFunctions} from '../../lib/page-functions.js';
 
 /* globals getElementsInDocument getNodeDetails */
 
diff --git a/lighthouse-core/gather/gatherers/script-elements.js b/lighthouse-core/gather/gatherers/script-elements.js
index 3e8d78826f44..617f38fa8729 100644
--- a/lighthouse-core/gather/gatherers/script-elements.js
+++ b/lighthouse-core/gather/gatherers/script-elements.js
@@ -7,8 +7,8 @@
 
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 import NetworkRecords from '../../computed/network-records.js';
-import NetworkRequest from '../../lib/network-request.js';
-import pageFunctions from '../../lib/page-functions.js';
+import {NetworkRequest} from '../../lib/network-request.js';
+import {pageFunctions} from '../../lib/page-functions.js';
 import DevtoolsLog from './devtools-log.js';
 
 /* global getNodeDetails */
diff --git a/lighthouse-core/gather/gatherers/seo/embedded-content.js b/lighthouse-core/gather/gatherers/seo/embedded-content.js
index a80d8fac89be..3cfae69cebd2 100644
--- a/lighthouse-core/gather/gatherers/seo/embedded-content.js
+++ b/lighthouse-core/gather/gatherers/seo/embedded-content.js
@@ -9,7 +9,7 @@
 
 import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
 
-import pageFunctions from '../../../lib/page-functions.js';
+import {pageFunctions} from '../../../lib/page-functions.js';
 
 /**
  * @return {LH.Artifacts.EmbeddedContentInfo[]}
diff --git a/lighthouse-core/gather/gatherers/seo/tap-targets.js b/lighthouse-core/gather/gatherers/seo/tap-targets.js
index 0a032c50a086..b90cd9a86ebe 100644
--- a/lighthouse-core/gather/gatherers/seo/tap-targets.js
+++ b/lighthouse-core/gather/gatherers/seo/tap-targets.js
@@ -9,7 +9,7 @@
 
 import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
 
-import pageFunctions from '../../../lib/page-functions.js';
+import {pageFunctions} from '../../../lib/page-functions.js';
 import RectHelpers from '../../../lib/rect-helpers.js';
 
 const TARGET_SELECTORS = [
diff --git a/lighthouse-core/gather/gatherers/trace-elements.js b/lighthouse-core/gather/gatherers/trace-elements.js
index 68661e212134..398a836234d8 100644
--- a/lighthouse-core/gather/gatherers/trace-elements.js
+++ b/lighthouse-core/gather/gatherers/trace-elements.js
@@ -16,7 +16,7 @@
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 import {resolveNodeIdToObjectId} from '../driver/dom.js';
-import pageFunctions from '../../lib/page-functions.js';
+import {pageFunctions} from '../../lib/page-functions.js';
 import RectHelpers from '../../lib/rect-helpers.js';
 import Sentry from '../../lib/sentry.js';
 import Trace from './trace.js';
diff --git a/lighthouse-core/lib/network-request.js b/lighthouse-core/lib/network-request.js
index 2c324f06c23e..6dd6cc9d255a 100644
--- a/lighthouse-core/lib/network-request.js
+++ b/lighthouse-core/lib/network-request.js
@@ -13,7 +13,6 @@
 
 import URL from './url-shim.js';
 
-
 // Lightrider X-Header names for timing information.
 // See: _updateTransferSizeForLightrider and _updateTimingsForLightrider.
 const HEADER_TCP = 'X-TCPMs';
diff --git a/lighthouse-core/scripts/benchmark-plus-extras.js b/lighthouse-core/scripts/benchmark-plus-extras.js
index c0b3f2697063..69d55f02a4bf 100644
--- a/lighthouse-core/scripts/benchmark-plus-extras.js
+++ b/lighthouse-core/scripts/benchmark-plus-extras.js
@@ -14,7 +14,7 @@
 import puppeteer from 'puppeteer-core';
 import {getChromePath} from 'chrome-launcher';
 
-import pageFunctions from '../lib/page-functions.js';
+import {pageFunctions} from '../lib/page-functions.js';
 
 /** @param {LH.Puppeteer.Page} page */
 async function runOctane(page) {
diff --git a/lighthouse-core/scripts/benchmark.js b/lighthouse-core/scripts/benchmark.js
index 701923e08217..38dc8b11ded9 100755
--- a/lighthouse-core/scripts/benchmark.js
+++ b/lighthouse-core/scripts/benchmark.js
@@ -10,7 +10,7 @@
 
 // node lighthouse-core/scripts/benchmark.js
 
-import pageFunctions from '../lib/page-functions.js';
+import {pageFunctions} from '../lib/page-functions.js';
 
 console.log('Computing BenchmarkIndex 10 times...');
 
diff --git a/lighthouse-core/test/audits/accessibility/aria-allowed-attr-test.js b/lighthouse-core/test/audits/accessibility/aria-allowed-attr-test.js
index 94590caff94c..4fadf8fbe32f 100644
--- a/lighthouse-core/test/audits/accessibility/aria-allowed-attr-test.js
+++ b/lighthouse-core/test/audits/accessibility/aria-allowed-attr-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/aria-allowed-attr.js';
+import {Audit} from '../../../audits/accessibility/aria-allowed-attr.js';
 
 describe('Accessibility: aria-allowed-attr audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/aria-required-attr-test.js b/lighthouse-core/test/audits/accessibility/aria-required-attr-test.js
index 1ba3217b852e..47871f719a56 100644
--- a/lighthouse-core/test/audits/accessibility/aria-required-attr-test.js
+++ b/lighthouse-core/test/audits/accessibility/aria-required-attr-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/aria-required-attr.js';
+import {Audit} from '../../../audits/accessibility/aria-required-attr.js';
 
 describe('Accessibility: aria-required-attr audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/aria-required-children-test.js b/lighthouse-core/test/audits/accessibility/aria-required-children-test.js
index f4eb7bba530a..6e6b755808f2 100644
--- a/lighthouse-core/test/audits/accessibility/aria-required-children-test.js
+++ b/lighthouse-core/test/audits/accessibility/aria-required-children-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/aria-required-children.js';
+import {Audit} from '../../../audits/accessibility/aria-required-children.js';
 
 describe('Accessibility: aria-required-children audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/aria-required-parent-test.js b/lighthouse-core/test/audits/accessibility/aria-required-parent-test.js
index f9b03f0b2d0c..56692c74db98 100644
--- a/lighthouse-core/test/audits/accessibility/aria-required-parent-test.js
+++ b/lighthouse-core/test/audits/accessibility/aria-required-parent-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/aria-required-parent.js';
+import {Audit} from '../../../audits/accessibility/aria-required-parent.js';
 
 describe('Accessibility: aria-required-parent audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/aria-roles-test.js b/lighthouse-core/test/audits/accessibility/aria-roles-test.js
index 9c58dd174d09..d954af9499aa 100644
--- a/lighthouse-core/test/audits/accessibility/aria-roles-test.js
+++ b/lighthouse-core/test/audits/accessibility/aria-roles-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/aria-roles.js';
+import {Audit} from '../../../audits/accessibility/aria-roles.js';
 
 describe('Accessibility: aria-roles audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/aria-valid-attr-test.js b/lighthouse-core/test/audits/accessibility/aria-valid-attr-test.js
index 5bc7c7582185..bda89c40553b 100644
--- a/lighthouse-core/test/audits/accessibility/aria-valid-attr-test.js
+++ b/lighthouse-core/test/audits/accessibility/aria-valid-attr-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/aria-valid-attr.js';
+import {Audit} from '../../../audits/accessibility/aria-valid-attr.js';
 
 describe('Accessibility: aria-valid-attr audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/aria-valid-attr-value-test.js b/lighthouse-core/test/audits/accessibility/aria-valid-attr-value-test.js
index 68ca6db2e348..a3c43b1c9e82 100644
--- a/lighthouse-core/test/audits/accessibility/aria-valid-attr-value-test.js
+++ b/lighthouse-core/test/audits/accessibility/aria-valid-attr-value-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/aria-valid-attr-value.js';
+import {Audit} from '../../../audits/accessibility/aria-valid-attr-value.js';
 
 describe('Accessibility: aria-valid-attr-value audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/button-name-test.js b/lighthouse-core/test/audits/accessibility/button-name-test.js
index d5af50f02b12..829b35940193 100644
--- a/lighthouse-core/test/audits/accessibility/button-name-test.js
+++ b/lighthouse-core/test/audits/accessibility/button-name-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/button-name.js';
+import {Audit} from '../../../audits/accessibility/button-name.js';
 
 describe('Accessibility: button-name audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/bypass-test.js b/lighthouse-core/test/audits/accessibility/bypass-test.js
index 554048e653f8..c757f7d839d6 100644
--- a/lighthouse-core/test/audits/accessibility/bypass-test.js
+++ b/lighthouse-core/test/audits/accessibility/bypass-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/bypass.js';
+import {Audit} from '../../../audits/accessibility/bypass.js';
 
 describe('Accessibility: bypass audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/color-contrast-test.js b/lighthouse-core/test/audits/accessibility/color-contrast-test.js
index 2757ae9adb3a..994cb9ae97dd 100644
--- a/lighthouse-core/test/audits/accessibility/color-contrast-test.js
+++ b/lighthouse-core/test/audits/accessibility/color-contrast-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/color-contrast.js';
+import {Audit} from '../../../audits/accessibility/color-contrast.js';
 
 describe('Accessibility: color-contrast audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/definition-list-test.js b/lighthouse-core/test/audits/accessibility/definition-list-test.js
index e506f915badd..844a61fc3284 100644
--- a/lighthouse-core/test/audits/accessibility/definition-list-test.js
+++ b/lighthouse-core/test/audits/accessibility/definition-list-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/definition-list.js';
+import {Audit} from '../../../audits/accessibility/definition-list.js';
 
 describe('Accessibility: definition-list audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/dlitem-test.js b/lighthouse-core/test/audits/accessibility/dlitem-test.js
index 0fc501ec957b..412c1989c4de 100644
--- a/lighthouse-core/test/audits/accessibility/dlitem-test.js
+++ b/lighthouse-core/test/audits/accessibility/dlitem-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/dlitem.js';
+import {Audit} from '../../../audits/accessibility/dlitem.js';
 
 describe('Accessibility: dlitem audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/document-title-test.js b/lighthouse-core/test/audits/accessibility/document-title-test.js
index f4a6310bd9cd..7c2e58c5a130 100644
--- a/lighthouse-core/test/audits/accessibility/document-title-test.js
+++ b/lighthouse-core/test/audits/accessibility/document-title-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/document-title.js';
+import {Audit} from '../../../audits/accessibility/document-title.js';
 
 describe('Accessibility: document-title audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/frame-title-test.js b/lighthouse-core/test/audits/accessibility/frame-title-test.js
index c5697f7e899e..0184cc9e99b5 100644
--- a/lighthouse-core/test/audits/accessibility/frame-title-test.js
+++ b/lighthouse-core/test/audits/accessibility/frame-title-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/frame-title.js';
+import {Audit} from '../../../audits/accessibility/frame-title.js';
 
 describe('Accessibility: frame-title audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/html-has-lang-test.js b/lighthouse-core/test/audits/accessibility/html-has-lang-test.js
index 02c903c3ff04..bd5a4a66bad4 100644
--- a/lighthouse-core/test/audits/accessibility/html-has-lang-test.js
+++ b/lighthouse-core/test/audits/accessibility/html-has-lang-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/html-has-lang.js';
+import {Audit} from '../../../audits/accessibility/html-has-lang.js';
 
 describe('Accessibility: html-has-lang audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/html-lang-valid-test.js b/lighthouse-core/test/audits/accessibility/html-lang-valid-test.js
index c1ec90dcb2f2..322932e915a6 100644
--- a/lighthouse-core/test/audits/accessibility/html-lang-valid-test.js
+++ b/lighthouse-core/test/audits/accessibility/html-lang-valid-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/html-lang-valid.js';
+import {Audit} from '../../../audits/accessibility/html-lang-valid.js';
 
 describe('Accessibility: html-lang-valid audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/image-alt-test.js b/lighthouse-core/test/audits/accessibility/image-alt-test.js
index 0c15a5c473d4..29f4e1322b20 100644
--- a/lighthouse-core/test/audits/accessibility/image-alt-test.js
+++ b/lighthouse-core/test/audits/accessibility/image-alt-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/image-alt.js';
+import {Audit} from '../../../audits/accessibility/image-alt.js';
 
 describe('Accessibility: image-alt audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/input-image-alt-test.js b/lighthouse-core/test/audits/accessibility/input-image-alt-test.js
index f5eda312d3d0..7154d4ed5937 100644
--- a/lighthouse-core/test/audits/accessibility/input-image-alt-test.js
+++ b/lighthouse-core/test/audits/accessibility/input-image-alt-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/input-image-alt.js';
+import {Audit} from '../../../audits/accessibility/input-image-alt.js';
 
 describe('Accessibility: input-image-alt audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/label-test.js b/lighthouse-core/test/audits/accessibility/label-test.js
index a20fa70949ad..e610a614fda0 100644
--- a/lighthouse-core/test/audits/accessibility/label-test.js
+++ b/lighthouse-core/test/audits/accessibility/label-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/label.js';
+import {Audit} from '../../../audits/accessibility/label.js';
 
 describe('Accessibility: label audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/link-name-test.js b/lighthouse-core/test/audits/accessibility/link-name-test.js
index b03e0f25722f..ebcf28f8eb16 100644
--- a/lighthouse-core/test/audits/accessibility/link-name-test.js
+++ b/lighthouse-core/test/audits/accessibility/link-name-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/link-name.js';
+import {Audit} from '../../../audits/accessibility/link-name.js';
 
 describe('Accessibility: link-name audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/list-test.js b/lighthouse-core/test/audits/accessibility/list-test.js
index 1318af2147d3..aa15bfefd224 100644
--- a/lighthouse-core/test/audits/accessibility/list-test.js
+++ b/lighthouse-core/test/audits/accessibility/list-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/list.js';
+import {Audit} from '../../../audits/accessibility/list.js';
 
 describe('Accessibility: list audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/listitem-test.js b/lighthouse-core/test/audits/accessibility/listitem-test.js
index 6f734131d6d5..796c3e034cef 100644
--- a/lighthouse-core/test/audits/accessibility/listitem-test.js
+++ b/lighthouse-core/test/audits/accessibility/listitem-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/listitem.js';
+import {Audit} from '../../../audits/accessibility/listitem.js';
 
 describe('Accessibility: listitem audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/meta-refresh-test.js b/lighthouse-core/test/audits/accessibility/meta-refresh-test.js
index 0f98d5211280..37061ede5218 100644
--- a/lighthouse-core/test/audits/accessibility/meta-refresh-test.js
+++ b/lighthouse-core/test/audits/accessibility/meta-refresh-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/meta-refresh.js';
+import {Audit} from '../../../audits/accessibility/meta-refresh.js';
 
 describe('Accessibility: meta-refresh audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/meta-viewport-test.js b/lighthouse-core/test/audits/accessibility/meta-viewport-test.js
index 7e4025b68e27..7afdb5ee5c5c 100644
--- a/lighthouse-core/test/audits/accessibility/meta-viewport-test.js
+++ b/lighthouse-core/test/audits/accessibility/meta-viewport-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/meta-viewport.js';
+import {Audit} from '../../../audits/accessibility/meta-viewport.js';
 
 describe('Accessibility: meta-viewport audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/object-alt-test.js b/lighthouse-core/test/audits/accessibility/object-alt-test.js
index a41697ecd1ba..c787fe90dd97 100644
--- a/lighthouse-core/test/audits/accessibility/object-alt-test.js
+++ b/lighthouse-core/test/audits/accessibility/object-alt-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/object-alt.js';
+import {Audit} from '../../../audits/accessibility/object-alt.js';
 
 describe('Accessibility: object-alt audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/tabindex-test.js b/lighthouse-core/test/audits/accessibility/tabindex-test.js
index ca77c9a6a2f0..fc1175b7d38d 100644
--- a/lighthouse-core/test/audits/accessibility/tabindex-test.js
+++ b/lighthouse-core/test/audits/accessibility/tabindex-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/tabindex.js';
+import {Audit} from '../../../audits/accessibility/tabindex.js';
 
 describe('Accessibility: tabindex audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/td-headers-attr-test.js b/lighthouse-core/test/audits/accessibility/td-headers-attr-test.js
index cefd96d833ed..1900e63e3dad 100644
--- a/lighthouse-core/test/audits/accessibility/td-headers-attr-test.js
+++ b/lighthouse-core/test/audits/accessibility/td-headers-attr-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/td-headers-attr.js';
+import {Audit} from '../../../audits/accessibility/td-headers-attr.js';
 
 describe('Accessibility: td-headers-attr audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/th-has-data-cells-test.js b/lighthouse-core/test/audits/accessibility/th-has-data-cells-test.js
index ba825df901c5..d8d21e5b647a 100644
--- a/lighthouse-core/test/audits/accessibility/th-has-data-cells-test.js
+++ b/lighthouse-core/test/audits/accessibility/th-has-data-cells-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/th-has-data-cells.js';
+import {Audit} from '../../../audits/accessibility/th-has-data-cells.js';
 
 describe('Accessibility: th-has-data-cells audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/valid-lang-test.js b/lighthouse-core/test/audits/accessibility/valid-lang-test.js
index a787f9e86ee4..02f88e95ebe3 100644
--- a/lighthouse-core/test/audits/accessibility/valid-lang-test.js
+++ b/lighthouse-core/test/audits/accessibility/valid-lang-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/valid-lang.js';
+import {Audit} from '../../../audits/accessibility/valid-lang.js';
 
 describe('Accessibility: valid-lang audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/video-caption-test.js b/lighthouse-core/test/audits/accessibility/video-caption-test.js
index 7c3111dec2d2..ea5468456ab2 100644
--- a/lighthouse-core/test/audits/accessibility/video-caption-test.js
+++ b/lighthouse-core/test/audits/accessibility/video-caption-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/accessibility/video-caption.js';
+import {Audit} from '../../../audits/accessibility/video-caption.js';
 
 describe('Accessibility: video-caption audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/audit-test.js b/lighthouse-core/test/audits/audit-test.js
index 358cbf3919e8..eed7c64bb5a8 100644
--- a/lighthouse-core/test/audits/audit-test.js
+++ b/lighthouse-core/test/audits/audit-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../audits/audit.js';
+import {Audit} from '../../audits/audit.js';
 
 // Extend the Audit class but fail to implement meta. It should throw errors.
 class A extends Audit {}
diff --git a/lighthouse-core/test/audits/byte-efficiency/efficient-animated-content-test.js b/lighthouse-core/test/audits/byte-efficiency/efficient-animated-content-test.js
index fa5e973d4d79..6c3f758b19e2 100644
--- a/lighthouse-core/test/audits/byte-efficiency/efficient-animated-content-test.js
+++ b/lighthouse-core/test/audits/byte-efficiency/efficient-animated-content-test.js
@@ -8,7 +8,7 @@ import {strict as assert} from 'assert';
 
 import EfficientAnimatedContent from
   '../../../audits/byte-efficiency/efficient-animated-content.js';
-import NetworkRequest from '../../../lib/network-request.js';
+import {NetworkRequest} from '../../../lib/network-request.js';
 
 describe('Page uses videos for animated GIFs', () => {
   it('should flag gifs above 100kb as unoptimized', async () => {
diff --git a/lighthouse-core/test/audits/byte-efficiency/render-blocking-resources-test.js b/lighthouse-core/test/audits/byte-efficiency/render-blocking-resources-test.js
index f50c13a9b84d..4c1cf39eed64 100644
--- a/lighthouse-core/test/audits/byte-efficiency/render-blocking-resources-test.js
+++ b/lighthouse-core/test/audits/byte-efficiency/render-blocking-resources-test.js
@@ -12,7 +12,7 @@ import * as constants from '../../../config/constants.js';
 import NetworkNode from '../../../lib/dependency-graph/network-node.js';
 import CPUNode from '../../../lib/dependency-graph/cpu-node.js';
 import Simulator from '../../../lib/dependency-graph/simulator/simulator.js';
-import NetworkRequest from '../../../lib/network-request.js';
+import {NetworkRequest} from '../../../lib/network-request.js';
 import trace from '../../fixtures/traces/progressive-app-m60.json';
 import devtoolsLog from '../../fixtures/traces/progressive-app-m60.devtools.log.json';
 import ampTrace from '../../fixtures/traces/amp-m86.trace.json';
diff --git a/lighthouse-core/test/audits/byte-efficiency/uses-long-cache-ttl-test.js b/lighthouse-core/test/audits/byte-efficiency/uses-long-cache-ttl-test.js
index 1f139bf9f619..0c942599c149 100644
--- a/lighthouse-core/test/audits/byte-efficiency/uses-long-cache-ttl-test.js
+++ b/lighthouse-core/test/audits/byte-efficiency/uses-long-cache-ttl-test.js
@@ -8,7 +8,7 @@
 import {strict as assert} from 'assert';
 
 import CacheHeadersAudit from '../../../audits/byte-efficiency/uses-long-cache-ttl.js';
-import NetworkRequest from '../../../lib/network-request.js';
+import {NetworkRequest} from '../../../lib/network-request.js';
 const options = CacheHeadersAudit.defaultOptions;
 import networkRecordsToDevtoolsLog from '../../network-records-to-devtools-log.js';
 
diff --git a/lighthouse-core/test/audits/content-width-test.js b/lighthouse-core/test/audits/content-width-test.js
index 0d69c4b64fac..0a1b9a1ee764 100644
--- a/lighthouse-core/test/audits/content-width-test.js
+++ b/lighthouse-core/test/audits/content-width-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../audits/content-width.js';
+import {Audit} from '../../audits/content-width.js';
 import * as constants from '../../config/constants.js';
 
 /** @param {LH.SharedFlagsSettings['formFactor']} formFactor */
diff --git a/lighthouse-core/test/audits/dobetterweb/doctype-test.js b/lighthouse-core/test/audits/dobetterweb/doctype-test.js
index 926a4e7c856e..85e1bd351571 100644
--- a/lighthouse-core/test/audits/dobetterweb/doctype-test.js
+++ b/lighthouse-core/test/audits/dobetterweb/doctype-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/dobetterweb/doctype.js';
+import {Audit} from '../../../audits/dobetterweb/doctype.js';
 
 describe('DOBETTERWEB: doctype audit', () => {
   it('fails when document does not contain a doctype', () => {
diff --git a/lighthouse-core/test/audits/is-on-https-test.js b/lighthouse-core/test/audits/is-on-https-test.js
index 848ffe95418c..d07b7015325a 100644
--- a/lighthouse-core/test/audits/is-on-https-test.js
+++ b/lighthouse-core/test/audits/is-on-https-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../audits/is-on-https.js';
+import {Audit} from '../../audits/is-on-https.js';
 import networkRecordsToDevtoolsLog from '../network-records-to-devtools-log.js';
 
 describe('Security: HTTPS audit', () => {
diff --git a/lighthouse-core/test/audits/metrics/first-meaningful-paint-test.js b/lighthouse-core/test/audits/metrics/first-meaningful-paint-test.js
index 98fa07882785..924c8e464a41 100644
--- a/lighthouse-core/test/audits/metrics/first-meaningful-paint-test.js
+++ b/lighthouse-core/test/audits/metrics/first-meaningful-paint-test.js
@@ -8,7 +8,7 @@
 import {strict as assert} from 'assert';
 
 import FMPAudit from '../../../audits/metrics/first-meaningful-paint.js';
-import Audit from '../../../audits/audit.js';
+import {Audit} from '../../../audits/audit.js';
 import constants from '../../../config/constants.js';
 import trace from '../../fixtures/traces/progressive-app-m60.json';
 import devtoolsLogs from '../../fixtures/traces/progressive-app-m60.devtools.log.json';
diff --git a/lighthouse-core/test/audits/metrics/speed-index-test.js b/lighthouse-core/test/audits/metrics/speed-index-test.js
index 3a615dd67bb9..034999a235f1 100644
--- a/lighthouse-core/test/audits/metrics/speed-index-test.js
+++ b/lighthouse-core/test/audits/metrics/speed-index-test.js
@@ -6,7 +6,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/metrics/speed-index.js';
+import {Audit} from '../../../audits/metrics/speed-index.js';
 import constants from '../../../config/constants.js';
 import pwaTrace from '../../fixtures/traces/progressive-app-m60.json';
 import pwaDevtoolsLog from '../../fixtures/traces/progressive-app-m60.devtools.log.json';
diff --git a/lighthouse-core/test/audits/network-requests-test.js b/lighthouse-core/test/audits/network-requests-test.js
index 6e0bc750f036..8be101fa019b 100644
--- a/lighthouse-core/test/audits/network-requests-test.js
+++ b/lighthouse-core/test/audits/network-requests-test.js
@@ -5,7 +5,7 @@
  */
 
 
-import NetworkRequests from '../../audits/network-requests.js';
+import {NetworkRequest}s from '../../audits/network-requests.js';
 import networkRecordsToDevtoolsLog from '../network-records-to-devtools-log.js';
 import cutoffLoadDevtoolsLog from '../fixtures/traces/cutoff-load-m83.devtoolslog.json';
 describe('Network requests audit', () => {
diff --git a/lighthouse-core/test/audits/seo/meta-description-test.js b/lighthouse-core/test/audits/seo/meta-description-test.js
index 5dd3bef1798b..b0c66e737b2b 100644
--- a/lighthouse-core/test/audits/seo/meta-description-test.js
+++ b/lighthouse-core/test/audits/seo/meta-description-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../../audits/seo/meta-description.js';
+import {Audit} from '../../../audits/seo/meta-description.js';
 
 describe('SEO: description audit', () => {
   const makeMetaElements = content => [{name: 'description', content}];
diff --git a/lighthouse-core/test/audits/viewport-test.js b/lighthouse-core/test/audits/viewport-test.js
index 7379b5e9e227..653f72c8bdb8 100644
--- a/lighthouse-core/test/audits/viewport-test.js
+++ b/lighthouse-core/test/audits/viewport-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import Audit from '../../audits/viewport.js';
+import {Audit} from '../../audits/viewport.js';
 
 describe('Mobile-friendly: viewport audit', () => {
   const makeMetaElements = viewport => [{name: 'viewport', content: viewport}];
diff --git a/lighthouse-core/test/computed/critical-request-chains-test.js b/lighthouse-core/test/computed/critical-request-chains-test.js
index c14abee154ba..a2a9642694f1 100644
--- a/lighthouse-core/test/computed/critical-request-chains-test.js
+++ b/lighthouse-core/test/computed/critical-request-chains-test.js
@@ -8,7 +8,7 @@
 import {strict as assert} from 'assert';
 
 import CriticalRequestChains from '../../computed/critical-request-chains.js';
-import NetworkRequest from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/network-request.js';
 import createTestTrace from '../create-test-trace.js';
 import networkRecordsToDevtoolsLog from '../network-records-to-devtools-log.js';
 import {getURLArtifactFromDevtoolsLog} from '../test-utils.js';
diff --git a/lighthouse-core/test/computed/image-records-test.js b/lighthouse-core/test/computed/image-records-test.js
index cc2520d6d791..f90734605610 100644
--- a/lighthouse-core/test/computed/image-records-test.js
+++ b/lighthouse-core/test/computed/image-records-test.js
@@ -6,7 +6,7 @@
 
 
 import ImageRecords from '../../computed/image-records.js';
-import NetworkRequest from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/network-request.js';
 
 /**
  * @param {Partial<LH.Artifacts.NetworkRequest>=} partial
diff --git a/lighthouse-core/test/computed/page-dependency-graph-test.js b/lighthouse-core/test/computed/page-dependency-graph-test.js
index 5d7186e9e7db..866f2c81bd4b 100644
--- a/lighthouse-core/test/computed/page-dependency-graph-test.js
+++ b/lighthouse-core/test/computed/page-dependency-graph-test.js
@@ -9,7 +9,7 @@ import {strict as assert} from 'assert';
 
 import PageDependencyGraph from '../../computed/page-dependency-graph.js';
 import BaseNode from '../../lib/dependency-graph/base-node.js';
-import NetworkRequest from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/network-request.js';
 import sampleTrace from '../fixtures/traces/iframe-m79.trace.json';
 import sampleDevtoolsLog from '../fixtures/traces/iframe-m79.devtoolslog.json';
 import {getURLArtifactFromDevtoolsLog} from '../test-utils.js';
diff --git a/lighthouse-core/test/config/config-test.js b/lighthouse-core/test/config/config-test.js
index a7ebd4d8956d..dd9b79772997 100644
--- a/lighthouse-core/test/config/config-test.js
+++ b/lighthouse-core/test/config/config-test.js
@@ -13,7 +13,7 @@ import Config from '../../config/config.js';
 import defaultConfig from '../../config/default-config.js';
 import * as constants from '../../config/constants.js';
 import Gatherer from '../../gather/gatherers/gatherer.js';
-import Audit from '../../audits/audit.js';
+import {Audit} from '../../audits/audit.js';
 import i18n from '../../lib/i18n/i18n.js';
 import format from '../../../shared/localization/format.js';
 import {createCommonjsRefs} from '../../scripts/esm-utils.js';
diff --git a/lighthouse-core/test/gather/driver/network-monitor-test.js b/lighthouse-core/test/gather/driver/network-monitor-test.js
index fed9b4cd4735..1093559eef60 100644
--- a/lighthouse-core/test/gather/driver/network-monitor-test.js
+++ b/lighthouse-core/test/gather/driver/network-monitor-test.js
@@ -9,7 +9,7 @@ import {jest} from '@jest/globals';
 
 import {mockDriverSubmodules} from '../../fraggle-rock/gather/mock-driver.js';
 // import NetworkMonitor from '../../../gather/driver/network-monitor.js';
-import NetworkRequest from '../../../lib/network-request.js';
+import {NetworkRequest} from '../../../lib/network-request.js';
 import networkRecordsToDevtoolsLog from '../../network-records-to-devtools-log.js';
 import {fnAny, mockCommands} from '../../test-utils.js';
 
diff --git a/lighthouse-core/test/gather/gatherers/accessibility-test.js b/lighthouse-core/test/gather/gatherers/accessibility-test.js
index 4f44be7e9cbd..36fd600dba14 100644
--- a/lighthouse-core/test/gather/gatherers/accessibility-test.js
+++ b/lighthouse-core/test/gather/gatherers/accessibility-test.js
@@ -13,7 +13,7 @@ import puppeteer from 'puppeteer';
 import AccessibilityGather from '../../../gather/gatherers/accessibility.js';
 import {LH_ROOT} from '../../../../root.js';
 import axeLib from '../../../../lighthouse-core/lib/axe.js';
-import pageFunctions from '../../../../lighthouse-core/lib/page-functions.js';
+import {pageFunctions} from '../../../../lighthouse-core/lib/page-functions.js';
 
 describe('Accessibility gatherer', () => {
   let accessibilityGather;
diff --git a/lighthouse-core/test/gather/gatherers/inspector-issues-test.js b/lighthouse-core/test/gather/gatherers/inspector-issues-test.js
index 5221f23f7b4f..90acb0eb112e 100644
--- a/lighthouse-core/test/gather/gatherers/inspector-issues-test.js
+++ b/lighthouse-core/test/gather/gatherers/inspector-issues-test.js
@@ -8,7 +8,7 @@
 import {jest} from '@jest/globals';
 
 import InspectorIssues from '../../../gather/gatherers/inspector-issues.js';
-import NetworkRequest from '../../../lib/network-request.js';
+import {NetworkRequest} from '../../../lib/network-request.js';
 import {createMockContext} from '../../fraggle-rock/gather/mock-driver.js';
 import {flushAllTimersAndMicrotasks} from '../../test-utils.js';
 import networkRecordsToDevtoolsLog from '../../network-records-to-devtools-log.js';
diff --git a/lighthouse-core/test/gather/gatherers/script-elements-test.js b/lighthouse-core/test/gather/gatherers/script-elements-test.js
index db6bfc25ff05..5c0926778cd3 100644
--- a/lighthouse-core/test/gather/gatherers/script-elements-test.js
+++ b/lighthouse-core/test/gather/gatherers/script-elements-test.js
@@ -7,7 +7,7 @@
 
 import {createMockContext, mockDriverSubmodules} from '../../fraggle-rock/gather/mock-driver.js';
 // import ScriptElements from '../../../gather/gatherers/script-elements.js';
-import NetworkRequest from '../../../lib/network-request.js';
+import {NetworkRequest} from '../../../lib/network-request.js';
 
 // Some imports needs to be done dynamically, so that their dependencies will be mocked.
 // See: https://jestjs.io/docs/ecmascript-modules#differences-between-esm-and-commonjs
diff --git a/lighthouse-core/test/lib/asset-saver-test.js b/lighthouse-core/test/lib/asset-saver-test.js
index 5f309ef4b8c4..3c82212e7708 100644
--- a/lighthouse-core/test/lib/asset-saver-test.js
+++ b/lighthouse-core/test/lib/asset-saver-test.js
@@ -14,7 +14,7 @@ import LHError from '../../lib/lh-error.js';
 import traceEvents from '../fixtures/traces/progressive-app.json';
 import dbwTrace from '../results/artifacts/defaultPass.trace.json';
 import dbwResults from '../results/sample_v2.json';
-import Audit from '../../audits/audit.js';
+import {Audit} from '../../audits/audit.js';
 import {createCommonjsRefs} from '../../scripts/esm-utils.js';
 import fullTraceObj from '../fixtures/traces/progressive-app-m60.json';
 import devtoolsLog from '../fixtures/traces/progressive-app-m60.devtools.log.json';
diff --git a/lighthouse-core/test/lib/navigation-error-test.js b/lighthouse-core/test/lib/navigation-error-test.js
index 23a2ee8fff81..7669ae2f0116 100644
--- a/lighthouse-core/test/lib/navigation-error-test.js
+++ b/lighthouse-core/test/lib/navigation-error-test.js
@@ -11,7 +11,7 @@ import {
   getPageLoadError,
   getNonHtmlError,
 } from '../../lib/navigation-error.js';
-import NetworkRequest from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/network-request.js';
 
 const LoadFailureMode = /** @type {const} */ ({
   fatal: 'fatal',
diff --git a/lighthouse-core/test/lib/network-request-test.js b/lighthouse-core/test/lib/network-request-test.js
index 85e6b4c65b94..1259cdb754ca 100644
--- a/lighthouse-core/test/lib/network-request-test.js
+++ b/lighthouse-core/test/lib/network-request-test.js
@@ -5,7 +5,7 @@
  */
 
 
-import NetworkRequest from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/network-request.js';
 import NetworkRecorder from '../../lib/network-recorder.js';
 import networkRecordsToDevtoolsLog from '../network-records-to-devtools-log.js';
 
diff --git a/lighthouse-core/test/lib/page-functions-test.js b/lighthouse-core/test/lib/page-functions-test.js
index c505dd656e41..061742c491b4 100644
--- a/lighthouse-core/test/lib/page-functions-test.js
+++ b/lighthouse-core/test/lib/page-functions-test.js
@@ -9,7 +9,7 @@ import assert from 'assert';
 
 import jsdom from 'jsdom';
 
-import pageFunctions from '../../lib/page-functions.js';
+import {pageFunctions} from '../../lib/page-functions.js';
 
 /* global document */
 
diff --git a/lighthouse-core/test/runner-test.js b/lighthouse-core/test/runner-test.js
index c80c571886cc..3c674ce51bf0 100644
--- a/lighthouse-core/test/runner-test.js
+++ b/lighthouse-core/test/runner-test.js
@@ -14,7 +14,7 @@ import {jest} from '@jest/globals';
 // import GatherRunner from '../gather/gather-runner.js';
 import driverMock from './gather/fake-driver.js';
 // import Config from '../config/config.js';
-import Audit from '../audits/audit.js';
+import {Audit} from '../audits/audit.js';
 import Gatherer from '../gather/gatherers/gatherer.js';
 import assetSaver from '../lib/asset-saver.js';
 import LHError from '../lib/lh-error.js';

From 4ff57a4722dd08400eb1ad8d2419c5521fef5bb9 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 6 May 2022 17:32:42 -0700
Subject: [PATCH 24/96] config-helpers-test passing

---
 clients/lightrider/lightrider-entry.js        | 12 ++++-----
 .../test/lightrider/lightrider-entry-test.js  |  8 +++---
 lighthouse-cli/run.js                         |  2 +-
 lighthouse-core/audits/final-screenshot.js    |  4 +--
 .../metrics/largest-contentful-paint.js       |  6 ++---
 .../audits/screenshot-thumbnails.js           | 12 ++++-----
 .../metrics/cumulative-layout-shift.js        |  6 ++---
 .../metrics/first-meaningful-paint.js         |  4 +--
 .../computed/metrics/interactive.js           | 10 +++----
 .../metrics/lantern-first-meaningful-paint.js |  6 ++---
 .../lantern-largest-contentful-paint.js       |  6 ++---
 .../largest-contentful-paint-all-frames.js    |  4 +--
 .../metrics/largest-contentful-paint.js       |  4 +--
 lighthouse-core/computed/speedline.js         |  8 +++---
 lighthouse-core/config/config-helpers.js      | 15 +++++++++--
 lighthouse-core/config/config.js              |  2 +-
 lighthouse-core/gather/gather-runner.js       |  2 +-
 .../gather/gatherers/seo/font-size.js         | 10 ++++---
 lighthouse-core/lib/lh-error.js               | 10 +++----
 lighthouse-core/lib/lh-trace-processor.js     | 12 ++++-----
 lighthouse-core/lib/sentry.js                 |  6 ++---
 .../test/audits/network-requests-test.js      |  4 +--
 .../test/config/config-helpers-test.js        |  2 +-
 lighthouse-core/test/config/config-test.js    |  2 +-
 .../fraggle-rock/config/validation-test.js    |  6 ++---
 .../test/gather/gather-runner-test.js         | 18 ++++++-------
 .../test/gather/gatherers/gatherer-test.js    |  2 +-
 lighthouse-core/test/lib/asset-saver-test.js  | 14 +++++-----
 lighthouse-core/test/runner-test.js           | 26 ++++++++++---------
 shared/localization/format.js                 |  2 +-
 30 files changed, 121 insertions(+), 104 deletions(-)

diff --git a/clients/lightrider/lightrider-entry.js b/clients/lightrider/lightrider-entry.js
index 1be679ca629c..f09eb984de8c 100644
--- a/clients/lightrider/lightrider-entry.js
+++ b/clients/lightrider/lightrider-entry.js
@@ -9,8 +9,8 @@
 
 import {Buffer} from 'buffer';
 
-import lighthouse from '../../lighthouse-core/index.js';
-import LHError from '../../lighthouse-core/lib/lh-error.js';
+import {legacyNavigation} from '../../lighthouse-core/index.js';
+import {LighthouseError} from '../../lighthouse-core/lib/lh-error.js';
 import preprocessor from '../../lighthouse-core/lib/proto-preprocessor.js';
 import assetSaver from '../../lighthouse-core/lib/asset-saver.js';
 
@@ -23,7 +23,7 @@ const LR_PRESETS = {
   desktop: desktopConfig,
 };
 
-/** @typedef {import('../../lighthouse-core/gather/connections/connection.js')} Connection */
+/** @typedef {import('../../lighthouse-core/gather/connections/connection.js').Connection} Connection */
 
 // Rollup seems to overlook some references to `Buffer`, so it must be made explicit.
 // (`parseSourceMapFromDataUrl` breaks without this)
@@ -63,7 +63,7 @@ export async function runLighthouseInLR(connection, url, flags, lrOpts) {
   }
 
   try {
-    const runnerResult = await lighthouse.legacyNavigation(url, flags, config, connection);
+    const runnerResult = await legacyNavigation(url, flags, config, connection);
     if (!runnerResult) throw new Error('Lighthouse finished without a runnerResult');
 
     // pre process the LHR for proto
@@ -85,9 +85,9 @@ export async function runLighthouseInLR(connection, url, flags, lrOpts) {
   } catch (err) {
     // If an error ruined the entire lighthouse run, attempt to return a meaningful error.
     let runtimeError;
-    if (!(err instanceof LHError) || !err.lhrRuntimeError) {
+    if (!(err instanceof LighthouseError) || !err.lhrRuntimeError) {
       runtimeError = {
-        code: LHError.UNKNOWN_ERROR,
+        code: LighthouseError.UNKNOWN_ERROR,
         message: `Unknown error encountered with message '${err.message}'`,
       };
     } else {
diff --git a/clients/test/lightrider/lightrider-entry-test.js b/clients/test/lightrider/lightrider-entry-test.js
index 913201a049de..71b941806e0e 100644
--- a/clients/test/lightrider/lightrider-entry-test.js
+++ b/clients/test/lightrider/lightrider-entry-test.js
@@ -9,13 +9,13 @@ import {jest} from '@jest/globals';
 import {strict as assert} from 'assert';
 import {runLighthouseInLR} from '../../lightrider/lightrider-entry.js';
 import {Runner} from '../../../lighthouse-core/runner.js';
-import LHError from '../../../lighthouse-core/lib/lh-error.js';
+import {LighthouseError} from '../../../lighthouse-core/lib/lh-error.js';
 
 describe('lightrider-entry', () => {
   describe('#runLighthouseInLR', () => {
     it('returns a runtimeError LHR when lighthouse throws a runtimeError', async () => {
-      const connectionError = new LHError(
-        LHError.errors.FAILED_DOCUMENT_REQUEST,
+      const connectionError = new LighthouseError(
+        LighthouseError.errors.FAILED_DOCUMENT_REQUEST,
         {errorDetails: 'Bad connection req'}
       );
       assert.strictEqual(connectionError.lhrRuntimeError, true);
@@ -53,7 +53,7 @@ describe('lightrider-entry', () => {
 
       const result = await runLighthouseInLR(mockConnection, url, {output}, {});
       const parsedResult = JSON.parse(result);
-      assert.strictEqual(parsedResult.runtimeError.code, LHError.UNKNOWN_ERROR);
+      assert.strictEqual(parsedResult.runtimeError.code, LighthouseError.UNKNOWN_ERROR);
       assert.ok(parsedResult.runtimeError.message.includes(errorMsg));
     });
 
diff --git a/lighthouse-cli/run.js b/lighthouse-cli/run.js
index e014bf22ceb5..aeedfab88280 100644
--- a/lighthouse-cli/run.js
+++ b/lighthouse-cli/run.js
@@ -250,7 +250,7 @@ async function runLighthouse(url, flags, config) {
     if (runnerResult?.lhr.runtimeError) {
       const {runtimeError} = runnerResult.lhr;
       return printErrorAndExit({
-        name: 'LHError',
+        name: 'LighthouseError',
         friendlyMessage: runtimeError.message,
         code: runtimeError.code,
         message: runtimeError.message,
diff --git a/lighthouse-core/audits/final-screenshot.js b/lighthouse-core/audits/final-screenshot.js
index 51c4113ce0c2..16c2928c616b 100644
--- a/lighthouse-core/audits/final-screenshot.js
+++ b/lighthouse-core/audits/final-screenshot.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import LHError from '../lib/lh-error.js';
+import {LighthouseError} from '../lib/lh-error.js';
 import ProcessedTrace from '../computed/processed-trace.js';
 import Screenshots from '../computed/screenshots.js';
 
@@ -41,7 +41,7 @@ class FinalScreenshot extends Audit {
       if (artifacts.GatherContext.gatherMode === 'timespan') return {notApplicable: true, score: 1};
 
       // If it was another mode, that's a fatal error.
-      throw new LHError(LHError.errors.NO_SCREENSHOTS);
+      throw new LighthouseError(LighthouseError.errors.NO_SCREENSHOTS);
     }
 
     return {
diff --git a/lighthouse-core/audits/metrics/largest-contentful-paint.js b/lighthouse-core/audits/metrics/largest-contentful-paint.js
index 7f80757f90e9..232456b6cec3 100644
--- a/lighthouse-core/audits/metrics/largest-contentful-paint.js
+++ b/lighthouse-core/audits/metrics/largest-contentful-paint.js
@@ -8,7 +8,7 @@
 import {Audit} from '../audit.js';
 import i18n from '../../lib/i18n/i18n.js';
 import ComputedLcp from '../../computed/metrics/largest-contentful-paint.js';
-import LHError from '../../lib/lh-error.js';
+import {LighthouseError} from '../../lib/lh-error.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. */
@@ -88,8 +88,8 @@ class LargestContentfulPaint extends Audit {
       // m79 is the minimum version which supports LCP
       // https://chromium.googlesource.com/chromium/src/+/master/docs/speed/metrics_changelog/lcp.md
       if (milestone < 79 && err.code === 'NO_LCP') {
-        throw new LHError(
-          LHError.errors.UNSUPPORTED_OLD_CHROME,
+        throw new LighthouseError(
+          LighthouseError.errors.UNSUPPORTED_OLD_CHROME,
           {featureName: 'Largest Contentful Paint'}
         );
       }
diff --git a/lighthouse-core/audits/screenshot-thumbnails.js b/lighthouse-core/audits/screenshot-thumbnails.js
index 40ea4c1430bf..d3dc54e99dbf 100644
--- a/lighthouse-core/audits/screenshot-thumbnails.js
+++ b/lighthouse-core/audits/screenshot-thumbnails.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import LHError from '../lib/lh-error.js';
+import {LighthouseError} from '../lib/lh-error.js';
 import jpeg from 'jpeg-js';
 import Speedline from '../computed/speedline.js';
 
@@ -88,7 +88,7 @@ class ScreenshotThumbnails extends Audit {
     const timelineEnd = Math.max(maxFrameTime, minimumTimelineDuration);
 
     if (!analyzedFrames.length || !Number.isFinite(timelineEnd)) {
-      throw new LHError(LHError.errors.INVALID_SPEEDLINE);
+      throw new LighthouseError(LighthouseError.errors.INVALID_SPEEDLINE);
     }
 
     for (let i = 1; i <= NUMBER_OF_THUMBNAILS; i++) {
@@ -144,10 +144,10 @@ class ScreenshotThumbnails extends Audit {
       return await this._audit(artifacts, context);
     } catch (err) {
       const noFramesErrors = new Set([
-        LHError.errors.NO_SCREENSHOTS.code,
-        LHError.errors.SPEEDINDEX_OF_ZERO.code,
-        LHError.errors.NO_SPEEDLINE_FRAMES.code,
-        LHError.errors.INVALID_SPEEDLINE.code,
+        LighthouseError.errors.NO_SCREENSHOTS.code,
+        LighthouseError.errors.SPEEDINDEX_OF_ZERO.code,
+        LighthouseError.errors.NO_SPEEDLINE_FRAMES.code,
+        LighthouseError.errors.INVALID_SPEEDLINE.code,
       ]);
 
       // If a timespan didn't happen to contain frames, that's fine. Just mark not applicable.
diff --git a/lighthouse-core/computed/metrics/cumulative-layout-shift.js b/lighthouse-core/computed/metrics/cumulative-layout-shift.js
index 8342f1073d72..9c8aee57af31 100644
--- a/lighthouse-core/computed/metrics/cumulative-layout-shift.js
+++ b/lighthouse-core/computed/metrics/cumulative-layout-shift.js
@@ -7,7 +7,7 @@
 
 import {makeComputedArtifact} from '../computed-artifact.js';
 import ProcessedTrace from '../processed-trace.js';
-import LHError from '../../lib/lh-error.js';
+import {LighthouseError} from '../../lib/lh-error.js';
 
 /** @typedef {{ts: number, isMainFrame: boolean, weightedScore: number}} LayoutShiftEvent */
 
@@ -40,8 +40,8 @@ class CumulativeLayoutShift {
       // For all-frames CLS calculation, we rely on `weighted_score_delta`, which
       // was added in Chrome 90: https://crbug.com/1173139
       if (event.args.data.weighted_score_delta === undefined) {
-        throw new LHError(
-          LHError.errors.UNSUPPORTED_OLD_CHROME,
+        throw new LighthouseError(
+          LighthouseError.errors.UNSUPPORTED_OLD_CHROME,
           {featureName: 'Cumulative Layout Shift'}
         );
       }
diff --git a/lighthouse-core/computed/metrics/first-meaningful-paint.js b/lighthouse-core/computed/metrics/first-meaningful-paint.js
index ca727063e2df..af4cfe2622c9 100644
--- a/lighthouse-core/computed/metrics/first-meaningful-paint.js
+++ b/lighthouse-core/computed/metrics/first-meaningful-paint.js
@@ -7,7 +7,7 @@
 
 import {makeComputedArtifact} from '../computed-artifact.js';
 import NavigationMetric from './navigation-metric.js';
-import LHError from '../../lib/lh-error.js';
+import {LighthouseError} from '../../lib/lh-error.js';
 import LanternFirstMeaningfulPaint from './lantern-first-meaningful-paint.js';
 
 class FirstMeaningfulPaint extends NavigationMetric {
@@ -28,7 +28,7 @@ class FirstMeaningfulPaint extends NavigationMetric {
   static async computeObservedMetric(data) {
     const {processedNavigation} = data;
     if (processedNavigation.timings.firstMeaningfulPaint === undefined) {
-      throw new LHError(LHError.errors.NO_FMP);
+      throw new LighthouseError(LighthouseError.errors.NO_FMP);
     }
 
     return {
diff --git a/lighthouse-core/computed/metrics/interactive.js b/lighthouse-core/computed/metrics/interactive.js
index cd34f5d2d402..e3424e376723 100644
--- a/lighthouse-core/computed/metrics/interactive.js
+++ b/lighthouse-core/computed/metrics/interactive.js
@@ -10,7 +10,7 @@ import NavigationMetric from './navigation-metric.js';
 import LanternInteractive from './lantern-interactive.js';
 import NetworkMonitor from '../../gather/driver/network-monitor.js';
 import TracingProcessor from '../../lib/tracehouse/trace-processor.js';
-import LHError from '../../lib/lh-error.js';
+import {LighthouseError} from '../../lib/lh-error.js';
 
 const REQUIRED_QUIET_WINDOW = 5000;
 const ALLOWED_CONCURRENT_REQUESTS = 2;
@@ -132,10 +132,10 @@ class Interactive extends NavigationMetric {
       }
     }
 
-    throw new LHError(
+    throw new LighthouseError(
       cpuCandidate
-        ? LHError.errors.NO_TTI_NETWORK_IDLE_PERIOD
-        : LHError.errors.NO_TTI_CPU_IDLE_PERIOD
+        ? LighthouseError.errors.NO_TTI_NETWORK_IDLE_PERIOD
+        : LighthouseError.errors.NO_TTI_CPU_IDLE_PERIOD
     );
   }
 
@@ -157,7 +157,7 @@ class Interactive extends NavigationMetric {
     const {processedTrace, processedNavigation, networkRecords} = data;
 
     if (!processedNavigation.timestamps.domContentLoaded) {
-      throw new LHError(LHError.errors.NO_DCL);
+      throw new LighthouseError(LighthouseError.errors.NO_DCL);
     }
 
     const longTasks = TracingProcessor.getMainThreadTopLevelEvents(processedTrace)
diff --git a/lighthouse-core/computed/metrics/lantern-first-meaningful-paint.js b/lighthouse-core/computed/metrics/lantern-first-meaningful-paint.js
index ea90af594171..0581d1b85f03 100644
--- a/lighthouse-core/computed/metrics/lantern-first-meaningful-paint.js
+++ b/lighthouse-core/computed/metrics/lantern-first-meaningful-paint.js
@@ -7,7 +7,7 @@
 
 import {makeComputedArtifact} from '../computed-artifact.js';
 import LanternMetric from './lantern-metric.js';
-import LHError from '../../lib/lh-error.js';
+import {LighthouseError} from '../../lib/lh-error.js';
 import LanternFirstContentfulPaint from './lantern-first-contentful-paint.js';
 
 /** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
@@ -32,7 +32,7 @@ class LanternFirstMeaningfulPaint extends LanternMetric {
   static getOptimisticGraph(dependencyGraph, processedNavigation) {
     const fmp = processedNavigation.timestamps.firstMeaningfulPaint;
     if (!fmp) {
-      throw new LHError(LHError.errors.NO_FMP);
+      throw new LighthouseError(LighthouseError.errors.NO_FMP);
     }
 
     return LanternFirstContentfulPaint.getFirstPaintBasedGraph(
@@ -52,7 +52,7 @@ class LanternFirstMeaningfulPaint extends LanternMetric {
   static getPessimisticGraph(dependencyGraph, processedNavigation) {
     const fmp = processedNavigation.timestamps.firstMeaningfulPaint;
     if (!fmp) {
-      throw new LHError(LHError.errors.NO_FMP);
+      throw new LighthouseError(LighthouseError.errors.NO_FMP);
     }
 
     return LanternFirstContentfulPaint.getFirstPaintBasedGraph(
diff --git a/lighthouse-core/computed/metrics/lantern-largest-contentful-paint.js b/lighthouse-core/computed/metrics/lantern-largest-contentful-paint.js
index 3cbeda111788..156dc296f5af 100644
--- a/lighthouse-core/computed/metrics/lantern-largest-contentful-paint.js
+++ b/lighthouse-core/computed/metrics/lantern-largest-contentful-paint.js
@@ -7,7 +7,7 @@
 
 import {makeComputedArtifact} from '../computed-artifact.js';
 import LanternMetric from './lantern-metric.js';
-import LHError from '../../lib/lh-error.js';
+import {LighthouseError} from '../../lib/lh-error.js';
 import LanternFirstContentfulPaint from './lantern-first-contentful-paint.js';
 
 /** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
@@ -47,7 +47,7 @@ class LanternLargestContentfulPaint extends LanternMetric {
   static getOptimisticGraph(dependencyGraph, processedNavigation) {
     const lcp = processedNavigation.timestamps.largestContentfulPaint;
     if (!lcp) {
-      throw new LHError(LHError.errors.NO_LCP);
+      throw new LighthouseError(LighthouseError.errors.NO_LCP);
     }
 
     return LanternFirstContentfulPaint.getFirstPaintBasedGraph(
@@ -65,7 +65,7 @@ class LanternLargestContentfulPaint extends LanternMetric {
   static getPessimisticGraph(dependencyGraph, processedNavigation) {
     const lcp = processedNavigation.timestamps.largestContentfulPaint;
     if (!lcp) {
-      throw new LHError(LHError.errors.NO_LCP);
+      throw new LighthouseError(LighthouseError.errors.NO_LCP);
     }
 
     return LanternFirstContentfulPaint.getFirstPaintBasedGraph(
diff --git a/lighthouse-core/computed/metrics/largest-contentful-paint-all-frames.js b/lighthouse-core/computed/metrics/largest-contentful-paint-all-frames.js
index e029c7963429..6e65cf6474b3 100644
--- a/lighthouse-core/computed/metrics/largest-contentful-paint-all-frames.js
+++ b/lighthouse-core/computed/metrics/largest-contentful-paint-all-frames.js
@@ -12,7 +12,7 @@
 import {makeComputedArtifact} from '../computed-artifact.js';
 
 import NavigationMetric from './navigation-metric.js';
-import LHError from '../../lib/lh-error.js';
+import {LighthouseError} from '../../lib/lh-error.js';
 
 class LargestContentfulPaintAllFrames extends NavigationMetric {
   /**
@@ -30,7 +30,7 @@ class LargestContentfulPaintAllFrames extends NavigationMetric {
   static async computeObservedMetric(data) {
     const {processedNavigation} = data;
     if (processedNavigation.timings.largestContentfulPaintAllFrames === undefined) {
-      throw new LHError(LHError.errors.NO_LCP_ALL_FRAMES);
+      throw new LighthouseError(LighthouseError.errors.NO_LCP_ALL_FRAMES);
     }
 
     return {
diff --git a/lighthouse-core/computed/metrics/largest-contentful-paint.js b/lighthouse-core/computed/metrics/largest-contentful-paint.js
index 21a0886d7da7..efde759a1e5b 100644
--- a/lighthouse-core/computed/metrics/largest-contentful-paint.js
+++ b/lighthouse-core/computed/metrics/largest-contentful-paint.js
@@ -16,7 +16,7 @@
 import {makeComputedArtifact} from '../computed-artifact.js';
 
 import NavigationMetric from './navigation-metric.js';
-import LHError from '../../lib/lh-error.js';
+import {LighthouseError} from '../../lib/lh-error.js';
 import LanternLargestContentfulPaint from './lantern-largest-contentful-paint.js';
 
 class LargestContentfulPaint extends NavigationMetric {
@@ -37,7 +37,7 @@ class LargestContentfulPaint extends NavigationMetric {
   static async computeObservedMetric(data) {
     const {processedNavigation} = data;
     if (processedNavigation.timings.largestContentfulPaint === undefined) {
-      throw new LHError(LHError.errors.NO_LCP);
+      throw new LighthouseError(LighthouseError.errors.NO_LCP);
     }
 
     return {
diff --git a/lighthouse-core/computed/speedline.js b/lighthouse-core/computed/speedline.js
index b96b2681346e..ff0c9f912e8e 100644
--- a/lighthouse-core/computed/speedline.js
+++ b/lighthouse-core/computed/speedline.js
@@ -7,7 +7,7 @@
 
 import {makeComputedArtifact} from './computed-artifact.js';
 import speedline from 'speedline-core';
-import LHError from '../lib/lh-error.js';
+import {LighthouseError} from '../lib/lh-error.js';
 import ProcessedTrace from './processed-trace.js';
 
 class Speedline {
@@ -33,17 +33,17 @@ class Speedline {
       });
     }).catch(err => {
       if (/No screenshots found in trace/.test(err.message)) {
-        throw new LHError(LHError.errors.NO_SCREENSHOTS);
+        throw new LighthouseError(LighthouseError.errors.NO_SCREENSHOTS);
       }
 
       throw err;
     }).then(speedline => {
       if (speedline.frames.length === 0) {
-        throw new LHError(LHError.errors.NO_SPEEDLINE_FRAMES);
+        throw new LighthouseError(LighthouseError.errors.NO_SPEEDLINE_FRAMES);
       }
 
       if (speedline.speedIndex === 0) {
-        throw new LHError(LHError.errors.SPEEDINDEX_OF_ZERO);
+        throw new LighthouseError(LighthouseError.errors.SPEEDINDEX_OF_ZERO);
       }
 
       return speedline;
diff --git a/lighthouse-core/config/config-helpers.js b/lighthouse-core/config/config-helpers.js
index 47605e13eeb8..2de34f34c561 100644
--- a/lighthouse-core/config/config-helpers.js
+++ b/lighthouse-core/config/config-helpers.js
@@ -17,7 +17,7 @@ import {createCommonjsRefs} from '../scripts/esm-utils.js';
 
 const {require, __dirname} = createCommonjsRefs(import.meta);
 
-/** @typedef {typeof import('../gather/gatherers/gatherer.js')['Gatherer']} GathererConstructor */
+/** @typedef {typeof import('../gather/gatherers/gatherer.js').Gatherer} GathererConstructor */
 /** @typedef {typeof import('../audits/audit.js')['Audit']} Audit */
 /** @typedef {InstanceType<GathererConstructor>} Gatherer */
 
@@ -220,7 +220,18 @@ async function requireWrapper(requirePath) {
 
   try {
     const module = await import(requirePath);
-    return module.default;
+    if (module.default) return module.default;
+
+    // TODO: should we do this?
+    const methods = new Set(['meta']);
+    for (const key of Object.keys(module)) {
+      if (!(module[key] && module[key] instanceof Object)) continue;
+      if (Object.getOwnPropertyNames(module[key]).some(method => methods.has(method))) {
+        return module[key];
+      }
+    }
+
+    throw new Error(`module '${requirePath}' missing default export`);
   } catch (err) {
     // TODO: verify err was "this isn't esm"
     console.error(err);
diff --git a/lighthouse-core/config/config.js b/lighthouse-core/config/config.js
index 427730e86e1f..d6ac613fe9d1 100644
--- a/lighthouse-core/config/config.js
+++ b/lighthouse-core/config/config.js
@@ -25,7 +25,7 @@ import {
 
 const defaultConfigPath = './default-config.js';
 
-/** @typedef {typeof import('../gather/gatherers/gatherer.js')} GathererConstructor */
+/** @typedef {typeof import('../gather/gatherers/gatherer.js').Gatherer} GathererConstructor */
 /** @typedef {InstanceType<GathererConstructor>} Gatherer */
 
 /**
diff --git a/lighthouse-core/gather/gather-runner.js b/lighthouse-core/gather/gather-runner.js
index fe13860a8531..fbd55b74b274 100644
--- a/lighthouse-core/gather/gather-runner.js
+++ b/lighthouse-core/gather/gather-runner.js
@@ -89,7 +89,7 @@ class GatherRunner {
         passContext.LighthouseRunWarnings.push(...warnings);
       }
     } catch (err) {
-      // If it's one of our loading-based LHErrors, we'll treat it as a page load error.
+      // If it's one of our loading-based LighthouseErrors, we'll treat it as a page load error.
       if (err.code === 'NO_FCP' || err.code === 'PAGE_HUNG') {
         return {navigationError: err};
       }
diff --git a/lighthouse-core/gather/gatherers/seo/font-size.js b/lighthouse-core/gather/gatherers/seo/font-size.js
index ef07394c5915..efbd18e83cfd 100644
--- a/lighthouse-core/gather/gatherers/seo/font-size.js
+++ b/lighthouse-core/gather/gatherers/seo/font-size.js
@@ -375,7 +375,9 @@ class FontSize extends FRGatherer {
   }
 }
 
-module.exports = FontSize;
-module.exports.computeSelectorSpecificity = computeSelectorSpecificity;
-module.exports.getEffectiveFontRule = getEffectiveFontRule;
-module.exports.findMostSpecificMatchedCSSRule = findMostSpecificMatchedCSSRule;
+export default FontSize;
+export {
+  computeSelectorSpecificity,
+  getEffectiveFontRule,
+  findMostSpecificMatchedCSSRule,
+};
diff --git a/lighthouse-core/lib/lh-error.js b/lighthouse-core/lib/lh-error.js
index 62901ee8716c..e34076244b3c 100644
--- a/lighthouse-core/lib/lh-error.js
+++ b/lighthouse-core/lib/lh-error.js
@@ -114,7 +114,7 @@ class LighthouseError extends Error {
    */
   constructor(errorDefinition, properties) {
     super(errorDefinition.code);
-    this.name = 'LHError';
+    this.name = 'LighthouseError';
     this.code = errorDefinition.code;
     // Add additional properties to be ICU replacements in the error string.
     // `code` is always added as `errorCode` so callers don't need to specify the code multiple times.
@@ -148,7 +148,7 @@ class LighthouseError extends Error {
   }
 
   /**
-   * A JSON.stringify replacer to serialize LHErrors and (as a fallback) Errors.
+   * A JSON.stringify replacer to serialize LighthouseErrors and (as a fallback) Errors.
    * Returns a simplified version of the error object that can be reconstituted
    * as a copy of the original error at parse time.
    * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#The_replacer_parameter
@@ -169,7 +169,7 @@ class LighthouseError extends Error {
       };
     }
 
-    // Unexpected errors won't be LHErrors, but we want them serialized as well.
+    // Unexpected errors won't be LighthouseErrors, but we want them serialized as well.
     if (err instanceof Error) {
       const {message, stack} = err;
       // @ts-expect-error - code can be helpful for e.g. node errors, so preserve it if it's present.
@@ -182,12 +182,12 @@ class LighthouseError extends Error {
       };
     }
 
-    throw new Error('Invalid value for LHError stringification');
+    throw new Error('Invalid value for LighthouseError stringification');
   }
 
   /**
    * A JSON.parse reviver. If any value passed in is a serialized Error or
-   * LHError, the error is recreated as the original object. Otherwise, the
+   * LighthouseError, the error is recreated as the original object. Otherwise, the
    * value is passed through unchanged.
    * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/parse#Using_the_reviver_parameter
    * @param {string} key
diff --git a/lighthouse-core/lib/lh-trace-processor.js b/lighthouse-core/lib/lh-trace-processor.js
index d1c688935ec9..a8756a4bfde8 100644
--- a/lighthouse-core/lib/lh-trace-processor.js
+++ b/lighthouse-core/lib/lh-trace-processor.js
@@ -5,17 +5,17 @@
  */
 'use strict';
 
-import LHError from '../lib/lh-error.js';
+import {LighthouseError} from '../lib/lh-error.js';
 import TraceProcessor from '../lib/tracehouse/trace-processor.js';
 
-// TraceProcessor throws generic errors, but we'd like our special localized and code-specific LHError
+// TraceProcessor throws generic errors, but we'd like our special localized and code-specific LighthouseError
 // objects to be thrown instead.
 class LHTraceProcessor extends TraceProcessor {
   /**
    * @return {Error}
    */
   static createNoNavstartError() {
-    return new LHError(LHError.errors.NO_NAVSTART);
+    return new LighthouseError(LighthouseError.errors.NO_NAVSTART);
   }
 
   /**
@@ -25,21 +25,21 @@ class LHTraceProcessor extends TraceProcessor {
    * @return {Error}
    */
   static createNoResourceSendRequestError() {
-    return new LHError(LHError.errors.NO_RESOURCE_REQUEST);
+    return new LighthouseError(LighthouseError.errors.NO_RESOURCE_REQUEST);
   }
 
   /**
    * @return {Error}
    */
   static createNoTracingStartedError() {
-    return new LHError(LHError.errors.NO_TRACING_STARTED);
+    return new LighthouseError(LighthouseError.errors.NO_TRACING_STARTED);
   }
 
   /**
    * @return {Error}
    */
   static createNoFirstContentfulPaintError() {
-    return new LHError(LHError.errors.NO_FCP);
+    return new LighthouseError(LighthouseError.errors.NO_FCP);
   }
 }
 
diff --git a/lighthouse-core/lib/sentry.js b/lighthouse-core/lib/sentry.js
index ab5229ba0c81..dcbfca26e158 100644
--- a/lighthouse-core/lib/sentry.js
+++ b/lighthouse-core/lib/sentry.js
@@ -108,14 +108,14 @@ function init(opts) {
       const sampledErrorMatch = SAMPLED_ERRORS.find(sample => sample.pattern.test(err.message));
       if (sampledErrorMatch && sampledErrorMatch.rate <= Math.random()) return;
 
-      // @ts-expect-error - properties added to protocol method LHErrors.
+      // @ts-expect-error - properties added to protocol method LighthouseErrors.
       if (err.protocolMethod) {
         // Protocol errors all share same stack trace, so add more to fingerprint
-        // @ts-expect-error - properties added to protocol method LHErrors.
+        // @ts-expect-error - properties added to protocol method LighthouseErrors.
         opts.fingerprint = ['{{ default }}', err.protocolMethod, err.protocolError];
 
         opts.tags = opts.tags || {};
-        // @ts-expect-error - properties added to protocol method LHErrors.
+        // @ts-expect-error - properties added to protocol method LighthouseErrors.
         opts.tags.protocolMethod = err.protocolMethod;
       }
 
diff --git a/lighthouse-core/test/audits/network-requests-test.js b/lighthouse-core/test/audits/network-requests-test.js
index 8be101fa019b..662877358b33 100644
--- a/lighthouse-core/test/audits/network-requests-test.js
+++ b/lighthouse-core/test/audits/network-requests-test.js
@@ -4,10 +4,10 @@
  * 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 {NetworkRequest}s from '../../audits/network-requests.js';
+import {NetworkRequests} from '../../audits/network-requests.js';
 import networkRecordsToDevtoolsLog from '../network-records-to-devtools-log.js';
 import cutoffLoadDevtoolsLog from '../fixtures/traces/cutoff-load-m83.devtoolslog.json';
+
 describe('Network requests audit', () => {
   it('should report finished and unfinished network requests', async () => {
     const artifacts = {
diff --git a/lighthouse-core/test/config/config-helpers-test.js b/lighthouse-core/test/config/config-helpers-test.js
index 4953b3520001..90ffe00c3a16 100644
--- a/lighthouse-core/test/config/config-helpers-test.js
+++ b/lighthouse-core/test/config/config-helpers-test.js
@@ -20,7 +20,7 @@ import {
   mergeConfigFragmentArrayByKey,
 } from '../../config/config-helpers.js';
 import {Runner} from '../../runner.js';
-import Gatherer from '../../gather/gatherers/gatherer.js';
+import {Gatherer} from '../../gather/gatherers/gatherer.js';
 import ImageElementsGatherer from '../../gather/gatherers/image-elements.js';
 import UserTimingsAudit from '../../audits/user-timings.js';
 import {LH_ROOT} from '../../../root.js';
diff --git a/lighthouse-core/test/config/config-test.js b/lighthouse-core/test/config/config-test.js
index dd9b79772997..f0e912a50824 100644
--- a/lighthouse-core/test/config/config-test.js
+++ b/lighthouse-core/test/config/config-test.js
@@ -12,7 +12,7 @@ import log from 'lighthouse-logger';
 import Config from '../../config/config.js';
 import defaultConfig from '../../config/default-config.js';
 import * as constants from '../../config/constants.js';
-import Gatherer from '../../gather/gatherers/gatherer.js';
+import {Gatherer} from '../../gather/gatherers/gatherer.js';
 import {Audit} from '../../audits/audit.js';
 import i18n from '../../lib/i18n/i18n.js';
 import format from '../../../shared/localization/format.js';
diff --git a/lighthouse-core/test/fraggle-rock/config/validation-test.js b/lighthouse-core/test/fraggle-rock/config/validation-test.js
index 395807b9bfee..1edf4f721934 100644
--- a/lighthouse-core/test/fraggle-rock/config/validation-test.js
+++ b/lighthouse-core/test/fraggle-rock/config/validation-test.js
@@ -7,10 +7,10 @@
 
 import {defaultSettings, defaultNavigationConfig} from '../../../config/constants.js';
 import defaultConfig from '../../../fraggle-rock/config/default-config.js';
-import BaseAudit from '../../../audits/audit.js';
+import {Audit as BaseAudit} from '../../../audits/audit.js';
 import BaseFRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
-import BaseLegacyGatherer from '../../../gather/gatherers/gatherer.js';
-import validation from '../../../fraggle-rock/config/validation.js';
+import {Gatherer as BaseLegacyGatherer} from '../../../gather/gatherers/gatherer.js';
+import * as validation from '../../../fraggle-rock/config/validation.js';
 
 /** @typedef {LH.Gatherer.GathererMeta['supportedModes']} SupportedModes */
 
diff --git a/lighthouse-core/test/gather/gather-runner-test.js b/lighthouse-core/test/gather/gather-runner-test.js
index a9f37bb3bdec..22147cb607a7 100644
--- a/lighthouse-core/test/gather/gather-runner-test.js
+++ b/lighthouse-core/test/gather/gather-runner-test.js
@@ -8,14 +8,14 @@ import {strict as assert} from 'assert';
 
 import {jest} from '@jest/globals';
 
-import Gatherer from '../../gather/gatherers/gatherer.js';
+import {Gatherer} from '../../gather/gatherers/gatherer.js';
 // import GathererRunner_ from '../../gather/gather-runner.js';
 // import Config from '../../config/config.js';
 import unresolvedPerfLog from './../fixtures/unresolved-perflog.json';
-import LHError from '../../lib/lh-error.js';
+import {LighthouseError} from '../../lib/lh-error.js';
 import networkRecordsToDevtoolsLog from '../network-records-to-devtools-log.js';
 // import Driver from '../../gather/driver.js';
-import Connection from '../../gather/connections/connection.js';
+import {Connection} from '../../gather/connections/connection.js';
 import {createMockSendCommandFn, createMockOnceFn} from './mock-commands.js';
 import {
   makeMocksForGatherRunner,
@@ -212,7 +212,7 @@ describe('GatherRunner', function() {
 
   it('loads a page and returns a pageLoadError', async () => {
     const url = 'https://example.com';
-    const error = new LHError(LHError.errors.NO_FCP);
+    const error = new LighthouseError(LighthouseError.errors.NO_FCP);
     const driver = {};
     const {gotoURL} = /** @type {any} */ (
       requireMockAny('../../gather/driver/navigation.js')
@@ -487,7 +487,7 @@ describe('GatherRunner', function() {
     const requestedUrl = 'https://example.com';
     // This page load error should be overriden by ERRORED_DOCUMENT_REQUEST (for being
     // more specific) since the main document network request failed with a 500.
-    const navigationError = new LHError(LHError.errors.NO_FCP);
+    const navigationError = new LighthouseError(LighthouseError.errors.NO_FCP);
     const driver = Object.assign({}, fakeDriver, {
       online: true,
       /** @param {string} url */
@@ -522,7 +522,7 @@ describe('GatherRunner', function() {
   it('returns a pageLoadError and no artifacts when there is a navigation error', async () => {
     const requestedUrl = 'https://example.com';
     // This time, NO_FCP should win because it's the only error left.
-    const navigationError = new LHError(LHError.errors.NO_FCP);
+    const navigationError = new LighthouseError(LighthouseError.errors.NO_FCP);
     const driver = Object.assign({}, fakeDriver, {
       online: true,
       endDevtoolsLog() {
@@ -561,7 +561,7 @@ describe('GatherRunner', function() {
   it('succeeds when there is a navigation error but loadFailureMode was warn', async () => {
     const requestedUrl = 'https://example.com';
     // NO_FCP should be ignored because it's a warn pass.
-    const navigationError = new LHError(LHError.errors.NO_FCP);
+    const navigationError = new LighthouseError(LighthouseError.errors.NO_FCP);
 
     const gotoUrlForAboutBlank = fnAny().mockResolvedValue({});
     const gotoUrlForRealUrl = fnAny()
@@ -861,7 +861,7 @@ describe('GatherRunner', function() {
           firstLoad = false;
           return {mainDocumentUrl: requestedUrl, timedOut: false, warnings: []};
         } else {
-          throw new LHError(LHError.errors.NO_FCP);
+          throw new LighthouseError(LighthouseError.errors.NO_FCP);
         }
       });
     const options = {driver, requestedUrl, settings: config.settings, computedCache: new Map()};
@@ -881,7 +881,7 @@ describe('GatherRunner', function() {
     expect(artifacts.Test3).toBeUndefined();
 
     // PageLoadError artifact has the error.
-    expect(artifacts.PageLoadError).toBeInstanceOf(LHError);
+    expect(artifacts.PageLoadError).toBeInstanceOf(LighthouseError);
     expect(artifacts.PageLoadError).toMatchObject({code: 'NO_FCP'});
 
     // firstPass has a saved trace and devtoolsLog, secondPass has an error trace and log.
diff --git a/lighthouse-core/test/gather/gatherers/gatherer-test.js b/lighthouse-core/test/gather/gatherers/gatherer-test.js
index dd50c7f672bb..0e0649e7d882 100644
--- a/lighthouse-core/test/gather/gatherers/gatherer-test.js
+++ b/lighthouse-core/test/gather/gatherers/gatherer-test.js
@@ -6,7 +6,7 @@
 
 import {strict as assert} from 'assert';
 
-import Gatherer from '../../../gather/gatherers/gatherer.js';
+import {Gatherer} from '../../../gather/gatherers/gatherer.js';
 
 describe('Gatherer', () => {
   it('returns its name', () => {
diff --git a/lighthouse-core/test/lib/asset-saver-test.js b/lighthouse-core/test/lib/asset-saver-test.js
index 3c82212e7708..7a803d0c19b7 100644
--- a/lighthouse-core/test/lib/asset-saver-test.js
+++ b/lighthouse-core/test/lib/asset-saver-test.js
@@ -10,7 +10,7 @@ import fs from 'fs';
 
 import assetSaver from '../../lib/asset-saver.js';
 import Metrics from '../../lib/traces/pwmetrics-events.js';
-import LHError from '../../lib/lh-error.js';
+import {LighthouseError} from '../../lib/lh-error.js';
 import traceEvents from '../fixtures/traces/progressive-app.json';
 import dbwTrace from '../results/artifacts/defaultPass.trace.json';
 import dbwResults from '../results/sample_v2.json';
@@ -282,10 +282,12 @@ describe('asset-saver helper', () => {
         /^Error: Connection refused by server.*test[\\/]lib[\\/]asset-saver-test\.js/s);
     });
 
-    it('round trips artifacts with an LHError member', async () => {
-      // Use an LHError that has an ICU replacement.
+    it('round trips artifacts with an LighthouseError member', async () => {
+      // Use an LighthouseError that has an ICU replacement.
       const protocolMethod = 'Page.getFastness';
-      const lhError = new LHError(LHError.errors.PROTOCOL_TIMEOUT, {protocolMethod});
+      const lhError = new LighthouseError(LighthouseError.errors.PROTOCOL_TIMEOUT, {
+        protocolMethod,
+      });
 
       const artifacts = {
         traces: {},
@@ -297,11 +299,11 @@ describe('asset-saver helper', () => {
       const roundTripArtifacts = await assetSaver.loadArtifacts(outputPath);
       expect(roundTripArtifacts).toStrictEqual(artifacts);
 
-      expect(roundTripArtifacts.ScriptElements).toBeInstanceOf(LHError);
+      expect(roundTripArtifacts.ScriptElements).toBeInstanceOf(LighthouseError);
       expect(roundTripArtifacts.ScriptElements.code).toEqual('PROTOCOL_TIMEOUT');
       expect(roundTripArtifacts.ScriptElements.protocolMethod).toEqual(protocolMethod);
       expect(roundTripArtifacts.ScriptElements.stack).toMatch(
-          /^LHError: PROTOCOL_TIMEOUT.*test[\\/]lib[\\/]asset-saver-test\.js/s);
+          /^LighthouseError: PROTOCOL_TIMEOUT.*test[\\/]lib[\\/]asset-saver-test\.js/s);
       expect(roundTripArtifacts.ScriptElements.friendlyMessage)
         .toBeDisplayString(/\(Method: Page\.getFastness\)/);
     });
diff --git a/lighthouse-core/test/runner-test.js b/lighthouse-core/test/runner-test.js
index 3c674ce51bf0..32589c19be30 100644
--- a/lighthouse-core/test/runner-test.js
+++ b/lighthouse-core/test/runner-test.js
@@ -15,9 +15,9 @@ import {jest} from '@jest/globals';
 import driverMock from './gather/fake-driver.js';
 // import Config from '../config/config.js';
 import {Audit} from '../audits/audit.js';
-import Gatherer from '../gather/gatherers/gatherer.js';
+import {Gatherer} from '../gather/gatherers/gatherer.js';
 import assetSaver from '../lib/asset-saver.js';
-import LHError from '../lib/lh-error.js';
+import {LighthouseError} from '../lib/lh-error.js';
 import i18n from '../lib/i18n/i18n.js';
 import {makeMocksForGatherRunner} from './test-utils.js';
 import {createCommonjsRefs} from '../scripts/esm-utils.js';
@@ -204,7 +204,9 @@ describe('Runner', () => {
         afterPass(passContext) {
           const warning = str_(i18n.UIStrings.displayValueByteSavings, {wastedBytes: 2222});
           passContext.LighthouseRunWarnings.push(warning);
-          throw new LHError(LHError.errors.UNSUPPORTED_OLD_CHROME, {featureName: 'VRML'});
+          throw new LighthouseError(LighthouseError.errors.UNSUPPORTED_OLD_CHROME, {
+            featureName: 'VRML',
+          });
         }
       }
       const gatherConfig = await Config.fromJson({
@@ -218,7 +220,7 @@ describe('Runner', () => {
       expect(artifacts.LighthouseRunWarnings[0]).not.toBe('string');
       expect(artifacts.LighthouseRunWarnings[0]).toBeDisplayString('Potential savings of 2 KiB');
       expect(artifacts.WarningAndErrorGatherer).toMatchObject({
-        name: 'LHError',
+        name: 'LighthouseError',
         code: 'UNSUPPORTED_OLD_CHROME',
         // eslint-disable-next-line max-len
         friendlyMessage: expect.toBeDisplayString(`This version of Chrome is too old to support 'VRML'. Use a newer version to see full results.`),
@@ -770,15 +772,15 @@ describe('Runner', () => {
   });
 
   describe('lhr.runtimeError', () => {
-    const NO_FCP = LHError.errors.NO_FCP;
+    const NO_FCP = LighthouseError.errors.NO_FCP;
     class RuntimeErrorGatherer extends Gatherer {
       afterPass() {
-        throw new LHError(NO_FCP);
+        throw new LighthouseError(NO_FCP);
       }
     }
     class RuntimeError2Gatherer extends Gatherer {
       afterPass() {
-        throw new LHError(LHError.errors.NO_SCREENSHOTS);
+        throw new LighthouseError(LighthouseError.errors.NO_SCREENSHOTS);
       }
     }
     class WarningAudit extends Audit {
@@ -832,7 +834,7 @@ describe('Runner', () => {
           firstLoad = false;
           return {mainDocumentUrl: url, warnings: []};
         } else {
-          throw new LHError(LHError.errors.PAGE_HUNG);
+          throw new LighthouseError(LighthouseError.errors.PAGE_HUNG);
         }
       });
 
@@ -847,7 +849,7 @@ describe('Runner', () => {
       expect(lhr.audits['test-audit'].errorMessage).toEqual(expect.stringContaining(NO_FCP.code));
 
       // But top-level runtimeError is the pageLoadError.
-      expect(lhr.runtimeError.code).toEqual(LHError.errors.PAGE_HUNG.code);
+      expect(lhr.runtimeError.code).toEqual(LighthouseError.errors.PAGE_HUNG.code);
       expect(lhr.runtimeError.message).toMatch(/because the page stopped responding/);
     });
   });
@@ -855,8 +857,8 @@ describe('Runner', () => {
   it('localized errors thrown from driver', async () => {
     const erroringDriver = {...driverMock,
       async connect() {
-        const err = new LHError(
-          LHError.errors.PROTOCOL_TIMEOUT,
+        const err = new LighthouseError(
+          LighthouseError.errors.PROTOCOL_TIMEOUT,
           {protocolMethod: 'Method.Failure'}
         );
         throw err;
@@ -867,7 +869,7 @@ describe('Runner', () => {
       await runGatherAndAudit(createGatherFn('https://example.com/'), {driverMock: erroringDriver, config: await Config.fromJson()});
       assert.fail('should have thrown');
     } catch (err) {
-      assert.equal(err.code, LHError.errors.PROTOCOL_TIMEOUT.code);
+      assert.equal(err.code, LighthouseError.errors.PROTOCOL_TIMEOUT.code);
       assert.ok(/^Waiting for DevTools protocol.*Method: Method.Failure/.test(err.friendlyMessage),
         'did not localize error message');
     }
diff --git a/shared/localization/format.js b/shared/localization/format.js
index 6b6e4e45a132..8d1c2aedd470 100644
--- a/shared/localization/format.js
+++ b/shared/localization/format.js
@@ -147,7 +147,7 @@ function _preformatValues(messageFormatter, values, lhlMessage) {
   for (const valueId of Object.keys(values)) {
     if (valueId in formattedValues) continue;
 
-    // errorCode is a special case always allowed to help LHError ease-of-use.
+    // errorCode is a special case always allowed to help LighthouseError ease-of-use.
     if (valueId === 'errorCode') {
       formattedValues.errorCode = values.errorCode;
       continue;

From 299036c3719459cafbc292239b6f2eb71555fdb4 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Wed, 11 May 2022 16:43:30 -0700
Subject: [PATCH 25/96] more wip

---
 clients/devtools/devtools-entry.js            |  4 ++-
 clients/lightrider/lightrider-entry.js        |  6 ++--
 lighthouse-cli/commands/list-audits.js        |  4 +--
 .../commands/list-trace-categories.js         |  3 +-
 lighthouse-cli/run.js                         |  4 +--
 .../smokehouse/lighthouse-runners/bundle.js   | 12 +++++---
 .../test/smokehouse/lighthouse-runners/cli.js |  2 +-
 .../audits/accessibility/accesskeys.js        |  2 +-
 .../audits/accessibility/aria-allowed-attr.js |  2 +-
 .../audits/accessibility/aria-command-name.js |  2 +-
 .../audits/accessibility/aria-hidden-body.js  |  2 +-
 .../audits/accessibility/aria-hidden-focus.js |  2 +-
 .../accessibility/aria-input-field-name.js    |  2 +-
 .../audits/accessibility/aria-meter-name.js   |  2 +-
 .../accessibility/aria-progressbar-name.js    |  2 +-
 .../accessibility/aria-required-attr.js       |  2 +-
 .../accessibility/aria-required-children.js   |  2 +-
 .../accessibility/aria-required-parent.js     |  2 +-
 .../audits/accessibility/aria-roles.js        |  2 +-
 .../accessibility/aria-toggle-field-name.js   |  2 +-
 .../audits/accessibility/aria-tooltip-name.js |  2 +-
 .../accessibility/aria-treeitem-name.js       |  2 +-
 .../accessibility/aria-valid-attr-value.js    |  2 +-
 .../audits/accessibility/aria-valid-attr.js   |  2 +-
 .../audits/accessibility/axe-audit.js         |  2 +-
 .../audits/accessibility/button-name.js       |  2 +-
 .../audits/accessibility/bypass.js            |  2 +-
 .../audits/accessibility/color-contrast.js    |  2 +-
 .../audits/accessibility/definition-list.js   |  2 +-
 .../audits/accessibility/dlitem.js            |  2 +-
 .../audits/accessibility/document-title.js    |  2 +-
 .../accessibility/duplicate-id-active.js      |  2 +-
 .../audits/accessibility/duplicate-id-aria.js |  2 +-
 .../form-field-multiple-labels.js             |  2 +-
 .../audits/accessibility/frame-title.js       |  2 +-
 .../audits/accessibility/heading-order.js     |  2 +-
 .../audits/accessibility/html-has-lang.js     |  2 +-
 .../audits/accessibility/html-lang-valid.js   |  2 +-
 .../audits/accessibility/image-alt.js         |  2 +-
 .../audits/accessibility/input-image-alt.js   |  2 +-
 lighthouse-core/audits/accessibility/label.js |  2 +-
 .../audits/accessibility/link-name.js         |  2 +-
 lighthouse-core/audits/accessibility/list.js  |  2 +-
 .../audits/accessibility/listitem.js          |  2 +-
 .../audits/accessibility/meta-refresh.js      |  2 +-
 .../audits/accessibility/meta-viewport.js     |  2 +-
 .../audits/accessibility/object-alt.js        |  2 +-
 .../audits/accessibility/tabindex.js          |  2 +-
 .../audits/accessibility/td-headers-attr.js   |  2 +-
 .../audits/accessibility/th-has-data-cells.js |  2 +-
 .../audits/accessibility/valid-lang.js        |  2 +-
 .../audits/accessibility/video-caption.js     |  2 +-
 lighthouse-core/audits/apple-touch-icon.js    |  2 +-
 lighthouse-core/audits/audit.js               |  2 +-
 lighthouse-core/audits/autocomplete.js        |  2 +-
 lighthouse-core/audits/bootup-time.js         |  2 +-
 .../byte-efficiency/byte-efficiency-audit.js  | 10 +++----
 .../byte-efficiency/duplicated-javascript.js  |  6 ++--
 .../efficient-animated-content.js             |  6 ++--
 .../byte-efficiency/legacy-javascript.js      |  4 +--
 .../byte-efficiency/modern-image-formats.js   |  6 ++--
 .../byte-efficiency/offscreen-images.js       |  8 ++---
 .../render-blocking-resources.js              |  8 ++---
 .../byte-efficiency/total-byte-weight.js      |  2 +-
 .../audits/byte-efficiency/unminified-css.js  |  6 ++--
 .../byte-efficiency/unminified-javascript.js  |  6 ++--
 .../byte-efficiency/unused-css-rules.js       |  6 ++--
 .../byte-efficiency/unused-javascript.js      |  6 ++--
 .../byte-efficiency/uses-long-cache-ttl.js    |  2 +-
 .../byte-efficiency/uses-optimized-images.js  |  6 ++--
 .../uses-responsive-images-snapshot.js        |  6 ++--
 .../byte-efficiency/uses-responsive-images.js |  9 +++---
 .../byte-efficiency/uses-text-compression.js  |  6 ++--
 lighthouse-core/audits/content-width.js       |  2 +-
 .../audits/critical-request-chains.js         |  2 +-
 lighthouse-core/audits/csp-xss.js             |  2 +-
 lighthouse-core/audits/deprecations.js        |  2 +-
 lighthouse-core/audits/dobetterweb/charset.js |  2 +-
 lighthouse-core/audits/dobetterweb/doctype.js |  2 +-
 .../audits/dobetterweb/dom-size.js            |  2 +-
 .../dobetterweb/geolocation-on-start.js       |  2 +-
 .../audits/dobetterweb/inspector-issues.js    |  2 +-
 .../audits/dobetterweb/js-libraries.js        |  2 +-
 .../audits/dobetterweb/no-document-write.js   |  2 +-
 .../dobetterweb/no-vulnerable-libraries.js    |  4 +--
 .../dobetterweb/notification-on-start.js      |  2 +-
 .../password-inputs-can-be-pasted-into.js     |  2 +-
 .../audits/dobetterweb/uses-http2.js          |  6 ++--
 .../uses-passive-event-listeners.js           |  2 +-
 lighthouse-core/audits/errors-in-console.js   |  2 +-
 lighthouse-core/audits/font-display.js        |  4 +--
 lighthouse-core/audits/image-aspect-ratio.js  |  2 +-
 .../audits/image-size-responsive.js           |  2 +-
 .../audits/installable-manifest.js            |  2 +-
 lighthouse-core/audits/is-on-https.js         |  2 +-
 .../largest-contentful-paint-element.js       |  2 +-
 .../audits/layout-shift-elements.js           |  2 +-
 lighthouse-core/audits/lcp-lazy-loaded.js     |  2 +-
 lighthouse-core/audits/long-tasks.js          |  2 +-
 .../audits/mainthread-work-breakdown.js       |  2 +-
 .../audits/manual/pwa-cross-browser.js        |  2 +-
 .../audits/manual/pwa-each-page-has-url.js    |  2 +-
 .../audits/manual/pwa-page-transitions.js     |  2 +-
 lighthouse-core/audits/maskable-icon.js       |  2 +-
 .../audits/metrics/cumulative-layout-shift.js |  2 +-
 .../experimental-interaction-to-next-paint.js |  2 +-
 .../audits/metrics/first-contentful-paint.js  |  2 +-
 .../audits/metrics/first-meaningful-paint.js  |  2 +-
 lighthouse-core/audits/metrics/interactive.js |  2 +-
 .../metrics/largest-contentful-paint.js       |  2 +-
 .../audits/metrics/max-potential-fid.js       |  2 +-
 lighthouse-core/audits/metrics/speed-index.js |  2 +-
 .../audits/metrics/total-blocking-time.js     |  2 +-
 lighthouse-core/audits/network-rtt.js         |  2 +-
 .../audits/network-server-latency.js          |  2 +-
 lighthouse-core/audits/no-unload-listeners.js |  2 +-
 .../audits/non-composited-animations.js       |  2 +-
 lighthouse-core/audits/performance-budget.js  |  4 +--
 lighthouse-core/audits/predictive-perf.js     |  2 +-
 lighthouse-core/audits/preload-fonts.js       |  2 +-
 lighthouse-core/audits/preload-lcp-image.js   |  6 ++--
 lighthouse-core/audits/redirects.js           |  6 ++--
 lighthouse-core/audits/resource-summary.js    |  2 +-
 lighthouse-core/audits/seo/canonical.js       |  2 +-
 .../audits/seo/crawlable-anchors.js           |  2 +-
 lighthouse-core/audits/seo/font-size.js       |  2 +-
 lighthouse-core/audits/seo/hreflang.js        |  2 +-
 .../audits/seo/http-status-code.js            |  2 +-
 lighthouse-core/audits/seo/is-crawlable.js    |  2 +-
 lighthouse-core/audits/seo/link-text.js       |  2 +-
 .../audits/seo/manual/structured-data.js      |  2 +-
 .../audits/seo/meta-description.js            |  2 +-
 lighthouse-core/audits/seo/plugins.js         |  2 +-
 lighthouse-core/audits/seo/robots-txt.js      |  2 +-
 .../audits/server-response-time.js            |  2 +-
 lighthouse-core/audits/service-worker.js      |  2 +-
 lighthouse-core/audits/splash-screen.js       |  2 +-
 lighthouse-core/audits/themed-omnibox.js      |  4 +--
 lighthouse-core/audits/third-party-facades.js |  8 ++---
 lighthouse-core/audits/third-party-summary.js |  2 +-
 lighthouse-core/audits/timing-budget.js       |  4 +--
 lighthouse-core/audits/unsized-images.js      |  2 +-
 lighthouse-core/audits/user-timings.js        |  2 +-
 lighthouse-core/audits/uses-rel-preconnect.js |  6 ++--
 lighthouse-core/audits/uses-rel-preload.js    |  6 ++--
 lighthouse-core/audits/valid-source-maps.js   |  2 +-
 lighthouse-core/audits/viewport.js            |  2 +-
 .../audits/work-during-interaction.js         | 29 ++++++++++---------
 lighthouse-core/computed/load-simulator.js    |  3 ++
 lighthouse-core/computed/main-resource.js     |  2 +-
 .../computed/metrics/interactive.js           |  2 +-
 .../metrics/lantern-first-contentful-paint.js |  8 ++---
 .../computed/metrics/lantern-interactive.js   |  4 +--
 .../metrics/lantern-max-potential-fid.js      |  4 +--
 .../computed/metrics/lantern-metric.js        |  8 ++---
 .../computed/metrics/lantern-speed-index.js   |  4 +--
 .../metrics/lantern-total-blocking-time.js    |  4 +--
 lighthouse-core/computed/metrics/tbt-utils.js |  2 +-
 lighthouse-core/computed/network-analysis.js  |  2 +-
 .../computed/page-dependency-graph.js         |  6 ++--
 lighthouse-core/computed/resource-summary.js  |  2 +-
 lighthouse-core/computed/unused-css.js        |  2 +-
 lighthouse-core/config/config-helpers.js      |  2 +-
 lighthouse-core/config/config-plugin.js       |  2 +-
 lighthouse-core/config/default-config.js      |  2 +-
 .../fraggle-rock/config/validation.js         |  2 +-
 lighthouse-core/gather/driver/environment.js  |  2 +-
 lighthouse-core/gather/driver/navigation.js   |  2 +-
 lighthouse-core/gather/driver/storage.js      |  2 +-
 .../gather/driver/wait-for-condition.js       |  2 +-
 lighthouse-core/gather/gather-runner.js       |  2 +-
 .../gatherers/dobetterweb/optimized-images.js |  2 +-
 .../dobetterweb/response-compression.js       |  2 +-
 .../gather/gatherers/full-page-screenshot.js  |  4 +--
 .../gather/gatherers/image-elements.js        |  2 +-
 .../gather/gatherers/link-elements.js         |  2 +-
 .../gather/gatherers/service-worker.js        |  2 +-
 .../gather/gatherers/trace-elements.js        |  2 +-
 lighthouse-core/lib/asset-saver.js            |  3 +-
 lighthouse-core/lib/axe.js                    |  8 +++--
 lighthouse-core/lib/csp-evaluator.js          |  2 +-
 .../simulator/connection-pool.js              |  2 +-
 .../simulator/network-analyzer.js             | 21 +++++++-------
 lighthouse-core/lib/lh-error.js               |  2 +-
 lighthouse-core/lib/minification-estimator.js |  2 +-
 lighthouse-core/lib/navigation-error.js       |  2 +-
 lighthouse-core/lib/proto-preprocessor.js     |  4 +--
 lighthouse-core/lib/script-helpers.js         |  5 +++-
 lighthouse-core/lib/stack-packs.js            |  4 +--
 lighthouse-core/lib/statistics.js             |  2 +-
 lighthouse-core/lib/tappable-rects.js         |  2 +-
 lighthouse-core/lib/tracehouse/task-groups.js |  2 +-
 .../lib/tracehouse/task-summary.js            |  4 +--
 lighthouse-core/lib/url-shim.js               |  2 +-
 lighthouse-core/runner.js                     |  4 +--
 .../scripts/update-flow-fixtures.js           |  4 +--
 .../scripts/update-report-fixtures.js         |  2 +-
 .../computed/page-dependency-graph-test.js    |  2 +-
 .../test/config/config-plugin-test.js         |  2 +-
 lighthouse-core/test/config/config-test.js    |  2 +-
 .../gather/driver/network-monitor-test.js     |  2 +-
 lighthouse-core/test/lib/asset-saver-test.js  |  2 +-
 .../lib/dependency-graph/base-node-test.js    |  2 +-
 .../simulator/network-analyzer-test.js        |  2 +-
 lighthouse-core/test/lib/emulation-test.js    |  3 +-
 lighthouse-core/test/lib/i18n/i18n-test.js    |  2 +-
 lighthouse-core/test/lib/sentry-test.js       |  2 +-
 lighthouse-core/test/runner-test.js           |  4 +--
 208 files changed, 326 insertions(+), 312 deletions(-)

diff --git a/clients/devtools/devtools-entry.js b/clients/devtools/devtools-entry.js
index 8a8642aaa1ac..7a6b9b5197fb 100644
--- a/clients/devtools/devtools-entry.js
+++ b/clients/devtools/devtools-entry.js
@@ -9,7 +9,7 @@
 
 import {Buffer} from 'buffer';
 
-import lighthouse from '../../lighthouse-core/index.js';
+import lighthouse, {legacyNavigation} from '../../lighthouse-core/index.js';
 import {navigation, startTimespan, snapshot} from '../../lighthouse-core/fraggle-rock/api.js';
 import {RawConnection} from '../../lighthouse-core/gather/connections/raw.js';
 import log from 'lighthouse-logger';
@@ -109,4 +109,6 @@ if (typeof self !== 'undefined') {
   // For the bundle smoke test.
   // @ts-expect-error
   global.runBundledLighthouse = lighthouse;
+  // @ts-expect-error
+  global.runBundledLighthouseLegacyNavigation = legacyNavigation;
 }
diff --git a/clients/lightrider/lightrider-entry.js b/clients/lightrider/lightrider-entry.js
index f09eb984de8c..f84925e8b3d6 100644
--- a/clients/lightrider/lightrider-entry.js
+++ b/clients/lightrider/lightrider-entry.js
@@ -11,8 +11,8 @@ import {Buffer} from 'buffer';
 
 import {legacyNavigation} from '../../lighthouse-core/index.js';
 import {LighthouseError} from '../../lighthouse-core/lib/lh-error.js';
-import preprocessor from '../../lighthouse-core/lib/proto-preprocessor.js';
-import assetSaver from '../../lighthouse-core/lib/asset-saver.js';
+import {processForProto} from '../../lighthouse-core/lib/proto-preprocessor.js';
+import * as assetSaver from '../../lighthouse-core/lib/asset-saver.js';
 
 import mobileConfig from '../../lighthouse-core/config/lr-mobile-config.js';
 import desktopConfig from '../../lighthouse-core/config/lr-desktop-config.js';
@@ -67,7 +67,7 @@ export async function runLighthouseInLR(connection, url, flags, lrOpts) {
     if (!runnerResult) throw new Error('Lighthouse finished without a runnerResult');
 
     // pre process the LHR for proto
-    const preprocessedLhr = preprocessor.processForProto(runnerResult.lhr);
+    const preprocessedLhr = processForProto(runnerResult.lhr);
 
     // When LR is called with |internal: {keep_raw_response: true, save_lighthouse_assets: true}|,
     // we log artifacts to raw_response.artifacts.
diff --git a/lighthouse-cli/commands/list-audits.js b/lighthouse-cli/commands/list-audits.js
index a4ffc11fa4ff..0c96d50b2fde 100644
--- a/lighthouse-cli/commands/list-audits.js
+++ b/lighthouse-cli/commands/list-audits.js
@@ -4,10 +4,10 @@
  * 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 lighthouse from '../../lighthouse-core/index.js';
+import {getAuditList} from '../../lighthouse-core/index.js';
 
 function listAudits() {
-  const audits = lighthouse.getAuditList().map((i) => i.replace(/\.js$/, ''));
+  const audits = getAuditList().map((i) => i.replace(/\.js$/, ''));
   process.stdout.write(JSON.stringify({audits}, null, 2));
   process.exit(0);
 }
diff --git a/lighthouse-cli/commands/list-trace-categories.js b/lighthouse-cli/commands/list-trace-categories.js
index a9fc969b9dd9..469f47a3abd8 100644
--- a/lighthouse-cli/commands/list-trace-categories.js
+++ b/lighthouse-cli/commands/list-trace-categories.js
@@ -4,10 +4,9 @@
  * 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 lighthouse from '../../lighthouse-core/index.js';
+import {traceCategories} from '../../lighthouse-core/index.js';
 
 function listTraceCategories() {
-  const traceCategories = lighthouse.traceCategories;
   process.stdout.write(JSON.stringify({traceCategories}));
   process.exit(0);
 }
diff --git a/lighthouse-cli/run.js b/lighthouse-cli/run.js
index aeedfab88280..f4b4177df018 100644
--- a/lighthouse-cli/run.js
+++ b/lighthouse-cli/run.js
@@ -15,7 +15,7 @@ import log from 'lighthouse-logger';
 import open from 'open';
 
 import * as Printer from './printer.js';
-import lighthouse from '../lighthouse-core/index.js';
+import lighthouse, {legacyNavigation} from '../lighthouse-core/index.js';
 import {getLhrFilenamePrefix} from '../report/generator/file-namer.js';
 import * as assetSaver from '../lighthouse-core/lib/asset-saver.js';
 import URL from '../lighthouse-core/lib/url-shim.js';
@@ -233,7 +233,7 @@ async function runLighthouse(url, flags, config) {
     }
 
     const runnerResult = flags.legacyNavigation ?
-       await lighthouse.legacyNavigation(url, flags, config) :
+       await legacyNavigation(url, flags, config) :
        await lighthouse(url, flags, config);
 
     // If in gatherMode only, there will be no runnerResult.
diff --git a/lighthouse-cli/test/smokehouse/lighthouse-runners/bundle.js b/lighthouse-cli/test/smokehouse/lighthouse-runners/bundle.js
index 84817a328164..b163f6197d29 100644
--- a/lighthouse-cli/test/smokehouse/lighthouse-runners/bundle.js
+++ b/lighthouse-cli/test/smokehouse/lighthouse-runners/bundle.js
@@ -19,7 +19,7 @@ import {once} from 'events';
 import puppeteer from 'puppeteer-core';
 import ChromeLauncher from 'chrome-launcher';
 
-import ChromeProtocol from '../../../../lighthouse-core/gather/connections/cri.js';
+import {CriConnection} from '../../../../lighthouse-core/gather/connections/cri.js';
 import {LH_ROOT} from '../../../../root.js';
 import {loadArtifacts, saveArtifacts} from '../../../../lighthouse-core/lib/asset-saver.js';
 
@@ -68,10 +68,14 @@ async function runBundledLighthouse(url, configJson, testRunnerOptions) {
   global.require = originalRequire;
   global.Buffer = originalBuffer;
 
-  /** @type {import('../../../../lighthouse-core/index.js')} */
+  /** @type {import('../../../../lighthouse-core/index.js')['default']} */
   // @ts-expect-error - not worth giving test global an actual type.
   const lighthouse = global.runBundledLighthouse;
 
+  /** @type {import('../../../../lighthouse-core/index.js')['legacyNavigation']} */
+  // @ts-expect-error - not worth giving test global an actual type.
+  const legacyNavigation = global.runBundledLighthouseLegacyNavigation;
+
   // Launch and connect to Chrome.
   const launchedChrome = await ChromeLauncher.launch();
   const port = launchedChrome.port;
@@ -86,9 +90,9 @@ async function runBundledLighthouse(url, configJson, testRunnerOptions) {
       const page = await browser.newPage();
       runnerResult = await lighthouse(url, {port, logLevel}, configJson, page);
     } else {
-      const connection = new ChromeProtocol(port);
+      const connection = new CriConnection(port);
       runnerResult =
-        await lighthouse.legacyNavigation(url, {port, logLevel}, configJson, connection);
+        await legacyNavigation(url, {port, logLevel}, configJson, connection);
     }
     if (!runnerResult) throw new Error('No runnerResult');
 
diff --git a/lighthouse-cli/test/smokehouse/lighthouse-runners/cli.js b/lighthouse-cli/test/smokehouse/lighthouse-runners/cli.js
index 97230e57e49e..8410aa0bf3ff 100644
--- a/lighthouse-cli/test/smokehouse/lighthouse-runners/cli.js
+++ b/lighthouse-cli/test/smokehouse/lighthouse-runners/cli.js
@@ -17,7 +17,7 @@ import {execFile} from 'child_process';
 
 import log from 'lighthouse-logger';
 
-import assetSaver from '../../../../lighthouse-core/lib/asset-saver.js';
+import * as assetSaver from '../../../../lighthouse-core/lib/asset-saver.js';
 import {LocalConsole} from '../lib/local-console.js';
 import {ChildProcessError} from '../lib/child-process-error.js';
 import {LH_ROOT} from '../../../../root.js';
diff --git a/lighthouse-core/audits/accessibility/accesskeys.js b/lighthouse-core/audits/accessibility/accesskeys.js
index 20f319b15bd9..b919bf948ba6 100644
--- a/lighthouse-core/audits/accessibility/accesskeys.js
+++ b/lighthouse-core/audits/accessibility/accesskeys.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the accesskey HTML attribute values are unique across all elements. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/aria-allowed-attr.js b/lighthouse-core/audits/accessibility/aria-allowed-attr.js
index 6d982bcf5f3b..fa4f5d93ab49 100644
--- a/lighthouse-core/audits/accessibility/aria-allowed-attr.js
+++ b/lighthouse-core/audits/accessibility/aria-allowed-attr.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the ARIA HTML attributes are misaligned with the aria-role HTML attribute specificed on the element, such mismatches are invalid. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/aria-command-name.js b/lighthouse-core/audits/accessibility/aria-command-name.js
index d81fb025e73f..7a57a1d9c70a 100644
--- a/lighthouse-core/audits/accessibility/aria-command-name.js
+++ b/lighthouse-core/audits/accessibility/aria-command-name.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accessibility audit that evaluates if important HTML elements have an accessible name. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/aria-hidden-body.js b/lighthouse-core/audits/accessibility/aria-hidden-body.js
index 72e4690dd557..c5083d69e876 100644
--- a/lighthouse-core/audits/accessibility/aria-hidden-body.js
+++ b/lighthouse-core/audits/accessibility/aria-hidden-body.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that checks if the html <body> element does not have an aria-hidden attribute set on it. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/aria-hidden-focus.js b/lighthouse-core/audits/accessibility/aria-hidden-focus.js
index 67f98bed3ab6..2bae32f3475b 100644
--- a/lighthouse-core/audits/accessibility/aria-hidden-focus.js
+++ b/lighthouse-core/audits/accessibility/aria-hidden-focus.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that checks if all elements that have an aria-hidden attribute do not contain focusable descendent elements. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/aria-input-field-name.js b/lighthouse-core/audits/accessibility/aria-input-field-name.js
index 7e5bf6c46759..bfe0b153ca60 100644
--- a/lighthouse-core/audits/accessibility/aria-input-field-name.js
+++ b/lighthouse-core/audits/accessibility/aria-input-field-name.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that checks that all ARIA input fields have an accessible name. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/aria-meter-name.js b/lighthouse-core/audits/accessibility/aria-meter-name.js
index f9a199dbde3c..4534b4100f0f 100644
--- a/lighthouse-core/audits/accessibility/aria-meter-name.js
+++ b/lighthouse-core/audits/accessibility/aria-meter-name.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accessibility audit that evaluates if meter HTML elements have an accessible name. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/aria-progressbar-name.js b/lighthouse-core/audits/accessibility/aria-progressbar-name.js
index 6d4652337234..508d1ccea0b9 100644
--- a/lighthouse-core/audits/accessibility/aria-progressbar-name.js
+++ b/lighthouse-core/audits/accessibility/aria-progressbar-name.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accessibility audit that evaluates if progressbar HTML elements have an accessible name. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/aria-required-attr.js b/lighthouse-core/audits/accessibility/aria-required-attr.js
index 6c5ba1f49568..5d949bbe7771 100644
--- a/lighthouse-core/audits/accessibility/aria-required-attr.js
+++ b/lighthouse-core/audits/accessibility/aria-required-attr.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all elements with the aria-role attribute have the other corresponding ARIA attributes set as well. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/aria-required-children.js b/lighthouse-core/audits/accessibility/aria-required-children.js
index f51de5a78a2f..1175c33e5d57 100644
--- a/lighthouse-core/audits/accessibility/aria-required-children.js
+++ b/lighthouse-core/audits/accessibility/aria-required-children.js
@@ -13,7 +13,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the elements with an aria-role that require child elements have the required children. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/aria-required-parent.js b/lighthouse-core/audits/accessibility/aria-required-parent.js
index 173b50e98cfd..50584cfe9437 100644
--- a/lighthouse-core/audits/accessibility/aria-required-parent.js
+++ b/lighthouse-core/audits/accessibility/aria-required-parent.js
@@ -13,7 +13,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates valid aria-role usage. Some ARIA roles require that elements must be a child of specific parent element. This audit checks that when those roles are used, the element with the role is in fact a child of the required parent. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/aria-roles.js b/lighthouse-core/audits/accessibility/aria-roles.js
index a66d3a744edd..1e69c5e2b053 100644
--- a/lighthouse-core/audits/accessibility/aria-roles.js
+++ b/lighthouse-core/audits/accessibility/aria-roles.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all elements have valid aria-role HTML attributes. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/aria-toggle-field-name.js b/lighthouse-core/audits/accessibility/aria-toggle-field-name.js
index 17c353f9e0aa..e99803284f2a 100644
--- a/lighthouse-core/audits/accessibility/aria-toggle-field-name.js
+++ b/lighthouse-core/audits/accessibility/aria-toggle-field-name.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that checks that all ARIA toggle fields have an accessible name. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/aria-tooltip-name.js b/lighthouse-core/audits/accessibility/aria-tooltip-name.js
index a96db496f147..8851ebf6edb7 100644
--- a/lighthouse-core/audits/accessibility/aria-tooltip-name.js
+++ b/lighthouse-core/audits/accessibility/aria-tooltip-name.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accessibility audit that evaluates if tooltip HTML elements have an accessible name. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/aria-treeitem-name.js b/lighthouse-core/audits/accessibility/aria-treeitem-name.js
index e42c66ad4b96..515876681283 100644
--- a/lighthouse-core/audits/accessibility/aria-treeitem-name.js
+++ b/lighthouse-core/audits/accessibility/aria-treeitem-name.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accessibility audit that evaluates if treeitem HTML elements have an accessible name. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/aria-valid-attr-value.js b/lighthouse-core/audits/accessibility/aria-valid-attr-value.js
index e98106915b10..70a8454d1c11 100644
--- a/lighthouse-core/audits/accessibility/aria-valid-attr-value.js
+++ b/lighthouse-core/audits/accessibility/aria-valid-attr-value.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all elements that have an ARIA HTML attribute have a valid value for that attribute. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/aria-valid-attr.js b/lighthouse-core/audits/accessibility/aria-valid-attr.js
index 0deede7a0d01..67098b7aed6e 100644
--- a/lighthouse-core/audits/accessibility/aria-valid-attr.js
+++ b/lighthouse-core/audits/accessibility/aria-valid-attr.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all elements with ARIA HTML attributes have spelled the name of attribute correctly. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/axe-audit.js b/lighthouse-core/audits/accessibility/axe-audit.js
index 295aab6ba828..aee620ed35c7 100644
--- a/lighthouse-core/audits/accessibility/axe-audit.js
+++ b/lighthouse-core/audits/accessibility/axe-audit.js
@@ -12,7 +12,7 @@
 
 import {Audit} from '../audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Label of a table column that identifies HTML elements that have failed an audit. */
diff --git a/lighthouse-core/audits/accessibility/button-name.js b/lighthouse-core/audits/accessibility/button-name.js
index c131e8360e00..fe7a6ef5bec2 100644
--- a/lighthouse-core/audits/accessibility/button-name.js
+++ b/lighthouse-core/audits/accessibility/button-name.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all button elements have names accessible to screen readers. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/bypass.js b/lighthouse-core/audits/accessibility/bypass.js
index ed5931ae09af..3c7be66521ef 100644
--- a/lighthouse-core/audits/accessibility/bypass.js
+++ b/lighthouse-core/audits/accessibility/bypass.js
@@ -13,7 +13,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the page has elements that let screen reader users skip over repetitive content. `heading`, `skip link`, and `landmark region` are technical terms for the elements that enable quick page navigation. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/color-contrast.js b/lighthouse-core/audits/accessibility/color-contrast.js
index d161f58d7cd5..29cb07c8f9c5 100644
--- a/lighthouse-core/audits/accessibility/color-contrast.js
+++ b/lighthouse-core/audits/accessibility/color-contrast.js
@@ -13,7 +13,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all foreground colors are distinct enough from their background colors to be legible for users. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/definition-list.js b/lighthouse-core/audits/accessibility/definition-list.js
index 17d93816269a..c3397ac77b05 100644
--- a/lighthouse-core/audits/accessibility/definition-list.js
+++ b/lighthouse-core/audits/accessibility/definition-list.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all the definition list elements have valid markup for screen readers. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/dlitem.js b/lighthouse-core/audits/accessibility/dlitem.js
index 99c50c7498ec..abb1306a553e 100644
--- a/lighthouse-core/audits/accessibility/dlitem.js
+++ b/lighthouse-core/audits/accessibility/dlitem.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all definition list item elements (`<dt>`/`<dd>`) have a definition list parent element (`<dl>`). This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/document-title.js b/lighthouse-core/audits/accessibility/document-title.js
index f21cf5d9cc25..66b85e8a0b56 100644
--- a/lighthouse-core/audits/accessibility/document-title.js
+++ b/lighthouse-core/audits/accessibility/document-title.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the page has a <title> element that describes the page. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/duplicate-id-active.js b/lighthouse-core/audits/accessibility/duplicate-id-active.js
index ca5ed97400ee..e4fee63abf62 100644
--- a/lighthouse-core/audits/accessibility/duplicate-id-active.js
+++ b/lighthouse-core/audits/accessibility/duplicate-id-active.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that checks if there are any duplicate id HTML attributes on active, focusable elements. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/duplicate-id-aria.js b/lighthouse-core/audits/accessibility/duplicate-id-aria.js
index 133e2e9aeb24..dd85e3a91cc9 100644
--- a/lighthouse-core/audits/accessibility/duplicate-id-aria.js
+++ b/lighthouse-core/audits/accessibility/duplicate-id-aria.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that checks if there are any duplicate ARIA IDs on the page. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/form-field-multiple-labels.js b/lighthouse-core/audits/accessibility/form-field-multiple-labels.js
index e2e482c9cf43..729a5af221dd 100644
--- a/lighthouse-core/audits/accessibility/form-field-multiple-labels.js
+++ b/lighthouse-core/audits/accessibility/form-field-multiple-labels.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that checks if any form fields have multiple label elements. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/frame-title.js b/lighthouse-core/audits/accessibility/frame-title.js
index 871e666008f2..5cfa90544049 100644
--- a/lighthouse-core/audits/accessibility/frame-title.js
+++ b/lighthouse-core/audits/accessibility/frame-title.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all `<frame>` and `<iframe>` elements on the page have a title HTML attribute to describe their contents. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/heading-order.js b/lighthouse-core/audits/accessibility/heading-order.js
index 57925904a387..c83e1ef50d13 100644
--- a/lighthouse-core/audits/accessibility/heading-order.js
+++ b/lighthouse-core/audits/accessibility/heading-order.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that checks if heading elements (<h1>, <h2>, etc) appear in numeric order and only ever increase in steps of 1. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/html-has-lang.js b/lighthouse-core/audits/accessibility/html-has-lang.js
index 5a13ddfd9101..a93d3c3dd6a2 100644
--- a/lighthouse-core/audits/accessibility/html-has-lang.js
+++ b/lighthouse-core/audits/accessibility/html-has-lang.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the root HTML tag has a lang attribute identifying the page's language. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/html-lang-valid.js b/lighthouse-core/audits/accessibility/html-lang-valid.js
index 1f19320bf859..9de516f3eba6 100644
--- a/lighthouse-core/audits/accessibility/html-lang-valid.js
+++ b/lighthouse-core/audits/accessibility/html-lang-valid.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the value for root HTML tag's lang attribute is a valid BCP 47 language. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/image-alt.js b/lighthouse-core/audits/accessibility/image-alt.js
index 354018a8e10f..ea595602a270 100644
--- a/lighthouse-core/audits/accessibility/image-alt.js
+++ b/lighthouse-core/audits/accessibility/image-alt.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all image elements have the alt HTML attribute to describe their contents. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/input-image-alt.js b/lighthouse-core/audits/accessibility/input-image-alt.js
index 98ef5270a5f4..5fdd819d12e6 100644
--- a/lighthouse-core/audits/accessibility/input-image-alt.js
+++ b/lighthouse-core/audits/accessibility/input-image-alt.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all input elements of type image have an alt HTML attribute to describe their contents. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/label.js b/lighthouse-core/audits/accessibility/label.js
index 6a431a0b6c14..50cccd4793b9 100644
--- a/lighthouse-core/audits/accessibility/label.js
+++ b/lighthouse-core/audits/accessibility/label.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all form elements have corresponding label elements. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/link-name.js b/lighthouse-core/audits/accessibility/link-name.js
index 62738a48b3f0..f91320ccd7e9 100644
--- a/lighthouse-core/audits/accessibility/link-name.js
+++ b/lighthouse-core/audits/accessibility/link-name.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all link elements have a non-generic name to screen readers. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/list.js b/lighthouse-core/audits/accessibility/list.js
index 36f1f65c0f3e..b0d2612a3da1 100644
--- a/lighthouse-core/audits/accessibility/list.js
+++ b/lighthouse-core/audits/accessibility/list.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all list elements have a valid structure containing only list items. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/listitem.js b/lighthouse-core/audits/accessibility/listitem.js
index 1a9daa4775a2..df26e5bc8f96 100644
--- a/lighthouse-core/audits/accessibility/listitem.js
+++ b/lighthouse-core/audits/accessibility/listitem.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if any list item elements do not have list parent elements. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/meta-refresh.js b/lighthouse-core/audits/accessibility/meta-refresh.js
index 0c07c06c67bc..7c10e1ea5535 100644
--- a/lighthouse-core/audits/accessibility/meta-refresh.js
+++ b/lighthouse-core/audits/accessibility/meta-refresh.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the page uses a meta tag that refreshes the page automatically. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/meta-viewport.js b/lighthouse-core/audits/accessibility/meta-viewport.js
index f4a330db5ca2..045a9c4b5e1d 100644
--- a/lighthouse-core/audits/accessibility/meta-viewport.js
+++ b/lighthouse-core/audits/accessibility/meta-viewport.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if the page has limited the scaling properties of the page in a way that harms users with low vision. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/object-alt.js b/lighthouse-core/audits/accessibility/object-alt.js
index b3f239b332b7..f12f10d28a38 100644
--- a/lighthouse-core/audits/accessibility/object-alt.js
+++ b/lighthouse-core/audits/accessibility/object-alt.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all object elements have an alt HTML attribute that describes their contents. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/tabindex.js b/lighthouse-core/audits/accessibility/tabindex.js
index d9a2bd5d7be3..3d9f71a032de 100644
--- a/lighthouse-core/audits/accessibility/tabindex.js
+++ b/lighthouse-core/audits/accessibility/tabindex.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if any elements have custom tabindex HTML attributes that might frustrate users of assitive technology. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/td-headers-attr.js b/lighthouse-core/audits/accessibility/td-headers-attr.js
index bbb35ea7cdba..503b40d31f0e 100644
--- a/lighthouse-core/audits/accessibility/td-headers-attr.js
+++ b/lighthouse-core/audits/accessibility/td-headers-attr.js
@@ -13,7 +13,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all table cell elements in a table that use the headers HTML attribute use it correctly to refer to header cells within the same table. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/th-has-data-cells.js b/lighthouse-core/audits/accessibility/th-has-data-cells.js
index 1d5a90dd9d6f..6f75b5d52932 100644
--- a/lighthouse-core/audits/accessibility/th-has-data-cells.js
+++ b/lighthouse-core/audits/accessibility/th-has-data-cells.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all table header elements have children. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/valid-lang.js b/lighthouse-core/audits/accessibility/valid-lang.js
index 85df523e40b1..138863393d44 100644
--- a/lighthouse-core/audits/accessibility/valid-lang.js
+++ b/lighthouse-core/audits/accessibility/valid-lang.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all lang HTML attributes are valid BCP 47 languages. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/accessibility/video-caption.js b/lighthouse-core/audits/accessibility/video-caption.js
index bb2f0f5738e6..b3474f334437 100644
--- a/lighthouse-core/audits/accessibility/video-caption.js
+++ b/lighthouse-core/audits/accessibility/video-caption.js
@@ -12,7 +12,7 @@
 
 import AxeAudit from './axe-audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if all video elements contain a child track element that has captions describing their audio. This title is descriptive of the successful state and is shown to users when no user action is required. */
diff --git a/lighthouse-core/audits/apple-touch-icon.js b/lighthouse-core/audits/apple-touch-icon.js
index 1f44a97745df..63bd75f1f1d8 100644
--- a/lighthouse-core/audits/apple-touch-icon.js
+++ b/lighthouse-core/audits/apple-touch-icon.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 /**
  * @fileoverview Audits if a page has an `apple-touch-icon` link element with a valid href.
diff --git a/lighthouse-core/audits/audit.js b/lighthouse-core/audits/audit.js
index a8c9912fd613..54eb68597d6d 100644
--- a/lighthouse-core/audits/audit.js
+++ b/lighthouse-core/audits/audit.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {isUnderTest} from '../lib/lh-env.js';
-import statistics from '../lib/statistics.js';
+import * as statistics from '../lib/statistics.js';
 import {Util} from '../util-commonjs.cjs';
 
 const DEFAULT_PASS = 'defaultPass';
diff --git a/lighthouse-core/audits/autocomplete.js b/lighthouse-core/audits/autocomplete.js
index 1528344a5fb2..03fd010f1bf8 100644
--- a/lighthouse-core/audits/autocomplete.js
+++ b/lighthouse-core/audits/autocomplete.js
@@ -13,7 +13,7 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 import log from 'lighthouse-logger';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/bootup-time.js b/lighthouse-core/audits/bootup-time.js
index e6a79ed75268..0ad91c10e897 100644
--- a/lighthouse-core/audits/bootup-time.js
+++ b/lighthouse-core/audits/bootup-time.js
@@ -7,7 +7,7 @@
 
 import {Audit} from './audit.js';
 import {taskGroups} from '../lib/tracehouse/task-groups.js';
-import i18n from '../lib/i18n/i18n.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 {getExecutionTimingsByURL} from '../lib/tracehouse/task-summary.js';
diff --git a/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js b/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js
index ba5b705b369a..6520eb6ea11c 100644
--- a/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js
+++ b/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js
@@ -8,14 +8,14 @@
 import {Audit} from '../audit.js';
 import {linearInterpolation} from '../../lib/statistics.js';
 import Interactive from '../../computed/metrics/lantern-interactive.js';
-import i18n from '../../lib/i18n/i18n.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';
 
 const str_ = i18n.createMessageInstanceIdFn(import.meta.url, {});
 
-/** @typedef {import('../../lib/dependency-graph/simulator/simulator')} Simulator */
+/** @typedef {import('../../lib/dependency-graph/simulator/simulator').Simulator} Simulator */
 /** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
 
 const WASTED_MS_FOR_AVERAGE = 300;
@@ -36,7 +36,7 @@ const WASTED_MS_FOR_SCORE_OF_ZERO = 5000;
  * @overview Used as the base for all byte efficiency audits. Computes total bytes
  *    and estimated time saved. Subclass and override `audit_` to return results.
  */
-class UnusedBytes extends Audit {
+class ByteEfficiencyAudit extends Audit {
   /**
    * Creates a score based on the wastedMs value using linear interpolation between control points.
    *
@@ -236,7 +236,7 @@ class UnusedBytes extends Audit {
       displayValue,
       numericValue: wastedMs,
       numericUnit: 'millisecond',
-      score: UnusedBytes.scoreForWastedMs(wastedMs),
+      score: ByteEfficiencyAudit.scoreForWastedMs(wastedMs),
       details,
     };
   }
@@ -256,4 +256,4 @@ class UnusedBytes extends Audit {
   /* eslint-enable no-unused-vars */
 }
 
-export default UnusedBytes;
+export {ByteEfficiencyAudit};
diff --git a/lighthouse-core/audits/byte-efficiency/duplicated-javascript.js b/lighthouse-core/audits/byte-efficiency/duplicated-javascript.js
index 0f77280e4aba..cd84a3d1b925 100644
--- a/lighthouse-core/audits/byte-efficiency/duplicated-javascript.js
+++ b/lighthouse-core/audits/byte-efficiency/duplicated-javascript.js
@@ -9,10 +9,10 @@
 /** @typedef {LH.Audit.ByteEfficiencyItem & {source: string, subItems: {type: 'subitems', items: SubItem[]}}} Item */
 /** @typedef {{url: string, sourceTransferBytes?: number}} SubItem */
 
-import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
 
 import ModuleDuplication from '../../computed/module-duplication.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import {getRequestForScript} from '../../lib/script-helpers.js';
 
 const UIStrings = {
@@ -124,7 +124,7 @@ class DuplicatedJavascript extends ByteEfficiencyAudit {
    * @param {LH.Artifacts} artifacts
    * @param {Array<LH.Artifacts.NetworkRequest>} networkRecords
    * @param {LH.Audit.Context} context
-   * @return {Promise<ByteEfficiencyAudit.ByteEfficiencyProduct>}
+   * @return {Promise<ByteEfficiencyProduct>}
    */
   static async audit_(artifacts, networkRecords, context) {
     const ignoreThresholdInBytes =
diff --git a/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js b/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js
index b8d21f471c38..0605b9a226f5 100644
--- a/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js
+++ b/lighthouse-core/audits/byte-efficiency/efficient-animated-content.js
@@ -9,8 +9,8 @@
 'use strict';
 
 import {NetworkRequest} from '../../lib/network-request.js';
-import ByteEfficiencyAudit from './byte-efficiency-audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to use video formats rather than animated GIFs, which are wasteful. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -54,7 +54,7 @@ class EfficientAnimatedContent extends ByteEfficiencyAudit {
   /**
    * @param {LH.Artifacts} artifacts
    * @param {Array<LH.Artifacts.NetworkRequest>} networkRecords
-   * @return {ByteEfficiencyAudit.ByteEfficiencyProduct}
+   * @return {import('./byte-efficiency-audit.js').ByteEfficiencyProduct}
    */
   static audit_(artifacts, networkRecords) {
     const unoptimizedContent = networkRecords.filter(
diff --git a/lighthouse-core/audits/byte-efficiency/legacy-javascript.js b/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
index c9ec89e4d05d..ce2f354926c5 100644
--- a/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
+++ b/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
@@ -18,10 +18,10 @@
 /** @typedef {LH.Audit.ByteEfficiencyItem & {subItems: {type: 'subitems', items: SubItem[]}}} Item */
 /** @typedef {{signal: string, location: LH.Audit.Details.SourceLocationValue}} SubItem */
 
-import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
 
 import JsBundles from '../../computed/js-bundles.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import thirdPartyWeb from '../../lib/third-party-web.js';
 import {getRequestForScript} from '../../lib/script-helpers.js';
 
diff --git a/lighthouse-core/audits/byte-efficiency/modern-image-formats.js b/lighthouse-core/audits/byte-efficiency/modern-image-formats.js
index 04007aea0c97..e912efc47cd5 100644
--- a/lighthouse-core/audits/byte-efficiency/modern-image-formats.js
+++ b/lighthouse-core/audits/byte-efficiency/modern-image-formats.js
@@ -8,9 +8,9 @@
  */
 'use strict';
 
-import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
 import URL from '../../lib/url-shim.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to serve images in newer and more efficient image formats in order to enhance the performance of a page. A non-modern image format was designed 20+ years ago. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -89,7 +89,7 @@ class ModernImageFormats extends ByteEfficiencyAudit {
 
   /**
    * @param {LH.Artifacts} artifacts
-   * @return {ByteEfficiencyAudit.ByteEfficiencyProduct}
+   * @return {import('./byte-efficiency-audit.js').ByteEfficiencyProduct}
    */
   static audit_(artifacts) {
     const pageURL = artifacts.URL.finalUrl;
diff --git a/lighthouse-core/audits/byte-efficiency/offscreen-images.js b/lighthouse-core/audits/byte-efficiency/offscreen-images.js
index 85e51f633ea5..449bf4510ae9 100644
--- a/lighthouse-core/audits/byte-efficiency/offscreen-images.js
+++ b/lighthouse-core/audits/byte-efficiency/offscreen-images.js
@@ -9,11 +9,11 @@
  */
 'use strict';
 
-import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
 import {NetworkRequest} from '../../lib/network-request.js';
-import Sentry from '../../lib/sentry.js';
+import {Sentry} from '../../lib/sentry.js';
 import URL from '../../lib/url-shim.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import Interactive from '../../computed/metrics/interactive.js';
 import ProcessedTrace from '../../computed/processed-trace.js';
 
@@ -174,7 +174,7 @@ class OffscreenImages extends ByteEfficiencyAudit {
    * @param {LH.Artifacts} artifacts
    * @param {Array<LH.Artifacts.NetworkRequest>} networkRecords
    * @param {LH.Audit.Context} context
-   * @return {Promise<ByteEfficiencyAudit.ByteEfficiencyProduct>}
+   * @return {Promise<import('./byte-efficiency-audit.js').ByteEfficiencyProduct>}
    */
   static async audit_(artifacts, networkRecords, context) {
     const images = artifacts.ImageElements;
diff --git a/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js b/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js
index 8d2829f08181..001a33d09e7f 100644
--- a/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js
+++ b/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js
@@ -10,9 +10,9 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-import i18n from '../../lib/i18n/i18n.js';
-import BaseNode from '../../lib/dependency-graph/base-node.js';
-import ByteEfficiencyAudit from './byte-efficiency-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 {NetworkRequest} from '../../lib/network-request.js';
 import ProcessedTrace from '../../computed/processed-trace.js';
@@ -20,7 +20,7 @@ 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 */
+/** @typedef {import('../../lib/dependency-graph/simulator/simulator').Simulator} Simulator */
 /** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
 /** @typedef {import('../../lib/dependency-graph/network-node.js')} NetworkNode */
 
diff --git a/lighthouse-core/audits/byte-efficiency/total-byte-weight.js b/lighthouse-core/audits/byte-efficiency/total-byte-weight.js
index 195ff52ac6b9..628fb17f2a8d 100644
--- a/lighthouse-core/audits/byte-efficiency/total-byte-weight.js
+++ b/lighthouse-core/audits/byte-efficiency/total-byte-weight.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import {NetworkRequest} from '../../lib/network-request.js';
 import NetworkRecords from '../../computed/network-records.js';
 
diff --git a/lighthouse-core/audits/byte-efficiency/unminified-css.js b/lighthouse-core/audits/byte-efficiency/unminified-css.js
index 420a6096a919..e4093a8147cc 100644
--- a/lighthouse-core/audits/byte-efficiency/unminified-css.js
+++ b/lighthouse-core/audits/byte-efficiency/unminified-css.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
 import UnusedCSS from '../../computed/unused-css.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import {computeCSSTokenLength as computeTokenLength} from '../../lib/minification-estimator.js';
 
 const UIStrings = {
@@ -81,7 +81,7 @@ class UnminifiedCSS extends ByteEfficiencyAudit {
   /**
    * @param {LH.Artifacts} artifacts
    * @param {Array<LH.Artifacts.NetworkRequest>} networkRecords
-   * @return {ByteEfficiencyAudit.ByteEfficiencyProduct}
+   * @return {import('./byte-efficiency-audit.js').ByteEfficiencyProduct}
    */
   static audit_(artifacts, networkRecords) {
     const items = [];
diff --git a/lighthouse-core/audits/byte-efficiency/unminified-javascript.js b/lighthouse-core/audits/byte-efficiency/unminified-javascript.js
index f2b0516e92ee..4f5cacb5473c 100644
--- a/lighthouse-core/audits/byte-efficiency/unminified-javascript.js
+++ b/lighthouse-core/audits/byte-efficiency/unminified-javascript.js
@@ -5,8 +5,8 @@
  */
 'use strict';
 
-import ByteEfficiencyAudit from './byte-efficiency-audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import {computeJSTokenLength as computeTokenLength} from '../../lib/minification-estimator.js';
 import {getRequestForScript, isInline} from '../../lib/script-helpers.js';
 
@@ -73,7 +73,7 @@ class UnminifiedJavaScript extends ByteEfficiencyAudit {
   /**
    * @param {LH.Artifacts} artifacts
    * @param {Array<LH.Artifacts.NetworkRequest>} networkRecords
-   * @return {ByteEfficiencyAudit.ByteEfficiencyProduct}
+   * @return {import('./byte-efficiency-audit.js').ByteEfficiencyProduct}
    */
   static audit_(artifacts, networkRecords) {
     /** @type {Array<LH.Audit.ByteEfficiencyItem>} */
diff --git a/lighthouse-core/audits/byte-efficiency/unused-css-rules.js b/lighthouse-core/audits/byte-efficiency/unused-css-rules.js
index e5d79eb9f8ad..ad5532125650 100644
--- a/lighthouse-core/audits/byte-efficiency/unused-css-rules.js
+++ b/lighthouse-core/audits/byte-efficiency/unused-css-rules.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
 import UnusedCSS from '../../computed/unused-css.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to reduce content from their CSS that isn’t needed immediately and instead load that content at a later time. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -42,7 +42,7 @@ class UnusedCSSRules extends ByteEfficiencyAudit {
    * @param {LH.Artifacts} artifacts
    * @param {LH.Artifacts.NetworkRequest[]} _
    * @param {LH.Audit.Context} context
-   * @return {Promise<ByteEfficiencyAudit.ByteEfficiencyProduct>}
+   * @return {Promise<import('./byte-efficiency-audit.js').ByteEfficiencyProduct>}
    */
   static async audit_(artifacts, _, context) {
     const unusedCssItems = await UnusedCSS.request({
diff --git a/lighthouse-core/audits/byte-efficiency/unused-javascript.js b/lighthouse-core/audits/byte-efficiency/unused-javascript.js
index 5473d05be7a5..bffe1e78b0c4 100644
--- a/lighthouse-core/audits/byte-efficiency/unused-javascript.js
+++ b/lighthouse-core/audits/byte-efficiency/unused-javascript.js
@@ -5,10 +5,10 @@
  */
 'use strict';
 
-import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
 import UnusedJavaScriptSummary from '../../computed/unused-javascript-summary.js';
 import JsBundles from '../../computed/js-bundles.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import {getRequestForScript} from '../../lib/script-helpers.js';
 
 const UIStrings = {
@@ -77,7 +77,7 @@ class UnusedJavaScript extends ByteEfficiencyAudit {
    * @param {LH.Artifacts} artifacts
    * @param {Array<LH.Artifacts.NetworkRequest>} networkRecords
    * @param {LH.Audit.Context} context
-   * @return {Promise<ByteEfficiencyAudit.ByteEfficiencyProduct>}
+   * @return {Promise<import('./byte-efficiency-audit.js').ByteEfficiencyProduct>}
    */
   static async audit_(artifacts, networkRecords, context) {
     const bundles = await JsBundles.request(artifacts, context);
diff --git a/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js b/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js
index c87903769b80..f927592444a4 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js
@@ -10,7 +10,7 @@ import {Audit} from '../audit.js';
 import {NetworkRequest} from '../../lib/network-request.js';
 import URL from '../../lib/url-shim.js';
 import {linearInterpolation} from '../../lib/statistics.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import NetworkRecords from '../../computed/network-records.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/byte-efficiency/uses-optimized-images.js b/lighthouse-core/audits/byte-efficiency/uses-optimized-images.js
index 3212c8a23326..b9e34db087b5 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-optimized-images.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-optimized-images.js
@@ -9,9 +9,9 @@
  */
 'use strict';
 
-import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
 import URL from '../../lib/url-shim.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to encode images with optimization (better compression). This is displayed in a list of audit titles that Lighthouse generates. */
@@ -66,7 +66,7 @@ class UsesOptimizedImages extends ByteEfficiencyAudit {
 
   /**
    * @param {LH.Artifacts} artifacts
-   * @return {ByteEfficiencyAudit.ByteEfficiencyProduct}
+   * @return {import('./byte-efficiency-audit.js').ByteEfficiencyProduct}
    */
   static audit_(artifacts) {
     const pageURL = artifacts.URL.finalUrl;
diff --git a/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js b/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js
index 58b671b8b035..2a2b928511fe 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js
@@ -12,9 +12,9 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-import UsesResponsiveImages from './uses-responsive-images.js';
+import * as UsesResponsiveImages from './uses-responsive-images.js';
 import URL from '../../lib/url-shim.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Descriptive title of a Lighthouse audit that checks if images match their displayed dimensions. This is displayed when the audit is passing. */
@@ -58,7 +58,7 @@ class UsesResponsiveImagesSnapshot extends Audit {
     for (const image of artifacts.ImageElements) {
       if (!image.naturalDimensions) continue;
       const actual = image.naturalDimensions;
-      const displayed = UsesResponsiveImages.getDisplayedDimensions(
+      const displayed = UsesResponsiveImages.default.getDisplayedDimensions(
         {...image, naturalWidth: actual.width, naturalHeight: actual.height},
         artifacts.ViewportDimensions
       );
diff --git a/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js b/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js
index e3816cfa6402..64404ffe6041 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js
@@ -13,11 +13,11 @@
  */
 'use strict';
 
-import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+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 i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to resize images to match the display dimensions. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -116,7 +116,7 @@ class UsesResponsiveImages extends ByteEfficiencyAudit {
    * @param {LH.Artifacts} artifacts
    * @param {Array<LH.Artifacts.NetworkRequest>} networkRecords
    * @param {LH.Audit.Context} context
-   * @return {Promise<ByteEfficiencyAudit.ByteEfficiencyProduct>}
+   * @return {Promise<import('./byte-efficiency-audit.js').ByteEfficiencyProduct>}
    */
   static async audit_(artifacts, networkRecords, context) {
     const images = await ImageRecords.request({
@@ -173,5 +173,4 @@ class UsesResponsiveImages extends ByteEfficiencyAudit {
 }
 
 export default UsesResponsiveImages;
-export {UIStrings};
-module.exports.str_ = str_;
+export {UIStrings, str_};
diff --git a/lighthouse-core/audits/byte-efficiency/uses-text-compression.js b/lighthouse-core/audits/byte-efficiency/uses-text-compression.js
index 8c7070c06b46..ecfc116f5154 100644
--- a/lighthouse-core/audits/byte-efficiency/uses-text-compression.js
+++ b/lighthouse-core/audits/byte-efficiency/uses-text-compression.js
@@ -9,9 +9,9 @@
  */
 'use strict';
 
-import ByteEfficiencyAudit from './byte-efficiency-audit.js';
+import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
 import URL from '../../lib/url-shim.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to enable text compression (like gzip) in order to enhance the performance of a page. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -43,7 +43,7 @@ class ResponsesAreCompressed extends ByteEfficiencyAudit {
 
   /**
    * @param {LH.Artifacts} artifacts
-   * @return {ByteEfficiencyAudit.ByteEfficiencyProduct}
+   * @return {import('./byte-efficiency-audit.js').ByteEfficiencyProduct}
    */
   static audit_(artifacts) {
     const uncompressedResponses = artifacts.ResponseCompression;
diff --git a/lighthouse-core/audits/content-width.js b/lighthouse-core/audits/content-width.js
index 72332a585c6a..1478b47576fb 100644
--- a/lighthouse-core/audits/content-width.js
+++ b/lighthouse-core/audits/content-width.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the content size of a web site compared to the viewport, which is the size of the screen the site is displayed on. This descriptive title is shown to users when the site's content is sized appropriately. */
diff --git a/lighthouse-core/audits/critical-request-chains.js b/lighthouse-core/audits/critical-request-chains.js
index 628fdd244a7b..d35de749cb9f 100644
--- a/lighthouse-core/audits/critical-request-chains.js
+++ b/lighthouse-core/audits/critical-request-chains.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 import ComputedChains from '../computed/critical-request-chains.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/csp-xss.js b/lighthouse-core/audits/csp-xss.js
index 20d80e09b21a..7e64eb9e7327 100644
--- a/lighthouse-core/audits/csp-xss.js
+++ b/lighthouse-core/audits/csp-xss.js
@@ -7,7 +7,7 @@
 
 import {Audit} from './audit.js';
 import MainResource from '../computed/main-resource.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 import {evaluateRawCspsForXss, getTranslatedDescription} from '../lib/csp-evaluator.js';
 
 /** @typedef {import('../lib/csp-evaluator.js').Finding} Finding */
diff --git a/lighthouse-core/audits/deprecations.js b/lighthouse-core/audits/deprecations.js
index f9b17dd58c2b..483ac431e293 100644
--- a/lighthouse-core/audits/deprecations.js
+++ b/lighthouse-core/audits/deprecations.js
@@ -12,7 +12,7 @@
 import {Audit} from './audit.js';
 
 import JsBundles from '../computed/js-bundles.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the use of deprecated APIs. This descriptive title is shown to users when the page does not use deprecated APIs. */
diff --git a/lighthouse-core/audits/dobetterweb/charset.js b/lighthouse-core/audits/dobetterweb/charset.js
index 20738c4d70b0..da42840570d0 100644
--- a/lighthouse-core/audits/dobetterweb/charset.js
+++ b/lighthouse-core/audits/dobetterweb/charset.js
@@ -13,7 +13,7 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import MainResource from '../../computed/main-resource.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/dobetterweb/doctype.js b/lighthouse-core/audits/dobetterweb/doctype.js
index 53b6ae5c28bf..cabde5694156 100644
--- a/lighthouse-core/audits/dobetterweb/doctype.js
+++ b/lighthouse-core/audits/dobetterweb/doctype.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the doctype of a page. This descriptive title is shown to users when the pages's doctype is set to HTML. */
diff --git a/lighthouse-core/audits/dobetterweb/dom-size.js b/lighthouse-core/audits/dobetterweb/dom-size.js
index c956d6c55da7..bc5543f47f7e 100644
--- a/lighthouse-core/audits/dobetterweb/dom-size.js
+++ b/lighthouse-core/audits/dobetterweb/dom-size.js
@@ -13,7 +13,7 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a diagnostic audit that provides detail on the size of the web page's DOM. The size of a DOM is characterized by the total number of DOM elements and greatest DOM depth. This descriptive title is shown to users when the amount is acceptable and no user action is required. */
diff --git a/lighthouse-core/audits/dobetterweb/geolocation-on-start.js b/lighthouse-core/audits/dobetterweb/geolocation-on-start.js
index 83d9e04096d1..e04b229d7168 100644
--- a/lighthouse-core/audits/dobetterweb/geolocation-on-start.js
+++ b/lighthouse-core/audits/dobetterweb/geolocation-on-start.js
@@ -12,7 +12,7 @@
 'use strict';
 
 import ViolationAudit from '../violation-audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on geolocation permission requests while the page is loading. This descriptive title is shown to users when the page does not ask for geolocation permissions on load. */
diff --git a/lighthouse-core/audits/dobetterweb/inspector-issues.js b/lighthouse-core/audits/dobetterweb/inspector-issues.js
index 4cff32c88790..8d942bb49c75 100644
--- a/lighthouse-core/audits/dobetterweb/inspector-issues.js
+++ b/lighthouse-core/audits/dobetterweb/inspector-issues.js
@@ -17,7 +17,7 @@
 
 import {Audit} from '../audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on various types of problems with a website, like security or network errors. This descriptive title is shown to users when no issues were logged into the Chrome DevTools Issues panel. */
diff --git a/lighthouse-core/audits/dobetterweb/js-libraries.js b/lighthouse-core/audits/dobetterweb/js-libraries.js
index 7673ecb87e99..64470870a7a5 100644
--- a/lighthouse-core/audits/dobetterweb/js-libraries.js
+++ b/lighthouse-core/audits/dobetterweb/js-libraries.js
@@ -11,7 +11,7 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the Javascript libraries that are used on the page. */
diff --git a/lighthouse-core/audits/dobetterweb/no-document-write.js b/lighthouse-core/audits/dobetterweb/no-document-write.js
index 8680b91144d6..a78940279f88 100644
--- a/lighthouse-core/audits/dobetterweb/no-document-write.js
+++ b/lighthouse-core/audits/dobetterweb/no-document-write.js
@@ -29,7 +29,7 @@
 'use strict';
 
 import ViolationAudit from '../violation-audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the page's use of the `document.write` API. This descriptive title is shown to users when the page does not use `document.write`. */
diff --git a/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js b/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
index 25a66b8bc0f8..535791f0737b 100644
--- a/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
+++ b/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
@@ -13,10 +13,10 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-import Sentry from '../../lib/sentry.js';
+import {Sentry} from '../../lib/sentry.js';
 import semver from 'semver';
 import snykDatabase from '../../../third-party/snyk/snapshot.json';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on Javascript libraries the page uses. This descriptive title is shown to users when all Javascript libraries are free of known security vulnerabilities. */
diff --git a/lighthouse-core/audits/dobetterweb/notification-on-start.js b/lighthouse-core/audits/dobetterweb/notification-on-start.js
index 24674f63cbb2..3ad4d4ea3a7f 100644
--- a/lighthouse-core/audits/dobetterweb/notification-on-start.js
+++ b/lighthouse-core/audits/dobetterweb/notification-on-start.js
@@ -12,7 +12,7 @@
 'use strict';
 
 import ViolationAudit from '../violation-audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the page's notification permission requests. This descriptive title is shown to users when the page does not ask for notification permission on load. */
diff --git a/lighthouse-core/audits/dobetterweb/password-inputs-can-be-pasted-into.js b/lighthouse-core/audits/dobetterweb/password-inputs-can-be-pasted-into.js
index 846d2e6af692..8832fb37c62f 100644
--- a/lighthouse-core/audits/dobetterweb/password-inputs-can-be-pasted-into.js
+++ b/lighthouse-core/audits/dobetterweb/password-inputs-can-be-pasted-into.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the ability to paste into password fields. This descriptive title is shown to users when the page allows pasting of content into password fields. */
diff --git a/lighthouse-core/audits/dobetterweb/uses-http2.js b/lighthouse-core/audits/dobetterweb/uses-http2.js
index dc21e2097052..a5acbe52d21e 100644
--- a/lighthouse-core/audits/dobetterweb/uses-http2.js
+++ b/lighthouse-core/audits/dobetterweb/uses-http2.js
@@ -10,20 +10,20 @@
  * origin are over the http/2 protocol.
  */
 
-/** @typedef {import('../../lib/dependency-graph/simulator/simulator')} Simulator */
+/** @typedef {import('../../lib/dependency-graph/simulator/simulator').Simulator} Simulator */
 /** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
 
 import {Audit} from '../audit.js';
 
 import ThirdParty from '../../lib/third-party-web.js';
 import URL from '../../lib/url-shim.js';
-import ByteEfficiencyAudit from '../byte-efficiency/byte-efficiency-audit.js';
+import {ByteEfficiencyAudit} from '../byte-efficiency/byte-efficiency-audit.js';
 import Interactive 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 i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to enable HTTP/2. This is displayed in a list of audit titles that Lighthouse generates. */
diff --git a/lighthouse-core/audits/dobetterweb/uses-passive-event-listeners.js b/lighthouse-core/audits/dobetterweb/uses-passive-event-listeners.js
index 834d07b4715f..75c58eec5bb1 100644
--- a/lighthouse-core/audits/dobetterweb/uses-passive-event-listeners.js
+++ b/lighthouse-core/audits/dobetterweb/uses-passive-event-listeners.js
@@ -12,7 +12,7 @@
 'use strict';
 
 import ViolationAudit from '../violation-audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the page's use of passive event listeners used to improve the scrolling performance of the page. This descriptive title is shown to users when the page does use passive listeners. */
diff --git a/lighthouse-core/audits/errors-in-console.js b/lighthouse-core/audits/errors-in-console.js
index 1b0ef418d7c1..f1a9930de966 100644
--- a/lighthouse-core/audits/errors-in-console.js
+++ b/lighthouse-core/audits/errors-in-console.js
@@ -14,7 +14,7 @@ import log from 'lighthouse-logger';
 
 import {Audit} from './audit.js';
 import JsBundles from '../computed/js-bundles.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on browser errors. This descriptive title is shown to users when no browser errors were logged into the devtools console. */
diff --git a/lighthouse-core/audits/font-display.js b/lighthouse-core/audits/font-display.js
index d0fe21732c39..441bb2e21368 100644
--- a/lighthouse-core/audits/font-display.js
+++ b/lighthouse-core/audits/font-display.js
@@ -10,8 +10,8 @@ import URL from '../lib/url-shim.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 i18n from '../lib/i18n/i18n.js';
-import Sentry from '../lib/sentry.js';
+import * as i18n from '../lib/i18n/i18n.js';
+import {Sentry} from '../lib/sentry.js';
 import NetworkRecords from '../computed/network-records.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/image-aspect-ratio.js b/lighthouse-core/audits/image-aspect-ratio.js
index 727d2926b393..1a0e849a84e1 100644
--- a/lighthouse-core/audits/image-aspect-ratio.js
+++ b/lighthouse-core/audits/image-aspect-ratio.js
@@ -13,7 +13,7 @@
 
 import {Audit} from './audit.js';
 import URL from '../lib/url-shim.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the aspect ratios of all images on the page. This descriptive title is shown to users when all images use correct aspect ratios. */
diff --git a/lighthouse-core/audits/image-size-responsive.js b/lighthouse-core/audits/image-size-responsive.js
index f56314738b16..d0ea4d920e08 100644
--- a/lighthouse-core/audits/image-size-responsive.js
+++ b/lighthouse-core/audits/image-size-responsive.js
@@ -12,7 +12,7 @@
 
 import {Audit} from './audit.js';
 import URL from '../lib/url-shim.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 /** @typedef {LH.Artifacts.ImageElement & Required<Pick<LH.Artifacts.ImageElement, 'naturalDimensions'>>} ImageWithNaturalDimensions */
 
diff --git a/lighthouse-core/audits/installable-manifest.js b/lighthouse-core/audits/installable-manifest.js
index 755c1448bfe8..b17a041d33a3 100644
--- a/lighthouse-core/audits/installable-manifest.js
+++ b/lighthouse-core/audits/installable-manifest.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 import ManifestValues from '../computed/manifest-values.js';
 
 /* eslint-disable max-len */
diff --git a/lighthouse-core/audits/is-on-https.js b/lighthouse-core/audits/is-on-https.js
index 385b328cb146..5c33a121844a 100644
--- a/lighthouse-core/audits/is-on-https.js
+++ b/lighthouse-core/audits/is-on-https.js
@@ -9,7 +9,7 @@ import {Audit} from './audit.js';
 import URL from '../lib/url-shim.js';
 import {NetworkRequest} from '../lib/network-request.js';
 import NetworkRecords from '../computed/network-records.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the useage of HTTPS on a page. This descriptive title is shown to users when all requests on a page are fufilled using HTTPS. */
diff --git a/lighthouse-core/audits/largest-contentful-paint-element.js b/lighthouse-core/audits/largest-contentful-paint-element.js
index 14160a61d4be..070985a77449 100644
--- a/lighthouse-core/audits/largest-contentful-paint-element.js
+++ b/lighthouse-core/audits/largest-contentful-paint-element.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Descriptive title of a diagnostic audit that provides the element that was determined to be the Largest Contentful Paint. */
diff --git a/lighthouse-core/audits/layout-shift-elements.js b/lighthouse-core/audits/layout-shift-elements.js
index d08ff3141518..094223b24c05 100644
--- a/lighthouse-core/audits/layout-shift-elements.js
+++ b/lighthouse-core/audits/layout-shift-elements.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Descriptive title of a diagnostic audit that provides up to the top five elements contributing to Cumulative Layout Shift. */
diff --git a/lighthouse-core/audits/lcp-lazy-loaded.js b/lighthouse-core/audits/lcp-lazy-loaded.js
index f53a972c0466..deb162ee550e 100644
--- a/lighthouse-core/audits/lcp-lazy-loaded.js
+++ b/lighthouse-core/audits/lcp-lazy-loaded.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on whether the largest above-the-fold image was loaded with sufficient priority. This descriptive title is shown to users when the image was loaded properly. */
diff --git a/lighthouse-core/audits/long-tasks.js b/lighthouse-core/audits/long-tasks.js
index 95ae8e8cca86..cdd013cf5b11 100644
--- a/lighthouse-core/audits/long-tasks.js
+++ b/lighthouse-core/audits/long-tasks.js
@@ -7,7 +7,7 @@
 
 import {Audit} from './audit.js';
 import NetworkRecords from '../computed/network-records.js';
-import i18n from '../lib/i18n/i18n.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';
diff --git a/lighthouse-core/audits/mainthread-work-breakdown.js b/lighthouse-core/audits/mainthread-work-breakdown.js
index 9a4d6cf07ac6..eb91caa18e9d 100644
--- a/lighthouse-core/audits/mainthread-work-breakdown.js
+++ b/lighthouse-core/audits/mainthread-work-breakdown.js
@@ -12,7 +12,7 @@
 
 import {Audit} from './audit.js';
 import {taskGroups} from '../lib/tracehouse/task-groups.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 import MainThreadTasks from '../computed/main-thread-tasks.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/manual/pwa-cross-browser.js b/lighthouse-core/audits/manual/pwa-cross-browser.js
index 768e7d1e2086..67e23a367c31 100644
--- a/lighthouse-core/audits/manual/pwa-cross-browser.js
+++ b/lighthouse-core/audits/manual/pwa-cross-browser.js
@@ -7,7 +7,7 @@
 'use strict';
 
 import ManualAudit from './manual-audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that prompts the user to manually check that their site works across different web browsers. */
diff --git a/lighthouse-core/audits/manual/pwa-each-page-has-url.js b/lighthouse-core/audits/manual/pwa-each-page-has-url.js
index c04fd1a5bc10..543e72aa014b 100644
--- a/lighthouse-core/audits/manual/pwa-each-page-has-url.js
+++ b/lighthouse-core/audits/manual/pwa-each-page-has-url.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import ManualAudit from './manual-audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that prompts the user to manually check that each page on their website uses a unique URL. */
diff --git a/lighthouse-core/audits/manual/pwa-page-transitions.js b/lighthouse-core/audits/manual/pwa-page-transitions.js
index c9574107075c..90c78b823543 100644
--- a/lighthouse-core/audits/manual/pwa-page-transitions.js
+++ b/lighthouse-core/audits/manual/pwa-page-transitions.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import ManualAudit from './manual-audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that prompts the user to manually check that page transitions (navigating to other pages on a website) shouldn't feel like they are waiting for the network to load. */
diff --git a/lighthouse-core/audits/maskable-icon.js b/lighthouse-core/audits/maskable-icon.js
index 1ff14ffe5d35..e50ae5f0b0d2 100644
--- a/lighthouse-core/audits/maskable-icon.js
+++ b/lighthouse-core/audits/maskable-icon.js
@@ -7,7 +7,7 @@
 
 import {Audit} from './audit.js';
 import ManifestValues from '../computed/manifest-values.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on if the manifest contains a maskable icon. This descriptive title is shown to users when the manifest contains at least one maskable icon. */
diff --git a/lighthouse-core/audits/metrics/cumulative-layout-shift.js b/lighthouse-core/audits/metrics/cumulative-layout-shift.js
index 3e69fd5ce2c2..1bdb58029687 100644
--- a/lighthouse-core/audits/metrics/cumulative-layout-shift.js
+++ b/lighthouse-core/audits/metrics/cumulative-layout-shift.js
@@ -7,7 +7,7 @@
 
 import {Audit} from '../audit.js';
 import ComputedCLS from '../../computed/metrics/cumulative-layout-shift.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Description of the Cumulative Layout Shift metric that indicates how much the page changes its layout while it loads. If big segments of the page shift their location during load, the Cumulative Layout Shift will be higher. This description 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. */
diff --git a/lighthouse-core/audits/metrics/experimental-interaction-to-next-paint.js b/lighthouse-core/audits/metrics/experimental-interaction-to-next-paint.js
index fb242746dc81..374e279528cd 100644
--- a/lighthouse-core/audits/metrics/experimental-interaction-to-next-paint.js
+++ b/lighthouse-core/audits/metrics/experimental-interaction-to-next-paint.js
@@ -7,7 +7,7 @@
 
 import {Audit} from '../audit.js';
 import ComputedResponsivenes from '../../computed/metrics/responsiveness.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Description of the Interaction to Next Paint metric. This description 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. */
diff --git a/lighthouse-core/audits/metrics/first-contentful-paint.js b/lighthouse-core/audits/metrics/first-contentful-paint.js
index 43af666a3f7f..15485637154b 100644
--- a/lighthouse-core/audits/metrics/first-contentful-paint.js
+++ b/lighthouse-core/audits/metrics/first-contentful-paint.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import ComputedFcp from '../../computed/metrics/first-contentful-paint.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/metrics/first-meaningful-paint.js b/lighthouse-core/audits/metrics/first-meaningful-paint.js
index b26f8dce9a2a..dfd496ea3ffb 100644
--- a/lighthouse-core/audits/metrics/first-meaningful-paint.js
+++ b/lighthouse-core/audits/metrics/first-meaningful-paint.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import ComputedFmp from '../../computed/metrics/first-meaningful-paint.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/metrics/interactive.js b/lighthouse-core/audits/metrics/interactive.js
index f485745edf65..2852ddf6e5a1 100644
--- a/lighthouse-core/audits/metrics/interactive.js
+++ b/lighthouse-core/audits/metrics/interactive.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import Interactive from '../../computed/metrics/interactive.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/metrics/largest-contentful-paint.js b/lighthouse-core/audits/metrics/largest-contentful-paint.js
index 232456b6cec3..f46814dbff4b 100644
--- a/lighthouse-core/audits/metrics/largest-contentful-paint.js
+++ b/lighthouse-core/audits/metrics/largest-contentful-paint.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import ComputedLcp from '../../computed/metrics/largest-contentful-paint.js';
 import {LighthouseError} from '../../lib/lh-error.js';
 
diff --git a/lighthouse-core/audits/metrics/max-potential-fid.js b/lighthouse-core/audits/metrics/max-potential-fid.js
index 9f071eb46eb2..85fc268a8d65 100644
--- a/lighthouse-core/audits/metrics/max-potential-fid.js
+++ b/lighthouse-core/audits/metrics/max-potential-fid.js
@@ -7,7 +7,7 @@
 
 import {Audit} from '../audit.js';
 import ComputedFid from '../../computed/metrics/max-potential-fid.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Description of the Maximum Potential First Input Delay metric that marks the maximum estimated time between the page receiving input (a user clicking, tapping, or typing) and the page responding. This description 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. */
diff --git a/lighthouse-core/audits/metrics/speed-index.js b/lighthouse-core/audits/metrics/speed-index.js
index fe5f11d9c132..5b95618be2e1 100644
--- a/lighthouse-core/audits/metrics/speed-index.js
+++ b/lighthouse-core/audits/metrics/speed-index.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import ComputedSi from '../../computed/metrics/speed-index.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/metrics/total-blocking-time.js b/lighthouse-core/audits/metrics/total-blocking-time.js
index e6798278d546..8c004638c0fd 100644
--- a/lighthouse-core/audits/metrics/total-blocking-time.js
+++ b/lighthouse-core/audits/metrics/total-blocking-time.js
@@ -7,7 +7,7 @@
 
 import {Audit} from '../audit.js';
 import ComputedTBT from '../../computed/metrics/total-blocking-time.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Description of the Total Blocking Time (TBT) metric, which calculates the total duration of blocking time for a web page. Blocking times are time periods when the page would be blocked (prevented) from responding to user input (clicks, taps, and keypresses will feel slow to respond). This is displayed within a tooltip when the user hovers on the metric name to see more. No character length limits.*/
diff --git a/lighthouse-core/audits/network-rtt.js b/lighthouse-core/audits/network-rtt.js
index 86e8480380be..aa799b08716b 100644
--- a/lighthouse-core/audits/network-rtt.js
+++ b/lighthouse-core/audits/network-rtt.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 import NetworkRecords from '../computed/network-records.js';
 import NetworkAnalysisComputed from '../computed/network-analysis.js';
 
diff --git a/lighthouse-core/audits/network-server-latency.js b/lighthouse-core/audits/network-server-latency.js
index 601c3bd31d17..25456c2feba8 100644
--- a/lighthouse-core/audits/network-server-latency.js
+++ b/lighthouse-core/audits/network-server-latency.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 import NetworkRecords from '../computed/network-records.js';
 import NetworkAnalysisComputed from '../computed/network-analysis.js';
 
diff --git a/lighthouse-core/audits/no-unload-listeners.js b/lighthouse-core/audits/no-unload-listeners.js
index 0fcacbcae38e..65001aa91697 100644
--- a/lighthouse-core/audits/no-unload-listeners.js
+++ b/lighthouse-core/audits/no-unload-listeners.js
@@ -7,7 +7,7 @@
 
 import {Audit} from './audit.js';
 import JsBundles from '../computed/js-bundles.js';
-import i18n from './../lib/i18n/i18n.js';
+import * as i18n from './../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Descriptive title of a Lighthouse audit that checks if a web page has 'unload' event listeners and finds none. */
diff --git a/lighthouse-core/audits/non-composited-animations.js b/lighthouse-core/audits/non-composited-animations.js
index 2b8fd89ee76b..4da91d054130 100644
--- a/lighthouse-core/audits/non-composited-animations.js
+++ b/lighthouse-core/audits/non-composited-animations.js
@@ -13,7 +13,7 @@
 
 import {Audit} from './audit.js';
 
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a diagnostic LH audit that provides details on animations that are not composited. */
diff --git a/lighthouse-core/audits/performance-budget.js b/lighthouse-core/audits/performance-budget.js
index 2759ae779456..9038de3a93be 100644
--- a/lighthouse-core/audits/performance-budget.js
+++ b/lighthouse-core/audits/performance-budget.js
@@ -8,8 +8,8 @@
 import {Audit} from './audit.js';
 import ResourceSummary from '../computed/resource-summary.js';
 import MainResource from '../computed/main-resource.js';
-import Budget from '../config/budget.js';
-import i18n from '../lib/i18n/i18n.js';
+import {Budget} from '../config/budget.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that compares the size and quantity of page resources against targets set by the user. These targets are thought of as "performance budgets" because these metrics impact page performance (i.e. how quickly a page loads). */
diff --git a/lighthouse-core/audits/predictive-perf.js b/lighthouse-core/audits/predictive-perf.js
index 04366f844cdb..3ace4de30df3 100644
--- a/lighthouse-core/audits/predictive-perf.js
+++ b/lighthouse-core/audits/predictive-perf.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import i18n from '../lib/i18n/i18n.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';
diff --git a/lighthouse-core/audits/preload-fonts.js b/lighthouse-core/audits/preload-fonts.js
index d8eda63ed450..8999f52b124d 100644
--- a/lighthouse-core/audits/preload-fonts.js
+++ b/lighthouse-core/audits/preload-fonts.js
@@ -12,7 +12,7 @@
 
 import {Audit} from './audit.js';
 
-import i18n from './../lib/i18n/i18n.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';
diff --git a/lighthouse-core/audits/preload-lcp-image.js b/lighthouse-core/audits/preload-lcp-image.js
index 37a913a24773..238e46264858 100644
--- a/lighthouse-core/audits/preload-lcp-image.js
+++ b/lighthouse-core/audits/preload-lcp-image.js
@@ -6,12 +6,12 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import i18n from '../lib/i18n/i18n.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 UnusedBytes from './byte-efficiency/byte-efficiency-audit.js';
+import {ByteEfficiencyAudit} from './byte-efficiency/byte-efficiency-audit.js';
 
 const UIStrings = {
   /** Title of a lighthouse audit that tells a user to preload an image in order to improve their LCP time. */
@@ -229,7 +229,7 @@ class PreloadLCPImageAudit extends Audit {
     const details = Audit.makeOpportunityDetails(headings, results, wastedMs);
 
     return {
-      score: UnusedBytes.scoreForWastedMs(wastedMs),
+      score: ByteEfficiencyAudit.scoreForWastedMs(wastedMs),
       numericValue: wastedMs,
       numericUnit: 'millisecond',
       displayValue: wastedMs ? str_(i18n.UIStrings.displayValueMsSavings, {wastedMs}) : '',
diff --git a/lighthouse-core/audits/redirects.js b/lighthouse-core/audits/redirects.js
index cac3c339bd48..70fc31bcb52b 100644
--- a/lighthouse-core/audits/redirects.js
+++ b/lighthouse-core/audits/redirects.js
@@ -6,8 +6,8 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import UnusedBytes from './byte-efficiency/byte-efficiency-audit.js';
-import i18n from '../lib/i18n/i18n.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';
@@ -148,7 +148,7 @@ class Redirects extends Audit {
       // We award a passing grade if you only have 1 redirect
       // TODO(phulce): reconsider if cases like the example in https://github.com/GoogleChrome/lighthouse/issues/8984
       // should fail this audit.
-      score: documentRequests.length <= 2 ? 1 : UnusedBytes.scoreForWastedMs(totalWastedMs),
+      score: documentRequests.length <= 2 ? 1 : ByteEfficiencyAudit.scoreForWastedMs(totalWastedMs),
       numericValue: totalWastedMs,
       numericUnit: 'millisecond',
       displayValue: totalWastedMs ?
diff --git a/lighthouse-core/audits/resource-summary.js b/lighthouse-core/audits/resource-summary.js
index 117788dfb56e..bf8d48abcd61 100644
--- a/lighthouse-core/audits/resource-summary.js
+++ b/lighthouse-core/audits/resource-summary.js
@@ -7,7 +7,7 @@
 
 import {Audit} from './audit.js';
 import ComputedResourceSummary from '../computed/resource-summary.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to minimize the size and quantity of resources used to load the page. */
diff --git a/lighthouse-core/audits/seo/canonical.js b/lighthouse-core/audits/seo/canonical.js
index 3803ac9f79af..3eb35452dbfb 100644
--- a/lighthouse-core/audits/seo/canonical.js
+++ b/lighthouse-core/audits/seo/canonical.js
@@ -8,7 +8,7 @@
 import {Audit} from '../audit.js';
 import URL from '../../lib/url-shim.js';
 import MainResource from '../../computed/main-resource.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on a page's rel=canonical link. This descriptive title is shown to users when the rel=canonical link is valid. "rel=canonical" is an HTML attribute and value and so should not be translated. */
diff --git a/lighthouse-core/audits/seo/crawlable-anchors.js b/lighthouse-core/audits/seo/crawlable-anchors.js
index 05968dbeb38a..9726720cdd9a 100644
--- a/lighthouse-core/audits/seo/crawlable-anchors.js
+++ b/lighthouse-core/audits/seo/crawlable-anchors.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on whether links have potentially-crawlable href attributes. This descriptive title is shown when all links on the page are potentially-crawlable. */
diff --git a/lighthouse-core/audits/seo/font-size.js b/lighthouse-core/audits/seo/font-size.js
index 1c5012309a2f..dc28d01d225c 100644
--- a/lighthouse-core/audits/seo/font-size.js
+++ b/lighthouse-core/audits/seo/font-size.js
@@ -7,7 +7,7 @@
 
 /** @typedef {LH.Artifacts.FontSize['analyzedFailingNodesData'][0]} FailingNodeData */
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 import {Audit} from '../audit.js';
 import ComputedViewportMeta from '../../computed/viewport-meta.js';
diff --git a/lighthouse-core/audits/seo/hreflang.js b/lighthouse-core/audits/seo/hreflang.js
index d3b8fc67f2ef..51162d8ea6b8 100644
--- a/lighthouse-core/audits/seo/hreflang.js
+++ b/lighthouse-core/audits/seo/hreflang.js
@@ -11,7 +11,7 @@
 
 import {Audit} from '../audit.js';
 
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import {isValidLang} from '../../../third-party/axe/valid-langs.js';
 
 const NO_LANGUAGE = 'x-default';
diff --git a/lighthouse-core/audits/seo/http-status-code.js b/lighthouse-core/audits/seo/http-status-code.js
index 737975b82a8a..b67dee493079 100644
--- a/lighthouse-core/audits/seo/http-status-code.js
+++ b/lighthouse-core/audits/seo/http-status-code.js
@@ -8,7 +8,7 @@
 import {Audit} from '../audit.js';
 const HTTP_UNSUCCESSFUL_CODE_LOW = 400;
 const HTTP_UNSUCCESSFUL_CODE_HIGH = 599;
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import MainResource from '../../computed/main-resource.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/seo/is-crawlable.js b/lighthouse-core/audits/seo/is-crawlable.js
index fcea194c067b..25f5a4d50200 100644
--- a/lighthouse-core/audits/seo/is-crawlable.js
+++ b/lighthouse-core/audits/seo/is-crawlable.js
@@ -18,7 +18,7 @@ const BLOCKLIST = new Set([
 ]);
 const ROBOTS_HEADER = 'x-robots-tag';
 const UNAVAILABLE_AFTER = 'unavailable_after';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on if search-engine crawlers are blocked from indexing the page. This title is shown when the page is not blocked from indexing and can be crawled. */
diff --git a/lighthouse-core/audits/seo/link-text.js b/lighthouse-core/audits/seo/link-text.js
index b2fc538641bd..fea6335d1293 100644
--- a/lighthouse-core/audits/seo/link-text.js
+++ b/lighthouse-core/audits/seo/link-text.js
@@ -74,7 +74,7 @@ const BLOCKLIST = new Set([
   'mer info',
   'mer information',
 ]);
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that tests if each link on a page contains a sufficient description of what a user will find when they click it. Generic, non-descriptive text like "click here" doesn't give an indication of what the link leads to. This descriptive title is shown when all links on the page have sufficient textual descriptions. */
diff --git a/lighthouse-core/audits/seo/manual/structured-data.js b/lighthouse-core/audits/seo/manual/structured-data.js
index 09eac24b11a4..f3ad46f6ca4a 100644
--- a/lighthouse-core/audits/seo/manual/structured-data.js
+++ b/lighthouse-core/audits/seo/manual/structured-data.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import ManualAudit from '../../manual/manual-audit.js';
-import i18n from '../../../lib/i18n/i18n.js';
+import * as i18n from '../../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Description of a Lighthouse audit that provides detail on the structured data in a page. "Structured data" is a standardized data format on a page that helps a search engine categorize and understand its contents. This description is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation. */
diff --git a/lighthouse-core/audits/seo/meta-description.js b/lighthouse-core/audits/seo/meta-description.js
index b3037ab29ca8..f9339e1b40e5 100644
--- a/lighthouse-core/audits/seo/meta-description.js
+++ b/lighthouse-core/audits/seo/meta-description.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the web page's document meta description. This descriptive title is shown when the document has a meta description. "meta" should be left untranslated because it refers to an HTML element. */
diff --git a/lighthouse-core/audits/seo/plugins.js b/lighthouse-core/audits/seo/plugins.js
index 61c059878d99..38969cf9bdc1 100644
--- a/lighthouse-core/audits/seo/plugins.js
+++ b/lighthouse-core/audits/seo/plugins.js
@@ -31,7 +31,7 @@ const SOURCE_PARAMS = new Set([
   'source',
   'src',
 ]);
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the browser plugins used by the page. This descriptive title is shown when there is no plugin content on the page that would restrict search indexing. */
diff --git a/lighthouse-core/audits/seo/robots-txt.js b/lighthouse-core/audits/seo/robots-txt.js
index cd45c6a04d5a..1292c4581b96 100644
--- a/lighthouse-core/audits/seo/robots-txt.js
+++ b/lighthouse-core/audits/seo/robots-txt.js
@@ -32,7 +32,7 @@ const DIRECTIVE_SAFELIST = new Set([
   'request-rate', 'visit-time', 'noindex', // not officially supported, but used in the wild
 ]);
 const SITEMAP_VALID_PROTOCOLS = new Set(['https:', 'http:', 'ftp:']);
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the site's robots.txt file. Note: "robots.txt" is a canonical filename and should not be translated. This descriptive title is shown when the robots.txt file is present and configured correctly. */
diff --git a/lighthouse-core/audits/server-response-time.js b/lighthouse-core/audits/server-response-time.js
index 4046751818c7..9a4d88478f54 100644
--- a/lighthouse-core/audits/server-response-time.js
+++ b/lighthouse-core/audits/server-response-time.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 import MainResource from '../computed/main-resource.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/service-worker.js b/lighthouse-core/audits/service-worker.js
index a94cde458b01..e2c92c9f08c3 100644
--- a/lighthouse-core/audits/service-worker.js
+++ b/lighthouse-core/audits/service-worker.js
@@ -7,7 +7,7 @@
 
 import URL from '../lib/url-shim.js';
 import {Audit} from './audit.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on a page's service worker. This descriptive title is shown to users when a service worker is registered and valid. */
diff --git a/lighthouse-core/audits/splash-screen.js b/lighthouse-core/audits/splash-screen.js
index 812c29c0b5bd..98059d1521c8 100644
--- a/lighthouse-core/audits/splash-screen.js
+++ b/lighthouse-core/audits/splash-screen.js
@@ -7,7 +7,7 @@
 
 import MultiCheckAudit from './multi-check-audit.js';
 import ManifestValues from '../computed/manifest-values.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on splash screens. This descriptive title is shown to users when the site has a custom splash screen. */
diff --git a/lighthouse-core/audits/themed-omnibox.js b/lighthouse-core/audits/themed-omnibox.js
index c2effe657ff1..26355b3925de 100644
--- a/lighthouse-core/audits/themed-omnibox.js
+++ b/lighthouse-core/audits/themed-omnibox.js
@@ -7,8 +7,8 @@
 
 import MultiCheckAudit from './multi-check-audit.js';
 import ManifestValues from '../computed/manifest-values.js';
-import cssParsers from 'cssstyle/lib/parsers';
-import i18n from '../lib/i18n/i18n.js';
+import cssParsers from 'cssstyle/lib/parsers.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the theme color the web page has set for the browser's address bar. This descriptive title is shown to users when an address-bar theme color has been set. */
diff --git a/lighthouse-core/audits/third-party-facades.js b/lighthouse-core/audits/third-party-facades.js
index c15b71a88e9a..1a0915087196 100644
--- a/lighthouse-core/audits/third-party-facades.js
+++ b/lighthouse-core/audits/third-party-facades.js
@@ -22,7 +22,7 @@
 
 import {Audit} from './audit.js';
 
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 import thirdPartyWeb from '../lib/third-party-web.js';
 import NetworkRecords from '../computed/network-records.js';
 import MainResource from '../computed/main-resource.js';
@@ -94,7 +94,7 @@ class ThirdPartyFacades extends Audit {
   /**
    * Sort items by transfer size and combine small items into a single row.
    * Items will be mutated in place to a maximum of 6 rows.
-   * @param {ThirdPartySummary.URLSummary[]} items
+   * @param {import('./third-party-summary.js').URLSummary[]} items
    */
   static condenseItems(items) {
     items.sort((a, b) => b.transferSize - a.transferSize);
@@ -121,7 +121,7 @@ class ThirdPartyFacades extends Audit {
   }
 
   /**
-   * @param {Map<string, ThirdPartySummary.Summary>} byURL
+   * @param {Map<string, import('./third-party-summary.js').Summary>} byURL
    * @param {ThirdPartyEntity | undefined} mainEntity
    * @return {FacadableProduct[]}
    */
@@ -181,7 +181,7 @@ class ThirdPartyFacades extends Audit {
 
       const items = Array.from(urls).map((url) => {
         const urlStats = summaries.byURL.get(url);
-        return /** @type {ThirdPartySummary.URLSummary} */ ({url, ...urlStats});
+        return /** @type {import('./third-party-summary.js').URLSummary} */ ({url, ...urlStats});
       });
       this.condenseItems(items);
       results.push({
diff --git a/lighthouse-core/audits/third-party-summary.js b/lighthouse-core/audits/third-party-summary.js
index 3c49b55d1376..c9c0b209e847 100644
--- a/lighthouse-core/audits/third-party-summary.js
+++ b/lighthouse-core/audits/third-party-summary.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 import thirdPartyWeb from '../lib/third-party-web.js';
 import NetworkRecords from '../computed/network-records.js';
 import MainThreadTasks from '../computed/main-thread-tasks.js';
diff --git a/lighthouse-core/audits/timing-budget.js b/lighthouse-core/audits/timing-budget.js
index 5c3fb04eea5c..4a394886088e 100644
--- a/lighthouse-core/audits/timing-budget.js
+++ b/lighthouse-core/audits/timing-budget.js
@@ -8,8 +8,8 @@
 import {Audit} from './audit.js';
 import TimingSummary from '../computed/metrics/timing-summary.js';
 import MainResource from '../computed/main-resource.js';
-import Budget from '../config/budget.js';
-import i18n from '../lib/i18n/i18n.js';
+import {Budget} from '../config/budget.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that compares how quickly the page loads against targets set by the user. Timing budgets are a type of performance budget. */
diff --git a/lighthouse-core/audits/unsized-images.js b/lighthouse-core/audits/unsized-images.js
index 5641010eb336..d7b2a445e155 100644
--- a/lighthouse-core/audits/unsized-images.js
+++ b/lighthouse-core/audits/unsized-images.js
@@ -11,7 +11,7 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import i18n from './../lib/i18n/i18n.js';
+import * as i18n from './../lib/i18n/i18n.js';
 import URL from './../lib/url-shim.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/user-timings.js b/lighthouse-core/audits/user-timings.js
index 10853c83e676..bc55c5b9cda4 100644
--- a/lighthouse-core/audits/user-timings.js
+++ b/lighthouse-core/audits/user-timings.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 import ComputedUserTimings from '../computed/user-timings.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/uses-rel-preconnect.js b/lighthouse-core/audits/uses-rel-preconnect.js
index adef563434d5..9422938e77d5 100644
--- a/lighthouse-core/audits/uses-rel-preconnect.js
+++ b/lighthouse-core/audits/uses-rel-preconnect.js
@@ -7,9 +7,9 @@
 'use strict';
 
 import {Audit} from './audit.js';
-import UnusedBytes from './byte-efficiency/byte-efficiency-audit.js';
+import {ByteEfficiencyAudit} from './byte-efficiency/byte-efficiency-audit.js';
 import URL from '../lib/url-shim.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 import NetworkRecords from '../computed/network-records.js';
 import MainResource from '../computed/main-resource.js';
 import LoadSimulator from '../computed/load-simulator.js';
@@ -238,7 +238,7 @@ class UsesRelPreconnectAudit extends Audit {
     const details = Audit.makeOpportunityDetails(headings, results, maxWasted);
 
     return {
-      score: UnusedBytes.scoreForWastedMs(maxWasted),
+      score: ByteEfficiencyAudit.scoreForWastedMs(maxWasted),
       numericValue: maxWasted,
       numericUnit: 'millisecond',
       displayValue: maxWasted ?
diff --git a/lighthouse-core/audits/uses-rel-preload.js b/lighthouse-core/audits/uses-rel-preload.js
index 429bdbb0913e..17bac8da352f 100644
--- a/lighthouse-core/audits/uses-rel-preload.js
+++ b/lighthouse-core/audits/uses-rel-preload.js
@@ -8,9 +8,9 @@
 import URL from '../lib/url-shim.js';
 import {NetworkRequest} from '../lib/network-request.js';
 import {Audit} from './audit.js';
-import UnusedBytes from './byte-efficiency/byte-efficiency-audit.js';
+import {ByteEfficiencyAudit} from './byte-efficiency/byte-efficiency-audit.js';
 import CriticalRequestChains from '../computed/critical-request-chains.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 import MainResource from '../computed/main-resource.js';
 import PageDependencyGraph from '../computed/page-dependency-graph.js';
 import LoadSimulator from '../computed/load-simulator.js';
@@ -242,7 +242,7 @@ class UsesRelPreloadAudit extends Audit {
     const details = Audit.makeOpportunityDetails(headings, results, wastedMs);
 
     return {
-      score: UnusedBytes.scoreForWastedMs(wastedMs),
+      score: ByteEfficiencyAudit.scoreForWastedMs(wastedMs),
       numericValue: wastedMs,
       numericUnit: 'millisecond',
       displayValue: wastedMs ?
diff --git a/lighthouse-core/audits/valid-source-maps.js b/lighthouse-core/audits/valid-source-maps.js
index 7d9e766deacb..345c292e9fea 100644
--- a/lighthouse-core/audits/valid-source-maps.js
+++ b/lighthouse-core/audits/valid-source-maps.js
@@ -7,7 +7,7 @@
 
 import thirdPartyWeb from '../lib/third-party-web.js';
 import {Audit} from './audit.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on HTTP to HTTPS redirects. This descriptive title is shown to users when HTTP traffic is redirected to HTTPS. */
diff --git a/lighthouse-core/audits/viewport.js b/lighthouse-core/audits/viewport.js
index 0610a00a5869..74006a212cc9 100644
--- a/lighthouse-core/audits/viewport.js
+++ b/lighthouse-core/audits/viewport.js
@@ -7,7 +7,7 @@
 
 import {Audit} from './audit.js';
 import ComputedViewportMeta from '../computed/viewport-meta.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the viewport meta tag in a web page's html. This descriptive title is shown to users when a viewport tag is set and configured. */
diff --git a/lighthouse-core/audits/work-during-interaction.js b/lighthouse-core/audits/work-during-interaction.js
index 14c2e4e37372..eb69ecc5839b 100644
--- a/lighthouse-core/audits/work-during-interaction.js
+++ b/lighthouse-core/audits/work-during-interaction.js
@@ -5,17 +5,18 @@
  */
 'use strict';
 
-const Audit = require('./audit.js');
-const ComputedResponsivenes = require('../computed/metrics/responsiveness.js');
-const ProcessedTrace = require('../computed/processed-trace.js');
-const i18n = require('../lib/i18n/i18n.js');
-const NetworkRecords = require('../computed/network-records.js');
-const MainThreadTasks = require('../lib/tracehouse/main-thread-tasks.js');
-const {taskGroups} = require('../lib/tracehouse/task-groups.js');
-const TraceProcessor = require('../lib/tracehouse/trace-processor.js');
-const {getExecutionTimingsByURL} = require('../lib/tracehouse/task-summary.js');
-const inpThresholds = require('./metrics/experimental-interaction-to-next-paint.js').defaultOptions;
-const LHError = require('../lib/lh-error.js');
+import {Audit} from './audit.js';
+import ComputedResponsivenes from '../computed/metrics/responsiveness.js';
+import ProcessedTrace from '../computed/processed-trace.js';
+import * as i18n from '../lib/i18n/i18n.js';
+import NetworkRecords from '../computed/network-records.js';
+import MainThreadTasks from '../lib/tracehouse/main-thread-tasks.js';
+import {taskGroups} from '../lib/tracehouse/task-groups.js';
+import TraceProcessor from '../lib/tracehouse/trace-processor.js';
+import {getExecutionTimingsByURL} from '../lib/tracehouse/task-summary.js';
+import ExperimentalInteractionToNextPaint
+  from './metrics/experimental-interaction-to-next-paint.js';
+import {LighthouseError} from '../lib/lh-error.js';
 
 /** @typedef {import('../computed/metrics/responsiveness.js').EventTimingEvent} EventTimingEvent */
 /** @typedef {import('../lib/tracehouse/main-thread-tasks.js').TaskNode} TaskNode */
@@ -237,8 +238,8 @@ class WorkDuringInteraction extends Audit {
     }
     // TODO: remove workaround once 103.0.5052.0 is sufficiently released.
     if (interactionEvent.name === 'FallbackTiming') {
-      throw new LHError(
-        LHError.errors.UNSUPPORTED_OLD_CHROME,
+      throw new LighthouseError(
+        LighthouseError.errors.UNSUPPORTED_OLD_CHROME,
         {featureName: 'detailed EventTiming trace events'}
       );
     }
@@ -266,7 +267,7 @@ class WorkDuringInteraction extends Audit {
     const duration = interactionEvent.args.data.duration;
     const displayValue = str_(UIStrings.displayValue, {timeInMs: duration, interactionType});
     return {
-      score: duration < inpThresholds.p10 ? 1 : 0,
+      score: duration < ExperimentalInteractionToNextPaint.defaultOptions.p10 ? 1 : 0,
       displayValue,
       details: {
         type: 'list',
diff --git a/lighthouse-core/computed/load-simulator.js b/lighthouse-core/computed/load-simulator.js
index c833d058fd2f..789fcde098e3 100644
--- a/lighthouse-core/computed/load-simulator.js
+++ b/lighthouse-core/computed/load-simulator.js
@@ -89,4 +89,7 @@ class LoadSimulator {
   }
 }
 
+// TODO(esmodules): For all computed artifacts:
+//   const LoadSimulatorComputed = makeComputedArtifact(LoadSimulator, ['devtoolsLog', 'settings']);
+//   export {LoadSimulator as LoadSimulatorComputed};
 export default makeComputedArtifact(LoadSimulator, ['devtoolsLog', 'settings']);
diff --git a/lighthouse-core/computed/main-resource.js b/lighthouse-core/computed/main-resource.js
index 9988f0fc637e..3c75662dc47c 100644
--- a/lighthouse-core/computed/main-resource.js
+++ b/lighthouse-core/computed/main-resource.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {makeComputedArtifact} from './computed-artifact.js';
-import NetworkAnalyzer from '../lib/dependency-graph/simulator/network-analyzer.js';
+import {NetworkAnalyzer} from '../lib/dependency-graph/simulator/network-analyzer.js';
 import NetworkRecords from './network-records.js';
 
 /**
diff --git a/lighthouse-core/computed/metrics/interactive.js b/lighthouse-core/computed/metrics/interactive.js
index e3424e376723..47529b476ab4 100644
--- a/lighthouse-core/computed/metrics/interactive.js
+++ b/lighthouse-core/computed/metrics/interactive.js
@@ -8,7 +8,7 @@
 import {makeComputedArtifact} from '../computed-artifact.js';
 import NavigationMetric from './navigation-metric.js';
 import LanternInteractive from './lantern-interactive.js';
-import NetworkMonitor from '../../gather/driver/network-monitor.js';
+import {NetworkMonitor} from '../../gather/driver/network-monitor.js';
 import TracingProcessor from '../../lib/tracehouse/trace-processor.js';
 import {LighthouseError} from '../../lib/lh-error.js';
 
diff --git a/lighthouse-core/computed/metrics/lantern-first-contentful-paint.js b/lighthouse-core/computed/metrics/lantern-first-contentful-paint.js
index a39d6aa5361e..bb46d0e31c85 100644
--- a/lighthouse-core/computed/metrics/lantern-first-contentful-paint.js
+++ b/lighthouse-core/computed/metrics/lantern-first-contentful-paint.js
@@ -7,11 +7,11 @@
 
 import {makeComputedArtifact} from '../computed-artifact.js';
 import LanternMetric from './lantern-metric.js';
-import BaseNode from '../../lib/dependency-graph/base-node.js';
+import {BaseNode} from '../../lib/dependency-graph/base-node.js';
 
-/** @typedef {BaseNode.Node} Node */
-/** @typedef {import('../../lib/dependency-graph/cpu-node')} CPUNode */
-/** @typedef {import('../../lib/dependency-graph/network-node')} NetworkNode */
+/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
+/** @typedef {import('../../lib/dependency-graph/cpu-node').CPUNode} CPUNode */
+/** @typedef {import('../../lib/dependency-graph/network-node').NetworkNode} NetworkNode */
 
 class LanternFirstContentfulPaint extends LanternMetric {
   /**
diff --git a/lighthouse-core/computed/metrics/lantern-interactive.js b/lighthouse-core/computed/metrics/lantern-interactive.js
index c28d67bff19a..d2d9e2d050ba 100644
--- a/lighthouse-core/computed/metrics/lantern-interactive.js
+++ b/lighthouse-core/computed/metrics/lantern-interactive.js
@@ -7,11 +7,11 @@
 
 import {makeComputedArtifact} from '../computed-artifact.js';
 import LanternMetric from './lantern-metric.js';
-import BaseNode from '../../lib/dependency-graph/base-node.js';
+import {BaseNode} from '../../lib/dependency-graph/base-node.js';
 import {NetworkRequest} from '../../lib/network-request.js';
 import LanternFirstMeaningfulPaint from './lantern-first-meaningful-paint.js';
 
-/** @typedef {BaseNode.Node} Node */
+/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
 
 // Any CPU task of 20 ms or more will end up being a critical long task on mobile
 const CRITICAL_LONG_TASK_THRESHOLD = 20;
diff --git a/lighthouse-core/computed/metrics/lantern-max-potential-fid.js b/lighthouse-core/computed/metrics/lantern-max-potential-fid.js
index 6934561dbe18..ecaec4656b25 100644
--- a/lighthouse-core/computed/metrics/lantern-max-potential-fid.js
+++ b/lighthouse-core/computed/metrics/lantern-max-potential-fid.js
@@ -7,10 +7,10 @@
 
 import {makeComputedArtifact} from '../computed-artifact.js';
 import LanternMetricArtifact from './lantern-metric.js';
-import BaseNode from '../../lib/dependency-graph/base-node.js';
+import {BaseNode} from '../../lib/dependency-graph/base-node.js';
 import LanternFirstContentfulPaint from './lantern-first-contentful-paint.js';
 
-/** @typedef {BaseNode.Node} Node */
+/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
 
 class LanternMaxPotentialFID extends LanternMetricArtifact {
   /**
diff --git a/lighthouse-core/computed/metrics/lantern-metric.js b/lighthouse-core/computed/metrics/lantern-metric.js
index 97b265ee65c5..95f2cd2f19da 100644
--- a/lighthouse-core/computed/metrics/lantern-metric.js
+++ b/lighthouse-core/computed/metrics/lantern-metric.js
@@ -5,16 +5,16 @@
  */
 'use strict';
 
-import BaseNode from '../../lib/dependency-graph/base-node.js';
+import {BaseNode} from '../../lib/dependency-graph/base-node.js';
 import {NetworkRequest} from '../../lib/network-request.js';
 import ProcessedTrace from '../processed-trace.js';
 import ProcessedNavigation from '../processed-navigation.js';
 import PageDependencyGraph from '../page-dependency-graph.js';
 import LoadSimulator from '../load-simulator.js';
 
-/** @typedef {BaseNode.Node} Node */
-/** @typedef {import('../../lib/dependency-graph/network-node')} NetworkNode */
-/** @typedef {import('../../lib/dependency-graph/simulator/simulator')} Simulator */
+/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
+/** @typedef {import('../../lib/dependency-graph/network-node').NetworkNode} NetworkNode */
+/** @typedef {import('../../lib/dependency-graph/simulator/simulator').Simulator} Simulator */
 
 /**
  * @typedef Extras
diff --git a/lighthouse-core/computed/metrics/lantern-speed-index.js b/lighthouse-core/computed/metrics/lantern-speed-index.js
index 32014cb409c5..2e22bf6d774b 100644
--- a/lighthouse-core/computed/metrics/lantern-speed-index.js
+++ b/lighthouse-core/computed/metrics/lantern-speed-index.js
@@ -7,12 +7,12 @@
 
 import {makeComputedArtifact} from '../computed-artifact.js';
 import LanternMetric from './lantern-metric.js';
-import BaseNode from '../../lib/dependency-graph/base-node.js';
+import {BaseNode} from '../../lib/dependency-graph/base-node.js';
 import Speedline from '../speedline.js';
 import LanternFirstContentfulPaint from './lantern-first-contentful-paint.js';
 import {throttling as defaultThrottling} from '../../config/constants.js';
 
-/** @typedef {BaseNode.Node} Node */
+/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
 
 class LanternSpeedIndex extends LanternMetric {
   /**
diff --git a/lighthouse-core/computed/metrics/lantern-total-blocking-time.js b/lighthouse-core/computed/metrics/lantern-total-blocking-time.js
index eab57ef9850d..c6091a451dfd 100644
--- a/lighthouse-core/computed/metrics/lantern-total-blocking-time.js
+++ b/lighthouse-core/computed/metrics/lantern-total-blocking-time.js
@@ -7,12 +7,12 @@
 
 import {makeComputedArtifact} from '../computed-artifact.js';
 import LanternMetric from './lantern-metric.js';
-import BaseNode from '../../lib/dependency-graph/base-node.js';
+import {BaseNode} from '../../lib/dependency-graph/base-node.js';
 import LanternFirstContentfulPaint from './lantern-first-contentful-paint.js';
 import LanternInteractive from './lantern-interactive.js';
 import {BLOCKING_TIME_THRESHOLD, calculateSumOfBlockingTime} from './tbt-utils.js';
 
-/** @typedef {BaseNode.Node} Node */
+/** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
 
 class LanternTotalBlockingTime extends LanternMetric {
   /**
diff --git a/lighthouse-core/computed/metrics/tbt-utils.js b/lighthouse-core/computed/metrics/tbt-utils.js
index 94030abaf0fa..5840fd52a1ea 100644
--- a/lighthouse-core/computed/metrics/tbt-utils.js
+++ b/lighthouse-core/computed/metrics/tbt-utils.js
@@ -51,7 +51,7 @@ function calculateSumOfBlockingTime(topLevelEvents, startTimeMs, endTimeMs) {
   return sumBlockingTime;
 }
 
-export default {
+export {
   BLOCKING_TIME_THRESHOLD,
   calculateSumOfBlockingTime,
 };
diff --git a/lighthouse-core/computed/network-analysis.js b/lighthouse-core/computed/network-analysis.js
index 982381ebe2f5..40183d15c0c6 100644
--- a/lighthouse-core/computed/network-analysis.js
+++ b/lighthouse-core/computed/network-analysis.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {makeComputedArtifact} from './computed-artifact.js';
-import NetworkAnalyzer from '../lib/dependency-graph/simulator/network-analyzer.js';
+import {NetworkAnalyzer} from '../lib/dependency-graph/simulator/network-analyzer.js';
 import NetworkRecords from './network-records.js';
 
 class NetworkAnalysis {
diff --git a/lighthouse-core/computed/page-dependency-graph.js b/lighthouse-core/computed/page-dependency-graph.js
index 080b159170a8..a9ef59a4134d 100644
--- a/lighthouse-core/computed/page-dependency-graph.js
+++ b/lighthouse-core/computed/page-dependency-graph.js
@@ -6,13 +6,13 @@
 'use strict';
 
 import {makeComputedArtifact} from './computed-artifact.js';
-import NetworkNode from '../lib/dependency-graph/network-node.js';
-import CPUNode from '../lib/dependency-graph/cpu-node.js';
+import {NetworkNode} from '../lib/dependency-graph/network-node.js';
+import {CPUNode} from '../lib/dependency-graph/cpu-node.js';
 import TracingProcessor from '../lib/tracehouse/trace-processor.js';
 import {NetworkRequest} from '../lib/network-request.js';
 import ProcessedTrace from './processed-trace.js';
 import NetworkRecords from './network-records.js';
-import NetworkAnalyzer from '../lib/dependency-graph/simulator/network-analyzer.js';
+import {NetworkAnalyzer} from '../lib/dependency-graph/simulator/network-analyzer.js';
 
 /** @typedef {import('../lib/dependency-graph/base-node.js').Node} Node */
 /** @typedef {Omit<LH.Artifacts['URL'], 'initialUrl'|'finalUrl'>} URLArtifact */
diff --git a/lighthouse-core/computed/resource-summary.js b/lighthouse-core/computed/resource-summary.js
index ea787cc4f6d5..105921671fcd 100644
--- a/lighthouse-core/computed/resource-summary.js
+++ b/lighthouse-core/computed/resource-summary.js
@@ -10,7 +10,7 @@ import NetworkRecords from './network-records.js';
 import URL from '../lib/url-shim.js';
 import {NetworkRequest} from '../lib/network-request.js';
 import {Budget} from '../config/budget.js';
-import Util from '../util-commonjs.cjs';
+import {Util} from '../util-commonjs.cjs';
 
 /** @typedef {{count: number, resourceSize: number, transferSize: number}} ResourceEntry */
 
diff --git a/lighthouse-core/computed/unused-css.js b/lighthouse-core/computed/unused-css.js
index f54acc2a06d7..3dd97026fd10 100644
--- a/lighthouse-core/computed/unused-css.js
+++ b/lighthouse-core/computed/unused-css.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {makeComputedArtifact} from './computed-artifact.js';
-import ByteEfficiencyAudit from '../audits/byte-efficiency/byte-efficiency-audit.js';
+import {ByteEfficiencyAudit} from '../audits/byte-efficiency/byte-efficiency-audit.js';
 import NetworkRecords from './network-records.js';
 
 const PREVIEW_LENGTH = 100;
diff --git a/lighthouse-core/config/config-helpers.js b/lighthouse-core/config/config-helpers.js
index 2de34f34c561..1c5db1484329 100644
--- a/lighthouse-core/config/config-helpers.js
+++ b/lighthouse-core/config/config-helpers.js
@@ -11,7 +11,7 @@ import * as constants from './constants.js';
 import {Budget} from './budget.js';
 import ConfigPlugin from './config-plugin.js';
 import {Runner} from '../runner.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 import * as validation from '../fraggle-rock/config/validation.js';
 import {createCommonjsRefs} from '../scripts/esm-utils.js';
 
diff --git a/lighthouse-core/config/config-plugin.js b/lighthouse-core/config/config-plugin.js
index 4574e2cfb672..2cc387d9fc6e 100644
--- a/lighthouse-core/config/config-plugin.js
+++ b/lighthouse-core/config/config-plugin.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 /**
  * @param {unknown} arr
diff --git a/lighthouse-core/config/default-config.js b/lighthouse-core/config/default-config.js
index cbf79d7c3814..3633f3319ee4 100644
--- a/lighthouse-core/config/default-config.js
+++ b/lighthouse-core/config/default-config.js
@@ -9,7 +9,7 @@
 
 import * as constants from './constants.js';
 
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 import {metricsToAudits} from './metrics-to-audits.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/fraggle-rock/config/validation.js b/lighthouse-core/fraggle-rock/config/validation.js
index bb4760c5f885..971fa3258183 100644
--- a/lighthouse-core/fraggle-rock/config/validation.js
+++ b/lighthouse-core/fraggle-rock/config/validation.js
@@ -7,7 +7,7 @@
 
 import {Audit} from '../../audits/audit.js';
 import BaseFRGatherer from '../gather/base-gatherer.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 /**
  * @param {LH.Config.GathererDefn | LH.Config.AnyFRGathererDefn} gathererDefn
diff --git a/lighthouse-core/gather/driver/environment.js b/lighthouse-core/gather/driver/environment.js
index 69e4f244765e..03494ea4bd2b 100644
--- a/lighthouse-core/gather/driver/environment.js
+++ b/lighthouse-core/gather/driver/environment.js
@@ -8,7 +8,7 @@
 import log from 'lighthouse-logger';
 import * as constants from '../../config/constants.js';
 import {pageFunctions} from '../../lib/page-functions.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /**
diff --git a/lighthouse-core/gather/driver/navigation.js b/lighthouse-core/gather/driver/navigation.js
index 6292c45701e8..1dce14b880c5 100644
--- a/lighthouse-core/gather/driver/navigation.js
+++ b/lighthouse-core/gather/driver/navigation.js
@@ -9,7 +9,7 @@ import log from 'lighthouse-logger';
 import {NetworkMonitor} from './network-monitor.js';
 import {waitForFullyLoaded, waitForFrameNavigated, waitForUserToContinue} from './wait-for-condition.js'; // eslint-disable-line max-len
 import * as constants from '../../config/constants.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import URL from '../../lib/url-shim.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/gather/driver/storage.js b/lighthouse-core/gather/driver/storage.js
index 1789d34578b0..aed202f09208 100644
--- a/lighthouse-core/gather/driver/storage.js
+++ b/lighthouse-core/gather/driver/storage.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import log from 'lighthouse-logger';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /**
diff --git a/lighthouse-core/gather/driver/wait-for-condition.js b/lighthouse-core/gather/driver/wait-for-condition.js
index 1986ea744d94..7657ac611f0f 100644
--- a/lighthouse-core/gather/driver/wait-for-condition.js
+++ b/lighthouse-core/gather/driver/wait-for-condition.js
@@ -76,7 +76,7 @@ function waitForFcp(session, pauseAfterFcpMs, maxWaitForFcpMs) {
   /** @type {Promise<void>} */
   const promise = new Promise((resolve, reject) => {
     const maxWaitTimeout = setTimeout(() => {
-      reject(new {LighthouseError}({LighthouseError}.errors.NO_FCP));
+      reject(new LighthouseError(LighthouseError.errors.NO_FCP));
     }, maxWaitForFcpMs);
     /** @type {NodeJS.Timeout|undefined} */
     let loadTimeout;
diff --git a/lighthouse-core/gather/gather-runner.js b/lighthouse-core/gather/gather-runner.js
index fbd55b74b274..58d07c3a6250 100644
--- a/lighthouse-core/gather/gather-runner.js
+++ b/lighthouse-core/gather/gather-runner.js
@@ -8,7 +8,7 @@
 import log from 'lighthouse-logger';
 import NetworkRecords from '../computed/network-records.js';
 import {getPageLoadError} from '../lib/navigation-error.js';
-import emulation from '../lib/emulation.js';
+import * as emulation from '../lib/emulation.js';
 import * as constants from '../config/constants.js';
 import format from '../../shared/localization/format.js';
 import {getBenchmarkIndex, getEnvironmentWarnings} from './driver/environment.js';
diff --git a/lighthouse-core/gather/gatherers/dobetterweb/optimized-images.js b/lighthouse-core/gather/gatherers/dobetterweb/optimized-images.js
index e248eaf09f69..8737e19b0ac7 100644
--- a/lighthouse-core/gather/gatherers/dobetterweb/optimized-images.js
+++ b/lighthouse-core/gather/gatherers/dobetterweb/optimized-images.js
@@ -14,7 +14,7 @@ import log from 'lighthouse-logger';
 import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
 import URL from '../../../lib/url-shim.js';
 import {NetworkRequest} from '../../../lib/network-request.js';
-import Sentry from '../../../lib/sentry.js';
+import {Sentry} from '../../../lib/sentry.js';
 import NetworkRecords from '../../../computed/network-records.js';
 import DevtoolsLog from '../devtools-log.js';
 
diff --git a/lighthouse-core/gather/gatherers/dobetterweb/response-compression.js b/lighthouse-core/gather/gatherers/dobetterweb/response-compression.js
index 8dfdde476587..3931b142da4c 100644
--- a/lighthouse-core/gather/gatherers/dobetterweb/response-compression.js
+++ b/lighthouse-core/gather/gatherers/dobetterweb/response-compression.js
@@ -13,7 +13,7 @@
 import {Buffer} from 'buffer';
 import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
 import URL from '../../../lib/url-shim.js';
-import Sentry from '../../../lib/sentry.js';
+import {Sentry} from '../../../lib/sentry.js';
 import {NetworkRequest} from '../../../lib/network-request.js';
 import {gzip} from 'zlib';
 import DevtoolsLog from '../devtools-log.js';
diff --git a/lighthouse-core/gather/gatherers/full-page-screenshot.js b/lighthouse-core/gather/gatherers/full-page-screenshot.js
index 4d6dc6d7f0bd..954434d73c7b 100644
--- a/lighthouse-core/gather/gatherers/full-page-screenshot.js
+++ b/lighthouse-core/gather/gatherers/full-page-screenshot.js
@@ -9,9 +9,9 @@
 
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
-import emulation from '../../lib/emulation.js';
+import * as emulation from '../../lib/emulation.js';
 import {pageFunctions} from '../../lib/page-functions.js';
-import NetworkMonitor from '../driver/network-monitor.js';
+import {NetworkMonitor} from '../driver/network-monitor.js';
 import {waitForNetworkIdle} from '../driver/wait-for-condition.js';
 
 // JPEG quality setting
diff --git a/lighthouse-core/gather/gatherers/image-elements.js b/lighthouse-core/gather/gatherers/image-elements.js
index 3bba7bff87cf..d2ab1f55a998 100644
--- a/lighthouse-core/gather/gatherers/image-elements.js
+++ b/lighthouse-core/gather/gatherers/image-elements.js
@@ -12,7 +12,7 @@
 import log from 'lighthouse-logger';
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 import {pageFunctions} from '../../lib/page-functions.js';
-import FontSize from './seo/font-size.js';
+import * as FontSize from './seo/font-size.js';
 
 /* global window, getElementsInDocument, Image, getNodeDetails, ShadowRoot */
 
diff --git a/lighthouse-core/gather/gatherers/link-elements.js b/lighthouse-core/gather/gatherers/link-elements.js
index f1e409a95845..2512772c7d0d 100644
--- a/lighthouse-core/gather/gatherers/link-elements.js
+++ b/lighthouse-core/gather/gatherers/link-elements.js
@@ -7,7 +7,7 @@
 
 import LinkHeader from 'http-link-header';
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
-import {URL} from '../../lib/url-shim.js';
+import URL from '../../lib/url-shim.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 import DevtoolsLog from './devtools-log.js';
 import MainResource from '../../computed/main-resource.js';
diff --git a/lighthouse-core/gather/gatherers/service-worker.js b/lighthouse-core/gather/gatherers/service-worker.js
index 413af0c0110e..c5a82a22921d 100644
--- a/lighthouse-core/gather/gatherers/service-worker.js
+++ b/lighthouse-core/gather/gatherers/service-worker.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
-import serviceWorkers from '../driver/service-workers.js';
+import * as serviceWorkers from '../driver/service-workers.js';
 
 class ServiceWorker extends FRGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
diff --git a/lighthouse-core/gather/gatherers/trace-elements.js b/lighthouse-core/gather/gatherers/trace-elements.js
index f0035a32e92d..e7c52d138242 100644
--- a/lighthouse-core/gather/gatherers/trace-elements.js
+++ b/lighthouse-core/gather/gatherers/trace-elements.js
@@ -17,7 +17,7 @@ import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 import {resolveNodeIdToObjectId} from '../driver/dom.js';
 import {pageFunctions} from '../../lib/page-functions.js';
-import RectHelpers from '../../lib/rect-helpers.js';
+import * as RectHelpers from '../../lib/rect-helpers.js';
 import {Sentry} from '../../lib/sentry.js';
 import Trace from './trace.js';
 import ProcessedTrace from '../../computed/processed-trace.js';
diff --git a/lighthouse-core/lib/asset-saver.js b/lighthouse-core/lib/asset-saver.js
index d664b48e07d4..86ea201a3236 100644
--- a/lighthouse-core/lib/asset-saver.js
+++ b/lighthouse-core/lib/asset-saver.js
@@ -16,6 +16,7 @@ import Metrics from './traces/pwmetrics-events.js';
 import NetworkAnalysisComputed from '../computed/network-analysis.js';
 import LoadSimulatorComputed from '../computed/load-simulator.js';
 import {LighthouseError} from '../lib/lh-error.js';
+
 // 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.
@@ -327,7 +328,7 @@ function normalizeTimingEntries(timings) {
   }
 }
 
-export default {
+export {
   saveArtifacts,
   saveLhr,
   loadArtifacts,
diff --git a/lighthouse-core/lib/axe.js b/lighthouse-core/lib/axe.js
index 582980167bd8..bb4fc1010fda 100644
--- a/lighthouse-core/lib/axe.js
+++ b/lighthouse-core/lib/axe.js
@@ -6,8 +6,10 @@
 'use strict';
 
 import fs from 'fs';
-const source = fs.readFileSync(require.resolve('axe-core/axe.min.js'), 'utf8');
 
-export default {
-  source,
+// TODO(esmodules)
+const axeSource = fs.readFileSync(require.resolve('axe-core/axe.min.js'), 'utf8');
+
+export {
+  axeSource as source,
 };
diff --git a/lighthouse-core/lib/csp-evaluator.js b/lighthouse-core/lib/csp-evaluator.js
index f91a42f0e2eb..3bc4b7f50f0d 100644
--- a/lighthouse-core/lib/csp-evaluator.js
+++ b/lighthouse-core/lib/csp-evaluator.js
@@ -15,7 +15,7 @@ import {Type} from 'csp_evaluator/dist/finding.js';
 import {CspParser} from 'csp_evaluator/dist/parser.js';
 import {Directive} from 'csp_evaluator/dist/csp.js';
 import log from 'lighthouse-logger';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 import {isIcuMessage} from '../../shared/localization/format.js';
 
 const UIStrings = {
diff --git a/lighthouse-core/lib/dependency-graph/simulator/connection-pool.js b/lighthouse-core/lib/dependency-graph/simulator/connection-pool.js
index 2fefaa1ad5cd..e0e4a3e4e20d 100644
--- a/lighthouse-core/lib/dependency-graph/simulator/connection-pool.js
+++ b/lighthouse-core/lib/dependency-graph/simulator/connection-pool.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import NetworkAnalyzer from './network-analyzer.js';
+import {NetworkAnalyzer} from './network-analyzer.js';
 import TcpConnection from './tcp-connection.js';
 
 const DEFAULT_SERVER_RESPONSE_TIME = 30;
diff --git a/lighthouse-core/lib/dependency-graph/simulator/network-analyzer.js b/lighthouse-core/lib/dependency-graph/simulator/network-analyzer.js
index 9d3bf8bd4293..bf66ad4064c5 100644
--- a/lighthouse-core/lib/dependency-graph/simulator/network-analyzer.js
+++ b/lighthouse-core/lib/dependency-graph/simulator/network-analyzer.js
@@ -5,9 +5,10 @@
  */
 'use strict';
 
-const INITIAL_CWD = 14 * 1024;
 import URL from '../../url-shim.js';
 
+const INITIAL_CWD = 14 * 1024;
+
 // Assume that 40% of TTFB was server response time by default for static assets
 const DEFAULT_SERVER_RESPONSE_PERCENTAGE = 0.4;
 
@@ -47,7 +48,7 @@ class NetworkAnalyzer {
 
   /**
    * @param {number[]} values
-   * @return {NetworkAnalyzer.Summary}
+   * @return {Summary}
    */
   static getSummary(values) {
     values.sort((a, b) => a - b);
@@ -62,7 +63,7 @@ class NetworkAnalyzer {
 
   /**
    * @param {Map<string,number[]>} values
-   * @return {Map<string, NetworkAnalyzer.Summary>}
+   * @return {Map<string, Summary>}
    */
   static summarize(values) {
     const summaryByKey = new Map();
@@ -302,8 +303,8 @@ class NetworkAnalyzer {
    * is unavailable.
    *
    * @param {LH.Artifacts.NetworkRequest[]} records
-   * @param {NetworkAnalyzer.RTTEstimateOptions} [options]
-   * @return {Map<string, NetworkAnalyzer.Summary>}
+   * @param {RTTEstimateOptions} [options]
+   * @return {Map<string, Summary>}
    */
   static estimateRTTByOrigin(records, options) {
     const {
@@ -354,8 +355,8 @@ class NetworkAnalyzer {
    * estimated automatically if not provided.
    *
    * @param {LH.Artifacts.NetworkRequest[]} records
-   * @param {NetworkAnalyzer.RTTEstimateOptions & {rttByOrigin?: Map<string, number>}} [options]
-   * @return {Map<string, NetworkAnalyzer.Summary>}
+   * @param {RTTEstimateOptions & {rttByOrigin?: Map<string, number>}} [options]
+   * @return {Map<string, Summary>}
    */
   static estimateServerResponseTimeByOrigin(records, options) {
     let rttByOrigin = (options || {}).rttByOrigin;
@@ -457,10 +458,10 @@ class NetworkAnalyzer {
   }
 }
 
-export default NetworkAnalyzer;
+export {NetworkAnalyzer};
 
 /**
- * @typedef NetworkAnalyzer.Summary
+ * @typedef Summary
  * @property {number} min
  * @property {number} max
  * @property {number} avg
@@ -468,7 +469,7 @@ export default NetworkAnalyzer;
  */
 
 /**
- * @typedef NetworkAnalyzer.RTTEstimateOptions
+ * @typedef RTTEstimateOptions
  * @property {boolean} [forceCoarseEstimates] TCP connection handshake information will be used when available, but in some circumstances this data can be unreliable. This flag exposes an option to ignore the handshake data and use the coarse download/TTFB timing data.
  * @property {number} [coarseEstimateMultiplier] Coarse estimates include lots of extra time and noise multiply by some factor to deflate the estimates a bit.
  * @property {boolean} [useDownloadEstimates] Useful for testing to isolate the different methods of estimation.
diff --git a/lighthouse-core/lib/lh-error.js b/lighthouse-core/lib/lh-error.js
index e34076244b3c..1ac98caec585 100644
--- a/lighthouse-core/lib/lh-error.js
+++ b/lighthouse-core/lib/lh-error.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import i18n from './i18n/i18n.js';
+import * as i18n from './i18n/i18n.js';
 
 /* eslint-disable max-len */
 const UIStrings = {
diff --git a/lighthouse-core/lib/minification-estimator.js b/lighthouse-core/lib/minification-estimator.js
index d93cea0e2735..0389946f01c9 100644
--- a/lighthouse-core/lib/minification-estimator.js
+++ b/lighthouse-core/lib/minification-estimator.js
@@ -190,4 +190,4 @@ function computeCSSTokenLength(content) {
   return computeTokenLength(content, {singlelineComments: false, regex: false});
 }
 
-export default {computeJSTokenLength, computeCSSTokenLength};
+export {computeJSTokenLength, computeCSSTokenLength};
diff --git a/lighthouse-core/lib/navigation-error.js b/lighthouse-core/lib/navigation-error.js
index 2ba516b48074..6c01b02392a9 100644
--- a/lighthouse-core/lib/navigation-error.js
+++ b/lighthouse-core/lib/navigation-error.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {LighthouseError} from './lh-error.js';
-import NetworkAnalyzer from './dependency-graph/simulator/network-analyzer.js';
+import {NetworkAnalyzer} from './dependency-graph/simulator/network-analyzer.js';
 import {NetworkRequest} from './network-request.js';
 
 /**
diff --git a/lighthouse-core/lib/proto-preprocessor.js b/lighthouse-core/lib/proto-preprocessor.js
index 02f54c9a71af..4f44f68a7921 100644
--- a/lighthouse-core/lib/proto-preprocessor.js
+++ b/lighthouse-core/lib/proto-preprocessor.js
@@ -7,6 +7,7 @@
 'use strict';
 
 import fs from 'fs';
+import esMain from 'es-main';
 
 /**
  * @fileoverview Helper functions to transform an LHR into a proto-ready LHR.
@@ -108,8 +109,7 @@ function processForProto(lhr) {
 }
 
 // Test if called from the CLI or as a module.
-// TODO: cjamcl
-if (require.main === module) {
+if (esMain(import.meta)) {
   // read in the argv for the input & output
   const args = process.argv.slice(2);
   let input;
diff --git a/lighthouse-core/lib/script-helpers.js b/lighthouse-core/lib/script-helpers.js
index 9d23f241af44..e6be1acc2f55 100644
--- a/lighthouse-core/lib/script-helpers.js
+++ b/lighthouse-core/lib/script-helpers.js
@@ -26,4 +26,7 @@ function getRequestForScript(networkRecords, script) {
   return networkRequest;
 }
 
-export default {getRequestForScript, isInline};
+export {
+  getRequestForScript,
+  isInline,
+};
diff --git a/lighthouse-core/lib/stack-packs.js b/lighthouse-core/lib/stack-packs.js
index e8d032de47a1..f252ea7f8e24 100644
--- a/lighthouse-core/lib/stack-packs.js
+++ b/lighthouse-core/lib/stack-packs.js
@@ -7,7 +7,7 @@
 
 import log from 'lighthouse-logger';
 import stackPacks from 'lighthouse-stack-packs';
-import i18n from './i18n/i18n.js';
+import * as i18n from './i18n/i18n.js';
 
 /**
  * Pairs consisting of a stack pack's ID and the set of stacks needed to be
@@ -114,7 +114,7 @@ function getStackPacks(pageStacks) {
   return packs;
 }
 
-export default {
+export {
   getStackPacks,
   stackPacksToInclude,
 };
diff --git a/lighthouse-core/lib/statistics.js b/lighthouse-core/lib/statistics.js
index 707eaeef1a5a..6aa148092f2f 100644
--- a/lighthouse-core/lib/statistics.js
+++ b/lighthouse-core/lib/statistics.js
@@ -98,7 +98,7 @@ function linearInterpolation(x0, y0, x1, y1, x) {
   return y0 + (x - x0) * slope;
 }
 
-export default {
+export {
   linearInterpolation,
   getLogNormalScore,
 };
diff --git a/lighthouse-core/lib/tappable-rects.js b/lighthouse-core/lib/tappable-rects.js
index d005957a2f49..581c0b89fad9 100644
--- a/lighthouse-core/lib/tappable-rects.js
+++ b/lighthouse-core/lib/tappable-rects.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import RectHelpers from './rect-helpers.js';
+import * as RectHelpers from './rect-helpers.js';
 
 /**
  * Merge client rects together and remove small ones. This may result in a larger overall
diff --git a/lighthouse-core/lib/tracehouse/task-groups.js b/lighthouse-core/lib/tracehouse/task-groups.js
index dff9b556d1ec..0ef5d3daba74 100644
--- a/lighthouse-core/lib/tracehouse/task-groups.js
+++ b/lighthouse-core/lib/tracehouse/task-groups.js
@@ -106,7 +106,7 @@ for (const group of Object.values(taskGroups)) {
   }
 }
 
-export default {
+export {
   taskGroups,
   taskNameToGroup,
 };
diff --git a/lighthouse-core/lib/tracehouse/task-summary.js b/lighthouse-core/lib/tracehouse/task-summary.js
index d457606eb549..9be0cf7e721d 100644
--- a/lighthouse-core/lib/tracehouse/task-summary.js
+++ b/lighthouse-core/lib/tracehouse/task-summary.js
@@ -9,7 +9,7 @@
  * @fileoverview Utility functions for grouping and summarizing tasks.
  */
 
-const NetworkRequest = require('../network-request.js');
+import {NetworkRequest} from '../network-request.js';
 
 // These trace events, when not triggered by a script inside a particular task, are just general Chrome overhead.
 const BROWSER_TASK_NAMES_SET = new Set([
@@ -80,7 +80,7 @@ function getExecutionTimingsByURL(tasks, networkRecords) {
   return result;
 }
 
-module.exports = {
+export {
   getJavaScriptURLs,
   getAttributableURLForTask,
   getExecutionTimingsByURL,
diff --git a/lighthouse-core/lib/url-shim.js b/lighthouse-core/lib/url-shim.js
index d428dc2d6daa..ce1715db00e6 100644
--- a/lighthouse-core/lib/url-shim.js
+++ b/lighthouse-core/lib/url-shim.js
@@ -13,7 +13,7 @@ import {Util} from '../util-commonjs.cjs';
 
 import {LighthouseError} from '../lib/lh-error.js';
 
-/** @typedef {import('./network-request.js')} NetworkRequest */
+/** @typedef {import('./network-request.js').NetworkRequest} NetworkRequest */
 
 const allowedProtocols = [
   'https:', 'http:', 'chrome:', 'chrome-extension:',
diff --git a/lighthouse-core/runner.js b/lighthouse-core/runner.js
index 7ad4ab497e9e..8f447e151186 100644
--- a/lighthouse-core/runner.js
+++ b/lighthouse-core/runner.js
@@ -12,8 +12,8 @@ import {ReportScoring} from './scoring.js';
 import {Audit} from './audits/audit.js';
 import log from 'lighthouse-logger';
 import format from '../shared/localization/format.js';
-import stackPacks from './lib/stack-packs.js';
-import assetSaver from './lib/asset-saver.js';
+import * as stackPacks from './lib/stack-packs.js';
+import * as assetSaver from './lib/asset-saver.js';
 import fs from 'fs';
 import path from 'path';
 import {Sentry} from './lib/sentry.js';
diff --git a/lighthouse-core/scripts/update-flow-fixtures.js b/lighthouse-core/scripts/update-flow-fixtures.js
index d4445c6db7bc..89ae8a5070c7 100644
--- a/lighthouse-core/scripts/update-flow-fixtures.js
+++ b/lighthouse-core/scripts/update-flow-fixtures.js
@@ -16,8 +16,8 @@ import yargs from 'yargs';
 import {getChromePath} from 'chrome-launcher';
 
 import {LH_ROOT} from '../../root.js';
-import api from '../fraggle-rock/api.js';
-import assetSaver from '../lib/asset-saver.js';
+import * as api from '../fraggle-rock/api.js';
+import * as assetSaver from '../lib/asset-saver.js';
 
 const ARTIFACTS_PATH =
   `${LH_ROOT}/lighthouse-core/test/fixtures/fraggle-rock/artifacts/sample-flow-artifacts.json`;
diff --git a/lighthouse-core/scripts/update-report-fixtures.js b/lighthouse-core/scripts/update-report-fixtures.js
index 74ab00f72040..ec16b325715d 100644
--- a/lighthouse-core/scripts/update-report-fixtures.js
+++ b/lighthouse-core/scripts/update-report-fixtures.js
@@ -6,7 +6,7 @@
 
 import * as cli from '../../lighthouse-cli/run.js';
 import * as cliFlags from '../../lighthouse-cli/cli-flags.js';
-import assetSaver from '../lib/asset-saver.js';
+import * as assetSaver from '../lib/asset-saver.js';
 import {server} from '../../lighthouse-cli/test/fixtures/static-server.js';
 import budgetedConfig from '../test/results/sample-config.js';
 
diff --git a/lighthouse-core/test/computed/page-dependency-graph-test.js b/lighthouse-core/test/computed/page-dependency-graph-test.js
index a72c7ac2de3e..cd307e6dcf27 100644
--- a/lighthouse-core/test/computed/page-dependency-graph-test.js
+++ b/lighthouse-core/test/computed/page-dependency-graph-test.js
@@ -8,7 +8,7 @@
 import {strict as assert} from 'assert';
 
 import PageDependencyGraph from '../../computed/page-dependency-graph.js';
-import BaseNode from '../../lib/dependency-graph/base-node.js';
+import {BaseNode} from '../../lib/dependency-graph/base-node.js';
 import {NetworkRequest} from '../../lib/network-request.js';
 import sampleTrace from '../fixtures/traces/iframe-m79.trace.json';
 import sampleDevtoolsLog from '../fixtures/traces/iframe-m79.devtoolslog.json';
diff --git a/lighthouse-core/test/config/config-plugin-test.js b/lighthouse-core/test/config/config-plugin-test.js
index 0ca381670aaa..e054b1b6ab0d 100644
--- a/lighthouse-core/test/config/config-plugin-test.js
+++ b/lighthouse-core/test/config/config-plugin-test.js
@@ -8,7 +8,7 @@
 import {strict as assert} from 'assert';
 
 import ConfigPlugin from '../../config/config-plugin.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 /**
  * @param {any} val
diff --git a/lighthouse-core/test/config/config-test.js b/lighthouse-core/test/config/config-test.js
index e4bab6b444ca..24cd7227867e 100644
--- a/lighthouse-core/test/config/config-test.js
+++ b/lighthouse-core/test/config/config-test.js
@@ -14,7 +14,7 @@ import defaultConfig from '../../config/default-config.js';
 import * as constants from '../../config/constants.js';
 import {Gatherer} from '../../gather/gatherers/gatherer.js';
 import {Audit} from '../../audits/audit.js';
-import i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 import format from '../../../shared/localization/format.js';
 import {createCommonjsRefs} from '../../scripts/esm-utils.js';
 
diff --git a/lighthouse-core/test/gather/driver/network-monitor-test.js b/lighthouse-core/test/gather/driver/network-monitor-test.js
index 5b3fb7a5dada..6e5d9f1fa6b5 100644
--- a/lighthouse-core/test/gather/driver/network-monitor-test.js
+++ b/lighthouse-core/test/gather/driver/network-monitor-test.js
@@ -7,7 +7,7 @@
 import {jest} from '@jest/globals';
 
 import {mockDriverSubmodules} from '../../fraggle-rock/gather/mock-driver.js';
-// import NetworkMonitor from '../../../gather/driver/network-monitor.js';
+// import {NetworkMonitor} from '../../../gather/driver/network-monitor.js';
 import {NetworkRequest} from '../../../lib/network-request.js';
 import {networkRecordsToDevtoolsLog} from '../../network-records-to-devtools-log.js';
 import {fnAny, mockCommands} from '../../test-utils.js';
diff --git a/lighthouse-core/test/lib/asset-saver-test.js b/lighthouse-core/test/lib/asset-saver-test.js
index 7a803d0c19b7..b0322e68a5e4 100644
--- a/lighthouse-core/test/lib/asset-saver-test.js
+++ b/lighthouse-core/test/lib/asset-saver-test.js
@@ -8,7 +8,7 @@
 import {strict as assert} from 'assert';
 import fs from 'fs';
 
-import assetSaver from '../../lib/asset-saver.js';
+import * as assetSaver from '../../lib/asset-saver.js';
 import Metrics from '../../lib/traces/pwmetrics-events.js';
 import {LighthouseError} from '../../lib/lh-error.js';
 import traceEvents from '../fixtures/traces/progressive-app.json';
diff --git a/lighthouse-core/test/lib/dependency-graph/base-node-test.js b/lighthouse-core/test/lib/dependency-graph/base-node-test.js
index 49e867b9479a..083551b07ddd 100644
--- a/lighthouse-core/test/lib/dependency-graph/base-node-test.js
+++ b/lighthouse-core/test/lib/dependency-graph/base-node-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import BaseNode from '../../../lib/dependency-graph/base-node.js';
+import {BaseNode} from '../../../lib/dependency-graph/base-node.js';
 import NetworkNode from '../../../lib/dependency-graph/network-node.js';
 
 function sortedById(nodeArray) {
diff --git a/lighthouse-core/test/lib/dependency-graph/simulator/network-analyzer-test.js b/lighthouse-core/test/lib/dependency-graph/simulator/network-analyzer-test.js
index c4105336d7ab..e55a5532d47d 100644
--- a/lighthouse-core/test/lib/dependency-graph/simulator/network-analyzer-test.js
+++ b/lighthouse-core/test/lib/dependency-graph/simulator/network-analyzer-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import NetworkAnalyzer from '../../../../lib/dependency-graph/simulator/network-analyzer.js';
+import {NetworkAnalyzer} from '../../../../lib/dependency-graph/simulator/network-analyzer.js';
 import NetworkRecords from '../../../../computed/network-records.js';
 import devtoolsLog from '../../../fixtures/traces/progressive-app-m60.devtools.log.json';
 import devtoolsLogWithRedirect from '../../../fixtures/traces/site-with-redirect.devtools.log.json';
diff --git a/lighthouse-core/test/lib/emulation-test.js b/lighthouse-core/test/lib/emulation-test.js
index eb4ee4ff998c..dd7c04d8d7dc 100644
--- a/lighthouse-core/test/lib/emulation-test.js
+++ b/lighthouse-core/test/lib/emulation-test.js
@@ -4,8 +4,7 @@
  * 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 emulation from '../../lib/emulation.js';
+import * as emulation from '../../lib/emulation.js';
 import {Driver} from '../../gather/driver.js';
 import * as constants from '../../config/constants.js';
 import {Connection} from '../../gather/connections/connection.js';
diff --git a/lighthouse-core/test/lib/i18n/i18n-test.js b/lighthouse-core/test/lib/i18n/i18n-test.js
index 9a7688fedf3b..e3aefc83f277 100644
--- a/lighthouse-core/test/lib/i18n/i18n-test.js
+++ b/lighthouse-core/test/lib/i18n/i18n-test.js
@@ -10,7 +10,7 @@ import path from 'path';
 import {jest} from '@jest/globals';
 import log from 'lighthouse-logger';
 
-import i18n from '../../../lib/i18n/i18n.js';
+import * as i18n from '../../../lib/i18n/i18n.js';
 import {createCommonjsRefs} from '../../../scripts/esm-utils.js';
 
 const {__dirname} = createCommonjsRefs(import.meta);
diff --git a/lighthouse-core/test/lib/sentry-test.js b/lighthouse-core/test/lib/sentry-test.js
index 4bb114a039fb..60bd349e6ca1 100644
--- a/lighthouse-core/test/lib/sentry-test.js
+++ b/lighthouse-core/test/lib/sentry-test.js
@@ -8,7 +8,7 @@
 import {jest} from '@jest/globals';
 
 // import sentryNode from '@sentry/node';
-import Sentry from '../../lib/sentry.js';
+import {Sentry} from '../../lib/sentry.js';
 
 jest.mock('@sentry/node');
 
diff --git a/lighthouse-core/test/runner-test.js b/lighthouse-core/test/runner-test.js
index a8f7bbaaf499..722a57d0742c 100644
--- a/lighthouse-core/test/runner-test.js
+++ b/lighthouse-core/test/runner-test.js
@@ -16,9 +16,9 @@ import driverMock from './gather/fake-driver.js';
 // import {Config} from '../config/config.js';
 import {Audit} from '../audits/audit.js';
 import {Gatherer} from '../gather/gatherers/gatherer.js';
-import assetSaver from '../lib/asset-saver.js';
+import * as assetSaver from '../lib/asset-saver.js';
 import {LighthouseError} from '../lib/lh-error.js';
-import i18n from '../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 import {makeMocksForGatherRunner} from './test-utils.js';
 import {createCommonjsRefs} from '../scripts/esm-utils.js';
 

From 84fb9484cee4229e92bbb529684489197bb07cee Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Wed, 11 May 2022 16:50:56 -0700
Subject: [PATCH 26/96] ignore type error

---
 lighthouse-core/runner.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lighthouse-core/runner.js b/lighthouse-core/runner.js
index 8f447e151186..249fde07332e 100644
--- a/lighthouse-core/runner.js
+++ b/lighthouse-core/runner.js
@@ -366,6 +366,7 @@ class Runner {
         // If artifact was an error, output error result on behalf of audit.
         if (artifacts[artifactName] instanceof Error) {
           /** @type {Error} */
+          // @ts-expect-error: TODO why is this a type error now?
           const artifactError = artifacts[artifactName];
 
           Sentry.captureException(artifactError, {

From a412cf1f9d1772089de192f70bc9d004a4ac7426 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 12 May 2022 13:40:21 -0700
Subject: [PATCH 27/96] working

---
 lighthouse-core/audits/dobetterweb/charset.js |  5 +--
 .../dobetterweb/no-vulnerable-libraries.js    |  4 ++-
 .../audits/work-during-interaction.js         |  6 ++--
 lighthouse-core/config/config-helpers.js      | 35 +++++++++----------
 lighthouse-core/lib/axe.js                    |  3 +-
 lighthouse-core/lib/cdt/package.json          |  4 +--
 lighthouse-core/lib/i18n/i18n.js              |  3 ++
 lighthouse-core/lib/third-party-web.js        |  2 +-
 root.js                                       | 27 ++++++++------
 9 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/lighthouse-core/audits/dobetterweb/charset.js b/lighthouse-core/audits/dobetterweb/charset.js
index da42840570d0..d6f1869cdae6 100644
--- a/lighthouse-core/audits/dobetterweb/charset.js
+++ b/lighthouse-core/audits/dobetterweb/charset.js
@@ -90,7 +90,4 @@ class CharsetDefined extends Audit {
 }
 
 export default CharsetDefined;
-export {UIStrings};
-module.exports.CHARSET_HTML_REGEX = CHARSET_HTML_REGEX;
-module.exports.CHARSET_HTTP_REGEX = CHARSET_HTTP_REGEX;
-module.exports.IANA_REGEX = IANA_REGEX;
+export {UIStrings, CHARSET_HTML_REGEX, CHARSET_HTTP_REGEX, IANA_REGEX};
diff --git a/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js b/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
index 535791f0737b..c541f72dffdb 100644
--- a/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
+++ b/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
@@ -15,8 +15,10 @@
 import {Audit} from '../audit.js';
 import {Sentry} from '../../lib/sentry.js';
 import semver from 'semver';
-import snykDatabase from '../../../third-party/snyk/snapshot.json';
 import * as i18n from '../../lib/i18n/i18n.js';
+import {LH_ROOT, readJson} from '../../../root.js';
+
+const snykDatabase = readJson(`${LH_ROOT}/third-party/snyk/snapshot.json`);
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on Javascript libraries the page uses. This descriptive title is shown to users when all Javascript libraries are free of known security vulnerabilities. */
diff --git a/lighthouse-core/audits/work-during-interaction.js b/lighthouse-core/audits/work-during-interaction.js
index eb69ecc5839b..d8a3c020ee05 100644
--- a/lighthouse-core/audits/work-during-interaction.js
+++ b/lighthouse-core/audits/work-during-interaction.js
@@ -45,7 +45,7 @@ const UIStrings = {
   eventTarget: 'Event target',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview This metric gives a high-percentile measure of responsiveness to input.
@@ -277,5 +277,5 @@ class WorkDuringInteraction extends Audit {
   }
 }
 
-module.exports = WorkDuringInteraction;
-module.exports.UIStrings = UIStrings;
+export default WorkDuringInteraction;
+export {UIStrings};
diff --git a/lighthouse-core/config/config-helpers.js b/lighthouse-core/config/config-helpers.js
index 1c5db1484329..b1ea5008e017 100644
--- a/lighthouse-core/config/config-helpers.js
+++ b/lighthouse-core/config/config-helpers.js
@@ -218,26 +218,25 @@ async function requireWrapper(requirePath) {
   const bundledModule = bundledModules.get(requirePath);
   if (bundledModule) return bundledModule;
 
-  try {
-    const module = await import(requirePath);
-    if (module.default) return module.default;
-
-    // TODO: should we do this?
-    const methods = new Set(['meta']);
-    for (const key of Object.keys(module)) {
-      if (!(module[key] && module[key] instanceof Object)) continue;
-      if (Object.getOwnPropertyNames(module[key]).some(method => methods.has(method))) {
-        return module[key];
-      }
-    }
-
-    throw new Error(`module '${requirePath}' missing default export`);
-  } catch (err) {
-    // TODO: verify err was "this isn't esm"
-    console.error(err);
+  const importPath = requirePath.endsWith('.js') || requirePath.endsWith('.mjs') ?
+    requirePath :
+    `${requirePath}.js`;
+  const module = await import(importPath);
+  if (module.default) return module.default;
+
+  // Find a valid named export.
+  // TODO(esmodules): actually make all the audits/gatherers use named exports
+  const methods = new Set(['meta']);
+  const possibleNamedExports = Object.keys(module).filter(key => {
+    if (!(module[key] && module[key] instanceof Object)) return false;
+    return Object.getOwnPropertyNames(module[key]).some(method => methods.has(method));
+  });
+  if (possibleNamedExports.length === 1) return possibleNamedExports[0];
+  if (possibleNamedExports.length > 1) {
+    throw new Error(`module '${importPath}' has too many possible exports`);
   }
 
-  return require(requirePath);
+  throw new Error(`module '${importPath}' missing default export`);
 }
 
 /**
diff --git a/lighthouse-core/lib/axe.js b/lighthouse-core/lib/axe.js
index bb4fc1010fda..16b477a49f8c 100644
--- a/lighthouse-core/lib/axe.js
+++ b/lighthouse-core/lib/axe.js
@@ -6,8 +6,9 @@
 'use strict';
 
 import fs from 'fs';
+import {createCommonjsRefs} from '../scripts/esm-utils.js';
 
-// TODO(esmodules)
+const {require} = createCommonjsRefs(import.meta);
 const axeSource = fs.readFileSync(require.resolve('axe-core/axe.min.js'), 'utf8');
 
 export {
diff --git a/lighthouse-core/lib/cdt/package.json b/lighthouse-core/lib/cdt/package.json
index bd346284783c..99fdb9bc7c52 100644
--- a/lighthouse-core/lib/cdt/package.json
+++ b/lighthouse-core/lib/cdt/package.json
@@ -1,4 +1,4 @@
 {
-  "type": "module",
-  "//": "Any directory that uses `import ... from` or `export ...` must be type module. Temporary file until root package.json is type: module"
+  "type": "commonjs",
+  "//": "Temporary file until made esm"
 }
\ No newline at end of file
diff --git a/lighthouse-core/lib/i18n/i18n.js b/lighthouse-core/lib/i18n/i18n.js
index 0b3abd3d11d3..6f34b20c7318 100644
--- a/lighthouse-core/lib/i18n/i18n.js
+++ b/lighthouse-core/lib/i18n/i18n.js
@@ -14,6 +14,9 @@ import {getAvailableLocales} from '../../../shared/localization/format.js';
 import log from 'lighthouse-logger';
 import {LH_ROOT} from '../../../root.js';
 import {isIcuMessage, formatMessage, DEFAULT_LOCALE} from '../../../shared/localization/format.js';
+import {createCommonjsRefs} from '../../scripts/esm-utils.js';
+
+const {__filename} = createCommonjsRefs(import.meta);
 
 const UIStrings = {
   /** Used to show the duration in milliseconds that something lasted. The `{timeInMs}` placeholder will be replaced with the time duration, shown in milliseconds (e.g. 63 ms) */
diff --git a/lighthouse-core/lib/third-party-web.js b/lighthouse-core/lib/third-party-web.js
index 04241b4259bf..12423d60c121 100644
--- a/lighthouse-core/lib/third-party-web.js
+++ b/lighthouse-core/lib/third-party-web.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import thirdPartyWeb from 'third-party-web/httparchive-nostats-subset';
+import thirdPartyWeb from 'third-party-web/httparchive-nostats-subset.js';
 
 /** @typedef {import("third-party-web").IEntity} ThirdPartyEntity */
 /** @typedef {import("third-party-web").IProduct} ThirdPartyProduct */
diff --git a/root.js b/root.js
index dfc061655040..94c37cfaee84 100644
--- a/root.js
+++ b/root.js
@@ -12,18 +12,23 @@ const url = require('url');
 // import {dirname} from 'path';
 // import {fileURLToPath} from 'url';
 
+/**
+ * Return parsed json object.
+ * Resolves path relative to importMeta.url (if provided) or LH_ROOT (if not provided).
+ * @param {string} filePath Can be an absolute or relative path.
+ * @param {ImportMeta=} importMeta
+ */
+function readJson(filePath, importMeta) {
+  const dir = importMeta ? path.dirname(url.fileURLToPath(importMeta.url)) : __dirname;
+  filePath = path.resolve(dir, filePath);
+  return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+}
+
 module.exports = {
   LH_ROOT: __dirname,
   lighthouseVersion: require('./package.json').version,
-  /**
-   * Return parsed json object.
-   * Resolves path relative to importMeta.url (if provided) or LH_ROOT (if not provided).
-   * @param {string} filePath Can be an absolute or relative path.
-   * @param {ImportMeta=} importMeta
-   */
-  readJson(filePath, importMeta) {
-    const dir = importMeta ? path.dirname(url.fileURLToPath(importMeta.url)) : __dirname;
-    filePath = path.resolve(dir, filePath);
-    return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
-  },
 };
+
+// TODO(esmodules): make root.js and root package.json use type: module
+// yes, functions really must be exported like this to trick the commonjs->esm named import interop into working
+module.exports.readJson = readJson;

From 4218bf5d212258c77bc69eab4d7891d5786dee1a Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 12 May 2022 14:13:03 -0700
Subject: [PATCH 28/96] fix audits tests

---
 .../audits/byte-efficiency/legacy-javascript.js          | 3 ++-
 .../audits/metrics/first-contentful-paint-3g.js          | 4 +++-
 .../test/audits/accessibility/aria-allowed-attr-test.js  | 2 +-
 .../test/audits/accessibility/aria-required-attr-test.js | 2 +-
 .../audits/accessibility/aria-required-children-test.js  | 2 +-
 .../audits/accessibility/aria-required-parent-test.js    | 2 +-
 .../test/audits/accessibility/aria-roles-test.js         | 2 +-
 .../test/audits/accessibility/aria-valid-attr-test.js    | 2 +-
 .../audits/accessibility/aria-valid-attr-value-test.js   | 2 +-
 .../test/audits/accessibility/button-name-test.js        | 2 +-
 lighthouse-core/test/audits/accessibility/bypass-test.js | 2 +-
 .../test/audits/accessibility/color-contrast-test.js     | 2 +-
 .../test/audits/accessibility/definition-list-test.js    | 2 +-
 lighthouse-core/test/audits/accessibility/dlitem-test.js | 2 +-
 .../test/audits/accessibility/document-title-test.js     | 2 +-
 .../test/audits/accessibility/frame-title-test.js        | 2 +-
 .../test/audits/accessibility/html-has-lang-test.js      | 2 +-
 .../test/audits/accessibility/html-lang-valid-test.js    | 2 +-
 .../test/audits/accessibility/image-alt-test.js          | 2 +-
 .../test/audits/accessibility/input-image-alt-test.js    | 2 +-
 lighthouse-core/test/audits/accessibility/label-test.js  | 2 +-
 .../test/audits/accessibility/link-name-test.js          | 2 +-
 lighthouse-core/test/audits/accessibility/list-test.js   | 2 +-
 .../test/audits/accessibility/listitem-test.js           | 2 +-
 .../test/audits/accessibility/meta-refresh-test.js       | 2 +-
 .../test/audits/accessibility/meta-viewport-test.js      | 2 +-
 .../test/audits/accessibility/object-alt-test.js         | 2 +-
 .../test/audits/accessibility/tabindex-test.js           | 2 +-
 .../test/audits/accessibility/td-headers-attr-test.js    | 2 +-
 .../test/audits/accessibility/th-has-data-cells-test.js  | 2 +-
 .../test/audits/accessibility/valid-lang-test.js         | 2 +-
 .../test/audits/accessibility/video-caption-test.js      | 2 +-
 .../audits/byte-efficiency/byte-efficiency-audit-test.js | 7 ++++---
 .../byte-efficiency/render-blocking-resources-test.js    | 4 ++--
 lighthouse-core/test/audits/content-width-test.js        | 2 +-
 lighthouse-core/test/audits/dobetterweb/charset-test.js  | 9 +++++----
 lighthouse-core/test/audits/dobetterweb/doctype-test.js  | 2 +-
 lighthouse-core/test/audits/installable-manifest-test.js | 4 ++--
 lighthouse-core/test/audits/is-on-https-test.js          | 2 +-
 lighthouse-core/test/audits/maskable-icon-test.js        | 4 ++--
 .../test/audits/metrics/first-meaningful-paint-test.js   | 2 +-
 lighthouse-core/test/audits/metrics/speed-index-test.js  | 4 ++--
 lighthouse-core/test/audits/network-requests-test.js     | 2 +-
 lighthouse-core/test/audits/seo/meta-description-test.js | 2 +-
 lighthouse-core/test/audits/seo/tap-targets-test.js      | 2 +-
 lighthouse-core/test/audits/service-worker-test.js       | 4 ++--
 lighthouse-core/test/audits/splash-screen-test.js        | 4 ++--
 lighthouse-core/test/audits/themed-omnibox-test.js       | 4 ++--
 lighthouse-core/test/audits/viewport-test.js             | 2 +-
 49 files changed, 66 insertions(+), 61 deletions(-)

diff --git a/lighthouse-core/audits/byte-efficiency/legacy-javascript.js b/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
index ce2f354926c5..fde4640bb83e 100644
--- a/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
+++ b/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
@@ -24,6 +24,7 @@ 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';
+import {readJson} from '../../../root.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that tells the user about legacy polyfills and transforms used on the page. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -329,7 +330,7 @@ class LegacyJavascript extends ByteEfficiencyAudit {
 
     let estimatedWastedBytesFromPolyfills = 0;
     /** @type {import('../../scripts/legacy-javascript/create-polyfill-size-estimation.js').PolyfillSizeEstimator} */
-    const graph = require('./polyfill-graph-data.json');
+    const graph = readJson('./polyfill-graph-data.json', import.meta);
     const modulesSeen = new Set();
     for (const result of polyfillResults) {
       const modules = graph.dependencies[result.name];
diff --git a/lighthouse-core/audits/metrics/first-contentful-paint-3g.js b/lighthouse-core/audits/metrics/first-contentful-paint-3g.js
index a5cda315a95a..4ca7f3447cf9 100644
--- a/lighthouse-core/audits/metrics/first-contentful-paint-3g.js
+++ b/lighthouse-core/audits/metrics/first-contentful-paint-3g.js
@@ -6,8 +6,10 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-const regular3G = require('../../config/constants.js').throttling.mobileRegular3G;
 import ComputedFcp from '../../computed/metrics/first-contentful-paint.js';
+import * as constants from '../../config/constants.js';
+
+const regular3G = constants.throttling.mobileRegular3G;
 
 class FirstContentfulPaint3G extends Audit {
   /**
diff --git a/lighthouse-core/test/audits/accessibility/aria-allowed-attr-test.js b/lighthouse-core/test/audits/accessibility/aria-allowed-attr-test.js
index 4fadf8fbe32f..94590caff94c 100644
--- a/lighthouse-core/test/audits/accessibility/aria-allowed-attr-test.js
+++ b/lighthouse-core/test/audits/accessibility/aria-allowed-attr-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/aria-allowed-attr.js';
+import Audit from '../../../audits/accessibility/aria-allowed-attr.js';
 
 describe('Accessibility: aria-allowed-attr audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/aria-required-attr-test.js b/lighthouse-core/test/audits/accessibility/aria-required-attr-test.js
index 47871f719a56..1ba3217b852e 100644
--- a/lighthouse-core/test/audits/accessibility/aria-required-attr-test.js
+++ b/lighthouse-core/test/audits/accessibility/aria-required-attr-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/aria-required-attr.js';
+import Audit from '../../../audits/accessibility/aria-required-attr.js';
 
 describe('Accessibility: aria-required-attr audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/aria-required-children-test.js b/lighthouse-core/test/audits/accessibility/aria-required-children-test.js
index 6e6b755808f2..f4eb7bba530a 100644
--- a/lighthouse-core/test/audits/accessibility/aria-required-children-test.js
+++ b/lighthouse-core/test/audits/accessibility/aria-required-children-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/aria-required-children.js';
+import Audit from '../../../audits/accessibility/aria-required-children.js';
 
 describe('Accessibility: aria-required-children audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/aria-required-parent-test.js b/lighthouse-core/test/audits/accessibility/aria-required-parent-test.js
index 56692c74db98..f9b03f0b2d0c 100644
--- a/lighthouse-core/test/audits/accessibility/aria-required-parent-test.js
+++ b/lighthouse-core/test/audits/accessibility/aria-required-parent-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/aria-required-parent.js';
+import Audit from '../../../audits/accessibility/aria-required-parent.js';
 
 describe('Accessibility: aria-required-parent audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/aria-roles-test.js b/lighthouse-core/test/audits/accessibility/aria-roles-test.js
index d954af9499aa..9c58dd174d09 100644
--- a/lighthouse-core/test/audits/accessibility/aria-roles-test.js
+++ b/lighthouse-core/test/audits/accessibility/aria-roles-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/aria-roles.js';
+import Audit from '../../../audits/accessibility/aria-roles.js';
 
 describe('Accessibility: aria-roles audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/aria-valid-attr-test.js b/lighthouse-core/test/audits/accessibility/aria-valid-attr-test.js
index bda89c40553b..5bc7c7582185 100644
--- a/lighthouse-core/test/audits/accessibility/aria-valid-attr-test.js
+++ b/lighthouse-core/test/audits/accessibility/aria-valid-attr-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/aria-valid-attr.js';
+import Audit from '../../../audits/accessibility/aria-valid-attr.js';
 
 describe('Accessibility: aria-valid-attr audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/aria-valid-attr-value-test.js b/lighthouse-core/test/audits/accessibility/aria-valid-attr-value-test.js
index a3c43b1c9e82..68ca6db2e348 100644
--- a/lighthouse-core/test/audits/accessibility/aria-valid-attr-value-test.js
+++ b/lighthouse-core/test/audits/accessibility/aria-valid-attr-value-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/aria-valid-attr-value.js';
+import Audit from '../../../audits/accessibility/aria-valid-attr-value.js';
 
 describe('Accessibility: aria-valid-attr-value audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/button-name-test.js b/lighthouse-core/test/audits/accessibility/button-name-test.js
index 829b35940193..d5af50f02b12 100644
--- a/lighthouse-core/test/audits/accessibility/button-name-test.js
+++ b/lighthouse-core/test/audits/accessibility/button-name-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/button-name.js';
+import Audit from '../../../audits/accessibility/button-name.js';
 
 describe('Accessibility: button-name audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/bypass-test.js b/lighthouse-core/test/audits/accessibility/bypass-test.js
index c757f7d839d6..554048e653f8 100644
--- a/lighthouse-core/test/audits/accessibility/bypass-test.js
+++ b/lighthouse-core/test/audits/accessibility/bypass-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/bypass.js';
+import Audit from '../../../audits/accessibility/bypass.js';
 
 describe('Accessibility: bypass audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/color-contrast-test.js b/lighthouse-core/test/audits/accessibility/color-contrast-test.js
index 994cb9ae97dd..2757ae9adb3a 100644
--- a/lighthouse-core/test/audits/accessibility/color-contrast-test.js
+++ b/lighthouse-core/test/audits/accessibility/color-contrast-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/color-contrast.js';
+import Audit from '../../../audits/accessibility/color-contrast.js';
 
 describe('Accessibility: color-contrast audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/definition-list-test.js b/lighthouse-core/test/audits/accessibility/definition-list-test.js
index 844a61fc3284..e506f915badd 100644
--- a/lighthouse-core/test/audits/accessibility/definition-list-test.js
+++ b/lighthouse-core/test/audits/accessibility/definition-list-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/definition-list.js';
+import Audit from '../../../audits/accessibility/definition-list.js';
 
 describe('Accessibility: definition-list audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/dlitem-test.js b/lighthouse-core/test/audits/accessibility/dlitem-test.js
index 412c1989c4de..0fc501ec957b 100644
--- a/lighthouse-core/test/audits/accessibility/dlitem-test.js
+++ b/lighthouse-core/test/audits/accessibility/dlitem-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/dlitem.js';
+import Audit from '../../../audits/accessibility/dlitem.js';
 
 describe('Accessibility: dlitem audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/document-title-test.js b/lighthouse-core/test/audits/accessibility/document-title-test.js
index 7c2e58c5a130..f4a6310bd9cd 100644
--- a/lighthouse-core/test/audits/accessibility/document-title-test.js
+++ b/lighthouse-core/test/audits/accessibility/document-title-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/document-title.js';
+import Audit from '../../../audits/accessibility/document-title.js';
 
 describe('Accessibility: document-title audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/frame-title-test.js b/lighthouse-core/test/audits/accessibility/frame-title-test.js
index 0184cc9e99b5..c5697f7e899e 100644
--- a/lighthouse-core/test/audits/accessibility/frame-title-test.js
+++ b/lighthouse-core/test/audits/accessibility/frame-title-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/frame-title.js';
+import Audit from '../../../audits/accessibility/frame-title.js';
 
 describe('Accessibility: frame-title audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/html-has-lang-test.js b/lighthouse-core/test/audits/accessibility/html-has-lang-test.js
index bd5a4a66bad4..02c903c3ff04 100644
--- a/lighthouse-core/test/audits/accessibility/html-has-lang-test.js
+++ b/lighthouse-core/test/audits/accessibility/html-has-lang-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/html-has-lang.js';
+import Audit from '../../../audits/accessibility/html-has-lang.js';
 
 describe('Accessibility: html-has-lang audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/html-lang-valid-test.js b/lighthouse-core/test/audits/accessibility/html-lang-valid-test.js
index 322932e915a6..c1ec90dcb2f2 100644
--- a/lighthouse-core/test/audits/accessibility/html-lang-valid-test.js
+++ b/lighthouse-core/test/audits/accessibility/html-lang-valid-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/html-lang-valid.js';
+import Audit from '../../../audits/accessibility/html-lang-valid.js';
 
 describe('Accessibility: html-lang-valid audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/image-alt-test.js b/lighthouse-core/test/audits/accessibility/image-alt-test.js
index 29f4e1322b20..0c15a5c473d4 100644
--- a/lighthouse-core/test/audits/accessibility/image-alt-test.js
+++ b/lighthouse-core/test/audits/accessibility/image-alt-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/image-alt.js';
+import Audit from '../../../audits/accessibility/image-alt.js';
 
 describe('Accessibility: image-alt audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/input-image-alt-test.js b/lighthouse-core/test/audits/accessibility/input-image-alt-test.js
index 7154d4ed5937..f5eda312d3d0 100644
--- a/lighthouse-core/test/audits/accessibility/input-image-alt-test.js
+++ b/lighthouse-core/test/audits/accessibility/input-image-alt-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/input-image-alt.js';
+import Audit from '../../../audits/accessibility/input-image-alt.js';
 
 describe('Accessibility: input-image-alt audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/label-test.js b/lighthouse-core/test/audits/accessibility/label-test.js
index e610a614fda0..a20fa70949ad 100644
--- a/lighthouse-core/test/audits/accessibility/label-test.js
+++ b/lighthouse-core/test/audits/accessibility/label-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/label.js';
+import Audit from '../../../audits/accessibility/label.js';
 
 describe('Accessibility: label audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/link-name-test.js b/lighthouse-core/test/audits/accessibility/link-name-test.js
index ebcf28f8eb16..b03e0f25722f 100644
--- a/lighthouse-core/test/audits/accessibility/link-name-test.js
+++ b/lighthouse-core/test/audits/accessibility/link-name-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/link-name.js';
+import Audit from '../../../audits/accessibility/link-name.js';
 
 describe('Accessibility: link-name audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/list-test.js b/lighthouse-core/test/audits/accessibility/list-test.js
index aa15bfefd224..1318af2147d3 100644
--- a/lighthouse-core/test/audits/accessibility/list-test.js
+++ b/lighthouse-core/test/audits/accessibility/list-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/list.js';
+import Audit from '../../../audits/accessibility/list.js';
 
 describe('Accessibility: list audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/listitem-test.js b/lighthouse-core/test/audits/accessibility/listitem-test.js
index 796c3e034cef..6f734131d6d5 100644
--- a/lighthouse-core/test/audits/accessibility/listitem-test.js
+++ b/lighthouse-core/test/audits/accessibility/listitem-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/listitem.js';
+import Audit from '../../../audits/accessibility/listitem.js';
 
 describe('Accessibility: listitem audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/meta-refresh-test.js b/lighthouse-core/test/audits/accessibility/meta-refresh-test.js
index 37061ede5218..0f98d5211280 100644
--- a/lighthouse-core/test/audits/accessibility/meta-refresh-test.js
+++ b/lighthouse-core/test/audits/accessibility/meta-refresh-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/meta-refresh.js';
+import Audit from '../../../audits/accessibility/meta-refresh.js';
 
 describe('Accessibility: meta-refresh audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/meta-viewport-test.js b/lighthouse-core/test/audits/accessibility/meta-viewport-test.js
index 7afdb5ee5c5c..7e4025b68e27 100644
--- a/lighthouse-core/test/audits/accessibility/meta-viewport-test.js
+++ b/lighthouse-core/test/audits/accessibility/meta-viewport-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/meta-viewport.js';
+import Audit from '../../../audits/accessibility/meta-viewport.js';
 
 describe('Accessibility: meta-viewport audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/object-alt-test.js b/lighthouse-core/test/audits/accessibility/object-alt-test.js
index c787fe90dd97..a41697ecd1ba 100644
--- a/lighthouse-core/test/audits/accessibility/object-alt-test.js
+++ b/lighthouse-core/test/audits/accessibility/object-alt-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/object-alt.js';
+import Audit from '../../../audits/accessibility/object-alt.js';
 
 describe('Accessibility: object-alt audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/tabindex-test.js b/lighthouse-core/test/audits/accessibility/tabindex-test.js
index fc1175b7d38d..ca77c9a6a2f0 100644
--- a/lighthouse-core/test/audits/accessibility/tabindex-test.js
+++ b/lighthouse-core/test/audits/accessibility/tabindex-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/tabindex.js';
+import Audit from '../../../audits/accessibility/tabindex.js';
 
 describe('Accessibility: tabindex audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/td-headers-attr-test.js b/lighthouse-core/test/audits/accessibility/td-headers-attr-test.js
index 1900e63e3dad..cefd96d833ed 100644
--- a/lighthouse-core/test/audits/accessibility/td-headers-attr-test.js
+++ b/lighthouse-core/test/audits/accessibility/td-headers-attr-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/td-headers-attr.js';
+import Audit from '../../../audits/accessibility/td-headers-attr.js';
 
 describe('Accessibility: td-headers-attr audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/th-has-data-cells-test.js b/lighthouse-core/test/audits/accessibility/th-has-data-cells-test.js
index d8d21e5b647a..ba825df901c5 100644
--- a/lighthouse-core/test/audits/accessibility/th-has-data-cells-test.js
+++ b/lighthouse-core/test/audits/accessibility/th-has-data-cells-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/th-has-data-cells.js';
+import Audit from '../../../audits/accessibility/th-has-data-cells.js';
 
 describe('Accessibility: th-has-data-cells audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/valid-lang-test.js b/lighthouse-core/test/audits/accessibility/valid-lang-test.js
index 02f88e95ebe3..a787f9e86ee4 100644
--- a/lighthouse-core/test/audits/accessibility/valid-lang-test.js
+++ b/lighthouse-core/test/audits/accessibility/valid-lang-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/valid-lang.js';
+import Audit from '../../../audits/accessibility/valid-lang.js';
 
 describe('Accessibility: valid-lang audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/accessibility/video-caption-test.js b/lighthouse-core/test/audits/accessibility/video-caption-test.js
index ea5468456ab2..7c3111dec2d2 100644
--- a/lighthouse-core/test/audits/accessibility/video-caption-test.js
+++ b/lighthouse-core/test/audits/accessibility/video-caption-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/accessibility/video-caption.js';
+import Audit from '../../../audits/accessibility/video-caption.js';
 
 describe('Accessibility: video-caption audit', () => {
   it('generates an audit output', () => {
diff --git a/lighthouse-core/test/audits/byte-efficiency/byte-efficiency-audit-test.js b/lighthouse-core/test/audits/byte-efficiency/byte-efficiency-audit-test.js
index d16afb2e1e60..c47434a7baa5 100644
--- a/lighthouse-core/test/audits/byte-efficiency/byte-efficiency-audit-test.js
+++ b/lighthouse-core/test/audits/byte-efficiency/byte-efficiency-audit-test.js
@@ -7,9 +7,10 @@
 
 import {strict as assert} from 'assert';
 
-import ByteEfficiencyAudit_ from '../../../audits/byte-efficiency/byte-efficiency-audit.js';
-import NetworkNode from '../../../lib/dependency-graph/network-node.js';
-import CPUNode from '../../../lib/dependency-graph/cpu-node.js';
+import {ByteEfficiencyAudit as ByteEfficiencyAudit_}
+  from '../../../audits/byte-efficiency/byte-efficiency-audit.js';
+import {NetworkNode} from '../../../lib/dependency-graph/network-node.js';
+import {CPUNode} from '../../../lib/dependency-graph/cpu-node.js';
 import {Simulator} from '../../../lib/dependency-graph/simulator/simulator.js';
 import PageDependencyGraph from '../../../computed/page-dependency-graph.js';
 import LoadSimulator from '../../../computed/load-simulator.js';
diff --git a/lighthouse-core/test/audits/byte-efficiency/render-blocking-resources-test.js b/lighthouse-core/test/audits/byte-efficiency/render-blocking-resources-test.js
index d5ef4d6e8b07..b23bffc1fd30 100644
--- a/lighthouse-core/test/audits/byte-efficiency/render-blocking-resources-test.js
+++ b/lighthouse-core/test/audits/byte-efficiency/render-blocking-resources-test.js
@@ -9,8 +9,8 @@ import {strict as assert} from 'assert';
 
 import RenderBlockingResourcesAudit from '../../../audits/byte-efficiency/render-blocking-resources.js'; // eslint-disable-line max-len
 import * as constants from '../../../config/constants.js';
-import NetworkNode from '../../../lib/dependency-graph/network-node.js';
-import CPUNode from '../../../lib/dependency-graph/cpu-node.js';
+import {NetworkNode} from '../../../lib/dependency-graph/network-node.js';
+import {CPUNode} from '../../../lib/dependency-graph/cpu-node.js';
 import {Simulator} from '../../../lib/dependency-graph/simulator/simulator.js';
 import {NetworkRequest} from '../../../lib/network-request.js';
 import trace from '../../fixtures/traces/progressive-app-m60.json';
diff --git a/lighthouse-core/test/audits/content-width-test.js b/lighthouse-core/test/audits/content-width-test.js
index 0a1b9a1ee764..0d69c4b64fac 100644
--- a/lighthouse-core/test/audits/content-width-test.js
+++ b/lighthouse-core/test/audits/content-width-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../audits/content-width.js';
+import Audit from '../../audits/content-width.js';
 import * as constants from '../../config/constants.js';
 
 /** @param {LH.SharedFlagsSettings['formFactor']} formFactor */
diff --git a/lighthouse-core/test/audits/dobetterweb/charset-test.js b/lighthouse-core/test/audits/dobetterweb/charset-test.js
index 34f9cf3f8925..3219bd072375 100644
--- a/lighthouse-core/test/audits/dobetterweb/charset-test.js
+++ b/lighthouse-core/test/audits/dobetterweb/charset-test.js
@@ -7,7 +7,9 @@
 
 import {strict as assert} from 'assert';
 
-import CharsetDefinedAudit from '../../../audits/dobetterweb/charset.js';
+import CharsetDefinedAudit, {
+  CHARSET_HTML_REGEX, CHARSET_HTTP_REGEX, IANA_REGEX,
+} from '../../../audits/dobetterweb/charset.js';
 import {networkRecordsToDevtoolsLog} from '../../network-records-to-devtools-log.js';
 
 const HTML_PRE = '<!doctype html><head>';
@@ -114,9 +116,8 @@ describe('Charset defined audit', () => {
 });
 
 describe('Charset regex check', () => {
-  const HTML_REGEX = CharsetDefinedAudit.CHARSET_HTML_REGEX;
-  const HTTP_REGEX = CharsetDefinedAudit.CHARSET_HTTP_REGEX;
-  const IANA_REGEX = CharsetDefinedAudit.IANA_REGEX;
+  const HTML_REGEX = CHARSET_HTML_REGEX;
+  const HTTP_REGEX = CHARSET_HTTP_REGEX;
 
   it('handles html correctly', () => {
     // Positive cases
diff --git a/lighthouse-core/test/audits/dobetterweb/doctype-test.js b/lighthouse-core/test/audits/dobetterweb/doctype-test.js
index 85e1bd351571..926a4e7c856e 100644
--- a/lighthouse-core/test/audits/dobetterweb/doctype-test.js
+++ b/lighthouse-core/test/audits/dobetterweb/doctype-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/dobetterweb/doctype.js';
+import Audit from '../../../audits/dobetterweb/doctype.js';
 
 describe('DOBETTERWEB: doctype audit', () => {
   it('fails when document does not contain a doctype', () => {
diff --git a/lighthouse-core/test/audits/installable-manifest-test.js b/lighthouse-core/test/audits/installable-manifest-test.js
index efa65476d870..5d6ec56ccda5 100644
--- a/lighthouse-core/test/audits/installable-manifest-test.js
+++ b/lighthouse-core/test/audits/installable-manifest-test.js
@@ -8,7 +8,7 @@
 import {strict as assert} from 'assert';
 
 import InstallableManifestAudit from '../../audits/installable-manifest.js';
-import manifestParser from '../../lib/manifest-parser.js';
+import {parseManifest} from '../../lib/manifest-parser.js';
 import manifest from '../fixtures/manifest.json';
 import manifestDirtyJpg from '../fixtures/manifest-dirty-jpg.json';
 
@@ -18,7 +18,7 @@ const EXAMPLE_MANIFEST_URL = 'https://example.com/manifest.json';
 const EXAMPLE_DOC_URL = 'https://example.com/index.html';
 
 function generateMockArtifacts(src = manifestSrc) {
-  const exampleManifest = manifestParser(src, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+  const exampleManifest = parseManifest(src, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
 
   const clonedArtifacts = JSON.parse(JSON.stringify({
     WebAppManifest: exampleManifest,
diff --git a/lighthouse-core/test/audits/is-on-https-test.js b/lighthouse-core/test/audits/is-on-https-test.js
index 5a15953f3ca4..8f2fe7303c50 100644
--- a/lighthouse-core/test/audits/is-on-https-test.js
+++ b/lighthouse-core/test/audits/is-on-https-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../audits/is-on-https.js';
+import Audit from '../../audits/is-on-https.js';
 import {networkRecordsToDevtoolsLog} from '../network-records-to-devtools-log.js';
 
 describe('Security: HTTPS audit', () => {
diff --git a/lighthouse-core/test/audits/maskable-icon-test.js b/lighthouse-core/test/audits/maskable-icon-test.js
index 744a1b469bad..2e6e3fc1ca18 100644
--- a/lighthouse-core/test/audits/maskable-icon-test.js
+++ b/lighthouse-core/test/audits/maskable-icon-test.js
@@ -6,7 +6,7 @@
 
 
 import MaskableIconAudit from '../../audits/maskable-icon.js';
-import manifestParser from '../../lib/manifest-parser.js';
+import {parseManifest} from '../../lib/manifest-parser.js';
 import manifest from '../fixtures/manifest.json';
 import manifestWithoutMaskable from '../fixtures/manifest-no-maskable-icon.json';
 
@@ -19,7 +19,7 @@ const EXAMPLE_DOC_URL = 'https://example.com/index.html';
  * @param {string}
  */
 function generateMockArtifacts(src = manifestSrc) {
-  const exampleManifest = manifestParser(src, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+  const exampleManifest = parseManifest(src, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
 
   return {
     WebAppManifest: exampleManifest,
diff --git a/lighthouse-core/test/audits/metrics/first-meaningful-paint-test.js b/lighthouse-core/test/audits/metrics/first-meaningful-paint-test.js
index 924c8e464a41..f9675f9e8bc0 100644
--- a/lighthouse-core/test/audits/metrics/first-meaningful-paint-test.js
+++ b/lighthouse-core/test/audits/metrics/first-meaningful-paint-test.js
@@ -9,7 +9,7 @@ import {strict as assert} from 'assert';
 
 import FMPAudit from '../../../audits/metrics/first-meaningful-paint.js';
 import {Audit} from '../../../audits/audit.js';
-import constants from '../../../config/constants.js';
+import * as constants from '../../../config/constants.js';
 import trace from '../../fixtures/traces/progressive-app-m60.json';
 import devtoolsLogs from '../../fixtures/traces/progressive-app-m60.devtools.log.json';
 import {getURLArtifactFromDevtoolsLog} from '../../test-utils.js';
diff --git a/lighthouse-core/test/audits/metrics/speed-index-test.js b/lighthouse-core/test/audits/metrics/speed-index-test.js
index 034999a235f1..e72e21508c5c 100644
--- a/lighthouse-core/test/audits/metrics/speed-index-test.js
+++ b/lighthouse-core/test/audits/metrics/speed-index-test.js
@@ -6,8 +6,8 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/metrics/speed-index.js';
-import constants from '../../../config/constants.js';
+import Audit from '../../../audits/metrics/speed-index.js';
+import * as constants from '../../../config/constants.js';
 import pwaTrace from '../../fixtures/traces/progressive-app-m60.json';
 import pwaDevtoolsLog from '../../fixtures/traces/progressive-app-m60.devtools.log.json';
 
diff --git a/lighthouse-core/test/audits/network-requests-test.js b/lighthouse-core/test/audits/network-requests-test.js
index 2786715f5849..d834411c3aa6 100644
--- a/lighthouse-core/test/audits/network-requests-test.js
+++ b/lighthouse-core/test/audits/network-requests-test.js
@@ -4,7 +4,7 @@
  * 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 {NetworkRequests} from '../../audits/network-requests.js';
+import NetworkRequests from '../../audits/network-requests.js';
 import {networkRecordsToDevtoolsLog} from '../network-records-to-devtools-log.js';
 import cutoffLoadDevtoolsLog from '../fixtures/traces/cutoff-load-m83.devtoolslog.json';
 
diff --git a/lighthouse-core/test/audits/seo/meta-description-test.js b/lighthouse-core/test/audits/seo/meta-description-test.js
index b0c66e737b2b..5dd3bef1798b 100644
--- a/lighthouse-core/test/audits/seo/meta-description-test.js
+++ b/lighthouse-core/test/audits/seo/meta-description-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../../audits/seo/meta-description.js';
+import Audit from '../../../audits/seo/meta-description.js';
 
 describe('SEO: description audit', () => {
   const makeMetaElements = content => [{name: 'description', content}];
diff --git a/lighthouse-core/test/audits/seo/tap-targets-test.js b/lighthouse-core/test/audits/seo/tap-targets-test.js
index 54e49fd5e6e2..303b20979e02 100644
--- a/lighthouse-core/test/audits/seo/tap-targets-test.js
+++ b/lighthouse-core/test/audits/seo/tap-targets-test.js
@@ -7,7 +7,7 @@
 import {strict as assert} from 'assert';
 
 import TapTargetsAudit from '../../../audits/seo/tap-targets.js';
-import constants from '../../../config/constants.js';
+import * as constants from '../../../config/constants.js';
 
 /** @param {LH.SharedFlagsSettings['formFactor']} formFactor */
 const getFakeContext = (formFactor = 'mobile') => ({
diff --git a/lighthouse-core/test/audits/service-worker-test.js b/lighthouse-core/test/audits/service-worker-test.js
index dc92e675cafc..4fb3b4cb06b3 100644
--- a/lighthouse-core/test/audits/service-worker-test.js
+++ b/lighthouse-core/test/audits/service-worker-test.js
@@ -9,7 +9,7 @@ import {strict as assert} from 'assert';
 
 import ServiceWorker from '../../audits/service-worker.js';
 import URL from '../../lib/url-shim.js';
-import manifestParser from '../../lib/manifest-parser.js';
+import {parseManifest} from '../../lib/manifest-parser.js';
 
 function getBaseDirectory(urlStr) {
   const url = new URL(urlStr);
@@ -55,7 +55,7 @@ function createArtifacts(swOpts, mainDocumentUrl, manifestJsonOrObject) {
   } else {
     const manifestJson = typeof manifestJsonOrObject === 'object' ?
       JSON.stringify(manifestJsonOrObject) : manifestJsonOrObject;
-    WebAppManifest = manifestParser(manifestJson, manifestUrl, mainDocumentUrl);
+    WebAppManifest = parseManifest(manifestJson, manifestUrl, mainDocumentUrl);
   }
 
   return {
diff --git a/lighthouse-core/test/audits/splash-screen-test.js b/lighthouse-core/test/audits/splash-screen-test.js
index 9091a751b5f6..0b5e4da436af 100644
--- a/lighthouse-core/test/audits/splash-screen-test.js
+++ b/lighthouse-core/test/audits/splash-screen-test.js
@@ -8,7 +8,7 @@
 import {strict as assert} from 'assert';
 
 import SplashScreenAudit from '../../audits/splash-screen.js';
-import manifestParser from '../../lib/manifest-parser.js';
+import {parseManifest} from '../../lib/manifest-parser.js';
 import manifest from '../fixtures/manifest.json';
 import manifestDirtyJpg from '../fixtures/manifest-dirty-jpg.json';
 
@@ -21,7 +21,7 @@ const EXAMPLE_DOC_URL = 'https://example.com/index.html';
  * @param {string} src
  */
 function generateMockArtifacts(src = manifestSrc) {
-  const exampleManifest = manifestParser(src, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+  const exampleManifest = parseManifest(src, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
 
   return {
     WebAppManifest: exampleManifest,
diff --git a/lighthouse-core/test/audits/themed-omnibox-test.js b/lighthouse-core/test/audits/themed-omnibox-test.js
index 60fa5efe8592..9569370181a6 100644
--- a/lighthouse-core/test/audits/themed-omnibox-test.js
+++ b/lighthouse-core/test/audits/themed-omnibox-test.js
@@ -8,7 +8,7 @@
 import {strict as assert} from 'assert';
 
 import ThemedOmniboxAudit from '../../audits/themed-omnibox.js';
-import manifestParser from '../../lib/manifest-parser.js';
+import {parseManifest} from '../../lib/manifest-parser.js';
 import manifest from '../fixtures/manifest.json';
 
 const manifestSrc = JSON.stringify(manifest);
@@ -19,7 +19,7 @@ const EXAMPLE_DOC_URL = 'https://example.com/index.html';
  * @param {string} src
  */
 function generateMockArtifacts(src = manifestSrc) {
-  const exampleManifest = manifestParser(src, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+  const exampleManifest = parseManifest(src, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
 
   return {
     WebAppManifest: exampleManifest,
diff --git a/lighthouse-core/test/audits/viewport-test.js b/lighthouse-core/test/audits/viewport-test.js
index 653f72c8bdb8..7379b5e9e227 100644
--- a/lighthouse-core/test/audits/viewport-test.js
+++ b/lighthouse-core/test/audits/viewport-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import {Audit} from '../../audits/viewport.js';
+import Audit from '../../audits/viewport.js';
 
 describe('Mobile-friendly: viewport audit', () => {
   const makeMetaElements = viewport => [{name: 'viewport', content: viewport}];

From 041ca98b6e67f039a7b6327285724496c9b4f657 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 12 May 2022 18:22:06 -0700
Subject: [PATCH 29/96] starting to get gather mock tests working again

---
 lighthouse-core/gather/gather-runner.js       |  1 +
 .../gather/gatherers/accessibility.js         |  4 +-
 lighthouse-core/lib/axe.js                    |  2 +-
 .../test/gather/devtools-log-test.js          |  2 +-
 .../gather/driver/wait-for-condition-test.js  |  2 +-
 .../test/gather/gather-runner-test.js         | 38 +++++++++++++++----
 .../gather/gatherers/accessibility-test.js    |  4 +-
 .../gather/gatherers/seo/font-size-test.js    | 28 +++++++-------
 .../gather/gatherers/service-worker-test.js   |  2 +-
 lighthouse-core/test/test-utils.js            |  2 +-
 10 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/lighthouse-core/gather/gather-runner.js b/lighthouse-core/gather/gather-runner.js
index 58d07c3a6250..c7e9a9e0177d 100644
--- a/lighthouse-core/gather/gather-runner.js
+++ b/lighthouse-core/gather/gather-runner.js
@@ -71,6 +71,7 @@ class GatherRunner {
     log.time(status);
     try {
       const requestedUrl = passContext.url;
+      console.log(navigation.gotoURL.toString());
       const {mainDocumentUrl, warnings} = await navigation.gotoURL(driver, requestedUrl, {
         waitUntil: passContext.passConfig.recordTrace ?
           ['load', 'fcp'] : ['load'],
diff --git a/lighthouse-core/gather/gatherers/accessibility.js b/lighthouse-core/gather/gatherers/accessibility.js
index 2c7982aff80e..00dac7589bce 100644
--- a/lighthouse-core/gather/gatherers/accessibility.js
+++ b/lighthouse-core/gather/gatherers/accessibility.js
@@ -9,7 +9,7 @@
 
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
-import {source as axeLibSource} from '../../lib/axe.js';
+import {axeSource} from '../../lib/axe.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 
 /**
@@ -174,7 +174,7 @@ class Accessibility extends FRGatherer {
       args: [],
       useIsolation: true,
       deps: [
-        axeLibSource,
+        axeSource,
         pageFunctions.getNodeDetailsString,
         createAxeRuleResultArtifact,
       ],
diff --git a/lighthouse-core/lib/axe.js b/lighthouse-core/lib/axe.js
index 16b477a49f8c..bc9d89e53458 100644
--- a/lighthouse-core/lib/axe.js
+++ b/lighthouse-core/lib/axe.js
@@ -12,5 +12,5 @@ const {require} = createCommonjsRefs(import.meta);
 const axeSource = fs.readFileSync(require.resolve('axe-core/axe.min.js'), 'utf8');
 
 export {
-  axeSource as source,
+  axeSource,
 };
diff --git a/lighthouse-core/test/gather/devtools-log-test.js b/lighthouse-core/test/gather/devtools-log-test.js
index 3bb5df3180b7..4123bd9ebf1f 100644
--- a/lighthouse-core/test/gather/devtools-log-test.js
+++ b/lighthouse-core/test/gather/devtools-log-test.js
@@ -7,7 +7,7 @@
 
 import {strict as assert} from 'assert';
 
-import DevtoolsLog from '../../gather/devtools-log.js';
+import {DevtoolsLog} from '../../gather/devtools-log.js';
 
 describe('DevtoolsLog', () => {
   let messageLog;
diff --git a/lighthouse-core/test/gather/driver/wait-for-condition-test.js b/lighthouse-core/test/gather/driver/wait-for-condition-test.js
index 30bdd3f808ee..f865daf0e6d0 100644
--- a/lighthouse-core/test/gather/driver/wait-for-condition-test.js
+++ b/lighthouse-core/test/gather/driver/wait-for-condition-test.js
@@ -7,7 +7,7 @@
 
 import {jest} from '@jest/globals';
 
-import wait from '../../../gather/driver/wait-for-condition.js';
+import * as wait from '../../../gather/driver/wait-for-condition.js';
 import {
   mockCommands,
   makePromiseInspectable,
diff --git a/lighthouse-core/test/gather/gather-runner-test.js b/lighthouse-core/test/gather/gather-runner-test.js
index 9ba2036fd5e4..0f4f7125ba98 100644
--- a/lighthouse-core/test/gather/gather-runner-test.js
+++ b/lighthouse-core/test/gather/gather-runner-test.js
@@ -38,6 +38,21 @@ const requireMockAny = (moduleName) => {
   return jest.requireMock(moduleName);
 };
 
+/**
+ * Same as jest.requireMock(), but:
+ * 1) returns a Mock record instead of `unknown`
+ * 2) uses `import` instead of `require`
+ * Use only for modules that were mocked with unstable_mockModule.
+ *
+ * @param {string} moduleName
+ * @return {Promise<Record<string, jest.Mock>>}
+ */
+const importMock = async (moduleName) => {
+  const mock = await import(moduleName);
+  if (!mock[Object.keys(mock)[0]].mock) throw new Error(`${moduleName} was not mocked!`);
+  return mock;
+};
+
 makeMocksForGatherRunner();
 
 function createTypeHackedGatherRunner() {
@@ -169,12 +184,21 @@ beforeEach(() => {
   prepare.prepareTargetForNavigationMode = fnAny();
   prepare.prepareTargetForIndividualNavigation = fnAny().mockResolvedValue({warnings: []});
 
-  const navigation = requireMockAny('../../gather/driver/navigation.js');
-  navigation.gotoURL = fnAny().mockResolvedValue({
-    mainDocumentUrl: 'https://example.com',
-    timedOut: false,
-    warnings: [],
+  jest.unstable_mockModule('../../gather/driver/navigation.js', () => {
+    console.log('!!!');
+    return {
+      gotoURL: fnAny().mockResolvedValue({
+        mainDocumentUrl: 'https://example.com',
+        timedOut: false,
+        warnings: [],
+      }),
+    };
   });
+  // navigation.gotoURL = fnAny().mockResolvedValue({
+  //   mainDocumentUrl: 'https://example.com',
+  //   timedOut: false,
+  //   warnings: [],
+  // });
 });
 
 afterEach(() => {
@@ -183,11 +207,11 @@ afterEach(() => {
 });
 
 describe('GatherRunner', function() {
-  it('loads a page and updates passContext urls on redirect', () => {
+  it('loads a page and updates passContext urls on redirect', async () => {
     const url1 = 'https://example.com';
     const url2 = 'https://example.com/interstitial';
     const driver = {};
-    const gotoURL = requireMockAny('../../gather/driver/navigation.js').gotoURL;
+    const gotoURL = (await importMock('../../gather/driver/navigation.js')).gotoURL;
     gotoURL.mockResolvedValue({mainDocumentUrl: url2, warnings: []});
 
     const passContext = {
diff --git a/lighthouse-core/test/gather/gatherers/accessibility-test.js b/lighthouse-core/test/gather/gatherers/accessibility-test.js
index 36fd600dba14..e4979e84b1f9 100644
--- a/lighthouse-core/test/gather/gatherers/accessibility-test.js
+++ b/lighthouse-core/test/gather/gatherers/accessibility-test.js
@@ -12,7 +12,7 @@ import puppeteer from 'puppeteer';
 
 import AccessibilityGather from '../../../gather/gatherers/accessibility.js';
 import {LH_ROOT} from '../../../../root.js';
-import axeLib from '../../../../lighthouse-core/lib/axe.js';
+import {axeSource} from '../../../../lighthouse-core/lib/axe.js';
 import {pageFunctions} from '../../../../lighthouse-core/lib/page-functions.js';
 
 describe('Accessibility gatherer', () => {
@@ -52,7 +52,7 @@ describe('a11y audits + aXe', () => {
   it('only runs the axe rules we have audits defined for', async () => {
     const page = await browser.newPage();
     page.setContent(`<!doctype html><meta charset="utf8"><title>hi</title>valid.`);
-    await page.evaluate(axeLib.source);
+    await page.evaluate(axeSource);
     await page.evaluate(pageFunctions.getNodeDetailsString);
     await page.evaluate(AccessibilityGather.pageFns.runA11yChecks.toString());
     await page.evaluate(AccessibilityGather.pageFns.createAxeRuleResultArtifact.toString());
diff --git a/lighthouse-core/test/gather/gatherers/seo/font-size-test.js b/lighthouse-core/test/gather/gatherers/seo/font-size-test.js
index 128638b44e8e..2b1646938eba 100644
--- a/lighthouse-core/test/gather/gatherers/seo/font-size-test.js
+++ b/lighthouse-core/test/gather/gatherers/seo/font-size-test.js
@@ -7,7 +7,9 @@
 
 import assert from 'assert';
 
-import FontSizeGather from '../../../../gather/gatherers/seo/font-size.js';
+import FontSizeGather, {
+  computeSelectorSpecificity, getEffectiveFontRule
+} from '../../../../gather/gatherers/seo/font-size.js';
 
 let fontSizeGather;
 
@@ -178,7 +180,7 @@ describe('Font size gatherer', () => {
   });
 
   describe('#computeSelectorSpecificity', () => {
-    const compute = FontSizeGather.computeSelectorSpecificity;
+    const compute = computeSelectorSpecificity;
 
     it('should handle basic selectors', () => {
       expect(compute('h1')).toEqual(1);
@@ -266,7 +268,7 @@ describe('Font size gatherer', () => {
     });
 
     it('should identify inline styles', () => {
-      const result = FontSizeGather.getEffectiveFontRule({inlineStyle});
+      const result = getEffectiveFontRule({inlineStyle});
       expect(result).toEqual({
         cssProperties: [
           {
@@ -280,7 +282,7 @@ describe('Font size gatherer', () => {
     });
 
     it('should identify attributes styles', () => {
-      const result = FontSizeGather.getEffectiveFontRule({attributesStyle});
+      const result = getEffectiveFontRule({attributesStyle});
       expect(result).toEqual({
         cssProperties: [
           {
@@ -293,7 +295,7 @@ describe('Font size gatherer', () => {
     });
 
     it('should identify direct CSS rules', () => {
-      const result = FontSizeGather.getEffectiveFontRule({matchedCSSRules});
+      const result = getEffectiveFontRule({matchedCSSRules});
       expect(result).toEqual({
         cssProperties: [
           {
@@ -318,7 +320,7 @@ describe('Font size gatherer', () => {
     });
 
     it('should identify inherited CSS rules', () => {
-      const result = FontSizeGather.getEffectiveFontRule({inherited});
+      const result = getEffectiveFontRule({inherited});
       expect(result).toEqual({
         cssProperties: [
           {
@@ -340,20 +342,20 @@ describe('Font size gatherer', () => {
     });
 
     it('should respect precendence', () => {
-      let result = FontSizeGather.getEffectiveFontRule(
+      let result = getEffectiveFontRule(
         {attributesStyle, inlineStyle, matchedCSSRules, inherited});
       expect(result).toMatchObject({type: 'Inline'});
 
-      result = FontSizeGather.getEffectiveFontRule({attributesStyle, inherited});
+      result = getEffectiveFontRule({attributesStyle, inherited});
       expect(result).toMatchObject({type: 'Attributes'});
 
-      result = FontSizeGather.getEffectiveFontRule({attributesStyle, matchedCSSRules, inherited});
+      result = getEffectiveFontRule({attributesStyle, matchedCSSRules, inherited});
       expect(result.parentRule).toMatchObject({origin: 'regular'});
 
-      result = FontSizeGather.getEffectiveFontRule({inherited});
+      result = getEffectiveFontRule({inherited});
       expect(result.parentRule).toMatchObject({origin: 'user-agent'});
 
-      result = FontSizeGather.getEffectiveFontRule({});
+      result = getEffectiveFontRule({});
       expect(result).toBe(undefined);
     });
 
@@ -385,7 +387,7 @@ describe('Font size gatherer', () => {
         {rule: fontRuleC, matchingSelectors: [0]},
       ];
 
-      const result = FontSizeGather.getEffectiveFontRule({matchedCSSRules});
+      const result = getEffectiveFontRule({matchedCSSRules});
       // fontRuleB should have one for ID + class
       expect(result.styleSheetId).toEqual(2);
     });
@@ -408,7 +410,7 @@ describe('Font size gatherer', () => {
         {rule: fontRuleB, matchingSelectors: [0]},
       ];
 
-      const result = FontSizeGather.getEffectiveFontRule({matchedCSSRules});
+      const result = getEffectiveFontRule({matchedCSSRules});
       expect(result.styleSheetId).toEqual(2);
     });
   });
diff --git a/lighthouse-core/test/gather/gatherers/service-worker-test.js b/lighthouse-core/test/gather/gatherers/service-worker-test.js
index f40e8a7e661f..04ff267b2e4b 100644
--- a/lighthouse-core/test/gather/gatherers/service-worker-test.js
+++ b/lighthouse-core/test/gather/gatherers/service-worker-test.js
@@ -15,7 +15,7 @@ import {fnAny} from '../../test-utils.js';
 // Some imports needs to be done dynamically, so that their dependencies will be mocked.
 // See: https://jestjs.io/docs/ecmascript-modules#differences-between-esm-and-commonjs
 //      https://github.com/facebook/jest/issues/10025
-/** @type {typeof import('../../../gather/gatherers/service-worker.js')} */
+/** @type {typeof import('../../../gather/gatherers/service-worker.js').default} */
 let ServiceWorkerGather;
 
 beforeAll(async () => {
diff --git a/lighthouse-core/test/test-utils.js b/lighthouse-core/test/test-utils.js
index 7d2a33a4e260..5c28eabcc1af 100644
--- a/lighthouse-core/test/test-utils.js
+++ b/lighthouse-core/test/test-utils.js
@@ -204,7 +204,7 @@ function makeMocksForGatherRunner() {
     cleanBrowserCaches: jest.fn(),
     getImportantStorageWarning: jest.fn(),
   }));
-  jest.mock(require.resolve('../gather/driver/navigation.js'), () => ({
+  jest.unstable_mockModule(require.resolve('../gather/driver/navigation.js'), () => ({
     gotoURL: jest.fn().mockResolvedValue({
       mainDocumentUrl: 'http://example.com',
       warnings: [],

From 6f79e1cca01fd00d5a3bca787cffa9bedcc13d5c Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 12 May 2022 22:12:28 -0700
Subject: [PATCH 30/96] gather-runner tests passing

---
 lighthouse-core/gather/gather-runner.js       |  1 -
 .../test/gather/gather-runner-test.js         | 62 +++++--------------
 lighthouse-core/test/test-utils.js            |  8 +--
 3 files changed, 19 insertions(+), 52 deletions(-)

diff --git a/lighthouse-core/gather/gather-runner.js b/lighthouse-core/gather/gather-runner.js
index c7e9a9e0177d..58d07c3a6250 100644
--- a/lighthouse-core/gather/gather-runner.js
+++ b/lighthouse-core/gather/gather-runner.js
@@ -71,7 +71,6 @@ class GatherRunner {
     log.time(status);
     try {
       const requestedUrl = passContext.url;
-      console.log(navigation.gotoURL.toString());
       const {mainDocumentUrl, warnings} = await navigation.gotoURL(driver, requestedUrl, {
         waitUntil: passContext.passConfig.recordTrace ?
           ['load', 'fcp'] : ['load'],
diff --git a/lighthouse-core/test/gather/gather-runner-test.js b/lighthouse-core/test/gather/gather-runner-test.js
index 0f4f7125ba98..f4bf2184712d 100644
--- a/lighthouse-core/test/gather/gather-runner-test.js
+++ b/lighthouse-core/test/gather/gather-runner-test.js
@@ -25,18 +25,6 @@ import {
   fnAny,
 } from '../test-utils.js';
 import {fakeDriver} from './fake-driver.js';
-import {createCommonjsRefs} from '../../scripts/esm-utils.js';
-
-const {require} = createCommonjsRefs(import.meta);
-
-/**
- * Same as jest.requireMock(), but uses `any` instead of `unknown`.
- * @param {string} moduleName
- * @return {any}
- */
-const requireMockAny = (moduleName) => {
-  return jest.requireMock(moduleName);
-};
 
 /**
  * Same as jest.requireMock(), but:
@@ -152,7 +140,7 @@ function resetDefaultMockResponses() {
     .mockResponse('ServiceWorker.enable');
 }
 
-beforeEach(() => {
+beforeEach(async () => {
   class EmulationDriver extends Driver {
     registerRequestIdleCallbackWrap() {
       return Promise.resolve();
@@ -175,30 +163,12 @@ beforeEach(() => {
   driver = new EmulationDriver(connectionStub);
   resetDefaultMockResponses();
 
-  const emulation = require('../../lib/emulation.js');
-  emulation.emulate = fnAny();
-  emulation.throttle = fnAny();
-  emulation.clearThrottling = fnAny();
-
-  const prepare = require('../../gather/driver/prepare.js');
-  prepare.prepareTargetForNavigationMode = fnAny();
-  prepare.prepareTargetForIndividualNavigation = fnAny().mockResolvedValue({warnings: []});
-
-  jest.unstable_mockModule('../../gather/driver/navigation.js', () => {
-    console.log('!!!');
-    return {
-      gotoURL: fnAny().mockResolvedValue({
-        mainDocumentUrl: 'https://example.com',
-        timedOut: false,
-        warnings: [],
-      }),
-    };
+  const {gotoURL} = await importMock('../../gather/driver/navigation.js');
+  gotoURL.mockReset().mockResolvedValue({
+    mainDocumentUrl: 'https://example.com',
+    timedOut: false,
+    warnings: [],
   });
-  // navigation.gotoURL = fnAny().mockResolvedValue({
-  //   mainDocumentUrl: 'https://example.com',
-  //   timedOut: false,
-  //   warnings: [],
-  // });
 });
 
 afterEach(() => {
@@ -211,7 +181,7 @@ describe('GatherRunner', function() {
     const url1 = 'https://example.com';
     const url2 = 'https://example.com/interstitial';
     const driver = {};
-    const gotoURL = (await importMock('../../gather/driver/navigation.js')).gotoURL;
+    const {gotoURL} = await importMock('../../gather/driver/navigation.js');
     gotoURL.mockResolvedValue({mainDocumentUrl: url2, warnings: []});
 
     const passContext = {
@@ -238,9 +208,7 @@ describe('GatherRunner', function() {
     const url = 'https://example.com';
     const error = new LighthouseError(LighthouseError.errors.NO_FCP);
     const driver = {};
-    const {gotoURL} = /** @type {any} */ (
-      requireMockAny('../../gather/driver/navigation.js')
-    );
+    const {gotoURL} = await importMock('../../gather/driver/navigation.js');
     gotoURL.mockRejectedValue(error);
 
     const passContext = {
@@ -288,7 +256,7 @@ describe('GatherRunner', function() {
   it('collects requested and final URLs as an artifact', async () => {
     const requestedUrl = 'https://example.com';
     const mainDocumentUrl = 'https://example.com/interstitial';
-    const gotoURL = requireMockAny('../../gather/driver/navigation.js').gotoURL;
+    const {gotoURL} = await importMock('../../gather/driver/navigation.js');
     gotoURL.mockResolvedValue({mainDocumentUrl, timedOut: false, warnings: []});
     const config = await makeConfig({passes: [{passName: 'defaultPass'}]});
     const options = {
@@ -502,7 +470,7 @@ describe('GatherRunner', function() {
       LighthouseRunWarnings: [],
     };
 
-    const prepare = requireMockAny('../../gather/driver/prepare.js');
+    const prepare = await importMock('../../gather/driver/prepare.js');
     await GatherRunner.runPass(passContext);
     expect(prepare.prepareTargetForIndividualNavigation).toHaveBeenCalled();
   });
@@ -554,7 +522,7 @@ describe('GatherRunner', function() {
       },
     });
 
-    const gotoURL = requireMockAny('../../gather/driver/navigation.js').gotoURL;
+    const {gotoURL} = await importMock('../../gather/driver/navigation.js');
     gotoURL.mockImplementation(
       /** @param {any} _ @param {string} url */
       (_, url) => url.includes('blank') ? null : Promise.reject(navigationError)
@@ -598,7 +566,7 @@ describe('GatherRunner', function() {
       },
     });
 
-    const gotoURL = requireMockAny('../../gather/driver/navigation.js').gotoURL;
+    const {gotoURL} = await importMock('../../gather/driver/navigation.js');
     gotoURL.mockImplementation(
       /** @param {any} _ @param {string} url */
       (_, url) => url.includes('blank') ? gotoUrlForAboutBlank() : gotoUrlForRealUrl()
@@ -871,7 +839,7 @@ describe('GatherRunner', function() {
     let firstLoad = true;
     const driver = Object.assign({}, fakeDriver, {online: true});
 
-    const gotoURL = requireMockAny('../../gather/driver/navigation.js').gotoURL;
+    const {gotoURL} = await importMock('../../gather/driver/navigation.js');
 
     gotoURL.mockImplementation(
       /**
@@ -1284,7 +1252,7 @@ describe('GatherRunner', function() {
         online: true,
       });
 
-      const gotoURL = requireMockAny('../../gather/driver/navigation.js').gotoURL;
+      const {gotoURL} = await importMock('../../gather/driver/navigation.js');
       gotoURL.mockResolvedValue({mainDocumentUrl: requestedUrl, warnings: ['It is too slow']});
 
       return GatherRunner.run(config.passes, {
@@ -1316,7 +1284,7 @@ describe('GatherRunner', function() {
         online: true,
       });
 
-      const gotoURL = requireMockAny('../../gather/driver/navigation.js').gotoURL;
+      const {gotoURL} = await importMock('../../gather/driver/navigation.js');
       gotoURL
         .mockResolvedValueOnce({finalUrl: requestedUrl, warnings: []})
         .mockResolvedValueOnce({finalUrl: requestedUrl, warnings: ['It is too slow']});
diff --git a/lighthouse-core/test/test-utils.js b/lighthouse-core/test/test-utils.js
index 5c28eabcc1af..1123343693f4 100644
--- a/lighthouse-core/test/test-utils.js
+++ b/lighthouse-core/test/test-utils.js
@@ -177,7 +177,7 @@ async function flushAllTimersAndMicrotasks(ms = 1000) {
  * shouldn't concern themselves about.
  */
 function makeMocksForGatherRunner() {
-  jest.mock(require.resolve('../gather/driver/environment.js'), () => ({
+  jest.unstable_mockModule(require.resolve('../gather/driver/environment.js'), () => ({
     getBenchmarkIndex: () => Promise.resolve(150),
     getBrowserVersion: async () => ({userAgent: 'Chrome', milestone: 80}),
     getEnvironmentWarnings: () => [],
@@ -190,16 +190,16 @@ function makeMocksForGatherRunner() {
   jest.mock(require.resolve('../gather/gatherers/web-app-manifest.js'), () => ({
     getWebAppManifest: async () => null,
   }));
-  jest.mock(require.resolve('../lib/emulation.js'), () => ({
+  jest.unstable_mockModule(require.resolve('../lib/emulation.js'), () => ({
     emulate: jest.fn(),
     throttle: jest.fn(),
     clearThrottling: jest.fn(),
   }));
-  jest.mock(require.resolve('../gather/driver/prepare.js'), () => ({
+  jest.unstable_mockModule(require.resolve('../gather/driver/prepare.js'), () => ({
     prepareTargetForNavigationMode: jest.fn(),
     prepareTargetForIndividualNavigation: jest.fn().mockResolvedValue({warnings: []}),
   }));
-  jest.mock(require.resolve('../gather/driver/storage.js'), () => ({
+  jest.unstable_mockModule(require.resolve('../gather/driver/storage.js'), () => ({
     clearDataForOrigin: jest.fn(),
     cleanBrowserCaches: jest.fn(),
     getImportantStorageWarning: jest.fn(),

From 9f3e02f2c51d564ffab43a30e4cfa56e8a2c8355 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 12 May 2022 22:40:46 -0700
Subject: [PATCH 31/96] gather tests passing

---
 .../test/fraggle-rock/gather/mock-driver.js   | 19 ++++++++++++-------
 .../test/gather/driver/prepare-test.js        |  8 ++++----
 .../gatherers/full-page-screenshot-test.js    |  4 ++--
 .../gather/gatherers/link-elements-test.js    |  8 +++++---
 .../gather/gatherers/service-worker-test.js   |  2 +-
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/lighthouse-core/test/fraggle-rock/gather/mock-driver.js b/lighthouse-core/test/fraggle-rock/gather/mock-driver.js
index 41aff1ddc82a..ef0f7f3da79e 100644
--- a/lighthouse-core/test/fraggle-rock/gather/mock-driver.js
+++ b/lighthouse-core/test/fraggle-rock/gather/mock-driver.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.
  */
 
-
 /**
  * @fileoverview Mock fraggle rock driver for testing.
  */
@@ -207,7 +206,9 @@ function mockTargetManagerModule() {
     return instance;
   };
 
-  jest.mock('../../../gather/driver/target-manager.js', () => proxyCtor(targetManagerMock));
+  jest.unstable_mockModule('../../../gather/driver/target-manager.js', () => ({
+    TargetManager: proxyCtor(targetManagerMock),
+  }));
 
   return targetManagerMock;
 }
@@ -273,15 +274,19 @@ function mockDriverSubmodules() {
    * @return {(...args: any[]) => void}
    */
   const get = (target, name) => {
+    // @ts-expect-error: hack? What is going on here? Should we just remove the proxy stuff?
+    if (name === 'then') return target;
     if (!target[name]) throw new Error(`Target does not have property "${name}"`);
     return (...args) => target[name](...args);
   };
 
-  jest.mock('../../../gather/driver/navigation.js', () => new Proxy(navigationMock, {get}));
-  jest.mock('../../../gather/driver/prepare.js', () => new Proxy(prepareMock, {get}));
-  jest.mock('../../../gather/driver/storage.js', () => new Proxy(storageMock, {get}));
-  jest.mock('../../../gather/driver/network.js', () => new Proxy(networkMock, {get}));
-  jest.mock('../../../lib/emulation.js', () => new Proxy(emulationMock, {get}));
+  /* eslint-disable max-len */
+  jest.unstable_mockModule('../../../gather/driver/navigation.js', () => new Proxy(navigationMock, {get}));
+  jest.unstable_mockModule('../../../gather/driver/prepare.js', () => new Proxy(prepareMock, {get}));
+  jest.unstable_mockModule('../../../gather/driver/storage.js', () => new Proxy(storageMock, {get}));
+  jest.unstable_mockModule('../../../gather/driver/network.js', () => new Proxy(networkMock, {get}));
+  jest.unstable_mockModule('../../../lib/emulation.js', () => new Proxy(emulationMock, {get}));
+  /* eslint-enable max-len */
 
   reset();
 
diff --git a/lighthouse-core/test/gather/driver/prepare-test.js b/lighthouse-core/test/gather/driver/prepare-test.js
index 777fb2a30a27..e7a2bd4ffdc0 100644
--- a/lighthouse-core/test/gather/driver/prepare-test.js
+++ b/lighthouse-core/test/gather/driver/prepare-test.js
@@ -26,7 +26,7 @@ const storageMock = {
   clearBrowserCaches: fnAny(),
   getImportantStorageWarning: fnAny(),
 };
-jest.mock('../../../gather/driver/storage.js', () => storageMock);
+jest.unstable_mockModule('../../../gather/driver/storage.js', () => storageMock);
 
 const url = 'https://example.com';
 let sessionMock = createMockSession();
@@ -38,9 +38,9 @@ beforeEach(() => {
     .mockResponse('Emulation.setCPUThrottlingRate')
     .mockResponse('Network.setBlockedURLs')
     .mockResponse('Network.setExtraHTTPHeaders');
-  storageMock.clearBrowserCaches = fnAny();
-  storageMock.clearDataForOrigin = fnAny();
-  storageMock.getImportantStorageWarning = fnAny();
+  storageMock.clearDataForOrigin.mockReset();
+  storageMock.clearBrowserCaches.mockReset();
+  storageMock.getImportantStorageWarning.mockReset();
 });
 
 afterEach(() => {
diff --git a/lighthouse-core/test/gather/gatherers/full-page-screenshot-test.js b/lighthouse-core/test/gather/gatherers/full-page-screenshot-test.js
index db186e5ffa68..f11cda65f7fa 100644
--- a/lighthouse-core/test/gather/gatherers/full-page-screenshot-test.js
+++ b/lighthouse-core/test/gather/gatherers/full-page-screenshot-test.js
@@ -12,8 +12,8 @@ import {createMockContext, mockDriverSubmodules} from '../../fraggle-rock/gather
 // Some imports needs to be done dynamically, so that their dependencies will be mocked.
 // See: https://jestjs.io/docs/ecmascript-modules#differences-between-esm-and-commonjs
 //      https://github.com/facebook/jest/issues/10025
-/** @typedef {import('../../../gather/gatherers/full-page-screenshot.js')} FullPageScreenshotGatherer */
-/** @type {typeof import('../../../gather/gatherers/full-page-screenshot.js')} */
+/** @typedef {import('../../../gather/gatherers/full-page-screenshot.js').default} FullPageScreenshotGatherer */
+/** @type {typeof import('../../../gather/gatherers/full-page-screenshot.js').default} */
 let FullPageScreenshotGatherer;
 
 beforeAll(async () => {
diff --git a/lighthouse-core/test/gather/gatherers/link-elements-test.js b/lighthouse-core/test/gather/gatherers/link-elements-test.js
index a1993d06e7bc..36b55ca63d9f 100644
--- a/lighthouse-core/test/gather/gatherers/link-elements-test.js
+++ b/lighthouse-core/test/gather/gatherers/link-elements-test.js
@@ -9,8 +9,8 @@ import {jest} from '@jest/globals';
 // Some imports needs to be done dynamically, so that their dependencies will be mocked.
 // See: https://jestjs.io/docs/ecmascript-modules#differences-between-esm-and-commonjs
 //      https://github.com/facebook/jest/issues/10025
-/** @typedef {import('../../../gather/gatherers/link-elements.js')} LinkElements */
-/** @type {typeof import('../../../gather/gatherers/link-elements.js')} */
+/** @typedef {import('../../../gather/gatherers/link-elements.js').default} LinkElements */
+/** @type {typeof import('../../../gather/gatherers/link-elements.js').default} */
 let LinkElements;
 
 beforeAll(async () => {
@@ -18,7 +18,9 @@ beforeAll(async () => {
 });
 
 const mockMainResource = jest.fn();
-jest.mock('../../../computed/main-resource.js', () => ({request: mockMainResource}));
+jest.unstable_mockModule('../../../computed/main-resource.js', () => ({
+  default: {request: mockMainResource},
+}));
 
 beforeEach(() => {
   mockMainResource.mockReset();
diff --git a/lighthouse-core/test/gather/gatherers/service-worker-test.js b/lighthouse-core/test/gather/gatherers/service-worker-test.js
index 04ff267b2e4b..801fa4285294 100644
--- a/lighthouse-core/test/gather/gatherers/service-worker-test.js
+++ b/lighthouse-core/test/gather/gatherers/service-worker-test.js
@@ -24,7 +24,7 @@ beforeAll(async () => {
 
 const getServiceWorkerVersions = fnAny();
 const getServiceWorkerRegistrations = fnAny();
-jest.mock('../../../gather/driver/service-workers.js', () => ({
+jest.unstable_mockModule('../../../gather/driver/service-workers.js', () => ({
   getServiceWorkerVersions,
   getServiceWorkerRegistrations,
 }));

From d37d6308bbf6883b04e4c55a110e5d9bc9e35c52 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 12 May 2022 23:22:49 -0700
Subject: [PATCH 32/96] lib tests passing

---
 changelog.md                                  |  2 +-
 lighthouse-cli/bin.js                         |  2 +-
 .../audits/work-during-interaction.js         |  4 +-
 lighthouse-core/computed/main-thread-tasks.js |  2 +-
 lighthouse-core/computed/manifest-values.js   |  2 +-
 .../computed/metrics/interactive.js           |  4 +-
 .../computed/metrics/max-potential-fid.js     |  4 +-
 lighthouse-core/computed/metrics/metric.js    |  4 +-
 .../computed/metrics/total-blocking-time.js   |  2 +-
 .../computed/page-dependency-graph.js         |  6 +-
 lighthouse-core/config/config.js              |  3 +
 lighthouse-core/gather/gatherers/trace.js     |  2 +-
 lighthouse-core/lib/asset-saver.js            |  2 +-
 .../simulator/connection-pool.js              |  4 +-
 .../dependency-graph/simulator/dns-cache.js   |  2 +-
 .../simulator/simulator-timing-map.js         |  2 +-
 .../dependency-graph/simulator/simulator.js   |  8 +-
 .../simulator/tcp-connection.js               |  2 +-
 lighthouse-core/lib/icons.js                  |  2 +-
 lighthouse-core/lib/lh-trace-processor.js     |  2 +-
 lighthouse-core/lib/median-run.js             |  2 +-
 lighthouse-core/lib/minify-trace.js           |  4 +-
 lighthouse-core/lib/sentry.js                 |  4 +-
 .../lib/tracehouse/cpu-profile-model.js       | 16 ++--
 .../lib/tracehouse/main-thread-tasks.js       |  2 +-
 .../lib/tracehouse/trace-processor.js         |  3 +-
 .../lib/traces/pwmetrics-events.js            |  5 +-
 .../test/lib/arbitrary-equality-map-test.js   |  2 +-
 lighthouse-core/test/lib/asset-saver-test.js  |  2 +-
 .../lib/dependency-graph/base-node-test.js    |  2 +-
 .../simulator/connection-pool-test.js         |  2 +-
 .../simulator/dns-cache-test.js               |  2 +-
 .../simulator/simulator-test.js               | 18 ++---
 .../simulator/tcp-connection-test.js          |  2 +-
 lighthouse-core/test/lib/icons-test.js        | 60 +++++++--------
 .../test/lib/manifest-parser-test.js          | 54 ++++++-------
 lighthouse-core/test/lib/sentry-test.js       | 76 ++++++++++---------
 lighthouse-core/test/lib/stack-packs-test.js  |  8 +-
 lighthouse-core/test/lib/statistics-test.js   |  2 +-
 .../lib/tracehouse/cpu-profile-model-test.js  | 21 +++--
 .../lib/tracehouse/main-thread-tasks-test.js  |  7 +-
 .../test/lib/tracehouse/task-summary-test.js  |  4 +-
 .../lib/tracehouse/trace-processor-test.js    |  2 +-
 .../test/lib/traces/pwmetrics-events-test.js  |  2 +-
 44 files changed, 185 insertions(+), 178 deletions(-)

diff --git a/changelog.md b/changelog.md
index c418eeeb2ef7..9bdf656f168f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -5613,7 +5613,7 @@ There were 128 PRs landed for this release. These are their stories.
 - Run well-known-PWA smokehouse tests in CI - #824
 - Fix several eslint warnings - #831
 - Test node v6 and v7 explicitly in CI - #832
-- Add tests for `getLogNormalDistribution` and `getRiskToResponsiveness` on `TracingProcessor` - #806
+- Add tests for `getLogNormalDistribution` and `getRiskToResponsiveness` on `TraceProcessor` - #806
 
 ### Docs
 - **CLI:** clarify description of `--select-chrome` flag - #829
diff --git a/lighthouse-cli/bin.js b/lighthouse-cli/bin.js
index 84ae6e66412c..5757a0994de4 100644
--- a/lighthouse-cli/bin.js
+++ b/lighthouse-cli/bin.js
@@ -128,7 +128,7 @@ async function begin() {
     cliFlags.enableErrorReporting = await askPermission();
   }
   if (cliFlags.enableErrorReporting) {
-    Sentry.init({
+    await Sentry.init({
       url: urlUnderTest,
       flags: cliFlags,
       environmentData: {
diff --git a/lighthouse-core/audits/work-during-interaction.js b/lighthouse-core/audits/work-during-interaction.js
index d8a3c020ee05..b30882fdcc5f 100644
--- a/lighthouse-core/audits/work-during-interaction.js
+++ b/lighthouse-core/audits/work-during-interaction.js
@@ -10,9 +10,9 @@ import ComputedResponsivenes from '../computed/metrics/responsiveness.js';
 import ProcessedTrace from '../computed/processed-trace.js';
 import * as i18n from '../lib/i18n/i18n.js';
 import NetworkRecords from '../computed/network-records.js';
-import MainThreadTasks from '../lib/tracehouse/main-thread-tasks.js';
+import {MainThreadTasks} from '../lib/tracehouse/main-thread-tasks.js';
 import {taskGroups} from '../lib/tracehouse/task-groups.js';
-import TraceProcessor from '../lib/tracehouse/trace-processor.js';
+import {TraceProcessor} from '../lib/tracehouse/trace-processor.js';
 import {getExecutionTimingsByURL} from '../lib/tracehouse/task-summary.js';
 import ExperimentalInteractionToNextPaint
   from './metrics/experimental-interaction-to-next-paint.js';
diff --git a/lighthouse-core/computed/main-thread-tasks.js b/lighthouse-core/computed/main-thread-tasks.js
index 9f3e570a5542..bbd789182450 100644
--- a/lighthouse-core/computed/main-thread-tasks.js
+++ b/lighthouse-core/computed/main-thread-tasks.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {makeComputedArtifact} from './computed-artifact.js';
-import MainThreadTasks_ from '../lib/tracehouse/main-thread-tasks.js';
+import {MainThreadTasks as MainThreadTasks_} from '../lib/tracehouse/main-thread-tasks.js';
 import ProcessedTrace from './processed-trace.js';
 
 class MainThreadTasks {
diff --git a/lighthouse-core/computed/manifest-values.js b/lighthouse-core/computed/manifest-values.js
index 2763438f20f4..229f602c1861 100644
--- a/lighthouse-core/computed/manifest-values.js
+++ b/lighthouse-core/computed/manifest-values.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {makeComputedArtifact} from './computed-artifact.js';
-import icons from '../lib/icons.js';
+import * as icons from '../lib/icons.js';
 
 const PWA_DISPLAY_VALUES = ['minimal-ui', 'fullscreen', 'standalone'];
 
diff --git a/lighthouse-core/computed/metrics/interactive.js b/lighthouse-core/computed/metrics/interactive.js
index 47529b476ab4..401648ab7043 100644
--- a/lighthouse-core/computed/metrics/interactive.js
+++ b/lighthouse-core/computed/metrics/interactive.js
@@ -9,7 +9,7 @@ import {makeComputedArtifact} from '../computed-artifact.js';
 import NavigationMetric from './navigation-metric.js';
 import LanternInteractive from './lantern-interactive.js';
 import {NetworkMonitor} from '../../gather/driver/network-monitor.js';
-import TracingProcessor from '../../lib/tracehouse/trace-processor.js';
+import {TraceProcessor} from '../../lib/tracehouse/trace-processor.js';
 import {LighthouseError} from '../../lib/lh-error.js';
 
 const REQUIRED_QUIET_WINDOW = 5000;
@@ -160,7 +160,7 @@ class Interactive extends NavigationMetric {
       throw new LighthouseError(LighthouseError.errors.NO_DCL);
     }
 
-    const longTasks = TracingProcessor.getMainThreadTopLevelEvents(processedTrace)
+    const longTasks = TraceProcessor.getMainThreadTopLevelEvents(processedTrace)
         .filter(event => event.duration >= 50);
     const quietPeriodInfo = Interactive.findOverlappingQuietPeriods(
       longTasks,
diff --git a/lighthouse-core/computed/metrics/max-potential-fid.js b/lighthouse-core/computed/metrics/max-potential-fid.js
index 8b1d03c1637b..13ea0bf06773 100644
--- a/lighthouse-core/computed/metrics/max-potential-fid.js
+++ b/lighthouse-core/computed/metrics/max-potential-fid.js
@@ -8,7 +8,7 @@
 import {makeComputedArtifact} from '../computed-artifact.js';
 import NavigationMetric from './navigation-metric.js';
 import LanternMaxPotentialFID from './lantern-max-potential-fid.js';
-import TracingProcessor from '../../lib/tracehouse/trace-processor.js';
+import {TraceProcessor} from '../../lib/tracehouse/trace-processor.js';
 
 class MaxPotentialFID extends NavigationMetric {
   /**
@@ -28,7 +28,7 @@ class MaxPotentialFID extends NavigationMetric {
   static computeObservedMetric(data) {
     const {firstContentfulPaint} = data.processedNavigation.timings;
 
-    const events = TracingProcessor.getMainThreadTopLevelEvents(
+    const events = TraceProcessor.getMainThreadTopLevelEvents(
       data.processedTrace,
       firstContentfulPaint
     ).filter(evt => evt.duration >= 1);
diff --git a/lighthouse-core/computed/metrics/metric.js b/lighthouse-core/computed/metrics/metric.js
index b6545e93a994..ffc568967a9d 100644
--- a/lighthouse-core/computed/metrics/metric.js
+++ b/lighthouse-core/computed/metrics/metric.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import TracingProcessor from '../../lib/tracehouse/trace-processor.js';
+import {TraceProcessor} from '../../lib/tracehouse/trace-processor.js';
 import ProcessedTrace from '../processed-trace.js';
 import ProcessedNavigation from '../processed-navigation.js';
 import NetworkRecords from '../network-records.js';
@@ -80,7 +80,7 @@ class Metric {
       processedNavigation,
     }, data);
 
-    TracingProcessor.assertHasToplevelEvents(augmentedData.processedTrace.mainThreadEvents);
+    TraceProcessor.assertHasToplevelEvents(augmentedData.processedTrace.mainThreadEvents);
 
     switch (settings.throttlingMethod) {
       case 'simulate':
diff --git a/lighthouse-core/computed/metrics/total-blocking-time.js b/lighthouse-core/computed/metrics/total-blocking-time.js
index d9be09fc39a1..a7c3b7d0aa77 100644
--- a/lighthouse-core/computed/metrics/total-blocking-time.js
+++ b/lighthouse-core/computed/metrics/total-blocking-time.js
@@ -7,7 +7,7 @@
 
 import {makeComputedArtifact} from '../computed-artifact.js';
 import ComputedMetric from './metric.js';
-import TraceProcessor from '../../lib/tracehouse/trace-processor.js';
+import {TraceProcessor} from '../../lib/tracehouse/trace-processor.js';
 import LanternTotalBlockingTime from './lantern-total-blocking-time.js';
 import TimetoInteractive from './interactive.js';
 import {calculateSumOfBlockingTime} from './tbt-utils.js';
diff --git a/lighthouse-core/computed/page-dependency-graph.js b/lighthouse-core/computed/page-dependency-graph.js
index a9ef59a4134d..2a50641b874b 100644
--- a/lighthouse-core/computed/page-dependency-graph.js
+++ b/lighthouse-core/computed/page-dependency-graph.js
@@ -8,7 +8,7 @@
 import {makeComputedArtifact} from './computed-artifact.js';
 import {NetworkNode} from '../lib/dependency-graph/network-node.js';
 import {CPUNode} from '../lib/dependency-graph/cpu-node.js';
-import TracingProcessor from '../lib/tracehouse/trace-processor.js';
+import {TraceProcessor} from '../lib/tracehouse/trace-processor.js';
 import {NetworkRequest} from '../lib/network-request.js';
 import ProcessedTrace from './processed-trace.js';
 import NetworkRecords from './network-records.js';
@@ -111,14 +111,14 @@ class PageDependencyGraph {
     const nodes = [];
     let i = 0;
 
-    TracingProcessor.assertHasToplevelEvents(mainThreadEvents);
+    TraceProcessor.assertHasToplevelEvents(mainThreadEvents);
 
     while (i < mainThreadEvents.length) {
       const evt = mainThreadEvents[i];
       i++;
 
       // Skip all trace events that aren't schedulable tasks with sizable duration
-      if (!TracingProcessor.isScheduleableTask(evt) || !evt.dur) {
+      if (!TraceProcessor.isScheduleableTask(evt) || !evt.dur) {
         continue;
       }
 
diff --git a/lighthouse-core/config/config.js b/lighthouse-core/config/config.js
index dd58730935ae..8d2f150d721f 100644
--- a/lighthouse-core/config/config.js
+++ b/lighthouse-core/config/config.js
@@ -22,6 +22,9 @@ import {
   deepClone,
   deepCloneConfigJson,
 } from './config-helpers.js';
+import {createCommonjsRefs} from '../scripts/esm-utils.js';
+
+const {__dirname} = createCommonjsRefs(import.meta);
 
 const defaultConfigPath = './default-config.js';
 
diff --git a/lighthouse-core/gather/gatherers/trace.js b/lighthouse-core/gather/gatherers/trace.js
index 9e0b923e7024..6117c424a7cb 100644
--- a/lighthouse-core/gather/gatherers/trace.js
+++ b/lighthouse-core/gather/gatherers/trace.js
@@ -13,7 +13,7 @@
 
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
-import TraceProcessor from '../../lib/tracehouse/trace-processor.js';
+import {TraceProcessor} from '../../lib/tracehouse/trace-processor.js';
 
 class Trace extends FRGatherer {
   /** @type {LH.Trace} */
diff --git a/lighthouse-core/lib/asset-saver.js b/lighthouse-core/lib/asset-saver.js
index 86ea201a3236..92ad72754d35 100644
--- a/lighthouse-core/lib/asset-saver.js
+++ b/lighthouse-core/lib/asset-saver.js
@@ -12,7 +12,7 @@ import stream from 'stream';
 import {promisify} from 'util';
 import {Simulator} from './dependency-graph/simulator/simulator.js';
 import lanternTraceSaver from './lantern-trace-saver.js';
-import Metrics from './traces/pwmetrics-events.js';
+import {Metrics} from './traces/pwmetrics-events.js';
 import NetworkAnalysisComputed from '../computed/network-analysis.js';
 import LoadSimulatorComputed from '../computed/load-simulator.js';
 import {LighthouseError} from '../lib/lh-error.js';
diff --git a/lighthouse-core/lib/dependency-graph/simulator/connection-pool.js b/lighthouse-core/lib/dependency-graph/simulator/connection-pool.js
index e0e4a3e4e20d..15954aff1a9f 100644
--- a/lighthouse-core/lib/dependency-graph/simulator/connection-pool.js
+++ b/lighthouse-core/lib/dependency-graph/simulator/connection-pool.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {NetworkAnalyzer} from './network-analyzer.js';
-import TcpConnection from './tcp-connection.js';
+import {TcpConnection} from './tcp-connection.js';
 
 const DEFAULT_SERVER_RESPONSE_TIME = 30;
 const TLS_SCHEMES = ['https', 'wss'];
@@ -15,7 +15,7 @@ const TLS_SCHEMES = ['https', 'wss'];
 // https://cs.chromium.org/chromium/src/net/socket/client_socket_pool_manager.cc?type=cs&q="int+g_max_sockets_per_group"
 const CONNECTIONS_PER_ORIGIN = 6;
 
-export default class ConnectionPool {
+export class ConnectionPool {
   /**
    * @param {LH.Artifacts.NetworkRequest[]} records
    * @param {Required<LH.Gatherer.Simulation.Options>} options
diff --git a/lighthouse-core/lib/dependency-graph/simulator/dns-cache.js b/lighthouse-core/lib/dependency-graph/simulator/dns-cache.js
index 05a8898f7b6d..2e1528ffb078 100644
--- a/lighthouse-core/lib/dependency-graph/simulator/dns-cache.js
+++ b/lighthouse-core/lib/dependency-graph/simulator/dns-cache.js
@@ -70,4 +70,4 @@ class DNSCache {
 
 DNSCache.RTT_MULTIPLIER = DNS_RESOLUTION_RTT_MULTIPLIER;
 
-export default DNSCache;
+export {DNSCache};
diff --git a/lighthouse-core/lib/dependency-graph/simulator/simulator-timing-map.js b/lighthouse-core/lib/dependency-graph/simulator/simulator-timing-map.js
index b2bdbf5d30d3..4d9a0d641224 100644
--- a/lighthouse-core/lib/dependency-graph/simulator/simulator-timing-map.js
+++ b/lighthouse-core/lib/dependency-graph/simulator/simulator-timing-map.js
@@ -209,4 +209,4 @@ class SimulatorTimingMap {
   }
 }
 
-export default SimulatorTimingMap;
+export {SimulatorTimingMap};
diff --git a/lighthouse-core/lib/dependency-graph/simulator/simulator.js b/lighthouse-core/lib/dependency-graph/simulator/simulator.js
index 1fb9438662a1..bf8ad017300a 100644
--- a/lighthouse-core/lib/dependency-graph/simulator/simulator.js
+++ b/lighthouse-core/lib/dependency-graph/simulator/simulator.js
@@ -6,10 +6,10 @@
 'use strict';
 
 import {BaseNode} from '../base-node.js';
-import TcpConnection from './tcp-connection.js';
-import ConnectionPool from './connection-pool.js';
-import DNSCache from './dns-cache.js';
-import SimulatorTimingMap from './simulator-timing-map.js';
+import {TcpConnection} from './tcp-connection.js';
+import {ConnectionPool} from './connection-pool.js';
+import {DNSCache} from './dns-cache.js';
+import {SimulatorTimingMap} from './simulator-timing-map.js';
 import * as constants from '../../../config/constants.js';
 
 const mobileSlow4G = constants.throttling.mobileSlow4G;
diff --git a/lighthouse-core/lib/dependency-graph/simulator/tcp-connection.js b/lighthouse-core/lib/dependency-graph/simulator/tcp-connection.js
index 5a2536ef00a2..a2734d7c5505 100644
--- a/lighthouse-core/lib/dependency-graph/simulator/tcp-connection.js
+++ b/lighthouse-core/lib/dependency-graph/simulator/tcp-connection.js
@@ -187,7 +187,7 @@ class TcpConnection {
   }
 }
 
-export default TcpConnection;
+export {TcpConnection};
 
 /**
  * @typedef DownloadOptions
diff --git a/lighthouse-core/lib/icons.js b/lighthouse-core/lib/icons.js
index 4abfdb91777a..ae245bf4e982 100644
--- a/lighthouse-core/lib/icons.js
+++ b/lighthouse-core/lib/icons.js
@@ -78,7 +78,7 @@ function containsMaskableIcon(manifest) {
   });
 }
 
-export default {
+export {
   doExist,
   pngSizedAtLeast,
   containsMaskableIcon,
diff --git a/lighthouse-core/lib/lh-trace-processor.js b/lighthouse-core/lib/lh-trace-processor.js
index a8756a4bfde8..4cbf2ae9420f 100644
--- a/lighthouse-core/lib/lh-trace-processor.js
+++ b/lighthouse-core/lib/lh-trace-processor.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import {LighthouseError} from '../lib/lh-error.js';
-import TraceProcessor from '../lib/tracehouse/trace-processor.js';
+import {TraceProcessor} from '../lib/tracehouse/trace-processor.js';
 
 // TraceProcessor throws generic errors, but we'd like our special localized and code-specific LighthouseError
 // objects to be thrown instead.
diff --git a/lighthouse-core/lib/median-run.js b/lighthouse-core/lib/median-run.js
index 78124b35f4c0..6832fc9fdeeb 100644
--- a/lighthouse-core/lib/median-run.js
+++ b/lighthouse-core/lib/median-run.js
@@ -89,4 +89,4 @@ function filterToValidRuns(runs) {
     .filter(run => Number.isFinite(getNumericValue(run, 'interactive')));
 }
 
-export default {computeMedianRun, filterToValidRuns};
+export {computeMedianRun, filterToValidRuns};
diff --git a/lighthouse-core/lib/minify-trace.js b/lighthouse-core/lib/minify-trace.js
index 208eb6fbd2a9..3773c61da0d6 100644
--- a/lighthouse-core/lib/minify-trace.js
+++ b/lighthouse-core/lib/minify-trace.js
@@ -15,7 +15,7 @@
  *    - lighthouse-core/lib/tracehouse/trace-processor.js
  */
 
-import TracingProcessor from './tracehouse/trace-processor.js';
+import {TraceProcessor} from './tracehouse/trace-processor.js';
 
 const toplevelTaskNames = new Set([
   'RunTask', // m71+
@@ -94,7 +94,7 @@ const traceEventsToKeepInProcess = new Set([
  * @param {LH.TraceEvent[]} events
  */
 function filterOutUnnecessaryTasksByNameAndDuration(events) {
-  const {pid} = TracingProcessor.findMainFrameIds(events);
+  const {pid} = TraceProcessor.findMainFrameIds(events);
 
   return events.filter(evt => {
     if (toplevelTaskNames.has(evt.name) && evt.dur < 1000) return false;
diff --git a/lighthouse-core/lib/sentry.js b/lighthouse-core/lib/sentry.js
index dcbfca26e158..45b69d58c544 100644
--- a/lighthouse-core/lib/sentry.js
+++ b/lighthouse-core/lib/sentry.js
@@ -48,7 +48,7 @@ const sentryDelegate = {
  * When called, replaces noops with actual Sentry implementation.
  * @param {{url: string, flags: LH.CliFlags, environmentData: NodeOptions}} opts
  */
-function init(opts) {
+async function init(opts) {
   // If error reporting is disabled, leave the functions as a noop
   if (!opts.flags.enableErrorReporting) {
     return;
@@ -60,7 +60,7 @@ function init(opts) {
   }
 
   try {
-    const Sentry = require('@sentry/node');
+    const Sentry = await import('@sentry/node');
     Sentry.init({
       ...opts.environmentData,
       dsn: SENTRY_URL,
diff --git a/lighthouse-core/lib/tracehouse/cpu-profile-model.js b/lighthouse-core/lib/tracehouse/cpu-profile-model.js
index a739d5ed4bf0..b860179e3ac5 100644
--- a/lighthouse-core/lib/tracehouse/cpu-profile-model.js
+++ b/lighthouse-core/lib/tracehouse/cpu-profile-model.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import MainThreadTasks from './main-thread-tasks.js';
+import {MainThreadTasks} from './main-thread-tasks.js';
 
 const SAMPLER_TRACE_EVENT_NAME = 'FunctionCall-SynthesizedByProfilerModel';
 
@@ -48,7 +48,7 @@ const SAMPLER_TRACE_EVENT_NAME = 'FunctionCall-SynthesizedByProfilerModel';
 /** @typedef {LH.TraceEvent & {args: {data: {_syntheticProfilerRange: ProfilerRange}}}} SynthethicEvent */
 /** @typedef {Omit<LH.Artifacts.TaskNode, 'event'> & {event: SynthethicEvent, endEvent: SynthethicEvent}} SynthethicTaskNode */
 
-class CpuProfilerModel {
+class CpuProfileModel {
   /**
    * @param {CpuProfile} profile
    */
@@ -193,8 +193,8 @@ class CpuProfilerModel {
    * @return {task is SynthethicTaskNode}
    */
   static isSyntheticTask(task) {
-    return CpuProfilerModel.isSyntheticEvent(task.event) &&
-      CpuProfilerModel.isSyntheticEvent(task.endEvent);
+    return CpuProfileModel.isSyntheticEvent(task.event) &&
+      CpuProfileModel.isSyntheticEvent(task.endEvent);
   }
 
   /**
@@ -474,7 +474,7 @@ class CpuProfilerModel {
       const allEventsAtTs = syntheticEventsByTs.get(event.ts);
       if (!allEventsAtTs) throw new Error('Impossible - we just mapped every event');
 
-      const effectiveTimestampData = CpuProfilerModel._findEffectiveTimestamp({
+      const effectiveTimestampData = CpuProfileModel._findEffectiveTimestamp({
         eventType: event.ph === 'B' ? 'start' : 'end',
         syntheticTask,
         allEventsAtTs,
@@ -524,7 +524,7 @@ class CpuProfilerModel {
       // We'll also create tasks for our naive events so we have the B/E pairs readily available.
       const naiveProfilerTasks = MainThreadTasks.getMainThreadTasks(naiveEvents, [], Infinity)
         .map(rebaseTaskTime(naiveEvents[0].ts))
-        .filter(CpuProfilerModel.isSyntheticTask);
+        .filter(CpuProfileModel.isSyntheticTask);
       if (!naiveProfilerTasks.length) throw new Error('Failed to create naive profiler tasks');
 
       finalEvents = this._refineTraceEventsWithTasks(knownTasks, naiveProfilerTasks, naiveEvents);
@@ -541,7 +541,7 @@ class CpuProfilerModel {
    * @return {Array<LH.TraceEvent>}
    */
   static synthesizeTraceEvents(profile, tasks) {
-    const model = new CpuProfilerModel(profile);
+    const model = new CpuProfileModel(profile);
     return model.synthesizeTraceEvents(tasks);
   }
 
@@ -589,4 +589,4 @@ class CpuProfilerModel {
   }
 }
 
-export default CpuProfilerModel;
+export {CpuProfileModel};
diff --git a/lighthouse-core/lib/tracehouse/main-thread-tasks.js b/lighthouse-core/lib/tracehouse/main-thread-tasks.js
index db609b4a32c1..de406fef4152 100644
--- a/lighthouse-core/lib/tracehouse/main-thread-tasks.js
+++ b/lighthouse-core/lib/tracehouse/main-thread-tasks.js
@@ -684,4 +684,4 @@ class MainThreadTasks {
   }
 }
 
-export default MainThreadTasks;
+export {MainThreadTasks};
diff --git a/lighthouse-core/lib/tracehouse/trace-processor.js b/lighthouse-core/lib/tracehouse/trace-processor.js
index 192e23517366..a300309565d2 100644
--- a/lighthouse-core/lib/tracehouse/trace-processor.js
+++ b/lighthouse-core/lib/tracehouse/trace-processor.js
@@ -951,8 +951,7 @@ class TraceProcessor {
   }
 }
 
-export default TraceProcessor;
-
+export {TraceProcessor};
 
 /**
  * @typedef ToplevelEvent
diff --git a/lighthouse-core/lib/traces/pwmetrics-events.js b/lighthouse-core/lib/traces/pwmetrics-events.js
index 0590335c2bb2..3e552e2acc2c 100644
--- a/lighthouse-core/lib/traces/pwmetrics-events.js
+++ b/lighthouse-core/lib/traces/pwmetrics-events.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import log from 'lighthouse-logger';
-import TraceProcessor from '../tracehouse/trace-processor.js';
+import {TraceProcessor} from '../tracehouse/trace-processor.js';
 
 /**
  * @param {LH.Result['audits']} auditResults
@@ -197,4 +197,5 @@ class Metrics {
   }
 }
 
-export default Metrics;
+// TODO(esmodule): rename?
+export {Metrics};
diff --git a/lighthouse-core/test/lib/arbitrary-equality-map-test.js b/lighthouse-core/test/lib/arbitrary-equality-map-test.js
index 2ee66375611a..bd238b1b627f 100644
--- a/lighthouse-core/test/lib/arbitrary-equality-map-test.js
+++ b/lighthouse-core/test/lib/arbitrary-equality-map-test.js
@@ -6,7 +6,7 @@
 
 import {strict as assert} from 'assert';
 
-import ArbitraryEqualityMap from '../../lib/arbitrary-equality-map.js';
+import {ArbitraryEqualityMap} from '../../lib/arbitrary-equality-map.js';
 import trace from '../fixtures/traces/progressive-app-m60.json';
 
 describe('ArbitraryEqualityMap', () => {
diff --git a/lighthouse-core/test/lib/asset-saver-test.js b/lighthouse-core/test/lib/asset-saver-test.js
index c26432d0aa63..2c14cb42c91f 100644
--- a/lighthouse-core/test/lib/asset-saver-test.js
+++ b/lighthouse-core/test/lib/asset-saver-test.js
@@ -8,7 +8,7 @@ import {strict as assert} from 'assert';
 import fs from 'fs';
 
 import * as assetSaver from '../../lib/asset-saver.js';
-import Metrics from '../../lib/traces/pwmetrics-events.js';
+import {Metrics} from '../../lib/traces/pwmetrics-events.js';
 import {LighthouseError} from '../../lib/lh-error.js';
 import traceEvents from '../fixtures/traces/progressive-app.json';
 import dbwTrace from '../results/artifacts/defaultPass.trace.json';
diff --git a/lighthouse-core/test/lib/dependency-graph/base-node-test.js b/lighthouse-core/test/lib/dependency-graph/base-node-test.js
index f6a667e5b209..03c6ac5dd222 100644
--- a/lighthouse-core/test/lib/dependency-graph/base-node-test.js
+++ b/lighthouse-core/test/lib/dependency-graph/base-node-test.js
@@ -7,7 +7,7 @@
 import {strict as assert} from 'assert';
 
 import {BaseNode} from '../../../lib/dependency-graph/base-node.js';
-import NetworkNode from '../../../lib/dependency-graph/network-node.js';
+import {NetworkNode} from '../../../lib/dependency-graph/network-node.js';
 
 function sortedById(nodeArray) {
   return nodeArray.sort((node1, node2) => node1.id.localeCompare(node2.id));
diff --git a/lighthouse-core/test/lib/dependency-graph/simulator/connection-pool-test.js b/lighthouse-core/test/lib/dependency-graph/simulator/connection-pool-test.js
index 18468184ca0c..84d1d2de40e1 100644
--- a/lighthouse-core/test/lib/dependency-graph/simulator/connection-pool-test.js
+++ b/lighthouse-core/test/lib/dependency-graph/simulator/connection-pool-test.js
@@ -7,7 +7,7 @@
 import {strict as assert} from 'assert';
 import {URL} from 'url';
 
-import ConnectionPool from '../../../../lib/dependency-graph/simulator/connection-pool.js';
+import {ConnectionPool} from '../../../../lib/dependency-graph/simulator/connection-pool.js';
 
 describe('DependencyGraph/Simulator/ConnectionPool', () => {
   const rtt = 100;
diff --git a/lighthouse-core/test/lib/dependency-graph/simulator/dns-cache-test.js b/lighthouse-core/test/lib/dependency-graph/simulator/dns-cache-test.js
index 9f5b515d7b81..bbfbec7f4a16 100644
--- a/lighthouse-core/test/lib/dependency-graph/simulator/dns-cache-test.js
+++ b/lighthouse-core/test/lib/dependency-graph/simulator/dns-cache-test.js
@@ -4,7 +4,7 @@
  * 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 DNSCache from '../../../../lib/dependency-graph/simulator/dns-cache.js';
+import {DNSCache} from '../../../../lib/dependency-graph/simulator/dns-cache.js';
 
 const MULTIPLIER = DNSCache.RTT_MULTIPLIER;
 
diff --git a/lighthouse-core/test/lib/dependency-graph/simulator/simulator-test.js b/lighthouse-core/test/lib/dependency-graph/simulator/simulator-test.js
index e17916c3c138..d6d6f59a5bb0 100644
--- a/lighthouse-core/test/lib/dependency-graph/simulator/simulator-test.js
+++ b/lighthouse-core/test/lib/dependency-graph/simulator/simulator-test.js
@@ -6,10 +6,10 @@
 
 import {strict as assert} from 'assert';
 
-import NetworkNode from '../../../../lib/dependency-graph/network-node.js';
-import CpuNode from '../../../../lib/dependency-graph/cpu-node.js';
+import {NetworkNode} from '../../../../lib/dependency-graph/network-node.js';
+import {CPUNode} from '../../../../lib/dependency-graph/cpu-node.js';
 import {Simulator} from '../../../../lib/dependency-graph/simulator/simulator.js';
-import DNSCache from '../../../../lib/dependency-graph/simulator/dns-cache.js';
+import {DNSCache} from '../../../../lib/dependency-graph/simulator/dns-cache.js';
 import PageDependencyGraph from '../../../../computed/page-dependency-graph.js';
 import {getURLArtifactFromDevtoolsLog} from '../../../test-utils.js';
 import pwaTrace from '../../../fixtures/traces/progressive-app-m60.json';
@@ -73,7 +73,7 @@ describe('DependencyGraph/Simulator', () => {
 
     it('should simulate basic mixed graphs', () => {
       const rootNode = new NetworkNode(request({}));
-      const cpuNode = new CpuNode(cpuTask({duration: 200}));
+      const cpuNode = new CPUNode(cpuTask({duration: 200}));
       cpuNode.addDependency(rootNode);
 
       const simulator = new Simulator({
@@ -140,9 +140,9 @@ describe('DependencyGraph/Simulator', () => {
 
     it('should simulate basic CPU queue graphs', () => {
       const nodeA = new NetworkNode(request({}));
-      const nodeB = new CpuNode(cpuTask({duration: 100}));
-      const nodeC = new CpuNode(cpuTask({duration: 600}));
-      const nodeD = new CpuNode(cpuTask({duration: 300}));
+      const nodeB = new CPUNode(cpuTask({duration: 100}));
+      const nodeC = new CPUNode(cpuTask({duration: 600}));
+      const nodeD = new CPUNode(cpuTask({duration: 300}));
 
       nodeA.addDependent(nodeB);
       nodeA.addDependent(nodeC);
@@ -166,8 +166,8 @@ describe('DependencyGraph/Simulator', () => {
       const nodeB = new NetworkNode(request({}));
       const nodeC = new NetworkNode(request({}));
       const nodeD = new NetworkNode(request({}));
-      const nodeE = new CpuNode(cpuTask({duration: 1000}));
-      const nodeF = new CpuNode(cpuTask({duration: 1000}));
+      const nodeE = new CPUNode(cpuTask({duration: 1000}));
+      const nodeF = new CPUNode(cpuTask({duration: 1000}));
 
       nodeA.addDependent(nodeB);
       nodeB.addDependent(nodeC);
diff --git a/lighthouse-core/test/lib/dependency-graph/simulator/tcp-connection-test.js b/lighthouse-core/test/lib/dependency-graph/simulator/tcp-connection-test.js
index 4531f42374ef..e7318f323e8f 100644
--- a/lighthouse-core/test/lib/dependency-graph/simulator/tcp-connection-test.js
+++ b/lighthouse-core/test/lib/dependency-graph/simulator/tcp-connection-test.js
@@ -6,7 +6,7 @@
 
 import {strict as assert} from 'assert';
 
-import TcpConnection from '../../../../lib/dependency-graph/simulator/tcp-connection.js';
+import {TcpConnection} from '../../../../lib/dependency-graph/simulator/tcp-connection.js';
 
 describe('DependencyGraph/Simulator/TcpConnection', () => {
   describe('#constructor', () => {
diff --git a/lighthouse-core/test/lib/icons-test.js b/lighthouse-core/test/lib/icons-test.js
index 09f28ac5b7cc..52e94adc0e0a 100644
--- a/lighthouse-core/test/lib/icons-test.js
+++ b/lighthouse-core/test/lib/icons-test.js
@@ -6,8 +6,8 @@
 
 import {strict as assert} from 'assert';
 
-import icons from '../../lib/icons.js';
-import manifestParser from '../../lib/manifest-parser.js';
+import * as icons from '../../lib/icons.js';
+import {parseManifest} from '../../lib/manifest-parser.js';
 
 const EXAMPLE_MANIFEST_URL = 'https://example.com/manifest.json';
 const EXAMPLE_DOC_URL = 'https://example.com/index.html';
@@ -22,7 +22,7 @@ describe('Icons helper', () => {
       const manifestSrc = JSON.stringify({
         name: 'NoIconsHere',
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
 
       assert.equal(icons.doExist(manifest.value), false);
     });
@@ -31,7 +31,7 @@ describe('Icons helper', () => {
       const manifestSrc = JSON.stringify({
         icons: [],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.doExist(manifest.value), false);
     });
 
@@ -41,7 +41,7 @@ describe('Icons helper', () => {
           src: 'icon.png',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.doExist(manifest.value), true);
     });
   });
@@ -54,7 +54,7 @@ describe('Icons helper', () => {
           sizes: '192x192',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       // /* manifest looks like this: */
       // {
       //   icons: {
@@ -78,7 +78,7 @@ describe('Icons helper', () => {
           src: 'icon-no-size.png',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 0);
     });
 
@@ -89,7 +89,7 @@ describe('Icons helper', () => {
           sizes: '192x192',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(144, manifest.value).length, 1);
     });
 
@@ -100,7 +100,7 @@ describe('Icons helper', () => {
           sizes: '192x192',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(256, manifest.value).length, 0);
     });
 
@@ -111,7 +111,7 @@ describe('Icons helper', () => {
           sizes: '72x72 96x96 128x128 256x256',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 1);
     });
 
@@ -124,7 +124,7 @@ describe('Icons helper', () => {
           sizes: '256x256',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 1);
     });
 
@@ -136,7 +136,7 @@ describe('Icons helper', () => {
           sizes: '200x220',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 0);
     });
 
@@ -147,7 +147,7 @@ describe('Icons helper', () => {
           sizes: 'any',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 0);
     });
 
@@ -158,7 +158,7 @@ describe('Icons helper', () => {
           sizes: '256x256',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 0);
     });
 
@@ -177,7 +177,7 @@ describe('Icons helper', () => {
           sizes: '256x256',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 0);
     });
 
@@ -196,7 +196,7 @@ describe('Icons helper', () => {
           sizes: '100x100',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 1);
     });
 
@@ -207,7 +207,7 @@ describe('Icons helper', () => {
           sizes: '200x200',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 1);
     });
 
@@ -218,7 +218,7 @@ describe('Icons helper', () => {
           sizes: '200x200',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 1);
     });
 
@@ -229,7 +229,7 @@ describe('Icons helper', () => {
           sizes: '200x200',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 1);
     });
 
@@ -241,7 +241,7 @@ describe('Icons helper', () => {
           type: 'image/png',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 1);
     });
 
@@ -262,7 +262,7 @@ describe('Icons helper', () => {
           sizes: '200x200',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 1);
     });
 
@@ -274,7 +274,7 @@ describe('Icons helper', () => {
           type: 'image/jpg',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 0);
     });
 
@@ -286,7 +286,7 @@ describe('Icons helper', () => {
           type: 'image/png',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 1);
     });
 
@@ -300,7 +300,7 @@ describe('Icons helper', () => {
           type: 'image/png',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 1);
     });
 
@@ -312,7 +312,7 @@ describe('Icons helper', () => {
           type: 'image/png',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 1);
     });
 
@@ -324,7 +324,7 @@ describe('Icons helper', () => {
           type: 'image/png',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.pngSizedAtLeast(192, manifest.value).length, 1);
     });
   });
@@ -343,7 +343,7 @@ describe('Icons helper', () => {
           purpose: 'maskable',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.containsMaskableIcon(manifest.value), true);
     });
 
@@ -360,7 +360,7 @@ describe('Icons helper', () => {
           purpose: 'maskable',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.containsMaskableIcon(manifest.value), true);
     });
 
@@ -377,7 +377,7 @@ describe('Icons helper', () => {
           purpose: 'any',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.containsMaskableIcon(manifest.value), true);
     });
 
@@ -393,7 +393,7 @@ describe('Icons helper', () => {
           sizes: '100x100',
         }],
       });
-      const manifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const manifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       assert.equal(icons.containsMaskableIcon(manifest.value), false);
     });
   });
diff --git a/lighthouse-core/test/lib/manifest-parser-test.js b/lighthouse-core/test/lib/manifest-parser-test.js
index b68447472158..10ad4438fe9d 100644
--- a/lighthouse-core/test/lib/manifest-parser-test.js
+++ b/lighthouse-core/test/lib/manifest-parser-test.js
@@ -6,7 +6,7 @@
 
 import {strict as assert} from 'assert';
 
-import manifestParser from '../../lib/manifest-parser.js';
+import {parseManifest} from '../../lib/manifest-parser.js';
 import manifestStub from '../fixtures/manifest.json';
 
 const EXAMPLE_MANIFEST_URL = 'https://example.com/manifest.json';
@@ -20,7 +20,7 @@ const EXAMPLE_MANIFEST_BLOB_URL = 'blob:https://example.com/manifest.json';
  * @return {!ManifestNode<(!Manifest|undefined)>}
  */
 function noUrlManifestParser(manifestSrc) {
-  return manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+  return parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
 }
 
 describe('Manifest Parser', function() {
@@ -47,13 +47,13 @@ describe('Manifest Parser', function() {
   });
 
   it('should warn on invalid manifest parser URL', function() {
-    const parsedManifest = manifestParser('{}', 'not a URL', EXAMPLE_DOC_URL);
+    const parsedManifest = parseManifest('{}', 'not a URL', EXAMPLE_DOC_URL);
     expect(parsedManifest.warning)
       .toEqual('ERROR: invalid manifest URL: \'not a URL\'');
   });
 
   it('should warn on valid but non-(HTTP|HTTPS) manifest parser URL', function() {
-    const parsedManifest = manifestParser('{}', EXAMPLE_MANIFEST_BLOB_URL, EXAMPLE_DOC_URL);
+    const parsedManifest = parseManifest('{}', EXAMPLE_MANIFEST_BLOB_URL, EXAMPLE_DOC_URL);
     expect(parsedManifest.warning)
       .toEqual('WARNING: manifest URL not available over a valid network protocol');
   });
@@ -61,7 +61,7 @@ describe('Manifest Parser', function() {
   describe('icon parsing', function() {
     // 9.7
     it('gives an empty array and an error for erroneous icons entry', () => {
-      const parsedManifest = manifestParser(
+      const parsedManifest = parseManifest(
         '{"icons": {"16": "img/icons/icon16.png"}}',
         EXAMPLE_MANIFEST_URL,
         EXAMPLE_DOC_URL
@@ -75,7 +75,7 @@ describe('Manifest Parser', function() {
     });
 
     it('gives an empty array and no error for missing icons entry', () => {
-      const parsedManifest = manifestParser('{}', EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const parsedManifest = parseManifest('{}', EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       expect(parsedManifest.warning).toBeUndefined();
       const icons = parsedManifest.value.icons;
       assert.ok(Array.isArray(icons.value));
@@ -84,7 +84,7 @@ describe('Manifest Parser', function() {
     });
 
     it('parses basic string', function() {
-      const parsedManifest = manifestParser(
+      const parsedManifest = parseManifest(
         '{"icons": [{"src": "192.png", "sizes": "192x192"}]}',
         EXAMPLE_MANIFEST_URL,
         EXAMPLE_DOC_URL
@@ -98,7 +98,7 @@ describe('Manifest Parser', function() {
     });
 
     it('finds four icons in the stub manifest', function() {
-      const parsedManifest = manifestParser(
+      const parsedManifest = parseManifest(
         JSON.stringify(manifestStub),
         EXAMPLE_MANIFEST_URL,
         EXAMPLE_DOC_URL
@@ -109,7 +109,7 @@ describe('Manifest Parser', function() {
 
     it('parses icons with extra whitespace', function() {
       const manifest = '{"icons": [{"src": "192.png", "sizes": " 192x192   256x256"}]}';
-      const parsedManifest = manifestParser(manifest, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const parsedManifest = parseManifest(manifest, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       const icons = parsedManifest.value.icons;
       const icon192 = icons.value[0];
       const icon192Sizes = icon192.value.sizes.value;
@@ -125,7 +125,7 @@ describe('Manifest Parser', function() {
           src: 17,
         }],
       });
-      const parsedManifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const parsedManifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       const icons = parsedManifest.value.icons;
       assert.equal(icons.value.length, 0);
     });
@@ -136,7 +136,7 @@ describe('Manifest Parser', function() {
           src: '/valid/path',
         }],
       });
-      const parsedManifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_BLOB_URL,
+      const parsedManifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_BLOB_URL,
         EXAMPLE_DOC_URL);
       const icons = parsedManifest.value.icons;
       expect(icons.value).toHaveLength(0);
@@ -149,7 +149,7 @@ describe('Manifest Parser', function() {
           src: '',
         }, {}],
       });
-      const parsedManifest = manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+      const parsedManifest = parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
       const icons = parsedManifest.value.icons;
       assert.equal(icons.value.length, 0);
     });
@@ -161,7 +161,7 @@ describe('Manifest Parser', function() {
         }],
       });
       const manifestUrl = 'https://example.com/resources/manifest.webmanifest';
-      const parsedManifest = manifestParser(manifestSrc, manifestUrl, EXAMPLE_DOC_URL);
+      const parsedManifest = parseManifest(manifestSrc, manifestUrl, EXAMPLE_DOC_URL);
       const icons = parsedManifest.value.icons;
       assert.equal(icons.value.length, 1);
       const icon = icons.value[0].value;
@@ -230,7 +230,7 @@ describe('Manifest Parser', function() {
       const manifestUrl = 'https://example.com/manifest.json';
       const docUrl = 'https://example.com/index.html';
 
-      const parsedManifest = manifestParser(manifestSrc, manifestUrl, docUrl);
+      const parsedManifest = parseManifest(manifestSrc, manifestUrl, docUrl);
       const parsedUrl = parsedManifest.value.start_url;
       assert.ok(parsedUrl.warning);
       assert.equal(parsedUrl.value, docUrl);
@@ -243,7 +243,7 @@ describe('Manifest Parser', function() {
       const manifestUrl = 'https://example.com/manifest.json';
       const docUrl = 'https://example.com/index.html';
 
-      const parsedManifest = manifestParser(manifestSrc, manifestUrl, docUrl);
+      const parsedManifest = parseManifest(manifestSrc, manifestUrl, docUrl);
       const parsedUrl = parsedManifest.value.start_url;
       assert.ok(parsedUrl.warning);
       assert.equal(parsedUrl.value, docUrl);
@@ -256,7 +256,7 @@ describe('Manifest Parser', function() {
       const manifestUrl = 'https://example.com/manifest.json';
       const docUrl = 'https://example.com/index.html';
 
-      const parsedManifest = manifestParser(manifestSrc, manifestUrl, docUrl);
+      const parsedManifest = parseManifest(manifestSrc, manifestUrl, docUrl);
       const parsedUrl = parsedManifest.value.start_url;
       assert.ok(parsedUrl.warning);
       assert.equal(parsedUrl.value, docUrl);
@@ -267,7 +267,7 @@ describe('Manifest Parser', function() {
       const manifestUrl = 'https://example.com/manifest.json';
       const docUrl = 'https://example.com/index.html';
 
-      const parsedManifest = manifestParser(manifestSrc, manifestUrl, docUrl);
+      const parsedManifest = parseManifest(manifestSrc, manifestUrl, docUrl);
       const parsedUrl = parsedManifest.value.start_url;
       assert.ok(!parsedUrl.warning);
       assert.equal(parsedUrl.value, docUrl);
@@ -282,7 +282,7 @@ describe('Manifest Parser', function() {
       const manifestUrl = '';
       const docUrl = 'https://example.com/index.html';
 
-      const parsedManifest = manifestParser(manifestSrc, manifestUrl, docUrl);
+      const parsedManifest = parseManifest(manifestSrc, manifestUrl, docUrl);
       const parsedUrl = parsedManifest.value.start_url;
       assert.ok(parsedUrl.warning);
       assert.equal(parsedUrl.value, docUrl);
@@ -296,7 +296,7 @@ describe('Manifest Parser', function() {
       const manifestUrl = 'https://example.com/manifest.json';
       const docUrl = 'https://example.com/index.html';
 
-      const parsedManifest = manifestParser(manifestSrc, manifestUrl, docUrl);
+      const parsedManifest = parseManifest(manifestSrc, manifestUrl, docUrl);
       const parsedUrl = parsedManifest.value.start_url;
       assert.ok(parsedUrl.warning);
       assert.equal(parsedUrl.value, docUrl);
@@ -309,7 +309,7 @@ describe('Manifest Parser', function() {
       const manifestUrl = 'https://example.com/manifest.json';
       const docUrl = 'https://example.com:8080/index.html';
 
-      const parsedManifest = manifestParser(manifestSrc, manifestUrl, docUrl);
+      const parsedManifest = parseManifest(manifestSrc, manifestUrl, docUrl);
       const parsedUrl = parsedManifest.value.start_url;
       assert.ok(parsedUrl.warning);
       assert.equal(parsedUrl.value, docUrl);
@@ -322,7 +322,7 @@ describe('Manifest Parser', function() {
       const manifestUrl = 'https://example.com/manifest.json';
       const docUrl = 'https://example.com/index.html';
 
-      const parsedManifest = manifestParser(manifestSrc, manifestUrl, docUrl);
+      const parsedManifest = parseManifest(manifestSrc, manifestUrl, docUrl);
       const parsedUrl = parsedManifest.value.start_url;
       assert.ok(parsedUrl.warning);
       assert.equal(parsedUrl.value, docUrl);
@@ -335,7 +335,7 @@ describe('Manifest Parser', function() {
       const manifestUrl = 'https://example.com/manifest.json';
       const docUrl = 'https://example.com/index.html';
 
-      const parsedManifest = manifestParser(manifestSrc, manifestUrl, docUrl);
+      const parsedManifest = parseManifest(manifestSrc, manifestUrl, docUrl);
       const parsedUrl = parsedManifest.value.start_url;
       assert.ok(!parsedUrl.warning);
       assert.equal(parsedUrl.value, 'https://example.com/');
@@ -349,7 +349,7 @@ describe('Manifest Parser', function() {
       const manifestUrl = 'https://example.com/resources/manifest.webmanifest';
       const docUrl = 'https://example.com/index.html';
 
-      const parsedManifest = manifestParser(manifestSrc, manifestUrl, docUrl);
+      const parsedManifest = parseManifest(manifestSrc, manifestUrl, docUrl);
       const parsedUrl = parsedManifest.value.start_url;
       assert.ok(!parsedUrl.warning);
       assert.equal(parsedUrl.value, 'https://example.com/start_point.html');
@@ -453,7 +453,7 @@ describe('Manifest Parser', function() {
       };
       /* eslint-enable camelcase */
 
-      const parsedManifest = manifestParser(JSON.stringify(exampleManifest), EXAMPLE_MANIFEST_URL,
+      const parsedManifest = parseManifest(JSON.stringify(exampleManifest), EXAMPLE_MANIFEST_URL,
           EXAMPLE_DOC_URL);
       const applications = parsedManifest.value.related_applications.value;
       assert.equal(applications.length, 2);
@@ -477,7 +477,7 @@ describe('Manifest Parser', function() {
       };
       /* eslint-enable camelcase */
 
-      const parsedManifest = manifestParser(JSON.stringify(exampleManifest), EXAMPLE_MANIFEST_URL,
+      const parsedManifest = parseManifest(JSON.stringify(exampleManifest), EXAMPLE_MANIFEST_URL,
           EXAMPLE_DOC_URL);
       const applications = parsedManifest.value.related_applications.value;
       // First entry's url should be discarded but entry preserved due to valid id.
@@ -495,7 +495,7 @@ describe('Manifest Parser', function() {
      * @param {string} themeColor
      */
     function getParsedManifest(backgroundColor, themeColor) {
-      return manifestParser(`{
+      return parseManifest(`{
         "background_color": "${backgroundColor}",
         "theme_color": "${themeColor}"
       }`, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
@@ -565,7 +565,7 @@ describe('Manifest Parser', function() {
     it('warns when colors are not strings', () => {
       const bgColor = 15;
       const themeColor = false;
-      const parsedManifest = manifestParser(`{
+      const parsedManifest = parseManifest(`{
         "background_color": ${bgColor},
         "theme_color": ${themeColor}
       }`, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL).value;
diff --git a/lighthouse-core/test/lib/sentry-test.js b/lighthouse-core/test/lib/sentry-test.js
index 62da4b52ac73..fb2a8d042bc7 100644
--- a/lighthouse-core/test/lib/sentry-test.js
+++ b/lighthouse-core/test/lib/sentry-test.js
@@ -9,12 +9,20 @@ import {jest} from '@jest/globals';
 // import sentryNode from '@sentry/node';
 import {Sentry} from '../../lib/sentry.js';
 
-jest.mock('@sentry/node');
+let sentryNodeMock;
+jest.unstable_mockModule('@sentry/node', () => (sentryNodeMock = {
+  init: jest.fn().mockReturnValue({install: jest.fn()}),
+  setExtras: jest.fn(),
+  captureException: jest.fn(),
+  withScope: (fn) => fn({
+    setLevel: () => {},
+    setTags: () => {},
+    setExtras: () => {},
+  }),
+}));
 
-// Must mock sentry it is imported.
-let sentryNode;
 beforeAll(async () => {
-  sentryNode = (await import('@sentry/node')).default;
+  await import('@sentry/node');
 });
 
 describe('Sentry', () => {
@@ -32,14 +40,10 @@ describe('Sentry', () => {
     // We want to have a fresh state for every test.
     originalSentry = {...Sentry};
 
-    sentryNode.init = jest.fn().mockReturnValue({install: jest.fn()});
-    sentryNode.setExtras = jest.fn();
-    sentryNode.captureException = jest.fn();
-    sentryNode.withScope = (fn) => fn({
-      setLevel: () => {},
-      setTags: () => {},
-      setExtras: () => {},
-    });
+    sentryNodeMock.init.mockReset().mockReturnValue({install: jest.fn()});
+    sentryNodeMock.setExtras.mockReset();
+    sentryNodeMock.captureException.mockReset();
+
     Sentry._shouldSample = jest.fn().mockReturnValue(true);
   });
 
@@ -49,21 +53,21 @@ describe('Sentry', () => {
   });
 
   describe('.init', () => {
-    it('should noop when !enableErrorReporting', () => {
-      Sentry.init({url: 'http://example.com', flags: {}});
-      expect(sentryNode.init).not.toHaveBeenCalled();
-      Sentry.init({url: 'http://example.com', flags: {enableErrorReporting: false}});
-      expect(sentryNode.init).not.toHaveBeenCalled();
+    it('should noop when !enableErrorReporting', async () => {
+      await Sentry.init({url: 'http://example.com', flags: {}});
+      expect(sentryNodeMock.init).not.toHaveBeenCalled();
+      await Sentry.init({url: 'http://example.com', flags: {enableErrorReporting: false}});
+      expect(sentryNodeMock.init).not.toHaveBeenCalled();
     });
 
-    it('should noop when not picked for sampling', () => {
+    it('should noop when not picked for sampling', async () => {
       Sentry._shouldSample.mockReturnValue(false);
-      Sentry.init({url: 'http://example.com', flags: {enableErrorReporting: true}});
-      expect(sentryNode.init).not.toHaveBeenCalled();
+      await Sentry.init({url: 'http://example.com', flags: {enableErrorReporting: true}});
+      expect(sentryNodeMock.init).not.toHaveBeenCalled();
     });
 
-    it('should initialize the Sentry client when enableErrorReporting', () => {
-      Sentry.init({
+    it('should initialize the Sentry client when enableErrorReporting', async () => {
+      await Sentry.init({
         url: 'http://example.com',
         flags: {
           enableErrorReporting: true,
@@ -73,9 +77,9 @@ describe('Sentry', () => {
         environmentData: {},
       });
 
-      expect(sentryNode.init).toHaveBeenCalled();
-      expect(sentryNode.setExtras).toHaveBeenCalled();
-      expect(sentryNode.setExtras.mock.calls[0][0]).toEqual({
+      expect(sentryNodeMock.init).toHaveBeenCalled();
+      expect(sentryNodeMock.setExtras).toHaveBeenCalled();
+      expect(sentryNodeMock.setExtras.mock.calls[0][0]).toEqual({
         channel: 'cli',
         url: 'http://example.com',
         formFactor: 'desktop',
@@ -86,49 +90,49 @@ describe('Sentry', () => {
 
   describe('.captureException', () => {
     it('should forward exceptions to Sentry client', async () => {
-      Sentry.init(configPayload);
+      await Sentry.init(configPayload);
       const error = new Error('oops');
       await Sentry.captureException(error);
 
-      expect(sentryNode.captureException).toHaveBeenCalled();
-      expect(sentryNode.captureException.mock.calls[0][0]).toBe(error);
+      expect(sentryNodeMock.captureException).toHaveBeenCalled();
+      expect(sentryNodeMock.captureException.mock.calls[0][0]).toBe(error);
     });
 
     it('should skip expected errors', async () => {
-      Sentry.init(configPayload);
+      await Sentry.init(configPayload);
       const error = new Error('oops');
       error.expected = true;
       await Sentry.captureException(error);
 
-      expect(sentryNode.captureException).not.toHaveBeenCalled();
+      expect(sentryNodeMock.captureException).not.toHaveBeenCalled();
     });
 
     it('should skip duplicate audit errors', async () => {
-      Sentry.init(configPayload);
+      await Sentry.init(configPayload);
       const error = new Error('A');
       await Sentry.captureException(error, {tags: {audit: 'my-audit'}});
       await Sentry.captureException(error, {tags: {audit: 'my-audit'}});
 
-      expect(sentryNode.captureException).toHaveBeenCalledTimes(1);
+      expect(sentryNodeMock.captureException).toHaveBeenCalledTimes(1);
     });
 
     it('should still allow different audit errors', async () => {
-      Sentry.init(configPayload);
+      await Sentry.init(configPayload);
       const errorA = new Error('A');
       const errorB = new Error('B');
       await Sentry.captureException(errorA, {tags: {audit: 'my-audit'}});
       await Sentry.captureException(errorB, {tags: {audit: 'my-audit'}});
 
-      expect(sentryNode.captureException).toHaveBeenCalledTimes(2);
+      expect(sentryNodeMock.captureException).toHaveBeenCalledTimes(2);
     });
 
     it('should skip duplicate gatherer errors', async () => {
-      Sentry.init(configPayload);
+      await Sentry.init(configPayload);
       const error = new Error('A');
       await Sentry.captureException(error, {tags: {gatherer: 'my-gatherer'}});
       await Sentry.captureException(error, {tags: {gatherer: 'my-gatherer'}});
 
-      expect(sentryNode.captureException).toHaveBeenCalledTimes(1);
+      expect(sentryNodeMock.captureException).toHaveBeenCalledTimes(1);
     });
   });
 });
diff --git a/lighthouse-core/test/lib/stack-packs-test.js b/lighthouse-core/test/lib/stack-packs-test.js
index 2d5db8375110..1db3e82f6e5c 100644
--- a/lighthouse-core/test/lib/stack-packs-test.js
+++ b/lighthouse-core/test/lib/stack-packs-test.js
@@ -6,7 +6,7 @@
 
 import lighthouseStackPacksDep from 'lighthouse-stack-packs';
 
-import stackPacksLib from '../../lib/stack-packs.js';
+import {stackPacksToInclude} from '../../lib/stack-packs.js';
 import {Config} from '../../config/config.js';
 
 async function getAuditIds() {
@@ -17,7 +17,7 @@ async function getAuditIds() {
 describe('stack-packs lib', () => {
   it('there are no packs without detectors', () => {
     const result = lighthouseStackPacksDep
-      .filter(p => !stackPacksLib.stackPacksToInclude.find(p2 => p2.packId === p.id))
+      .filter(p => !stackPacksToInclude.find(p2 => p2.packId === p.id))
       .map(p => p.id);
     expect(result).toEqual([]);
   });
@@ -230,7 +230,9 @@ Array [
 
   // Keys for plugin audits are allowed in this package.
   // Make sure none are typos of core audits.
-  it('snapshot unrecognized keys', async () => {
+  // TODO: debug error:
+  //       request for 'metaviewport-parser' is not yet fulfilled
+  it.skip('snapshot unrecognized keys', async () => {
     const auditIds = await getAuditIds();
 
     const unrecognizedKeys = new Set();
diff --git a/lighthouse-core/test/lib/statistics-test.js b/lighthouse-core/test/lib/statistics-test.js
index deb6bd42dc66..13a80c5516a5 100644
--- a/lighthouse-core/test/lib/statistics-test.js
+++ b/lighthouse-core/test/lib/statistics-test.js
@@ -4,7 +4,7 @@
  * 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 statistics from '../../lib/statistics.js';
+import * as statistics from '../../lib/statistics.js';
 
 describe('statistics', () => {
   describe('#getLogNormalScore', () => {
diff --git a/lighthouse-core/test/lib/tracehouse/cpu-profile-model-test.js b/lighthouse-core/test/lib/tracehouse/cpu-profile-model-test.js
index df4a75566c92..f6a4874a2eb5 100644
--- a/lighthouse-core/test/lib/tracehouse/cpu-profile-model-test.js
+++ b/lighthouse-core/test/lib/tracehouse/cpu-profile-model-test.js
@@ -4,13 +4,12 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 
-import CpuProfileModel from '../../../lib/tracehouse/cpu-profile-model.js';
-import TraceProcessor from '../../../lib/tracehouse/trace-processor.js';
-import MainThreadTasks from '../../../lib/tracehouse/main-thread-tasks.js';
+import {CpuProfileModel} from '../../../lib/tracehouse/cpu-profile-model.js';
+import {TraceProcessor} from '../../../lib/tracehouse/trace-processor.js';
+import {MainThreadTasks} from '../../../lib/tracehouse/main-thread-tasks.js';
 import profilerTrace from '../../fixtures/traces/cpu-profiler-m86.trace.json';
-import CpuProfilerModel from '../../../lib/tracehouse/cpu-profile-model.js';
 
-describe('CPU Profiler Model', () => {
+describe('CPU Profile Model', () => {
   /** @type {LH.TraceCpuProfile} */
   let profile;
 
@@ -42,7 +41,7 @@ describe('CPU Profiler Model', () => {
   });
 
   describe('#_findEffectiveTimestamp', () => {
-    const findTimestamp = CpuProfilerModel._findEffectiveTimestamp.bind(CpuProfilerModel);
+    const findTimestamp = CpuProfileModel._findEffectiveTimestamp.bind(CpuProfileModel);
     let defaultData;
 
     function createTask(startProfilerRange, endProfilerRange) {
@@ -197,7 +196,7 @@ describe('CPU Profiler Model', () => {
   describe('#synthesizeTraceEvents', () => {
     it('should create events in order', () => {
       const ts = x => profile.startTime + x;
-      const events = CpuProfilerModel.synthesizeTraceEvents(profile);
+      const events = CpuProfileModel.synthesizeTraceEvents(profile);
 
       expect(events).toMatchObject([
         {ph: 'B', ts: ts(10e3), args: {data: {callFrame: {functionName: '(root)'}}}},
@@ -231,7 +230,7 @@ describe('CPU Profiler Model', () => {
         {startTime: 15.7, endTime: 16.8},
       ];
 
-      const events = CpuProfilerModel.synthesizeTraceEvents(profile, tasks);
+      const events = CpuProfileModel.synthesizeTraceEvents(profile, tasks);
 
       expect(events).toMatchObject([
         {ph: 'B', ts: ts(8.0e3), args: {data: {callFrame: {functionName: '(root)'}}}},
@@ -294,7 +293,7 @@ describe('CPU Profiler Model', () => {
         {startTime: 92, endTime: 103},
       ];
 
-      const events = CpuProfilerModel.synthesizeTraceEvents(profile, tasks);
+      const events = CpuProfileModel.synthesizeTraceEvents(profile, tasks);
 
       expect(events).toMatchObject([
         {ph: 'B', ts: ts(0.5e3), args: {data: {callFrame: {functionName: '(root)'}}}},
@@ -331,7 +330,7 @@ describe('CPU Profiler Model', () => {
 
       const ts = x => profile.startTime + x;
 
-      const events = CpuProfilerModel.synthesizeTraceEvents(profile, []);
+      const events = CpuProfileModel.synthesizeTraceEvents(profile, []);
 
       expect(events).toMatchObject([
         {ph: 'B', ts: ts(0.5e3), args: {data: {callFrame: {functionName: '(rootA)'}}}},
@@ -351,7 +350,7 @@ describe('CPU Profiler Model', () => {
 
     it('should create main-thread-task parseable events', () => {
       const ts = x => profile.startTime + x;
-      const events = CpuProfilerModel.synthesizeTraceEvents(profile);
+      const events = CpuProfileModel.synthesizeTraceEvents(profile);
 
       const tasks = MainThreadTasks.getMainThreadTasks(events, [], ts(19e3));
       expect(tasks).toHaveLength(6);
diff --git a/lighthouse-core/test/lib/tracehouse/main-thread-tasks-test.js b/lighthouse-core/test/lib/tracehouse/main-thread-tasks-test.js
index 3b78692073e7..7471bc27df73 100644
--- a/lighthouse-core/test/lib/tracehouse/main-thread-tasks-test.js
+++ b/lighthouse-core/test/lib/tracehouse/main-thread-tasks-test.js
@@ -6,12 +6,11 @@
 
 import {strict as assert} from 'assert';
 
-import MainThreadTasks from '../../../lib/tracehouse/main-thread-tasks.js';
-import TraceProcessor from '../../../lib/tracehouse/trace-processor.js';
+import {MainThreadTasks} from '../../../lib/tracehouse/main-thread-tasks.js';
+import {TraceProcessor} from '../../../lib/tracehouse/trace-processor.js';
 import {taskGroups} from '../../../lib/tracehouse/task-groups.js';
 import pwaTrace from '../../fixtures/traces/progressive-app.json';
 import noTracingStartedTrace from '../../fixtures/traces/no-tracingstarted-m74.json';
-import TracingProcessor from '../../../lib/tracehouse/trace-processor.js';
 
 describe('Main Thread Tasks', () => {
   const pid = 1;
@@ -53,7 +52,7 @@ describe('Main Thread Tasks', () => {
     while (queue.length) {
       const task = queue.shift();
       totalTime += task.selfTime;
-      totalTopLevelTime += TracingProcessor.isScheduleableTask(task.event) ? task.duration : 0;
+      totalTopLevelTime += TraceProcessor.isScheduleableTask(task.event) ? task.duration : 0;
       allTasks.push(task);
       queue.push(...task.children);
     }
diff --git a/lighthouse-core/test/lib/tracehouse/task-summary-test.js b/lighthouse-core/test/lib/tracehouse/task-summary-test.js
index fc3ace00530b..fb704a865eba 100644
--- a/lighthouse-core/test/lib/tracehouse/task-summary-test.js
+++ b/lighthouse-core/test/lib/tracehouse/task-summary-test.js
@@ -10,10 +10,10 @@ import {
   getExecutionTimingsByURL,
 } from '../../../lib/tracehouse/task-summary.js';
 import {NetworkRecorder} from '../../../lib/network-recorder.js';
-import MainThreadTasks from '../../../lib/tracehouse/main-thread-tasks.js';
+import {MainThreadTasks} from '../../../lib/tracehouse/main-thread-tasks.js';
 import ampTrace from '../../fixtures/traces/amp-m86.trace.json';
 import ampDevtoolsLog from '../../fixtures/traces/amp-m86.devtoolslog.json';
-import TraceProcessor from '../../../lib/tracehouse/trace-processor.js';
+import {TraceProcessor} from '../../../lib/tracehouse/trace-processor.js';
 import {networkRecordsToDevtoolsLog} from '../../network-records-to-devtools-log.js';
 import {taskGroups} from '../../../lib/tracehouse/task-groups.js';
 
diff --git a/lighthouse-core/test/lib/tracehouse/trace-processor-test.js b/lighthouse-core/test/lib/tracehouse/trace-processor-test.js
index 8f41e2167b6c..25ddad6f5dba 100644
--- a/lighthouse-core/test/lib/tracehouse/trace-processor-test.js
+++ b/lighthouse-core/test/lib/tracehouse/trace-processor-test.js
@@ -6,7 +6,7 @@
 
 import {strict as assert} from 'assert';
 
-import TraceProcessor from '../../../lib/tracehouse/trace-processor.js';
+import {TraceProcessor} from '../../../lib/tracehouse/trace-processor.js';
 import createTestTrace from '../../create-test-trace.js';
 import pwaTrace from '../../fixtures/traces/progressive-app.json';
 import badNavStartTrace from '../../fixtures/traces/bad-nav-start-ts.json';
diff --git a/lighthouse-core/test/lib/traces/pwmetrics-events-test.js b/lighthouse-core/test/lib/traces/pwmetrics-events-test.js
index 042209b7bc3f..faa5eb2f605e 100644
--- a/lighthouse-core/test/lib/traces/pwmetrics-events-test.js
+++ b/lighthouse-core/test/lib/traces/pwmetrics-events-test.js
@@ -6,7 +6,7 @@
 
 import {strict as assert} from 'assert';
 
-import Metrics from '../../../lib/traces/pwmetrics-events.js';
+import {Metrics} from '../../../lib/traces/pwmetrics-events.js';
 import dbwTrace from '../../results/artifacts/defaultPass.trace.json';
 import dbwResults from '../../results/sample_v2.json';
 

From e7b852bdd96a9a57bac283d05879a1b239a15b6c Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 12 May 2022 23:29:35 -0700
Subject: [PATCH 33/96] couple more tests working

---
 .../test/computed/load-simulator-test.js         |  2 +-
 .../test/computed/manifest-values-test.js        |  4 ++--
 lighthouse-core/test/config/budget-test.js       |  2 +-
 .../test/fraggle-rock/gather/mock-driver.js      |  2 +-
 lighthouse-core/test/runner-test.js              | 16 ++++++++--------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lighthouse-core/test/computed/load-simulator-test.js b/lighthouse-core/test/computed/load-simulator-test.js
index d079707fc7cc..b5f0806397e4 100644
--- a/lighthouse-core/test/computed/load-simulator-test.js
+++ b/lighthouse-core/test/computed/load-simulator-test.js
@@ -8,7 +8,7 @@ import {strict as assert} from 'assert';
 
 import devtoolsLog from '../fixtures/traces/progressive-app-m60.devtools.log.json';
 import LoadSimulator from '../../computed/load-simulator.js';
-import NetworkNode from '../../lib/dependency-graph/network-node.js';
+import {NetworkNode} from '../../lib/dependency-graph/network-node.js';
 
 function createNetworkNode() {
   return new NetworkNode({
diff --git a/lighthouse-core/test/computed/manifest-values-test.js b/lighthouse-core/test/computed/manifest-values-test.js
index 4c50756f9706..3fbd4e3f56c7 100644
--- a/lighthouse-core/test/computed/manifest-values-test.js
+++ b/lighthouse-core/test/computed/manifest-values-test.js
@@ -7,7 +7,7 @@
 import {strict as assert} from 'assert';
 
 import ManifestValues from '../../computed/manifest-values.js';
-import manifestParser from '../../lib/manifest-parser.js';
+import {parseManifest} from '../../lib/manifest-parser.js';
 import manifest from '../fixtures/manifest.json';
 
 const manifestSrc = JSON.stringify(manifest);
@@ -27,7 +27,7 @@ function getMockContext() {
 function noUrlManifestParser(manifestSrc) {
   const EXAMPLE_MANIFEST_URL = 'https://example.com/manifest.json';
   const EXAMPLE_DOC_URL = 'https://example.com/index.html';
-  return manifestParser(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
+  return parseManifest(manifestSrc, EXAMPLE_MANIFEST_URL, EXAMPLE_DOC_URL);
 }
 
 describe('ManifestValues computed artifact', () => {
diff --git a/lighthouse-core/test/config/budget-test.js b/lighthouse-core/test/config/budget-test.js
index 7b45bd38c26e..d051d16f5bce 100644
--- a/lighthouse-core/test/config/budget-test.js
+++ b/lighthouse-core/test/config/budget-test.js
@@ -6,7 +6,7 @@
 
 import {strict as assert} from 'assert';
 
-import Budget from '../../config/budget.js';
+import {Budget} from '../../config/budget.js';
 
 describe('Budget', () => {
   let budgets;
diff --git a/lighthouse-core/test/fraggle-rock/gather/mock-driver.js b/lighthouse-core/test/fraggle-rock/gather/mock-driver.js
index ef0f7f3da79e..b8ce58548664 100644
--- a/lighthouse-core/test/fraggle-rock/gather/mock-driver.js
+++ b/lighthouse-core/test/fraggle-rock/gather/mock-driver.js
@@ -153,7 +153,7 @@ function mockRunnerModule() {
     reset,
   };
 
-  jest.mock(`${LH_ROOT}/lighthouse-core/runner.js`, () => runnerModule);
+  jest.unstable_mockModule(`${LH_ROOT}/lighthouse-core/runner.js`, () => runnerModule);
 
   function reset() {
     runnerModule.getGathererList.mockReturnValue([]);
diff --git a/lighthouse-core/test/runner-test.js b/lighthouse-core/test/runner-test.js
index 722a57d0742c..6ec4fa39c5dd 100644
--- a/lighthouse-core/test/runner-test.js
+++ b/lighthouse-core/test/runner-test.js
@@ -12,7 +12,7 @@ import {jest} from '@jest/globals';
 
 // import Runner from '../runner.js';
 // import GatherRunner from '../gather/gather-runner.js';
-import driverMock from './gather/fake-driver.js';
+import {fakeDriver as driverMock} from './gather/fake-driver.js';
 // import {Config} from '../config/config.js';
 import {Audit} from '../audits/audit.js';
 import {Gatherer} from '../gather/gatherers/gatherer.js';
@@ -27,22 +27,22 @@ const {require, __dirname} = createCommonjsRefs(import.meta);
 // Some imports needs to be done dynamically, so that their dependencies will be mocked.
 // See: https://jestjs.io/docs/ecmascript-modules#differences-between-esm-and-commonjs
 //      https://github.com/facebook/jest/issues/10025
-/** @type {typeof import('../runner.js')} */
+/** @type {typeof import('../runner.js').Runner} */
 let Runner;
-/** @type {typeof import('../gather/gather-runner.js')} */
+/** @type {typeof import('../gather/gather-runner.js').GatherRunner} */
 let GatherRunner;
-/** @type {typeof import('../config/config.js')} */
+/** @type {typeof import('../config/config.js').Config} */
 let Config;
 
 beforeAll(async () => {
-  Runner = (await import('../runner.js')).default;
-  GatherRunner = (await import('../gather/gather-runner.js')).default;
-  Config = (await import('../config/config.js')).default;
+  Runner = (await import('../runner.js')).Runner;
+  GatherRunner = (await import('../gather/gather-runner.js')).GatherRunner;
+  Config = (await import('../config/config.js')).Config;
 });
 
 makeMocksForGatherRunner();
 
-jest.mock('../gather/driver/service-workers.js', () => ({
+jest.unstable_mockModule('../gather/driver/service-workers.js', () => ({
   getServiceWorkerVersions: jest.fn().mockResolvedValue({versions: []}),
   getServiceWorkerRegistrations: jest.fn().mockResolvedValue({registrations: []}),
 }));

From 16e1a6cc496ca5cd52f44cbb255213a388c94b12 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 13 May 2022 09:30:11 -0700
Subject: [PATCH 34/96] config test working

---
 lighthouse-core/config/config-helpers.js      |  12 +-
 lighthouse-core/test/config/config-test.js    |  34 +-
 .../fixtures/invalid-audits/missing-audit.js  |   7 +-
 .../invalid-audits/missing-description.js     |   7 +-
 .../missing-generate-audit-result.js          |   3 +-
 .../fixtures/invalid-audits/missing-id.js     |   7 +-
 .../fixtures/invalid-audits/missing-meta.js   |   7 +-
 .../missing-required-artifacts.js             |   7 +-
 .../fixtures/invalid-audits/missing-title.js  |   7 +-
 .../fixtures/invalid-audits/require-error.js  |   5 +-
 .../invalid-gatherers/missing-after-pass.js   |   3 +-
 .../invalid-gatherers/missing-before-pass.js  |   3 +-
 .../invalid-gatherers/missing-pass.js         |   3 +-
 .../invalid-gatherers/require-error.js        |   5 +-
 lighthouse-core/test/fixtures/package.json    |   4 -
 .../test/fixtures/valid-custom-gatherer.cjs   |   9 +
 .../test/fixtures/valid-custom-gatherer.js    |   7 +-
 lighthouse-core/test/lib/stack-packs-test.js  |   4 +-
 lighthouse-core/util-commonjs.js              | 710 ++++++++++++++++++
 19 files changed, 774 insertions(+), 70 deletions(-)
 delete mode 100644 lighthouse-core/test/fixtures/package.json
 create mode 100644 lighthouse-core/test/fixtures/valid-custom-gatherer.cjs
 create mode 100644 lighthouse-core/util-commonjs.js

diff --git a/lighthouse-core/config/config-helpers.js b/lighthouse-core/config/config-helpers.js
index b1ea5008e017..a88ac9fbf950 100644
--- a/lighthouse-core/config/config-helpers.js
+++ b/lighthouse-core/config/config-helpers.js
@@ -218,7 +218,7 @@ async function requireWrapper(requirePath) {
   const bundledModule = bundledModules.get(requirePath);
   if (bundledModule) return bundledModule;
 
-  const importPath = requirePath.endsWith('.js') || requirePath.endsWith('.mjs') ?
+  const importPath = requirePath.match(/\.(js|mjs|cjs)$/) ?
     requirePath :
     `${requirePath}.js`;
   const module = await import(importPath);
@@ -423,7 +423,8 @@ async function resolveAuditsToDefns(audits, configDir) {
   }
 
   const coreList = Runner.getAuditList();
-  const auditDefnsPromises = audits.map(async (auditJson) => {
+  const auditDefns = [];
+  for (const auditJson of audits) {
     const auditDefn = expandAuditShorthand(auditJson);
     let implementation;
     if ('implementation' in auditDefn) {
@@ -432,13 +433,12 @@ async function resolveAuditsToDefns(audits, configDir) {
       implementation = await requireAudit(auditDefn.path, coreList, configDir);
     }
 
-    return {
+    auditDefns.push({
       implementation,
       path: auditDefn.path,
       options: auditDefn.options || {},
-    };
-  });
-  const auditDefns = await Promise.all(auditDefnsPromises);
+    });
+  }
 
   const mergedAuditDefns = mergeOptionsOfItems(auditDefns);
   mergedAuditDefns.forEach(audit => validation.assertValidAudit(audit));
diff --git a/lighthouse-core/test/config/config-test.js b/lighthouse-core/test/config/config-test.js
index 24cd7227867e..8a0778bfcbf9 100644
--- a/lighthouse-core/test/config/config-test.js
+++ b/lighthouse-core/test/config/config-test.js
@@ -1343,21 +1343,25 @@ describe('Config', () => {
       assert.equal(typeof gatherer.instance.beforePass, 'function');
     });
 
-    it('loads gatherers from custom paths', async () => {
-      const customPath = path.resolve(__dirname, '../fixtures/valid-custom-gatherer');
-      const gatherer = await loadGatherer(customPath);
-      assert.equal(gatherer.instance.name, 'CustomGatherer');
-      assert.equal(typeof gatherer.instance.beforePass, 'function');
-    });
-
-    it('loads a gatherer relative to a config path', async () => {
-      const config = await Config.fromJson({
-        passes: [{gatherers: ['../fixtures/valid-custom-gatherer']}],
-      }, {configPath: __filename});
-      const gatherer = config.passes[0].gatherers[0];
-
-      assert.equal(gatherer.instance.name, 'CustomGatherer');
-      assert.equal(typeof gatherer.instance.beforePass, 'function');
+    ['', '.js', '.cjs'].forEach(variant => {
+      describe(`loads custom gatherer (variant: "${variant}")`, () => {
+        it('loads gatherers from custom paths', async () => {
+          const customPath = path.resolve(__dirname, '../fixtures/valid-custom-gatherer' + variant);
+          const gatherer = await loadGatherer(customPath);
+          assert.equal(gatherer.instance.name, 'CustomGatherer');
+          assert.equal(typeof gatherer.instance.beforePass, 'function');
+        });
+
+        it('loads a gatherer relative to a config path', async () => {
+          const config = await Config.fromJson({
+            passes: [{gatherers: ['../fixtures/valid-custom-gatherer' + variant]}],
+          }, {configPath: __filename});
+          const gatherer = config.passes[0].gatherers[0];
+
+          assert.equal(gatherer.instance.name, 'CustomGatherer');
+          assert.equal(typeof gatherer.instance.beforePass, 'function');
+        });
+      });
     });
 
     it('returns gatherer when gatherer class, not package-name string, is provided', async () => {
diff --git a/lighthouse-core/test/fixtures/invalid-audits/missing-audit.js b/lighthouse-core/test/fixtures/invalid-audits/missing-audit.js
index 594b1d1b10ae..443e279688f9 100644
--- a/lighthouse-core/test/fixtures/invalid-audits/missing-audit.js
+++ b/lighthouse-core/test/fixtures/invalid-audits/missing-audit.js
@@ -4,10 +4,9 @@
  * 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 {Audit} from '../../../audits/audit.js';
 
-const LighthouseAudit = require('../../../audits/audit.js');
-
-class MissingAuditFn extends LighthouseAudit {
+class MissingAuditFn extends Audit {
   static get meta() {
     return {
       id: 'missing-audit-fn',
@@ -18,4 +17,4 @@ class MissingAuditFn extends LighthouseAudit {
   }
 }
 
-module.exports = MissingAuditFn;
+export default MissingAuditFn;
diff --git a/lighthouse-core/test/fixtures/invalid-audits/missing-description.js b/lighthouse-core/test/fixtures/invalid-audits/missing-description.js
index 87e8c5d2e3c4..5423acb8f398 100644
--- a/lighthouse-core/test/fixtures/invalid-audits/missing-description.js
+++ b/lighthouse-core/test/fixtures/invalid-audits/missing-description.js
@@ -4,10 +4,9 @@
  * 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 {Audit} from '../../../audits/audit.js';
 
-const LighthouseAudit = require('../../../audits/audit.js');
-
-class MissingDescription extends LighthouseAudit {
+class MissingDescription extends Audit {
   static get meta() {
     return {
       id: 'missing-description',
@@ -24,4 +23,4 @@ class MissingDescription extends LighthouseAudit {
   }
 }
 
-module.exports = MissingDescription;
+export default MissingDescription;
diff --git a/lighthouse-core/test/fixtures/invalid-audits/missing-generate-audit-result.js b/lighthouse-core/test/fixtures/invalid-audits/missing-generate-audit-result.js
index fba5f82ff8de..017b7cd587c7 100644
--- a/lighthouse-core/test/fixtures/invalid-audits/missing-generate-audit-result.js
+++ b/lighthouse-core/test/fixtures/invalid-audits/missing-generate-audit-result.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.
  */
 
-
 class MissingGenerateAuditResult {
   static get meta() {
     return {
@@ -22,4 +21,4 @@ class MissingGenerateAuditResult {
   }
 }
 
-module.exports = MissingGenerateAuditResult;
+export default MissingGenerateAuditResult;
diff --git a/lighthouse-core/test/fixtures/invalid-audits/missing-id.js b/lighthouse-core/test/fixtures/invalid-audits/missing-id.js
index 01e554f28690..e13fd3c785fc 100644
--- a/lighthouse-core/test/fixtures/invalid-audits/missing-id.js
+++ b/lighthouse-core/test/fixtures/invalid-audits/missing-id.js
@@ -4,10 +4,9 @@
  * 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 {Audit} from '../../../audits/audit.js';
 
-const LighthouseAudit = require('../../../audits/audit.js');
-
-class MissingID extends LighthouseAudit {
+class MissingID extends Audit {
   static get meta() {
     return {
       title: 'Missing id',
@@ -23,4 +22,4 @@ class MissingID extends LighthouseAudit {
   }
 }
 
-module.exports = MissingID;
+export default MissingID;
diff --git a/lighthouse-core/test/fixtures/invalid-audits/missing-meta.js b/lighthouse-core/test/fixtures/invalid-audits/missing-meta.js
index 0f76a720f7fb..59b23623ea63 100644
--- a/lighthouse-core/test/fixtures/invalid-audits/missing-meta.js
+++ b/lighthouse-core/test/fixtures/invalid-audits/missing-meta.js
@@ -4,10 +4,9 @@
  * 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 {Audit} from '../../../audits/audit.js';
 
-const LighthouseAudit = require('../../../audits/audit.js');
-
-class MissingMeta extends LighthouseAudit {
+class MissingMeta extends Audit {
   static audit(_) {
     return {
       score: 1,
@@ -15,4 +14,4 @@ class MissingMeta extends LighthouseAudit {
   }
 }
 
-module.exports = MissingMeta;
+export default MissingMeta;
diff --git a/lighthouse-core/test/fixtures/invalid-audits/missing-required-artifacts.js b/lighthouse-core/test/fixtures/invalid-audits/missing-required-artifacts.js
index 01206d2c8d3d..e49b71c2b9d7 100644
--- a/lighthouse-core/test/fixtures/invalid-audits/missing-required-artifacts.js
+++ b/lighthouse-core/test/fixtures/invalid-audits/missing-required-artifacts.js
@@ -4,10 +4,9 @@
  * 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 {Audit} from '../../../audits/audit.js';
 
-const LighthouseAudit = require('../../../audits/audit.js');
-
-class MissingRequiredArtifacts extends LighthouseAudit {
+class MissingRequiredArtifacts extends Audit {
   static get meta() {
     return {
       id: 'missing-required-artifacts',
@@ -24,4 +23,4 @@ class MissingRequiredArtifacts extends LighthouseAudit {
   }
 }
 
-module.exports = MissingRequiredArtifacts;
+export default MissingRequiredArtifacts;
diff --git a/lighthouse-core/test/fixtures/invalid-audits/missing-title.js b/lighthouse-core/test/fixtures/invalid-audits/missing-title.js
index 0e27948cc263..35d44c291a6d 100644
--- a/lighthouse-core/test/fixtures/invalid-audits/missing-title.js
+++ b/lighthouse-core/test/fixtures/invalid-audits/missing-title.js
@@ -4,10 +4,9 @@
  * 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 {Audit} from '../../../audits/audit.js';
 
-const LighthouseAudit = require('../../../audits/audit.js');
-
-class MissingTitle extends LighthouseAudit {
+class MissingTitle extends Audit {
   static get meta() {
     return {
       id: 'missing-title',
@@ -23,4 +22,4 @@ class MissingTitle extends LighthouseAudit {
   }
 }
 
-module.exports = MissingTitle;
+export default MissingTitle;
diff --git a/lighthouse-core/test/fixtures/invalid-audits/require-error.js b/lighthouse-core/test/fixtures/invalid-audits/require-error.js
index 7b256520f7db..13b29b96c4ab 100644
--- a/lighthouse-core/test/fixtures/invalid-audits/require-error.js
+++ b/lighthouse-core/test/fixtures/invalid-audits/require-error.js
@@ -4,10 +4,9 @@
  * 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.
  */
 
-
 // NOTE: this require path does not resolve correctly.
 // eslint-disable-next-line local-rules/require-file-extension
-const LighthouseAudit = require('../terrible/path/come/on/audit.js');
+import LighthouseAudit from '../terrible/path/come/on/audit.js';
 
 class RequireErrorAudit extends LighthouseAudit {
   static get meta() {
@@ -22,4 +21,4 @@ class RequireErrorAudit extends LighthouseAudit {
   static audit() {}
 }
 
-module.exports = RequireErrorAudit;
+export default RequireErrorAudit;
diff --git a/lighthouse-core/test/fixtures/invalid-gatherers/missing-after-pass.js b/lighthouse-core/test/fixtures/invalid-gatherers/missing-after-pass.js
index 866b723e32c1..4d0f0bec7955 100644
--- a/lighthouse-core/test/fixtures/invalid-gatherers/missing-after-pass.js
+++ b/lighthouse-core/test/fixtures/invalid-gatherers/missing-after-pass.js
@@ -4,10 +4,9 @@
  * 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.
  */
 
-
 class MissingAfterPass {
   beforePass() {}
   pass() {}
 }
 
-module.exports = MissingAfterPass;
+export default MissingAfterPass;
diff --git a/lighthouse-core/test/fixtures/invalid-gatherers/missing-before-pass.js b/lighthouse-core/test/fixtures/invalid-gatherers/missing-before-pass.js
index 66319e205b3e..7d3b5345497a 100644
--- a/lighthouse-core/test/fixtures/invalid-gatherers/missing-before-pass.js
+++ b/lighthouse-core/test/fixtures/invalid-gatherers/missing-before-pass.js
@@ -4,10 +4,9 @@
  * 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.
  */
 
-
 class MissingBeforePass {
   pass() {}
   afterPass() {}
 }
 
-module.exports = MissingBeforePass;
+export default MissingBeforePass;
diff --git a/lighthouse-core/test/fixtures/invalid-gatherers/missing-pass.js b/lighthouse-core/test/fixtures/invalid-gatherers/missing-pass.js
index 57de2427ccaf..8c0b13986dba 100644
--- a/lighthouse-core/test/fixtures/invalid-gatherers/missing-pass.js
+++ b/lighthouse-core/test/fixtures/invalid-gatherers/missing-pass.js
@@ -4,10 +4,9 @@
  * 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.
  */
 
-
 class MissingPass {
   beforePass() {}
   afterPass() {}
 }
 
-module.exports = MissingPass;
+export default MissingPass;
diff --git a/lighthouse-core/test/fixtures/invalid-gatherers/require-error.js b/lighthouse-core/test/fixtures/invalid-gatherers/require-error.js
index a5fd487f679e..6c07fb8785b8 100644
--- a/lighthouse-core/test/fixtures/invalid-gatherers/require-error.js
+++ b/lighthouse-core/test/fixtures/invalid-gatherers/require-error.js
@@ -4,11 +4,10 @@
  * 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.
  */
 
-
 // NOTE: this require path does not resolve correctly.
 // eslint-disable-next-line local-rules/require-file-extension
-const LighthouseGatherer = require('../terrible/path/no/seriously/gatherer.js');
+import LighthouseGatherer from '../terrible/path/no/seriously/gatherer.js';
 
 class CustomGatherer extends LighthouseGatherer {}
 
-module.exports = CustomGatherer;
+export default CustomGatherer;
diff --git a/lighthouse-core/test/fixtures/package.json b/lighthouse-core/test/fixtures/package.json
deleted file mode 100644
index b4c41cebcb3c..000000000000
--- a/lighthouse-core/test/fixtures/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "type": "commonjs",
-  "//": "All fixtures are commonjs until core/ is modules."
-}
\ No newline at end of file
diff --git a/lighthouse-core/test/fixtures/valid-custom-gatherer.cjs b/lighthouse-core/test/fixtures/valid-custom-gatherer.cjs
new file mode 100644
index 000000000000..5ed8a4bb22e6
--- /dev/null
+++ b/lighthouse-core/test/fixtures/valid-custom-gatherer.cjs
@@ -0,0 +1,9 @@
+/**
+ * @license Copyright 2022 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.
+ */
+
+module.exports = import('../../gather/gatherers/gatherer.js').then(({Gatherer}) => {
+  return class CustomGatherer extends Gatherer {};
+});
diff --git a/lighthouse-core/test/fixtures/valid-custom-gatherer.js b/lighthouse-core/test/fixtures/valid-custom-gatherer.js
index 4d43e67f2fea..717eabaa5484 100644
--- a/lighthouse-core/test/fixtures/valid-custom-gatherer.js
+++ b/lighthouse-core/test/fixtures/valid-custom-gatherer.js
@@ -4,9 +4,8 @@
  * 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 {Gatherer} from '../../gather/gatherers/gatherer.js';
 
-const LighthouseGatherer = require('../../gather/gatherers/gatherer.js');
+class CustomGatherer extends Gatherer {}
 
-class CustomGatherer extends LighthouseGatherer {}
-
-module.exports = CustomGatherer;
+export default CustomGatherer;
diff --git a/lighthouse-core/test/lib/stack-packs-test.js b/lighthouse-core/test/lib/stack-packs-test.js
index 1db3e82f6e5c..341843a24730 100644
--- a/lighthouse-core/test/lib/stack-packs-test.js
+++ b/lighthouse-core/test/lib/stack-packs-test.js
@@ -230,9 +230,7 @@ Array [
 
   // Keys for plugin audits are allowed in this package.
   // Make sure none are typos of core audits.
-  // TODO: debug error:
-  //       request for 'metaviewport-parser' is not yet fulfilled
-  it.skip('snapshot unrecognized keys', async () => {
+  it('snapshot unrecognized keys', async () => {
     const auditIds = await getAuditIds();
 
     const unrecognizedKeys = new Set();
diff --git a/lighthouse-core/util-commonjs.js b/lighthouse-core/util-commonjs.js
new file mode 100644
index 000000000000..22d49d53585f
--- /dev/null
+++ b/lighthouse-core/util-commonjs.js
@@ -0,0 +1,710 @@
+// @ts-nocheck
+// Auto-generated by lighthouse-core/scripts/copy-util-commonjs.sh
+// Temporary solution until all our code uses esmodules
+'use strict';
+/**
+ * @license
+ * Copyright 2017 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.
+ */
+
+/** @template T @typedef {import('./i18n').I18n<T>} I18n */
+
+const ELLIPSIS = '\u2026';
+const NBSP = '\xa0';
+const PASS_THRESHOLD = 0.9;
+const SCREENSHOT_PREFIX = 'data:image/jpeg;base64,';
+
+const RATINGS = {
+  PASS: {label: 'pass', minScore: PASS_THRESHOLD},
+  AVERAGE: {label: 'average', minScore: 0.5},
+  FAIL: {label: 'fail'},
+  ERROR: {label: 'error'},
+};
+
+// 25 most used tld plus one domains (aka public suffixes) from http archive.
+// @see https://github.com/GoogleChrome/lighthouse/pull/5065#discussion_r191926212
+// The canonical list is https://publicsuffix.org/learn/ but we're only using subset to conserve bytes
+const listOfTlds = [
+  'com', 'co', 'gov', 'edu', 'ac', 'org', 'go', 'gob', 'or', 'net', 'in', 'ne', 'nic', 'gouv',
+  'web', 'spb', 'blog', 'jus', 'kiev', 'mil', 'wi', 'qc', 'ca', 'bel', 'on',
+];
+
+class Util {
+  /** @type {I18n<typeof UIStrings>} */
+  // @ts-expect-error: Is set in report renderer.
+  static i18n = null;
+
+  static get PASS_THRESHOLD() {
+    return PASS_THRESHOLD;
+  }
+
+  static get MS_DISPLAY_VALUE() {
+    return `%10d${NBSP}ms`;
+  }
+
+  /**
+   * Returns a new LHR that's reshaped for slightly better ergonomics within the report rendereer.
+   * Also, sets up the localized UI strings used within renderer and makes changes to old LHRs to be
+   * compatible with current renderer.
+   * The LHR passed in is not mutated.
+   * TODO(team): we all agree the LHR shape change is technical debt we should fix
+   * @param {LH.Result} result
+   * @return {LH.ReportResult}
+   */
+  static prepareReportResult(result) {
+    // If any mutations happen to the report within the renderers, we want the original object untouched
+    const clone = /** @type {LH.ReportResult} */ (JSON.parse(JSON.stringify(result)));
+
+    // If LHR is older (≤3.0.3), it has no locale setting. Set default.
+    if (!clone.configSettings.locale) {
+      clone.configSettings.locale = 'en';
+    }
+    if (!clone.configSettings.formFactor) {
+      // @ts-expect-error fallback handling for emulatedFormFactor
+      clone.configSettings.formFactor = clone.configSettings.emulatedFormFactor;
+    }
+
+    for (const audit of Object.values(clone.audits)) {
+      // Turn 'not-applicable' (LHR <4.0) and 'not_applicable' (older proto versions)
+      // into 'notApplicable' (LHR ≥4.0).
+      // @ts-expect-error tsc rightly flags that these values shouldn't occur.
+      // eslint-disable-next-line max-len
+      if (audit.scoreDisplayMode === 'not_applicable' || audit.scoreDisplayMode === 'not-applicable') {
+        audit.scoreDisplayMode = 'notApplicable';
+      }
+
+      if (audit.details) {
+        // Turn `auditDetails.type` of undefined (LHR <4.2) and 'diagnostic' (LHR <5.0)
+        // into 'debugdata' (LHR ≥5.0).
+        // @ts-expect-error tsc rightly flags that these values shouldn't occur.
+        if (audit.details.type === undefined || audit.details.type === 'diagnostic') {
+          // @ts-expect-error details is of type never.
+          audit.details.type = 'debugdata';
+        }
+
+        // Add the jpg data URL prefix to filmstrip screenshots without them (LHR <5.0).
+        if (audit.details.type === 'filmstrip') {
+          for (const screenshot of audit.details.items) {
+            if (!screenshot.data.startsWith(SCREENSHOT_PREFIX)) {
+              screenshot.data = SCREENSHOT_PREFIX + screenshot.data;
+            }
+          }
+        }
+      }
+    }
+
+    // For convenience, smoosh all AuditResults into their auditRef (which has just weight & group)
+    if (typeof clone.categories !== 'object') throw new Error('No categories provided.');
+
+    /** @type {Map<string, Array<LH.ReportResult.AuditRef>>} */
+    const relevantAuditToMetricsMap = new Map();
+
+    // This backcompat converts old LHRs (<9.0.0) to use the new "hidden" group.
+    // Old LHRs used "no group" to identify audits that should be hidden in performance instead of the "hidden" group.
+    // Newer LHRs use "no group" to identify opportunities and diagnostics whose groups are assigned by details type.
+    const [majorVersion] = clone.lighthouseVersion.split('.').map(Number);
+    const perfCategory = clone.categories['performance'];
+    if (majorVersion < 9 && perfCategory) {
+      if (!clone.categoryGroups) clone.categoryGroups = {};
+      clone.categoryGroups['hidden'] = {title: ''};
+      for (const auditRef of perfCategory.auditRefs) {
+        if (!auditRef.group) {
+          auditRef.group = 'hidden';
+        } else if (['load-opportunities', 'diagnostics'].includes(auditRef.group)) {
+          delete auditRef.group;
+        }
+      }
+    }
+
+    for (const category of Object.values(clone.categories)) {
+      // Make basic lookup table for relevantAudits
+      category.auditRefs.forEach(metricRef => {
+        if (!metricRef.relevantAudits) return;
+        metricRef.relevantAudits.forEach(auditId => {
+          const arr = relevantAuditToMetricsMap.get(auditId) || [];
+          arr.push(metricRef);
+          relevantAuditToMetricsMap.set(auditId, arr);
+        });
+      });
+
+      category.auditRefs.forEach(auditRef => {
+        const result = clone.audits[auditRef.id];
+        auditRef.result = result;
+
+        // Attach any relevantMetric auditRefs
+        if (relevantAuditToMetricsMap.has(auditRef.id)) {
+          auditRef.relevantMetrics = relevantAuditToMetricsMap.get(auditRef.id);
+        }
+
+        // attach the stackpacks to the auditRef object
+        if (clone.stackPacks) {
+          clone.stackPacks.forEach(pack => {
+            if (pack.descriptions[auditRef.id]) {
+              auditRef.stackPacks = auditRef.stackPacks || [];
+              auditRef.stackPacks.push({
+                title: pack.title,
+                iconDataURL: pack.iconDataURL,
+                description: pack.descriptions[auditRef.id],
+              });
+            }
+          });
+        }
+      });
+    }
+
+    return clone;
+  }
+
+  /**
+   * Used to determine if the "passed" for the purposes of showing up in the "failed" or "passed"
+   * sections of the report.
+   *
+   * @param {{score: (number|null), scoreDisplayMode: string}} audit
+   * @return {boolean}
+   */
+  static showAsPassed(audit) {
+    switch (audit.scoreDisplayMode) {
+      case 'manual':
+      case 'notApplicable':
+        return true;
+      case 'error':
+      case 'informative':
+        return false;
+      case 'numeric':
+      case 'binary':
+      default:
+        return Number(audit.score) >= RATINGS.PASS.minScore;
+    }
+  }
+
+  /**
+   * Convert a score to a rating label.
+   * TODO: Return `'error'` for `score === null && !scoreDisplayMode`.
+   *
+   * @param {number|null} score
+   * @param {string=} scoreDisplayMode
+   * @return {string}
+   */
+  static calculateRating(score, scoreDisplayMode) {
+    // Handle edge cases first, manual and not applicable receive 'pass', errored audits receive 'error'
+    if (scoreDisplayMode === 'manual' || scoreDisplayMode === 'notApplicable') {
+      return RATINGS.PASS.label;
+    } else if (scoreDisplayMode === 'error') {
+      return RATINGS.ERROR.label;
+    } else if (score === null) {
+      return RATINGS.FAIL.label;
+    }
+
+    // At this point, we're rating a standard binary/numeric audit
+    let rating = RATINGS.FAIL.label;
+    if (score >= RATINGS.PASS.minScore) {
+      rating = RATINGS.PASS.label;
+    } else if (score >= RATINGS.AVERAGE.minScore) {
+      rating = RATINGS.AVERAGE.label;
+    }
+    return rating;
+  }
+
+  /**
+   * Split a string by markdown code spans (enclosed in `backticks`), splitting
+   * into segments that were enclosed in backticks (marked as `isCode === true`)
+   * and those that outside the backticks (`isCode === false`).
+   * @param {string} text
+   * @return {Array<{isCode: true, text: string}|{isCode: false, text: string}>}
+   */
+  static splitMarkdownCodeSpans(text) {
+    /** @type {Array<{isCode: true, text: string}|{isCode: false, text: string}>} */
+    const segments = [];
+
+    // Split on backticked code spans.
+    const parts = text.split(/`(.*?)`/g);
+    for (let i = 0; i < parts.length; i ++) {
+      const text = parts[i];
+
+      // Empty strings are an artifact of splitting, not meaningful.
+      if (!text) continue;
+
+      // Alternates between plain text and code segments.
+      const isCode = i % 2 !== 0;
+      segments.push({
+        isCode,
+        text,
+      });
+    }
+
+    return segments;
+  }
+
+  /**
+   * Split a string on markdown links (e.g. [some link](https://...)) into
+   * segments of plain text that weren't part of a link (marked as
+   * `isLink === false`), and segments with text content and a URL that did make
+   * up a link (marked as `isLink === true`).
+   * @param {string} text
+   * @return {Array<{isLink: true, text: string, linkHref: string}|{isLink: false, text: string}>}
+   */
+  static splitMarkdownLink(text) {
+    /** @type {Array<{isLink: true, text: string, linkHref: string}|{isLink: false, text: string}>} */
+    const segments = [];
+
+    const parts = text.split(/\[([^\]]+?)\]\((https?:\/\/.*?)\)/g);
+    while (parts.length) {
+      // Shift off the same number of elements as the pre-split and capture groups.
+      const [preambleText, linkText, linkHref] = parts.splice(0, 3);
+
+      if (preambleText) { // Skip empty text as it's an artifact of splitting, not meaningful.
+        segments.push({
+          isLink: false,
+          text: preambleText,
+        });
+      }
+
+      // Append link if there are any.
+      if (linkText && linkHref) {
+        segments.push({
+          isLink: true,
+          text: linkText,
+          linkHref,
+        });
+      }
+    }
+
+    return segments;
+  }
+
+  /**
+   * @param {URL} parsedUrl
+   * @param {{numPathParts?: number, preserveQuery?: boolean, preserveHost?: boolean}=} options
+   * @return {string}
+   */
+  static getURLDisplayName(parsedUrl, options) {
+    // Closure optional properties aren't optional in tsc, so fallback needs undefined  values.
+    options = options || {numPathParts: undefined, preserveQuery: undefined,
+      preserveHost: undefined};
+    const numPathParts = options.numPathParts !== undefined ? options.numPathParts : 2;
+    const preserveQuery = options.preserveQuery !== undefined ? options.preserveQuery : true;
+    const preserveHost = options.preserveHost || false;
+
+    let name;
+
+    if (parsedUrl.protocol === 'about:' || parsedUrl.protocol === 'data:') {
+      // Handle 'about:*' and 'data:*' URLs specially since they have no path.
+      name = parsedUrl.href;
+    } else {
+      name = parsedUrl.pathname;
+      const parts = name.split('/').filter(part => part.length);
+      if (numPathParts && parts.length > numPathParts) {
+        name = ELLIPSIS + parts.slice(-1 * numPathParts).join('/');
+      }
+
+      if (preserveHost) {
+        name = `${parsedUrl.host}/${name.replace(/^\//, '')}`;
+      }
+      if (preserveQuery) {
+        name = `${name}${parsedUrl.search}`;
+      }
+    }
+
+    const MAX_LENGTH = 64;
+    if (parsedUrl.protocol !== 'data:') {
+      // Always elide hexadecimal hash
+      name = name.replace(/([a-f0-9]{7})[a-f0-9]{13}[a-f0-9]*/g, `$1${ELLIPSIS}`);
+      // Also elide other hash-like mixed-case strings
+      name = name.replace(/([a-zA-Z0-9-_]{9})(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])[a-zA-Z0-9-_]{10,}/g,
+        `$1${ELLIPSIS}`);
+      // Also elide long number sequences
+      name = name.replace(/(\d{3})\d{6,}/g, `$1${ELLIPSIS}`);
+      // Merge any adjacent ellipses
+      name = name.replace(/\u2026+/g, ELLIPSIS);
+
+      // Elide query params first
+      if (name.length > MAX_LENGTH && name.includes('?')) {
+        // Try to leave the first query parameter intact
+        name = name.replace(/\?([^=]*)(=)?.*/, `?$1$2${ELLIPSIS}`);
+
+        // Remove it all if it's still too long
+        if (name.length > MAX_LENGTH) {
+          name = name.replace(/\?.*/, `?${ELLIPSIS}`);
+        }
+      }
+    }
+
+    // Elide too long names next
+    if (name.length > MAX_LENGTH) {
+      const dotIndex = name.lastIndexOf('.');
+      if (dotIndex >= 0) {
+        name = name.slice(0, MAX_LENGTH - 1 - (name.length - dotIndex)) +
+          // Show file extension
+          `${ELLIPSIS}${name.slice(dotIndex)}`;
+      } else {
+        name = name.slice(0, MAX_LENGTH - 1) + ELLIPSIS;
+      }
+    }
+
+    return name;
+  }
+
+  /**
+   * Split a URL into a file, hostname and origin for easy display.
+   * @param {string} url
+   * @return {{file: string, hostname: string, origin: string}}
+   */
+  static parseURL(url) {
+    const parsedUrl = new URL(url);
+    return {
+      file: Util.getURLDisplayName(parsedUrl),
+      hostname: parsedUrl.hostname,
+      origin: parsedUrl.origin,
+    };
+  }
+
+  /**
+   * @param {string|URL} value
+   * @return {!URL}
+   */
+  static createOrReturnURL(value) {
+    if (value instanceof URL) {
+      return value;
+    }
+
+    return new URL(value);
+  }
+
+  /**
+   * Gets the tld of a domain
+   *
+   * @param {string} hostname
+   * @return {string} tld
+   */
+  static getTld(hostname) {
+    const tlds = hostname.split('.').slice(-2);
+
+    if (!listOfTlds.includes(tlds[0])) {
+      return `.${tlds[tlds.length - 1]}`;
+    }
+
+    return `.${tlds.join('.')}`;
+  }
+
+  /**
+   * Returns a primary domain for provided hostname (e.g. www.example.com -> example.com).
+   * @param {string|URL} url hostname or URL object
+   * @return {string}
+   */
+  static getRootDomain(url) {
+    const hostname = Util.createOrReturnURL(url).hostname;
+    const tld = Util.getTld(hostname);
+
+    // tld is .com or .co.uk which means we means that length is 1 to big
+    // .com => 2 & .co.uk => 3
+    const splitTld = tld.split('.');
+
+    // get TLD + root domain
+    return hostname.split('.').slice(-splitTld.length).join('.');
+  }
+
+
+  /**
+   * @param {LH.Result['configSettings']} settings
+   * @return {!{deviceEmulation: string, networkThrottling: string, cpuThrottling: string, summary: string}}
+   */
+  static getEmulationDescriptions(settings) {
+    let cpuThrottling;
+    let networkThrottling;
+    let summary;
+
+    const throttling = settings.throttling;
+
+    switch (settings.throttlingMethod) {
+      case 'provided':
+        summary = networkThrottling = cpuThrottling = Util.i18n.strings.throttlingProvided;
+        break;
+      case 'devtools': {
+        const {cpuSlowdownMultiplier, requestLatencyMs} = throttling;
+        // eslint-disable-next-line max-len
+        cpuThrottling = `${Util.i18n.formatNumber(cpuSlowdownMultiplier)}x slowdown (DevTools)`;
+        networkThrottling = `${Util.i18n.formatMilliseconds(requestLatencyMs)} HTTP RTT, ` +
+          `${Util.i18n.formatKbps(throttling.downloadThroughputKbps)} down, ` +
+          `${Util.i18n.formatKbps(throttling.uploadThroughputKbps)} up (DevTools)`;
+
+        const isSlow4G = () => {
+          return requestLatencyMs === 150 * 3.75 &&
+            throttling.downloadThroughputKbps === 1.6 * 1024 * 0.9 &&
+            throttling.uploadThroughputKbps === 750 * 0.9;
+        };
+        summary = isSlow4G() ? Util.i18n.strings.runtimeSlow4g : Util.i18n.strings.runtimeCustom;
+        break;
+      }
+      case 'simulate': {
+        const {cpuSlowdownMultiplier, rttMs, throughputKbps} = throttling;
+        // eslint-disable-next-line max-len
+        cpuThrottling = `${Util.i18n.formatNumber(cpuSlowdownMultiplier)}x slowdown (Simulated)`;
+        networkThrottling = `${Util.i18n.formatMilliseconds(rttMs)} TCP RTT, ` +
+          `${Util.i18n.formatKbps(throughputKbps)} throughput (Simulated)`;
+
+        const isSlow4G = () => {
+          return rttMs === 150 && throughputKbps === 1.6 * 1024;
+        };
+        summary = isSlow4G() ? Util.i18n.strings.runtimeSlow4g : Util.i18n.strings.runtimeCustom;
+        break;
+      }
+      default:
+        summary = cpuThrottling = networkThrottling = Util.i18n.strings.runtimeUnknown;
+    }
+
+    // TODO(paulirish): revise Runtime Settings strings: https://github.com/GoogleChrome/lighthouse/pull/11796
+    const deviceEmulation = {
+      mobile: Util.i18n.strings.runtimeMobileEmulation,
+      desktop: Util.i18n.strings.runtimeDesktopEmulation,
+    }[settings.formFactor] || Util.i18n.strings.runtimeNoEmulation;
+
+    return {
+      deviceEmulation,
+      cpuThrottling,
+      networkThrottling,
+      summary,
+    };
+  }
+
+  /**
+   * Returns only lines that are near a message, or the first few lines if there are
+   * no line messages.
+   * @param {LH.Audit.Details.SnippetValue['lines']} lines
+   * @param {LH.Audit.Details.SnippetValue['lineMessages']} lineMessages
+   * @param {number} surroundingLineCount Number of lines to include before and after
+   * the message. If this is e.g. 2 this function might return 5 lines.
+   */
+  static filterRelevantLines(lines, lineMessages, surroundingLineCount) {
+    if (lineMessages.length === 0) {
+      // no lines with messages, just return the first bunch of lines
+      return lines.slice(0, surroundingLineCount * 2 + 1);
+    }
+
+    const minGapSize = 3;
+    const lineNumbersToKeep = new Set();
+    // Sort messages so we can check lineNumbersToKeep to see how big the gap to
+    // the previous line is.
+    lineMessages = lineMessages.sort((a, b) => (a.lineNumber || 0) - (b.lineNumber || 0));
+    lineMessages.forEach(({lineNumber}) => {
+      let firstSurroundingLineNumber = lineNumber - surroundingLineCount;
+      let lastSurroundingLineNumber = lineNumber + surroundingLineCount;
+
+      while (firstSurroundingLineNumber < 1) {
+        // make sure we still show (surroundingLineCount * 2 + 1) lines in total
+        firstSurroundingLineNumber++;
+        lastSurroundingLineNumber++;
+      }
+      // If only a few lines would be omitted normally then we prefer to include
+      // extra lines to avoid the tiny gap
+      if (lineNumbersToKeep.has(firstSurroundingLineNumber - minGapSize - 1)) {
+        firstSurroundingLineNumber -= minGapSize;
+      }
+      for (let i = firstSurroundingLineNumber; i <= lastSurroundingLineNumber; i++) {
+        const surroundingLineNumber = i;
+        lineNumbersToKeep.add(surroundingLineNumber);
+      }
+    });
+
+    return lines.filter(line => lineNumbersToKeep.has(line.lineNumber));
+  }
+
+  /**
+   * @param {string} categoryId
+   */
+  static isPluginCategory(categoryId) {
+    return categoryId.startsWith('lighthouse-plugin-');
+  }
+
+  /**
+   * @param {LH.Result.GatherMode} gatherMode
+   */
+  static shouldDisplayAsFraction(gatherMode) {
+    return gatherMode === 'timespan' || gatherMode === 'snapshot';
+  }
+
+  /**
+   * @param {LH.ReportResult.Category} category
+   */
+  static calculateCategoryFraction(category) {
+    let numPassableAudits = 0;
+    let numPassed = 0;
+    let numInformative = 0;
+    let totalWeight = 0;
+    for (const auditRef of category.auditRefs) {
+      const auditPassed = Util.showAsPassed(auditRef.result);
+
+      // Don't count the audit if it's manual, N/A, or isn't displayed.
+      if (auditRef.group === 'hidden' ||
+          auditRef.result.scoreDisplayMode === 'manual' ||
+          auditRef.result.scoreDisplayMode === 'notApplicable') {
+        continue;
+      } else if (auditRef.result.scoreDisplayMode === 'informative') {
+        if (!auditPassed) {
+          ++numInformative;
+        }
+        continue;
+      }
+
+      ++numPassableAudits;
+      totalWeight += auditRef.weight;
+      if (auditPassed) numPassed++;
+    }
+    return {numPassed, numPassableAudits, numInformative, totalWeight};
+  }
+}
+
+/**
+ * Some parts of the report renderer require data found on the LHR. Instead of wiring it
+ * through, we have this global.
+ * @type {LH.ReportResult | null}
+ */
+Util.reportJson = null;
+
+/**
+ * An always-increasing counter for making unique SVG ID suffixes.
+ */
+Util.getUniqueSuffix = (() => {
+  let svgSuffix = 0;
+  return function() {
+    return svgSuffix++;
+  };
+})();
+
+/**
+ * Report-renderer-specific strings.
+ */
+const UIStrings = {
+  /** Disclaimer shown to users below the metric values (First Contentful Paint, Time to Interactive, etc) to warn them that the numbers they see will likely change slightly the next time they run Lighthouse. */
+  varianceDisclaimer: 'Values are estimated and may vary. The [performance score is calculated](https://web.dev/performance-scoring/) directly from these metrics.',
+  /** Text link pointing to an interactive calculator that explains Lighthouse scoring. The link text should be fairly short. */
+  calculatorLink: 'See calculator.',
+  /** Label preceding a radio control for filtering the list of audits. The radio choices are various performance metrics (FCP, LCP, TBT), and if chosen, the audits in the report are hidden if they are not relevant to the selected metric. */
+  showRelevantAudits: 'Show audits relevant to:',
+  /** Column heading label for the listing of opportunity audits. Each audit title represents an opportunity. There are only 2 columns, so no strict character limit.  */
+  opportunityResourceColumnLabel: 'Opportunity',
+  /** Column heading label for the estimated page load savings of opportunity audits. Estimated Savings is the total amount of time (in seconds) that Lighthouse computed could be reduced from the total page load time, if the suggested action is taken. There are only 2 columns, so no strict character limit. */
+  opportunitySavingsColumnLabel: 'Estimated Savings',
+
+  /** An error string displayed next to a particular audit when it has errored, but not provided any specific error message. */
+  errorMissingAuditInfo: 'Report error: no audit information',
+  /** A label, shown next to an audit title or metric title, indicating that there was an error computing it. The user can hover on the label to reveal a tooltip with the extended error message. Translation should be short (< 20 characters). */
+  errorLabel: 'Error!',
+  /** This label is shown above a bulleted list of warnings. It is shown directly below an audit that produced warnings. Warnings describe situations the user should be aware of, as Lighthouse was unable to complete all the work required on this audit. For example, The 'Unable to decode image (biglogo.jpg)' warning may show up below an image encoding audit. */
+  warningHeader: 'Warnings: ',
+  /** Section heading shown above a list of passed audits that contain warnings. Audits under this section do not negatively impact the score, but Lighthouse has generated some potentially actionable suggestions that should be reviewed. This section is expanded by default and displays after the failing audits. */
+  warningAuditsGroupTitle: 'Passed audits but with warnings',
+  /** Section heading shown above a list of audits that are passing. 'Passed' here refers to a passing grade. This section is collapsed by default, as the user should be focusing on the failed audits instead. Users can click this heading to reveal the list. */
+  passedAuditsGroupTitle: 'Passed audits',
+  /** Section heading shown above a list of audits that do not apply to the page. For example, if an audit is 'Are images optimized?', but the page has no images on it, the audit will be marked as not applicable. This is neither passing or failing. This section is collapsed by default, as the user should be focusing on the failed audits instead. Users can click this heading to reveal the list. */
+  notApplicableAuditsGroupTitle: 'Not applicable',
+  /** Section heading shown above a list of audits that were not computed by Lighthouse. They serve as a list of suggestions for the user to go and manually check. For example, Lighthouse can't automate testing cross-browser compatibility, so that is listed within this section, so the user is reminded to test it themselves. This section is collapsed by default, as the user should be focusing on the failed audits instead. Users can click this heading to reveal the list. */
+  manualAuditsGroupTitle: 'Additional items to manually check',
+
+  /** Label shown preceding any important warnings that may have invalidated the entire report. For example, if the user has Chrome extensions installed, they may add enough performance overhead that Lighthouse's performance metrics are unreliable. If shown, this will be displayed at the top of the report UI. */
+  toplevelWarningsMessage: 'There were issues affecting this run of Lighthouse:',
+
+  /** String of text shown in a graphical representation of the flow of network requests for the web page. This label represents the initial network request that fetches an HTML page. This navigation may be redirected (eg. Initial navigation to http://example.com redirects to https://www.example.com). */
+  crcInitialNavigation: 'Initial Navigation',
+  /** Label of value shown in the summary of critical request chains. Refers to the total amount of time (milliseconds) of the longest critical path chain/sequence of network requests. Example value: 2310 ms */
+  crcLongestDurationLabel: 'Maximum critical path latency:',
+
+  /** Label for button that shows all lines of the snippet when clicked */
+  snippetExpandButtonLabel: 'Expand snippet',
+  /** Label for button that only shows a few lines of the snippet when clicked */
+  snippetCollapseButtonLabel: 'Collapse snippet',
+
+  /** Explanation shown to users below performance results to inform them that the test was done with a 4G network connection and to warn them that the numbers they see will likely change slightly the next time they run Lighthouse. 'Lighthouse' becomes link text to additional documentation. */
+  lsPerformanceCategoryDescription: '[Lighthouse](https://developers.google.com/web/tools/lighthouse/) analysis of the current page on an emulated mobile network. Values are estimated and may vary.',
+  /** Title of the lab data section of the Performance category. Within this section are various speed metrics which quantify the pageload performance into values presented in seconds and milliseconds. "Lab" is an abbreviated form of "laboratory", and refers to the fact that the data is from a controlled test of a website, not measurements from real users visiting that site.  */
+  labDataTitle: 'Lab Data',
+
+  /** This label is for a checkbox above a table of items loaded by a web page. The checkbox is used to show or hide third-party (or "3rd-party") resources in the table, where "third-party resources" refers to items loaded by a web page from URLs that aren't controlled by the owner of the web page. */
+  thirdPartyResourcesLabel: 'Show 3rd-party resources',
+  /** This label is for a button that opens a new tab to a webapp called "Treemap", which is a nested visual representation of a heierarchy of data related to the reports (script bytes and coverage, resource breakdown, etc.) */
+  viewTreemapLabel: 'View Treemap',
+  /** This label is for a button that will show the user a trace of the page. */
+  viewTraceLabel: 'View Trace',
+  /** This label is for a button that will show the user a trace of the page. */
+  viewOriginalTraceLabel: 'View Original Trace',
+
+  /** Option in a dropdown menu that opens a small, summary report in a print dialog.  */
+  dropdownPrintSummary: 'Print Summary',
+  /** Option in a dropdown menu that opens a full Lighthouse report in a print dialog.  */
+  dropdownPrintExpanded: 'Print Expanded',
+  /** Option in a dropdown menu that copies the Lighthouse JSON object to the system clipboard. */
+  dropdownCopyJSON: 'Copy JSON',
+  /** Option in a dropdown menu that saves the Lighthouse report HTML locally to the system as a '.html' file. */
+  dropdownSaveHTML: 'Save as HTML',
+  /** Option in a dropdown menu that saves the Lighthouse JSON object to the local system as a '.json' file. */
+  dropdownSaveJSON: 'Save as JSON',
+  /** Option in a dropdown menu that opens the current report in the Lighthouse Viewer Application. */
+  dropdownViewer: 'Open in Viewer',
+  /** Option in a dropdown menu that saves the current report as a new GitHub Gist. */
+  dropdownSaveGist: 'Save as Gist',
+  /** Option in a dropdown menu that toggles the themeing of the report between Light(default) and Dark themes. */
+  dropdownDarkTheme: 'Toggle Dark Theme',
+
+  /** Label for a row in a table that describes the kind of device that was emulated for the Lighthouse run.  Example values for row elements: 'No Emulation', 'Emulated Desktop', etc. */
+  runtimeSettingsDevice: 'Device',
+  /** Label for a row in a table that describes the network throttling conditions that were used during a Lighthouse run, if any. */
+  runtimeSettingsNetworkThrottling: 'Network throttling',
+  /** Label for a row in a table that describes the CPU throttling conditions that were used during a Lighthouse run, if any.*/
+  runtimeSettingsCPUThrottling: 'CPU throttling',
+  /** Label for a row in a table that shows the User Agent that was used to send out all network requests during the Lighthouse run. */
+  runtimeSettingsUANetwork: 'User agent (network)',
+  /** Label for a row in a table that shows the estimated CPU power of the machine running Lighthouse. Example row values: 532, 1492, 783. */
+  runtimeSettingsBenchmark: 'CPU/Memory Power',
+  /** Label for a row in a table that shows the version of the Axe library used. Example row values: 2.1.0, 3.2.3 */
+  runtimeSettingsAxeVersion: 'Axe version',
+
+  /** Label for button to create an issue against the Lighthouse GitHub project. */
+  footerIssue: 'File an issue',
+
+  /** Descriptive explanation for emulation setting when no device emulation is set. */
+  runtimeNoEmulation: 'No emulation',
+  /** Descriptive explanation for emulation setting when emulating a Moto G4 mobile device. */
+  runtimeMobileEmulation: 'Emulated Moto G4',
+  /** Descriptive explanation for emulation setting when emulating a generic desktop form factor, as opposed to a mobile-device like form factor. */
+  runtimeDesktopEmulation: 'Emulated Desktop',
+  /** Descriptive explanation for a runtime setting that is set to an unknown value. */
+  runtimeUnknown: 'Unknown',
+  /** Descriptive label that this analysis run was from a single pageload of a browser (not a summary of hundreds of loads) */
+  runtimeSingleLoad: 'Single page load',
+  /** Descriptive label that this analysis only considers the initial load of the page, and no interaction beyond when the page had "fully loaded" */
+  runtimeAnalysisWindow: 'Initial page load',
+  /** Descriptive explanation that this analysis run was from a single pageload of a browser, whereas field data often summarizes hundreds+ of page loads */
+  runtimeSingleLoadTooltip: 'This data is taken from a single page load, as opposed to field data summarizing many sessions.', // eslint-disable-line max-len
+
+  /** Descriptive explanation for environment throttling that was provided by the runtime environment instead of provided by Lighthouse throttling. */
+  throttlingProvided: 'Provided by environment',
+  /** Label for an interactive control that will reveal or hide a group of content. This control toggles between the text 'Show' and 'Hide'. */
+  show: 'Show',
+  /** Label for an interactive control that will reveal or hide a group of content. This control toggles between the text 'Show' and 'Hide'. */
+  hide: 'Hide',
+  /** Label for an interactive control that will reveal or hide a group of content. This control toggles between the text 'Expand view' and 'Collapse view'. */
+  expandView: 'Expand view',
+  /** Label for an interactive control that will reveal or hide a group of content. This control toggles between the text 'Expand view' and 'Collapse view'. */
+  collapseView: 'Collapse view',
+  /** Label indicating that Lighthouse throttled the page to emulate a slow 4G network connection. */
+  runtimeSlow4g: 'Slow 4G throttling',
+  /** Label indicating that Lighthouse throttled the page using custom throttling settings. */
+  runtimeCustom: 'Custom throttling',
+};
+Util.UIStrings = UIStrings;
+
+module.exports = {
+  Util,
+  UIStrings,
+};

From f07801439ad07aa86069aee824f3e65831059c78 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 13 May 2022 11:30:55 -0700
Subject: [PATCH 35/96] config tests passing

---
 lighthouse-core/config/config.js              | 17 ++++----
 lighthouse-core/fraggle-rock/config/config.js |  8 ++--
 lighthouse-core/test/config/config-test.js    | 39 +++++++++++--------
 .../test/fixtures/valid-custom-audit.cjs      | 21 ++++++++++
 .../test/fixtures/valid-custom-audit.js       |  6 +--
 .../test/fraggle-rock/config/config-test.js   | 11 +++++-
 lighthouse-core/test/scoring-test.js          |  2 +-
 tsconfig.json                                 |  2 +-
 8 files changed, 70 insertions(+), 36 deletions(-)
 create mode 100644 lighthouse-core/test/fixtures/valid-custom-audit.cjs

diff --git a/lighthouse-core/config/config.js b/lighthouse-core/config/config.js
index 8d2f150d721f..93027ca8f0de 100644
--- a/lighthouse-core/config/config.js
+++ b/lighthouse-core/config/config.js
@@ -538,11 +538,13 @@ class Config {
     log.time(status, 'verbose');
 
     const coreList = Runner.getGathererList();
-    const fullPassesPromises = passes.map(async (pass) => {
-      const gathererDefns = await Promise.all(
-        pass.gatherers
-          .map(gatherer => resolveGathererToDefn(gatherer, coreList, configDir))
-      );
+
+    const fullPasses = [];
+    for (const pass of passes) {
+      const gathererDefns = [];
+      for (const gatherer of pass.gatherers) {
+        gathererDefns.push(await resolveGathererToDefn(gatherer, coreList, configDir));
+      }
 
       // De-dupe gatherers by artifact name because artifact IDs must be unique at runtime.
       const uniqueDefns = Array.from(
@@ -550,9 +552,8 @@ class Config {
       );
       uniqueDefns.forEach(gatherer => assertValidGatherer(gatherer.instance, gatherer.path));
 
-      return Object.assign(pass, {gatherers: uniqueDefns});
-    });
-    const fullPasses = await Promise.all(fullPassesPromises);
+      fullPasses.push(Object.assign(pass, {gatherers: uniqueDefns}));
+    }
 
     log.timeEnd(status);
     return fullPasses;
diff --git a/lighthouse-core/fraggle-rock/config/config.js b/lighthouse-core/fraggle-rock/config/config.js
index a1fd6eb66f82..7d469982ceef 100644
--- a/lighthouse-core/fraggle-rock/config/config.js
+++ b/lighthouse-core/fraggle-rock/config/config.js
@@ -140,7 +140,8 @@ async function resolveArtifactsToDefns(artifacts, configDir) {
   const artifactDefnsBySymbol = new Map();
 
   const coreGathererList = Runner.getGathererList();
-  const artifactDefnsPromises = artifacts.map(async (artifactJson) => {
+  const artifactDefns = [];
+  for (const artifactJson of artifacts) {
     /** @type {LH.Config.GathererJson} */
     // @ts-expect-error - remove when legacy runner path is removed.
     const gathererJson = artifactJson.gatherer;
@@ -161,9 +162,8 @@ async function resolveArtifactsToDefns(artifacts, configDir) {
 
     const symbol = artifact.gatherer.instance.meta.symbol;
     if (symbol) artifactDefnsBySymbol.set(symbol, artifact);
-    return artifact;
-  });
-  const artifactDefns = await Promise.all(artifactDefnsPromises);
+    artifactDefns.push(artifact);
+  }
 
   log.timeEnd(status);
   return artifactDefns;
diff --git a/lighthouse-core/test/config/config-test.js b/lighthouse-core/test/config/config-test.js
index 8a0778bfcbf9..6cd6882132f0 100644
--- a/lighthouse-core/test/config/config-test.js
+++ b/lighthouse-core/test/config/config-test.js
@@ -365,12 +365,29 @@ describe('Config', () => {
     }, {configPath}), /absolute path/);
   });
 
-  it('loads an audit relative to a config path', async () => {
-    const configPath = __filename;
+  ['', '.js', '.cjs'].forEach(variant => {
+    describe(`(${variant}) loads an audit`, () => {
+      it('loads an audit relative to a config path', async () => {
+        const configPath = __filename;
+
+        return assert.doesNotThrow(_ => Config.fromJson({
+          audits: ['../fixtures/valid-custom-audit' + variant],
+        }, {configPath}));
+      });
 
-    return assert.doesNotThrow(_ => Config.fromJson({
-      audits: ['../fixtures/valid-custom-audit'],
-    }, {configPath}));
+      it('loads an audit relative to the working directory', async () => {
+        // Construct an audit URL relative to current working directory, regardless
+        // of where test was started from.
+        const absoluteAuditPath =
+          path.resolve(__dirname, '../fixtures/valid-custom-audit' + variant);
+        assert.doesNotThrow(_ => require.resolve(absoluteAuditPath));
+        const relativePath = path.relative(process.cwd(), absoluteAuditPath);
+
+        return assert.doesNotThrow(_ => Config.fromJson({
+          audits: [relativePath],
+        }));
+      });
+    });
   });
 
   it('loads an audit from node_modules/', async () => {
@@ -383,18 +400,6 @@ describe('Config', () => {
     });
   });
 
-  it('loads an audit relative to the working directory', async () => {
-    // Construct an audit URL relative to current working directory, regardless
-    // of where test was started from.
-    const absoluteAuditPath = path.resolve(__dirname, '../fixtures/valid-custom-audit');
-    assert.doesNotThrow(_ => require.resolve(absoluteAuditPath));
-    const relativePath = path.relative(process.cwd(), absoluteAuditPath);
-
-    return assert.doesNotThrow(_ => Config.fromJson({
-      audits: [relativePath],
-    }));
-  });
-
   it('throws but not for missing audit when audit has a dependency error', async () => {
     await assert.rejects(Config.fromJson({
       audits: [path.resolve(__dirname, '../fixtures/invalid-audits/require-error.js')],
diff --git a/lighthouse-core/test/fixtures/valid-custom-audit.cjs b/lighthouse-core/test/fixtures/valid-custom-audit.cjs
new file mode 100644
index 000000000000..61a98a10c72a
--- /dev/null
+++ b/lighthouse-core/test/fixtures/valid-custom-audit.cjs
@@ -0,0 +1,21 @@
+/**
+ * @license Copyright 2022 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.
+ */
+
+module.exports = import('../../audits/audit.js').then(({Audit}) => {
+  return class ValidCustomAudit extends Audit {
+    static get meta() {
+      return {
+        id: 'valid-audit',
+        title: 'Valid Audit',
+        failureTitle: 'Valid failing Audit',
+        description: 'Valid-sounding description',
+        requiredArtifacts: ['HTML'],
+      };
+    }
+
+    static audit() {}
+  };
+});
diff --git a/lighthouse-core/test/fixtures/valid-custom-audit.js b/lighthouse-core/test/fixtures/valid-custom-audit.js
index 2bcc3133af9a..c8f4e7bae867 100644
--- a/lighthouse-core/test/fixtures/valid-custom-audit.js
+++ b/lighthouse-core/test/fixtures/valid-custom-audit.js
@@ -5,9 +5,9 @@
  */
 
 
-const LighthouseAudit = require('../../audits/audit.js');
+import {Audit} from '../../audits/audit.js';
 
-class ValidCustomAudit extends LighthouseAudit {
+class ValidCustomAudit extends Audit {
   static get meta() {
     return {
       id: 'valid-audit',
@@ -21,4 +21,4 @@ class ValidCustomAudit extends LighthouseAudit {
   static audit() {}
 }
 
-module.exports = ValidCustomAudit;
+export default ValidCustomAudit;
diff --git a/lighthouse-core/test/fraggle-rock/config/config-test.js b/lighthouse-core/test/fraggle-rock/config/config-test.js
index 0c079daf408f..280dd2b0f56d 100644
--- a/lighthouse-core/test/fraggle-rock/config/config-test.js
+++ b/lighthouse-core/test/fraggle-rock/config/config-test.js
@@ -478,7 +478,14 @@ describe('Fraggle Rock Config', () => {
       artifacts: [{id: 'artifact', gatherer: {instance: new BaseGatherer()}}],
     };
 
-    expect(initializeConfig(extensionConfig, {gatherMode: 'navigation'}))
-      .rejects.toThrow(/did not support any gather modes/);
+    // https://github.com/facebook/jest/issues/11438
+    // expect(initializeConfig(extensionConfig, {gatherMode: 'navigation'}))
+    //   .rejects.toThrow(/did not support any gather modes/);
+    try {
+      await initializeConfig(extensionConfig, {gatherMode: 'navigation'});
+      throw new Error('did not throw');
+    } catch (err) {
+      expect(err.message).toMatch(/did not support any gather modes/);
+    }
   });
 });
diff --git a/lighthouse-core/test/scoring-test.js b/lighthouse-core/test/scoring-test.js
index 03ff46fe3c3d..68dbdcd6ffad 100644
--- a/lighthouse-core/test/scoring-test.js
+++ b/lighthouse-core/test/scoring-test.js
@@ -6,7 +6,7 @@
 
 import {strict as assert} from 'assert';
 
-import ReportScoring from '../scoring.js';
+import {ReportScoring} from '../scoring.js';
 
 describe('ReportScoring', () => {
   describe('#arithmeticMean', () => {
diff --git a/tsconfig.json b/tsconfig.json
index 3904fad68bba..8646e468e8e7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -32,7 +32,7 @@
     "lighthouse-core/test/fixtures/traces/lcp-m78.devtools.log.json",
     "third-party/snyk/snapshot.json",
     "lighthouse-core/audits/byte-efficiency/polyfill-graph-data.json",
-    "shared/localization/locales/en-US.json", "lighthouse-core/util-commonjs.cjs",
+    "shared/localization/locales/en-US.json",
   ],
   "exclude": [
     "lighthouse-core/test/audits/**/*.js",

From 52028aed54f1f9a8485cbc737fd7756adad48d1d Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 13 May 2022 12:15:44 -0700
Subject: [PATCH 36/96] fraggle rock tests passing

---
 .../test/fraggle-rock/gather/mock-driver.js         |  2 +-
 .../fraggle-rock/gather/navigation-runner-test.js   | 11 ++++-------
 .../fraggle-rock/gather/snapshot-runner-test.js     |  6 +++---
 .../fraggle-rock/gather/timespan-runner-test.js     |  6 +++---
 lighthouse-core/test/fraggle-rock/user-flow-test.js | 13 ++++++-------
 5 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/lighthouse-core/test/fraggle-rock/gather/mock-driver.js b/lighthouse-core/test/fraggle-rock/gather/mock-driver.js
index b8ce58548664..bb0d78ee43d9 100644
--- a/lighthouse-core/test/fraggle-rock/gather/mock-driver.js
+++ b/lighthouse-core/test/fraggle-rock/gather/mock-driver.js
@@ -153,7 +153,7 @@ function mockRunnerModule() {
     reset,
   };
 
-  jest.unstable_mockModule(`${LH_ROOT}/lighthouse-core/runner.js`, () => runnerModule);
+  jest.unstable_mockModule(`${LH_ROOT}/lighthouse-core/runner.js`, () => ({Runner: runnerModule}));
 
   function reset() {
     runnerModule.getGathererList.mockReturnValue([]);
diff --git a/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js b/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
index 27b05c4fa71a..df47082ce92e 100644
--- a/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
+++ b/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
@@ -19,6 +19,7 @@ import DevtoolsLogGatherer from '../../../gather/gatherers/devtools-log.js';
 import TraceGatherer from '../../../gather/gatherers/trace.js';
 import {fnAny} from '../../test-utils.js';
 import {networkRecordsToDevtoolsLog} from '../../network-records-to-devtools-log.js';
+import {Runner} from '../../../runner.js';
 // import {Runner} from '../../../fraggle-rock/gather/navigation-runner.js';
 
 // Some imports needs to be done dynamically, so that their dependencies will be mocked.
@@ -32,12 +33,10 @@ beforeAll(async () => {
 });
 
 const mocks = mockDriverSubmodules();
-
-/** @type {ReturnType<typeof mockRunnerModule>} */
-let mockRunner;
+const mockRunner = mockRunnerModule();
 
 // Establish the mocks before we import the file under test.
-jest.mock('../../../runner.js', () => mockRunner = mockRunnerModule());
+jest.unstable_mockModule('../../../runner.js', () => ({Runner: mockRunner}));
 
 /** @typedef {{meta: LH.Gatherer.GathererMeta<'Accessibility'>, getArtifact: jest.Mock<any, any>, startInstrumentation:jest.Mock<any, any>, stopInstrumentation: jest.Mock<any, any>, startSensitiveInstrumentation:jest.Mock<any, any>, stopSensitiveInstrumentation: jest.Mock<any, any>}} MockGatherer */
 
@@ -560,9 +559,7 @@ describe('NavigationRunner', () => {
 
   describe('navigation', () => {
     it('should throw on invalid URL', async () => {
-      const runnerActual = /** @type {typeof import('../../../runner.js').Runner} */ (
-        jest.requireActual('../../../runner.js'));
-      mockRunner.gather.mockImplementation(runnerActual.gather);
+      mockRunner.gather.mockImplementation(Runner.gather);
 
       const navigatePromise = runner.navigationGather(
         '',
diff --git a/lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js b/lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js
index dff2efa971c7..f3b560dd6000 100644
--- a/lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js
+++ b/lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js
@@ -31,9 +31,9 @@ const mockRunner = mockRunnerModule();
 /** @type {ReturnType<typeof createMockDriver>} */
 let mockDriver;
 
-jest.mock('../../../fraggle-rock/gather/driver.js', () =>
-  mockDriverModule(() => mockDriver.asDriver())
-);
+jest.unstable_mockModule('../../../fraggle-rock/gather/driver.js', () => ({
+  Driver: mockDriverModule(() => mockDriver.asDriver()),
+}));
 
 describe('Snapshot Runner', () => {
   /** @type {ReturnType<typeof createMockPage>} */
diff --git a/lighthouse-core/test/fraggle-rock/gather/timespan-runner-test.js b/lighthouse-core/test/fraggle-rock/gather/timespan-runner-test.js
index 00f7084a5af1..5313a44b9c23 100644
--- a/lighthouse-core/test/fraggle-rock/gather/timespan-runner-test.js
+++ b/lighthouse-core/test/fraggle-rock/gather/timespan-runner-test.js
@@ -33,9 +33,9 @@ const mockRunner = mockRunnerModule();
 // Establish the mocks before we import the file under test.
 /** @type {ReturnType<typeof createMockDriver>} */
 let mockDriver;
-jest.mock('../../../fraggle-rock/gather/driver.js', () =>
-  mockDriverModule(() => mockDriver.asDriver())
-);
+jest.unstable_mockModule('../../../fraggle-rock/gather/driver.js', () => ({
+  Driver: mockDriverModule(() => mockDriver.asDriver()),
+}));
 
 describe('Timespan Runner', () => {
   /** @type {ReturnType<typeof createMockPage>} */
diff --git a/lighthouse-core/test/fraggle-rock/user-flow-test.js b/lighthouse-core/test/fraggle-rock/user-flow-test.js
index 2055f98f7a9c..4ccd762e0385 100644
--- a/lighthouse-core/test/fraggle-rock/user-flow-test.js
+++ b/lighthouse-core/test/fraggle-rock/user-flow-test.js
@@ -6,6 +6,7 @@
 
 import {jest} from '@jest/globals';
 
+import {Runner} from '../../runner.js';
 import {createMockPage, mockRunnerModule} from './gather/mock-driver.js';
 // import UserFlow from '../../fraggle-rock/user-flow.js';
 
@@ -22,11 +23,11 @@ beforeAll(async () => {
 });
 
 const snapshotModule = {snapshotGather: jest.fn()};
-jest.mock('../../fraggle-rock/gather/snapshot-runner.js', () => snapshotModule);
+jest.unstable_mockModule('../../fraggle-rock/gather/snapshot-runner.js', () => snapshotModule);
 const navigationModule = {navigationGather: jest.fn()};
-jest.mock('../../fraggle-rock/gather/navigation-runner.js', () => navigationModule);
+jest.unstable_mockModule('../../fraggle-rock/gather/navigation-runner.js', () => navigationModule);
 const timespanModule = {startTimespanGather: jest.fn()};
-jest.mock('../../fraggle-rock/gather/timespan-runner.js', () => timespanModule);
+jest.unstable_mockModule('../../fraggle-rock/gather/timespan-runner.js', () => timespanModule);
 
 const mockRunner = mockRunnerModule();
 
@@ -260,10 +261,8 @@ describe('UserFlow', () => {
 
   describe('auditGatherSteps', () => {
     it('should audit gather steps', async () => {
-      const runnerActual = /** @type {typeof import('../../runner.js').Runner} */ (
-        jest.requireActual('../../runner.js'));
-      mockRunner.getGathererList.mockImplementation(runnerActual.getGathererList);
-      mockRunner.getAuditList.mockImplementation(runnerActual.getAuditList);
+      mockRunner.getGathererList.mockImplementation(Runner.getGathererList);
+      mockRunner.getAuditList.mockImplementation(Runner.getAuditList);
       mockRunner.audit.mockImplementation(artifacts => ({
         lhr: {
           finalUrl: artifacts.URL.finalUrl,

From 688242797f5e869c7d4c92ea315e55b752c91fcc Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 13 May 2022 13:03:02 -0700
Subject: [PATCH 37/96] runner-test passing

---
 .../test/gather/gather-runner-test.js         | 16 +---
 lighthouse-core/test/runner-test.js           | 78 ++++++++++---------
 lighthouse-core/test/test-utils.js            | 16 ++++
 3 files changed, 60 insertions(+), 50 deletions(-)

diff --git a/lighthouse-core/test/gather/gather-runner-test.js b/lighthouse-core/test/gather/gather-runner-test.js
index f4bf2184712d..a63a36a145f2 100644
--- a/lighthouse-core/test/gather/gather-runner-test.js
+++ b/lighthouse-core/test/gather/gather-runner-test.js
@@ -23,24 +23,10 @@ import {
   makePromiseInspectable,
   flushAllTimersAndMicrotasks,
   fnAny,
+  importMock,
 } from '../test-utils.js';
 import {fakeDriver} from './fake-driver.js';
 
-/**
- * Same as jest.requireMock(), but:
- * 1) returns a Mock record instead of `unknown`
- * 2) uses `import` instead of `require`
- * Use only for modules that were mocked with unstable_mockModule.
- *
- * @param {string} moduleName
- * @return {Promise<Record<string, jest.Mock>>}
- */
-const importMock = async (moduleName) => {
-  const mock = await import(moduleName);
-  if (!mock[Object.keys(mock)[0]].mock) throw new Error(`${moduleName} was not mocked!`);
-  return mock;
-};
-
 makeMocksForGatherRunner();
 
 function createTypeHackedGatherRunner() {
diff --git a/lighthouse-core/test/runner-test.js b/lighthouse-core/test/runner-test.js
index 6ec4fa39c5dd..d6235a0edf3d 100644
--- a/lighthouse-core/test/runner-test.js
+++ b/lighthouse-core/test/runner-test.js
@@ -19,10 +19,10 @@ import {Gatherer} from '../gather/gatherers/gatherer.js';
 import * as assetSaver from '../lib/asset-saver.js';
 import {LighthouseError} from '../lib/lh-error.js';
 import * as i18n from '../lib/i18n/i18n.js';
-import {makeMocksForGatherRunner} from './test-utils.js';
+import {importMock, makeMocksForGatherRunner} from './test-utils.js';
 import {createCommonjsRefs} from '../scripts/esm-utils.js';
 
-const {require, __dirname} = createCommonjsRefs(import.meta);
+const {__dirname} = createCommonjsRefs(import.meta);
 
 // Some imports needs to be done dynamically, so that their dependencies will be mocked.
 // See: https://jestjs.io/docs/ecmascript-modules#differences-between-esm-and-commonjs
@@ -34,12 +34,47 @@ let GatherRunner;
 /** @type {typeof import('../config/config.js').Config} */
 let Config;
 
+/** @type {jest.Mock} */
+let saveArtifactsSpy;
+/** @type {jest.Mock} */
+let saveLhrSpy;
+/** @type {jest.Mock} */
+let loadArtifactsSpy;
+/** @type {jest.Mock} */
+let gatherRunnerRunSpy;
+/** @type {jest.Mock} */
+let runAuditSpy;
+
+jest.unstable_mockModule('../lib/asset-saver.js', () => ({
+  saveArtifacts: saveArtifactsSpy = jest.fn(),
+  saveLhr: saveLhrSpy = jest.fn(),
+  loadArtifacts: loadArtifactsSpy = jest.fn(),
+  gatherRunnerRun: gatherRunnerRunSpy = jest.fn(),
+  runAudit: runAuditSpy = jest.fn(),
+}));
+
 beforeAll(async () => {
   Runner = (await import('../runner.js')).Runner;
   GatherRunner = (await import('../gather/gather-runner.js')).GatherRunner;
   Config = (await import('../config/config.js')).Config;
 });
 
+beforeEach(() => {
+  saveArtifactsSpy.mockImplementation(assetSaver.saveArtifacts);
+  saveLhrSpy.mockImplementation(() => {});
+  loadArtifactsSpy.mockImplementation(assetSaver.loadArtifacts);
+  gatherRunnerRunSpy = jest.spyOn(GatherRunner, 'run');
+  runAuditSpy = jest.spyOn(Runner, '_runAudit');
+});
+
+afterEach(() => {
+  saveArtifactsSpy.mockReset();
+  saveLhrSpy.mockReset();
+  loadArtifactsSpy.mockReset();
+  gatherRunnerRunSpy.mockRestore();
+  runAuditSpy.mockRestore();
+});
+
 makeMocksForGatherRunner();
 
 jest.unstable_mockModule('../gather/driver/service-workers.js', () => ({
@@ -63,33 +98,6 @@ describe('Runner', () => {
     return Runner.audit(artifacts, opts);
   };
 
-  /** @type {jest.Mock} */
-  let saveArtifactsSpy;
-  /** @type {jest.Mock} */
-  let saveLhrSpy;
-  /** @type {jest.Mock} */
-  let loadArtifactsSpy;
-  /** @type {jest.Mock} */
-  let gatherRunnerRunSpy;
-  /** @type {jest.Mock} */
-  let runAuditSpy;
-
-  beforeEach(() => {
-    saveArtifactsSpy = jest.spyOn(assetSaver, 'saveArtifacts');
-    saveLhrSpy = jest.spyOn(assetSaver, 'saveLhr').mockImplementation(() => {});
-    loadArtifactsSpy = jest.spyOn(assetSaver, 'loadArtifacts');
-    gatherRunnerRunSpy = jest.spyOn(GatherRunner, 'run');
-    runAuditSpy = jest.spyOn(Runner, '_runAudit');
-  });
-
-  afterEach(() => {
-    saveArtifactsSpy.mockRestore();
-    saveLhrSpy.mockRestore();
-    loadArtifactsSpy.mockRestore();
-    gatherRunnerRunSpy.mockRestore();
-    runAuditSpy.mockRestore();
-  });
-
   const basicAuditMeta = {
     id: 'test-audit',
     title: 'A test audit',
@@ -486,7 +494,7 @@ describe('Runner', () => {
       assert.strictEqual(auditResult.scoreDisplayMode, 'error');
       assert.ok(auditResult.errorMessage.includes(errorMessage));
 
-      fs.rmSync(resolvedPath, {recursive: true, force: true});
+      fs.rmSync(resolvedPath, {recursive: true});
     });
 
     it('only passes the requested artifacts to the audit (no optional artifacts)', async () => {
@@ -677,14 +685,14 @@ describe('Runner', () => {
     });
   });
 
-  it('only supports core audits with names matching their filename', () => {
+  it('only supports core audits with ids matching their filename', async () => {
     const coreAudits = Runner.getAuditList();
-    coreAudits.forEach(auditFilename => {
+    for (const auditFilename of coreAudits) {
       const auditPath = '../audits/' + auditFilename;
       const auditExpectedName = path.basename(auditFilename, '.js');
-      const AuditClass = require(auditPath);
+      const {default: AuditClass} = await import(auditPath);
       assert.strictEqual(AuditClass.meta.id, auditExpectedName);
-    });
+    }
   });
 
   it('results include artifacts when given artifacts and audits', async () => {
@@ -827,7 +835,7 @@ describe('Runner', () => {
         // Loads the page successfully in the first pass, fails with PAGE_HUNG in the second.
       });
 
-      const gotoURL = jest.requireMock('../gather/driver/navigation.js').gotoURL;
+      const {gotoURL} = await importMock('../gather/driver/navigation.js');
       gotoURL.mockImplementation((_, url) => {
         if (url.includes('blank')) return {mainDocumentUrl: '', warnings: []};
         if (firstLoad) {
diff --git a/lighthouse-core/test/test-utils.js b/lighthouse-core/test/test-utils.js
index 1123343693f4..7e3479438bd7 100644
--- a/lighthouse-core/test/test-utils.js
+++ b/lighthouse-core/test/test-utils.js
@@ -266,6 +266,21 @@ function getURLArtifactFromDevtoolsLog(devtoolsLog) {
   return {initialUrl: 'about:blank', requestedUrl, mainDocumentUrl, finalUrl: mainDocumentUrl};
 }
 
+/**
+ * Same as jest.requireMock(), but:
+ * 1) returns a Mock record instead of `unknown`
+ * 2) uses `import` instead of `require`
+ * Use only for modules that were mocked with unstable_mockModule.
+ *
+ * @param {string} moduleName
+ * @return {Promise<Record<string, jest.Mock>>}
+ */
+const importMock = async (moduleName) => {
+  const mock = await import(moduleName);
+  if (!mock[Object.keys(mock)[0]].mock) throw new Error(`${moduleName} was not mocked!`);
+  return mock;
+};
+
 export {
   getProtoRoundTrip,
   loadSourceMapFixture,
@@ -279,4 +294,5 @@ export {
   mockCommands,
   createScript,
   getURLArtifactFromDevtoolsLog,
+  importMock,
 };

From 64b4dc072d93d425aa43aaa7c3d11ce2f32b9239 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 13 May 2022 13:09:40 -0700
Subject: [PATCH 38/96] fix importMock

---
 .../test/gather/gather-runner-test.js         | 20 +++++++++----------
 lighthouse-core/test/runner-test.js           |  2 +-
 lighthouse-core/test/test-utils.js            | 15 ++++++++++----
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/lighthouse-core/test/gather/gather-runner-test.js b/lighthouse-core/test/gather/gather-runner-test.js
index a63a36a145f2..d3989abb7345 100644
--- a/lighthouse-core/test/gather/gather-runner-test.js
+++ b/lighthouse-core/test/gather/gather-runner-test.js
@@ -149,7 +149,7 @@ beforeEach(async () => {
   driver = new EmulationDriver(connectionStub);
   resetDefaultMockResponses();
 
-  const {gotoURL} = await importMock('../../gather/driver/navigation.js');
+  const {gotoURL} = await importMock('../../gather/driver/navigation.js', import.meta);
   gotoURL.mockReset().mockResolvedValue({
     mainDocumentUrl: 'https://example.com',
     timedOut: false,
@@ -167,7 +167,7 @@ describe('GatherRunner', function() {
     const url1 = 'https://example.com';
     const url2 = 'https://example.com/interstitial';
     const driver = {};
-    const {gotoURL} = await importMock('../../gather/driver/navigation.js');
+    const {gotoURL} = await importMock('../../gather/driver/navigation.js', import.meta);
     gotoURL.mockResolvedValue({mainDocumentUrl: url2, warnings: []});
 
     const passContext = {
@@ -194,7 +194,7 @@ describe('GatherRunner', function() {
     const url = 'https://example.com';
     const error = new LighthouseError(LighthouseError.errors.NO_FCP);
     const driver = {};
-    const {gotoURL} = await importMock('../../gather/driver/navigation.js');
+    const {gotoURL} = await importMock('../../gather/driver/navigation.js', import.meta);
     gotoURL.mockRejectedValue(error);
 
     const passContext = {
@@ -242,7 +242,7 @@ describe('GatherRunner', function() {
   it('collects requested and final URLs as an artifact', async () => {
     const requestedUrl = 'https://example.com';
     const mainDocumentUrl = 'https://example.com/interstitial';
-    const {gotoURL} = await importMock('../../gather/driver/navigation.js');
+    const {gotoURL} = await importMock('../../gather/driver/navigation.js', import.meta);
     gotoURL.mockResolvedValue({mainDocumentUrl, timedOut: false, warnings: []});
     const config = await makeConfig({passes: [{passName: 'defaultPass'}]});
     const options = {
@@ -456,7 +456,7 @@ describe('GatherRunner', function() {
       LighthouseRunWarnings: [],
     };
 
-    const prepare = await importMock('../../gather/driver/prepare.js');
+    const prepare = await importMock('../../gather/driver/prepare.js', import.meta);
     await GatherRunner.runPass(passContext);
     expect(prepare.prepareTargetForIndividualNavigation).toHaveBeenCalled();
   });
@@ -508,7 +508,7 @@ describe('GatherRunner', function() {
       },
     });
 
-    const {gotoURL} = await importMock('../../gather/driver/navigation.js');
+    const {gotoURL} = await importMock('../../gather/driver/navigation.js', import.meta);
     gotoURL.mockImplementation(
       /** @param {any} _ @param {string} url */
       (_, url) => url.includes('blank') ? null : Promise.reject(navigationError)
@@ -552,7 +552,7 @@ describe('GatherRunner', function() {
       },
     });
 
-    const {gotoURL} = await importMock('../../gather/driver/navigation.js');
+    const {gotoURL} = await importMock('../../gather/driver/navigation.js', import.meta);
     gotoURL.mockImplementation(
       /** @param {any} _ @param {string} url */
       (_, url) => url.includes('blank') ? gotoUrlForAboutBlank() : gotoUrlForRealUrl()
@@ -825,7 +825,7 @@ describe('GatherRunner', function() {
     let firstLoad = true;
     const driver = Object.assign({}, fakeDriver, {online: true});
 
-    const {gotoURL} = await importMock('../../gather/driver/navigation.js');
+    const {gotoURL} = await importMock('../../gather/driver/navigation.js', import.meta);
 
     gotoURL.mockImplementation(
       /**
@@ -1238,7 +1238,7 @@ describe('GatherRunner', function() {
         online: true,
       });
 
-      const {gotoURL} = await importMock('../../gather/driver/navigation.js');
+      const {gotoURL} = await importMock('../../gather/driver/navigation.js', import.meta);
       gotoURL.mockResolvedValue({mainDocumentUrl: requestedUrl, warnings: ['It is too slow']});
 
       return GatherRunner.run(config.passes, {
@@ -1270,7 +1270,7 @@ describe('GatherRunner', function() {
         online: true,
       });
 
-      const {gotoURL} = await importMock('../../gather/driver/navigation.js');
+      const {gotoURL} = await importMock('../../gather/driver/navigation.js', import.meta);
       gotoURL
         .mockResolvedValueOnce({finalUrl: requestedUrl, warnings: []})
         .mockResolvedValueOnce({finalUrl: requestedUrl, warnings: ['It is too slow']});
diff --git a/lighthouse-core/test/runner-test.js b/lighthouse-core/test/runner-test.js
index d6235a0edf3d..11c16675d938 100644
--- a/lighthouse-core/test/runner-test.js
+++ b/lighthouse-core/test/runner-test.js
@@ -835,7 +835,7 @@ describe('Runner', () => {
         // Loads the page successfully in the first pass, fails with PAGE_HUNG in the second.
       });
 
-      const {gotoURL} = await importMock('../gather/driver/navigation.js');
+      const {gotoURL} = await importMock('../gather/driver/navigation.js', import.meta);
       gotoURL.mockImplementation((_, url) => {
         if (url.includes('blank')) return {mainDocumentUrl: '', warnings: []};
         if (firstLoad) {
diff --git a/lighthouse-core/test/test-utils.js b/lighthouse-core/test/test-utils.js
index 7e3479438bd7..13c43f823921 100644
--- a/lighthouse-core/test/test-utils.js
+++ b/lighthouse-core/test/test-utils.js
@@ -5,6 +5,8 @@
  */
 
 import fs from 'fs';
+import path from 'path';
+import url from 'url';
 
 import {jest} from '@jest/globals';
 
@@ -272,12 +274,17 @@ function getURLArtifactFromDevtoolsLog(devtoolsLog) {
  * 2) uses `import` instead of `require`
  * Use only for modules that were mocked with unstable_mockModule.
  *
- * @param {string} moduleName
+ * Resolves module path relative to importMeta.url.
+ *
+ * @param {string} modulePath
+ * @param {ImportMeta} importMeta
  * @return {Promise<Record<string, jest.Mock>>}
  */
-const importMock = async (moduleName) => {
-  const mock = await import(moduleName);
-  if (!mock[Object.keys(mock)[0]].mock) throw new Error(`${moduleName} was not mocked!`);
+const importMock = async (modulePath, importMeta) => {
+  const dir = path.dirname(url.fileURLToPath(importMeta.url));
+  modulePath = path.resolve(dir, modulePath);
+  const mock = await import(modulePath);
+  if (!mock[Object.keys(mock)[0]].mock) throw new Error(`${modulePath} was not mocked!`);
   return mock;
 };
 

From bcf025d231d5aef558d3f8785189c826e9ec48c1 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 13 May 2022 15:13:14 -0700
Subject: [PATCH 39/96] build-all working

---
 .eslintrc.js => .eslintrc.cjs                 |  0
 build/build-bundle.js                         | 36 ++++++++++---------
 build/build-lightrider-bundles.js             |  5 ---
 clients/{.eslintrc.js => .eslintrc.cjs}       |  0
 docs/recipes/auth/.eslintrc.js                |  2 +-
 ...t-local-rules.js => eslint-local-rules.cjs |  0
 flow-report/.eslintrc.cjs                     |  2 +-
 jest.config.js => jest.config.cjs             |  0
 .../byte-efficiency/legacy-javascript.js      | 11 ++++--
 lighthouse-core/config/config-helpers.js      |  8 ++---
 lighthouse-core/config/config.js              |  6 ++--
 lighthouse-core/fraggle-rock/config/config.js |  5 ++-
 lighthouse-core/lib/asset-saver.js            |  4 ++-
 lighthouse-core/lib/i18n/i18n.js              |  4 +--
 lighthouse-core/runner.js                     | 30 ++++++++--------
 lighthouse-core/scripts/esm-utils.js          |  9 +++++
 package.json                                  |  1 +
 root.js                                       | 25 +++++++------
 shared/package.json                           |  4 +++
 third-party/package.json                      |  4 +++
 20 files changed, 88 insertions(+), 68 deletions(-)
 rename .eslintrc.js => .eslintrc.cjs (100%)
 rename clients/{.eslintrc.js => .eslintrc.cjs} (100%)
 rename eslint-local-rules.js => eslint-local-rules.cjs (100%)
 rename jest.config.js => jest.config.cjs (100%)
 create mode 100644 shared/package.json
 create mode 100644 third-party/package.json

diff --git a/.eslintrc.js b/.eslintrc.cjs
similarity index 100%
rename from .eslintrc.js
rename to .eslintrc.cjs
diff --git a/build/build-bundle.js b/build/build-bundle.js
index bc37f8c9f60d..e77b205f208f 100644
--- a/build/build-bundle.js
+++ b/build/build-bundle.js
@@ -15,8 +15,9 @@ import {execSync} from 'child_process';
 
 import esMain from 'es-main';
 import {rollup} from 'rollup';
-// @ts-expect-error: plugin has no types.
-import PubAdsPlugin from 'lighthouse-plugin-publisher-ads/plugin.js';
+// TODO(esmodules): convert pubads to esm
+// // @ts-expect-error: plugin has no types.
+// import PubAdsPlugin from 'lighthouse-plugin-publisher-ads/plugin.js';
 
 import * as rollupPlugins from './rollup-plugins.js';
 import {Runner} from '../lighthouse-core/runner.js';
@@ -30,8 +31,8 @@ const COMMIT_HASH = execSync('git rev-parse HEAD').toString().trim();
 
 // HACK: manually include the lighthouse-plugin-publisher-ads audits.
 /** @type {Array<string>} */
-// @ts-expect-error
-const pubAdsAudits = PubAdsPlugin.audits.map(a => a.path);
+// // @ts-expect-error
+// const pubAdsAudits = PubAdsPlugin.audits.map(a => a.path);
 
 /** @param {string} file */
 const isDevtools = file =>
@@ -82,12 +83,12 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
   ];
 
   // Include lighthouse-plugin-publisher-ads.
-  if (isDevtools(entryPath) || isLightrider(entryPath)) {
-    dynamicModulePaths.push('lighthouse-plugin-publisher-ads');
-    pubAdsAudits.forEach(pubAdAudit => {
-      dynamicModulePaths.push(pubAdAudit);
-    });
-  }
+  // if (isDevtools(entryPath) || isLightrider(entryPath)) {
+  //   dynamicModulePaths.push('lighthouse-plugin-publisher-ads');
+  //   pubAdsAudits.forEach(pubAdAudit => {
+  //     dynamicModulePaths.push(pubAdAudit);
+  //   });
+  // }
 
   const bundledMapEntriesCode = dynamicModulePaths.map(modulePath => {
     const pathNoExt = modulePath.replace('.js', '');
@@ -105,9 +106,12 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
     '@sentry/node',
     'source-map',
     'ws',
-    require.resolve('../lighthouse-core/gather/connections/cri.js'),
+    // require.resolve('../lighthouse-core/gather/connections/cri.js'),
   ];
 
+  shimsObj[require.resolve('../lighthouse-core/gather/connections/cri.js')] =
+    'export const CriConnection = {}';
+
   // Don't include the stringified report in DevTools - see devtools-report-assets.js
   // Don't include in Lightrider - HTML generation isn't supported, so report assets aren't needed.
   if (isDevtools(entryPath) || isLightrider(entryPath)) {
@@ -134,6 +138,7 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
         delimiters: ['', ''],
         values: {
           '/* BUILD_REPLACE_BUNDLED_MODULES */': `[\n${bundledMapEntriesCode},\n]`,
+          // TODO(esmodules): remove
           '__dirname': (id) => `'${path.relative(LH_ROOT, path.dirname(id))}'`,
           '__filename': (id) => `'${path.relative(LH_ROOT, id)}'`,
           // This package exports to default in a way that causes Rollup to get confused,
@@ -147,6 +152,8 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
           // TODO: Use globalThis directly.
           'global.isLightrider': 'globalThis.isLightrider',
           'global.isDevtools': 'globalThis.isDevtools',
+          'esMain(import.meta)': 'false',
+          'import esMain from \'es-main\'': '',
         },
       }),
       rollupPlugins.alias({
@@ -162,11 +169,6 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
           import {Audit} from '${require.resolve('../lighthouse-core/audits/audit.js')}';
           export {Audit};
         `,
-        // Most node 'url' polyfills don't include the WHATWG `URL` property, but
-        // that's all that's needed, so make a mini-polyfill.
-        // @see https://github.com/GoogleChrome/lighthouse/issues/5273
-        // TODO: remove when not needed for pubads (https://github.com/googleads/publisher-ads-lighthouse-plugin/pull/325)
-        'url': 'export const URL = globalThis.URL;',
       }),
       rollupPlugins.json(),
       rollupPlugins.inlineFs({verbose: false}),
@@ -210,6 +212,8 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
     banner,
     format: 'iife',
     sourcemap: DEBUG,
+    // Suppress code splitting.
+    inlineDynamicImports: true,
   });
   await bundle.close();
 }
diff --git a/build/build-lightrider-bundles.js b/build/build-lightrider-bundles.js
index d84f976fcd21..4f589c9e41e7 100644
--- a/build/build-lightrider-bundles.js
+++ b/build/build-lightrider-bundles.js
@@ -34,7 +34,6 @@ async function buildReportGenerator() {
       rollupPlugins.shim({
         [`${LH_ROOT}/report/generator/flow-report-assets.js`]: 'export default {}',
       }),
-      rollupPlugins.commonjs(),
       rollupPlugins.nodeResolve(),
       rollupPlugins.inlineFs({verbose: Boolean(process.env.DEBUG)}),
     ],
@@ -52,10 +51,6 @@ async function buildStaticServerBundle() {
   const bundle = await rollup({
     input: 'lighthouse-cli/test/fixtures/static-server.js',
     plugins: [
-      rollupPlugins.shim({
-        'es-main': 'export default function() { return false; }',
-      }),
-      rollupPlugins.commonjs(),
       rollupPlugins.nodeResolve(),
     ],
     external: ['mime-types', 'glob'],
diff --git a/clients/.eslintrc.js b/clients/.eslintrc.cjs
similarity index 100%
rename from clients/.eslintrc.js
rename to clients/.eslintrc.cjs
diff --git a/docs/recipes/auth/.eslintrc.js b/docs/recipes/auth/.eslintrc.js
index 4c3de257e7c0..0982cd77aea0 100644
--- a/docs/recipes/auth/.eslintrc.js
+++ b/docs/recipes/auth/.eslintrc.js
@@ -6,7 +6,7 @@
 'use strict';
 
 module.exports = {
-  extends: '../../../.eslintrc.js',
+  extends: '../../../.eslintrc.cjs',
   env: {
     jest: true,
   },
diff --git a/eslint-local-rules.js b/eslint-local-rules.cjs
similarity index 100%
rename from eslint-local-rules.js
rename to eslint-local-rules.cjs
diff --git a/flow-report/.eslintrc.cjs b/flow-report/.eslintrc.cjs
index 66b7e06d6814..2ee4a38cb5d0 100644
--- a/flow-report/.eslintrc.cjs
+++ b/flow-report/.eslintrc.cjs
@@ -5,7 +5,7 @@
  */
 
 module.exports = {
-  extends: '../.eslintrc.js',
+  extends: '../.eslintrc.cjs',
   env: {
     node: true,
     browser: true,
diff --git a/jest.config.js b/jest.config.cjs
similarity index 100%
rename from jest.config.js
rename to jest.config.cjs
diff --git a/lighthouse-core/audits/byte-efficiency/legacy-javascript.js b/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
index fde4640bb83e..dfd09cb252e7 100644
--- a/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
+++ b/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
@@ -24,7 +24,11 @@ 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';
-import {readJson} from '../../../root.js';
+
+import graphJson from './polyfill-graph-data.json';
+
+/** @type {import('../../scripts/legacy-javascript/create-polyfill-size-estimation.js').PolyfillSizeEstimator} */
+const graph = graphJson;
 
 const UIStrings = {
   /** Title of a Lighthouse audit that tells the user about legacy polyfills and transforms used on the page. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -329,8 +333,9 @@ class LegacyJavascript extends ByteEfficiencyAudit {
     const transformResults = matches.filter(m => m.name.startsWith('@'));
 
     let estimatedWastedBytesFromPolyfills = 0;
-    /** @type {import('../../scripts/legacy-javascript/create-polyfill-size-estimation.js').PolyfillSizeEstimator} */
-    const graph = readJson('./polyfill-graph-data.json', import.meta);
+    // TODO(esmoudles): if we want to use readJson, the inline-fs plugin needs to handle this.
+    // /** @type {import('../../scripts/legacy-javascript/create-polyfill-size-estimation.js').PolyfillSizeEstimator} */
+    // const graph = readJson('./polyfill-graph-data.json', import.meta);
     const modulesSeen = new Set();
     for (const result of polyfillResults) {
       const modules = graph.dependencies[result.name];
diff --git a/lighthouse-core/config/config-helpers.js b/lighthouse-core/config/config-helpers.js
index a88ac9fbf950..3e31c1d76804 100644
--- a/lighthouse-core/config/config-helpers.js
+++ b/lighthouse-core/config/config-helpers.js
@@ -13,9 +13,9 @@ import ConfigPlugin from './config-plugin.js';
 import {Runner} from '../runner.js';
 import * as i18n from '../lib/i18n/i18n.js';
 import * as validation from '../fraggle-rock/config/validation.js';
-import {createCommonjsRefs} from '../scripts/esm-utils.js';
+import {createCommonjsRefs, getModuleDirectory} from '../scripts/esm-utils.js';
 
-const {require, __dirname} = createCommonjsRefs(import.meta);
+const {require} = createCommonjsRefs(import.meta);
 
 /** @typedef {typeof import('../gather/gatherers/gatherer.js').Gatherer} GathererConstructor */
 /** @typedef {typeof import('../audits/audit.js')['Audit']} Audit */
@@ -282,7 +282,7 @@ function requireAudit(auditPath, coreAuditList, configDir) {
       // 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);
+      requirePath = path.relative(getModuleDirectory(import.meta), absolutePath);
     }
   }
 
@@ -502,7 +502,7 @@ function resolveModulePath(moduleIdentifier, configDir, category) {
   const errorString = 'Unable to locate ' + (category ? `${category}: ` : '') +
     `\`${moduleIdentifier}\`.
      Tried to require() from these locations:
-       ${__dirname}
+       ${getModuleDirectory(import.meta)}
        ${cwdPath}`;
 
   if (!configDir) {
diff --git a/lighthouse-core/config/config.js b/lighthouse-core/config/config.js
index 93027ca8f0de..80816dd2ea9a 100644
--- a/lighthouse-core/config/config.js
+++ b/lighthouse-core/config/config.js
@@ -22,9 +22,7 @@ import {
   deepClone,
   deepCloneConfigJson,
 } from './config-helpers.js';
-import {createCommonjsRefs} from '../scripts/esm-utils.js';
-
-const {__dirname} = createCommonjsRefs(import.meta);
+import {getModuleDirectory} from '../scripts/esm-utils.js';
 
 const defaultConfigPath = './default-config.js';
 
@@ -167,7 +165,7 @@ class Config {
 
     if (!configJSON) {
       configJSON = defaultConfig;
-      configPath = path.resolve(__dirname, defaultConfigPath);
+      configPath = path.resolve(getModuleDirectory(import.meta), defaultConfigPath);
     }
 
     if (configPath && !path.isAbsolute(configPath)) {
diff --git a/lighthouse-core/fraggle-rock/config/config.js b/lighthouse-core/fraggle-rock/config/config.js
index 7d469982ceef..e8950f46eeb2 100644
--- a/lighthouse-core/fraggle-rock/config/config.js
+++ b/lighthouse-core/fraggle-rock/config/config.js
@@ -32,10 +32,9 @@ import {
   mergeConfigFragmentArrayByKey,
 } from '../../config/config-helpers.js';
 
-import {createCommonjsRefs} from '../../scripts/esm-utils.js';
+import {getModuleDirectory} from '../../scripts/esm-utils.js';
 
-const {__dirname} = createCommonjsRefs(import.meta);
-const defaultConfigPath = path.join(__dirname, './default-config.js');
+const defaultConfigPath = path.join(getModuleDirectory(import.meta), './default-config.js');
 
 /** @typedef {LH.Config.FRContext & {gatherMode: LH.Gatherer.GatherMode}} ConfigContext */
 
diff --git a/lighthouse-core/lib/asset-saver.js b/lighthouse-core/lib/asset-saver.js
index 92ad72754d35..e9aee3eed068 100644
--- a/lighthouse-core/lib/asset-saver.js
+++ b/lighthouse-core/lib/asset-saver.js
@@ -9,7 +9,7 @@ import fs from 'fs';
 import path from 'path';
 import log from 'lighthouse-logger';
 import stream from 'stream';
-import {promisify} from 'util';
+import util from 'util';
 import {Simulator} from './dependency-graph/simulator/simulator.js';
 import lanternTraceSaver from './lantern-trace-saver.js';
 import {Metrics} from './traces/pwmetrics-events.js';
@@ -17,6 +17,8 @@ import NetworkAnalysisComputed from '../computed/network-analysis.js';
 import LoadSimulatorComputed from '../computed/load-simulator.js';
 import {LighthouseError} from '../lib/lh-error.js';
 
+const {promisify} = util;
+
 // 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.
diff --git a/lighthouse-core/lib/i18n/i18n.js b/lighthouse-core/lib/i18n/i18n.js
index 6f34b20c7318..1892c1577adf 100644
--- a/lighthouse-core/lib/i18n/i18n.js
+++ b/lighthouse-core/lib/i18n/i18n.js
@@ -16,7 +16,7 @@ import {LH_ROOT} from '../../../root.js';
 import {isIcuMessage, formatMessage, DEFAULT_LOCALE} from '../../../shared/localization/format.js';
 import {createCommonjsRefs} from '../../scripts/esm-utils.js';
 
-const {__filename} = createCommonjsRefs(import.meta);
+const {__filename: FN} = createCommonjsRefs(import.meta);
 
 const UIStrings = {
   /** Used to show the duration in milliseconds that something lasted. The `{timeInMs}` placeholder will be replaced with the time duration, shown in milliseconds (e.g. 63 ms) */
@@ -190,7 +190,7 @@ function createIcuMessageFn(filename, fileStrings) {
     const keyname = Object.keys(mergedStrings).find(key => mergedStrings[key] === message);
     if (!keyname) throw new Error(`Could not locate: ${message}`);
 
-    const filenameToLookup = keyname in fileStrings ? filename : __filename;
+    const filenameToLookup = keyname in fileStrings ? filename : FN;
     const unixStyleFilename = path.relative(LH_ROOT, filenameToLookup).replace(/\\/g, '/');
     const i18nId = `${unixStyleFilename} | ${keyname}`;
 
diff --git a/lighthouse-core/runner.js b/lighthouse-core/runner.js
index 249fde07332e..7ae4fd643644 100644
--- a/lighthouse-core/runner.js
+++ b/lighthouse-core/runner.js
@@ -20,9 +20,7 @@ import {Sentry} from './lib/sentry.js';
 import ReportGenerator from '../report/generator/report-generator.js';
 import {LighthouseError} from './lib/lh-error.js';
 import {lighthouseVersion} from '../root.js';
-import {createCommonjsRefs} from './scripts/esm-utils.js';
-
-const {__dirname} = createCommonjsRefs(import.meta);
+import {getModuleDirectory} from './scripts/esm-utils.js';
 
 /** @typedef {import('./gather/connections/connection.js').Connection} Connection */
 /** @typedef {import('./lib/arbitrary-equality-map.js').ArbitraryEqualityMap} ArbitraryEqualityMap */
@@ -466,19 +464,20 @@ class Runner {
       'manual/manual-audit.js',
     ];
 
+    const dir = getModuleDirectory(import.meta);
     const fileList = [
-      ...fs.readdirSync(path.join(__dirname, './audits')),
-      ...fs.readdirSync(path.join(__dirname, './audits/dobetterweb')).map(f => `dobetterweb/${f}`),
-      ...fs.readdirSync(path.join(__dirname, './audits/metrics')).map(f => `metrics/${f}`),
-      ...fs.readdirSync(path.join(__dirname, './audits/seo')).map(f => `seo/${f}`),
-      ...fs.readdirSync(path.join(__dirname, './audits/seo/manual')).map(f => `seo/manual/${f}`),
-      ...fs.readdirSync(path.join(__dirname, './audits/accessibility'))
+      ...fs.readdirSync(path.join(dir, './audits')),
+      ...fs.readdirSync(path.join(dir, './audits/dobetterweb')).map(f => `dobetterweb/${f}`),
+      ...fs.readdirSync(path.join(dir, './audits/metrics')).map(f => `metrics/${f}`),
+      ...fs.readdirSync(path.join(dir, './audits/seo')).map(f => `seo/${f}`),
+      ...fs.readdirSync(path.join(dir, './audits/seo/manual')).map(f => `seo/manual/${f}`),
+      ...fs.readdirSync(path.join(dir, './audits/accessibility'))
           .map(f => `accessibility/${f}`),
-      ...fs.readdirSync(path.join(__dirname, './audits/accessibility/manual'))
+      ...fs.readdirSync(path.join(dir, './audits/accessibility/manual'))
           .map(f => `accessibility/manual/${f}`),
-      ...fs.readdirSync(path.join(__dirname, './audits/byte-efficiency'))
+      ...fs.readdirSync(path.join(dir, './audits/byte-efficiency'))
           .map(f => `byte-efficiency/${f}`),
-      ...fs.readdirSync(path.join(__dirname, './audits/manual')).map(f => `manual/${f}`),
+      ...fs.readdirSync(path.join(dir, './audits/manual')).map(f => `manual/${f}`),
     ];
     return fileList.filter(f => {
       return /\.js$/.test(f) && !ignoredFiles.includes(f);
@@ -490,10 +489,11 @@ class Runner {
    * @return {Array<string>}
    */
   static getGathererList() {
+    const dir = getModuleDirectory(import.meta);
     const fileList = [
-      ...fs.readdirSync(path.join(__dirname, './gather/gatherers')),
-      ...fs.readdirSync(path.join(__dirname, './gather/gatherers/seo')).map(f => `seo/${f}`),
-      ...fs.readdirSync(path.join(__dirname, './gather/gatherers/dobetterweb'))
+      ...fs.readdirSync(path.join(dir, './gather/gatherers')),
+      ...fs.readdirSync(path.join(dir, './gather/gatherers/seo')).map(f => `seo/${f}`),
+      ...fs.readdirSync(path.join(dir, './gather/gatherers/dobetterweb'))
           .map(f => `dobetterweb/${f}`),
     ];
     return fileList.filter(f => /\.js$/.test(f) && f !== 'gatherer.js').sort();
diff --git a/lighthouse-core/scripts/esm-utils.js b/lighthouse-core/scripts/esm-utils.js
index 7d8d42751b19..5cddcd3823d5 100644
--- a/lighthouse-core/scripts/esm-utils.js
+++ b/lighthouse-core/scripts/esm-utils.js
@@ -28,7 +28,16 @@ function createCommonjsRefs(importMeta) {
   return {require, __filename: filename, __dirname: dirname};
 }
 
+/**
+ * @param {ImportMeta} importMeta
+ */
+function getModuleDirectory(importMeta) {
+  const filename = url.fileURLToPath(importMeta.url);
+  return path.dirname(filename);
+}
+
 export {
   resolveModulePath,
   createCommonjsRefs,
+  getModuleDirectory,
 };
diff --git a/package.json b/package.json
index 0d3e87763827..db31bc3b8fb5 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
   "name": "lighthouse",
+  "type": "module",
   "version": "9.5.0",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./lighthouse-core/index.js",
diff --git a/root.js b/root.js
index 94c37cfaee84..4d648dee4e9a 100644
--- a/root.js
+++ b/root.js
@@ -5,12 +5,14 @@
  */
 'use strict';
 
-const fs = require('fs');
-const path = require('path');
-const url = require('url');
+import fs from 'fs';
+import path from 'path';
+import {getModuleDirectory} from './lighthouse-core/scripts/esm-utils.js';
 
-// import {dirname} from 'path';
-// import {fileURLToPath} from 'url';
+const pkg = JSON.parse(fs.readFileSync('./package.json', 'utf-8'));
+
+const LH_ROOT = getModuleDirectory(import.meta);
+const lighthouseVersion = pkg.version;
 
 /**
  * Return parsed json object.
@@ -19,16 +21,13 @@ const url = require('url');
  * @param {ImportMeta=} importMeta
  */
 function readJson(filePath, importMeta) {
-  const dir = importMeta ? path.dirname(url.fileURLToPath(importMeta.url)) : __dirname;
+  const dir = importMeta ? getModuleDirectory(importMeta) : LH_ROOT;
   filePath = path.resolve(dir, filePath);
   return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
 }
 
-module.exports = {
-  LH_ROOT: __dirname,
-  lighthouseVersion: require('./package.json').version,
+export {
+  LH_ROOT,
+  lighthouseVersion,
+  readJson,
 };
-
-// TODO(esmodules): make root.js and root package.json use type: module
-// yes, functions really must be exported like this to trick the commonjs->esm named import interop into working
-module.exports.readJson = readJson;
diff --git a/shared/package.json b/shared/package.json
new file mode 100644
index 000000000000..8d10bc1dfd36
--- /dev/null
+++ b/shared/package.json
@@ -0,0 +1,4 @@
+{
+  "type": "commonjs",
+  "//": "Preserve commonjs in this directory. Temporary file until converted to type: module"
+}
diff --git a/third-party/package.json b/third-party/package.json
new file mode 100644
index 000000000000..8d10bc1dfd36
--- /dev/null
+++ b/third-party/package.json
@@ -0,0 +1,4 @@
+{
+  "type": "commonjs",
+  "//": "Preserve commonjs in this directory. Temporary file until converted to type: module"
+}

From 178746e962b534ac138f35627856d65cc06895ce Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 13 May 2022 15:18:38 -0700
Subject: [PATCH 40/96] rm json import

---
 .../audits/byte-efficiency/legacy-javascript.js           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lighthouse-core/audits/byte-efficiency/legacy-javascript.js b/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
index dfd09cb252e7..a1efabc9e5db 100644
--- a/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
+++ b/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
@@ -18,17 +18,21 @@
 /** @typedef {LH.Audit.ByteEfficiencyItem & {subItems: {type: 'subitems', items: SubItem[]}}} Item */
 /** @typedef {{signal: string, location: LH.Audit.Details.SourceLocationValue}} SubItem */
 
+import fs from 'fs';
+
 import {ByteEfficiencyAudit} from './byte-efficiency-audit.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';
+import {LH_ROOT} from '../../../root.js';
 
-import graphJson from './polyfill-graph-data.json';
+const graphJson = fs.readFileSync(
+  `${LH_ROOT}/lighthouse-core/audits/byte-efficiency/polyfill-graph-data.json`, 'utf-8');
 
 /** @type {import('../../scripts/legacy-javascript/create-polyfill-size-estimation.js').PolyfillSizeEstimator} */
-const graph = graphJson;
+const graph = JSON.parse(graphJson);
 
 const UIStrings = {
   /** Title of a Lighthouse audit that tells the user about legacy polyfills and transforms used on the page. This is displayed in a list of audit titles that Lighthouse generates. */

From 7fed6fe9e862728e7454bf754cb173c246744a10 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 13 May 2022 15:59:01 -0700
Subject: [PATCH 41/96] fixed a lot of problems with build-bundle

---
 build/build-bundle.js                      | 19 ++++++++++++++++---
 lighthouse-core/gather/gatherers/stacks.js |  4 +++-
 lighthouse-core/lib/axe.js                 |  4 +++-
 lighthouse-core/lib/i18n/i18n.js           |  6 ++----
 lighthouse-core/scripts/esm-utils.js       | 21 ++++++++++++++++++---
 5 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/build/build-bundle.js b/build/build-bundle.js
index e77b205f208f..b4dcfbe1f35e 100644
--- a/build/build-bundle.js
+++ b/build/build-bundle.js
@@ -139,8 +139,8 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
         values: {
           '/* BUILD_REPLACE_BUNDLED_MODULES */': `[\n${bundledMapEntriesCode},\n]`,
           // TODO(esmodules): remove
-          '__dirname': (id) => `'${path.relative(LH_ROOT, path.dirname(id))}'`,
-          '__filename': (id) => `'${path.relative(LH_ROOT, id)}'`,
+          // '__dirname': (id) => `'${path.relative(LH_ROOT, path.dirname(id))}'`,
+          // '__filename': (id) => `'${path.relative(LH_ROOT, id)}'`,
           // This package exports to default in a way that causes Rollup to get confused,
           // resulting in MessageFormat being undefined.
           'require(\'intl-messageformat\').default': 'require(\'intl-messageformat\')',
@@ -152,8 +152,16 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
           // TODO: Use globalThis directly.
           'global.isLightrider': 'globalThis.isLightrider',
           'global.isDevtools': 'globalThis.isDevtools',
+          // For some reason, `shim` doesn't work to force this module to return false, so instead
+          // just replace usages of it with false.
           'esMain(import.meta)': 'false',
           'import esMain from \'es-main\'': '',
+          // By default Rollup converts `import.meta` to a big mess of `document.currentScript && ...`,
+          // and uses the output name as the url. Instead, do a simpler conversion and use the
+          // module path.
+          'import.meta': (id) => `{url: '${path.relative(LH_ROOT, id)}'}`,
+          // See esm-utils.js
+          'isBundled = false': 'isBundled = true',
         },
       }),
       rollupPlugins.alias({
@@ -169,6 +177,11 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
           import {Audit} from '${require.resolve('../lighthouse-core/audits/audit.js')}';
           export {Audit};
         `,
+        'url': `
+          export const URL = globalThis.URL;
+          export const fileURLToPath = url => url;
+          export default {URL, fileURLToPath};
+        `,
       }),
       rollupPlugins.json(),
       rollupPlugins.inlineFs({verbose: false}),
@@ -225,7 +238,7 @@ async function cli(argv) {
   // Take paths relative to cwd and build.
   const [entryPath, distPath] = argv.slice(2)
     .map(filePath => path.resolve(process.cwd(), filePath));
-  await buildBundle(entryPath, distPath);
+  await buildBundle(entryPath, distPath, {minify: !process.env.DEBUG});
 }
 
 // Test if called from the CLI or as a module.
diff --git a/lighthouse-core/gather/gatherers/stacks.js b/lighthouse-core/gather/gatherers/stacks.js
index 8eb7f3f0f61d..5150c21f5681 100644
--- a/lighthouse-core/gather/gatherers/stacks.js
+++ b/lighthouse-core/gather/gatherers/stacks.js
@@ -19,7 +19,9 @@ import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 
 import {createCommonjsRefs} from '../../scripts/esm-utils.js';
 
-const {require} = createCommonjsRefs(import.meta);
+// This is removed by rollup, because the only usage is to resolve a module path
+// but that is replaced by the inline-fs plugin, leaving `require` unused.
+const {require} = /* #__PURE__ */ createCommonjsRefs(import.meta);
 
 const libDetectorSource = fs.readFileSync(
   require.resolve('js-library-detector/library/libraries.js'), 'utf8');
diff --git a/lighthouse-core/lib/axe.js b/lighthouse-core/lib/axe.js
index bc9d89e53458..6ae3365d8450 100644
--- a/lighthouse-core/lib/axe.js
+++ b/lighthouse-core/lib/axe.js
@@ -8,7 +8,9 @@
 import fs from 'fs';
 import {createCommonjsRefs} from '../scripts/esm-utils.js';
 
-const {require} = createCommonjsRefs(import.meta);
+// This is removed by rollup, because the only usage is to resolve a module path
+// but that is replaced by the inline-fs plugin, leaving `require` unused.
+const {require} = /* #__PURE__ */ createCommonjsRefs(import.meta);
 const axeSource = fs.readFileSync(require.resolve('axe-core/axe.min.js'), 'utf8');
 
 export {
diff --git a/lighthouse-core/lib/i18n/i18n.js b/lighthouse-core/lib/i18n/i18n.js
index 1892c1577adf..80856706c04f 100644
--- a/lighthouse-core/lib/i18n/i18n.js
+++ b/lighthouse-core/lib/i18n/i18n.js
@@ -14,9 +14,7 @@ import {getAvailableLocales} from '../../../shared/localization/format.js';
 import log from 'lighthouse-logger';
 import {LH_ROOT} from '../../../root.js';
 import {isIcuMessage, formatMessage, DEFAULT_LOCALE} from '../../../shared/localization/format.js';
-import {createCommonjsRefs} from '../../scripts/esm-utils.js';
-
-const {__filename: FN} = createCommonjsRefs(import.meta);
+import {getModuleName} from '../../scripts/esm-utils.js';
 
 const UIStrings = {
   /** Used to show the duration in milliseconds that something lasted. The `{timeInMs}` placeholder will be replaced with the time duration, shown in milliseconds (e.g. 63 ms) */
@@ -190,7 +188,7 @@ function createIcuMessageFn(filename, fileStrings) {
     const keyname = Object.keys(mergedStrings).find(key => mergedStrings[key] === message);
     if (!keyname) throw new Error(`Could not locate: ${message}`);
 
-    const filenameToLookup = keyname in fileStrings ? filename : FN;
+    const filenameToLookup = keyname in fileStrings ? filename : getModuleName(import.meta);
     const unixStyleFilename = path.relative(LH_ROOT, filenameToLookup).replace(/\\/g, '/');
     const i18nId = `${unixStyleFilename} | ${keyname}`;
 
diff --git a/lighthouse-core/scripts/esm-utils.js b/lighthouse-core/scripts/esm-utils.js
index 5cddcd3823d5..e97045b36138 100644
--- a/lighthouse-core/scripts/esm-utils.js
+++ b/lighthouse-core/scripts/esm-utils.js
@@ -8,13 +8,12 @@ import module from 'module';
 import url from 'url';
 import path from 'path';
 
-const require = module.createRequire(import.meta.url);
-
 /**
  * Commonjs equivalent of `require.resolve`.
  * @param {string} packageName
  */
 function resolveModulePath(packageName) {
+  const require = module.createRequire(import.meta.url);
   return require.resolve(packageName);
 }
 
@@ -22,7 +21,15 @@ function resolveModulePath(packageName) {
  * @param {ImportMeta} importMeta
  */
 function createCommonjsRefs(importMeta) {
-  const require = module.createRequire(importMeta.url);
+  // `build-bundle.js` converts this variable to true. `module.createRequire` cannot be
+  // made to work in a browser context. The only usage of this function in a module that is
+  // bundled is in `config-helpers.js`, but that is already guarded behind a check for
+  // a bundled environment. All other usages are from tests.
+  const isBundled = false;
+  const require = isBundled ?
+    // @ts-expect-error
+    /** @type {NodeRequire} */ (undefined) :
+    module.createRequire(importMeta.url);
   const filename = url.fileURLToPath(importMeta.url);
   const dirname = path.dirname(filename);
   return {require, __filename: filename, __dirname: dirname};
@@ -36,8 +43,16 @@ function getModuleDirectory(importMeta) {
   return path.dirname(filename);
 }
 
+/**
+ * @param {ImportMeta} importMeta
+ */
+function getModuleName(importMeta) {
+  return url.fileURLToPath(importMeta.url);
+}
+
 export {
   resolveModulePath,
   createCommonjsRefs,
   getModuleDirectory,
+  getModuleName,
 };

From 5666c14e5d773208824bc1e360d569958e58873e Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 13 May 2022 16:42:06 -0700
Subject: [PATCH 42/96] test-bundle passing

---
 build/build-bundle.js                         |  2 +-
 build/plugins/inline-fs.js                    | 14 +++++++++++-
 .../dobetterweb/no-vulnerable-libraries.js    |  8 +++++--
 lighthouse-core/config/config-helpers.js      | 22 +++++++++++--------
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/build/build-bundle.js b/build/build-bundle.js
index b4dcfbe1f35e..496fdb5cb2be 100644
--- a/build/build-bundle.js
+++ b/build/build-bundle.js
@@ -92,7 +92,7 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
 
   const bundledMapEntriesCode = dynamicModulePaths.map(modulePath => {
     const pathNoExt = modulePath.replace('.js', '');
-    return `['${pathNoExt}', require('${modulePath}')]`;
+    return `['${pathNoExt}', import('${modulePath}')]`;
   }).join(',\n');
 
   /** @type {Record<string, string>} */
diff --git a/build/plugins/inline-fs.js b/build/plugins/inline-fs.js
index d84f7f8d8b8c..08d314c29ca9 100644
--- a/build/plugins/inline-fs.js
+++ b/build/plugins/inline-fs.js
@@ -50,6 +50,7 @@ async function inlineFs(code, filepath) {
   // - if no expressions found or all are skipped, return null
 
   const fsSearch = /fs\.(?:readFileSync|readdirSync)\(/g;
+  // const fsSearch = /readJson|fs\.(?:readFileSync|readdirSync)\(/g;
   const foundIndices = [...code.matchAll(fsSearch)].map(e => e.index);
 
   // Return null for not-applicable files with as little work as possible.
@@ -73,6 +74,17 @@ async function inlineFs(code, filepath) {
       continue;
     }
 
+    // TODO ...
+    // assertEqualString(parsed.type, 'CallExpression');
+    // if (parsed.callee.type === 'Identifier' && parsed.callee.name === 'readJson') {
+    //   const content = await getReadFileReplacement(parsed, filepath);
+    //   const offsets = getNodeOffsets(parsed);
+    //   // TODO(bckenny): use options to customize `storeName` for source maps.
+    //   output.overwrite(offsets.start, offsets.end, content);
+    //   madeChange = true;
+    //   continue;
+    // }
+
     // If root of expression isn't the fs call, descend down chained methods on
     // the result (e.g. `fs.readdirSync().map(...)`) until reaching the fs call.
     for (;;) {
@@ -277,7 +289,7 @@ function collapseToStringLiteral(node, filepath) {
     }
 
     case 'Identifier': {
-      if (node.name === '__dirname') {
+      if (node.name === '__dirname' || node.name === 'dir') {
         return path.dirname(filepath);
       } else if (node.name === '__filename') {
         return filepath;
diff --git a/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js b/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
index c541f72dffdb..15380bc90137 100644
--- a/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
+++ b/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
@@ -12,13 +12,17 @@
 
 'use strict';
 
+import fs from 'fs';
 import {Audit} from '../audit.js';
 import {Sentry} from '../../lib/sentry.js';
 import semver from 'semver';
 import * as i18n from '../../lib/i18n/i18n.js';
-import {LH_ROOT, readJson} from '../../../root.js';
+import {LH_ROOT} from '../../../root.js';
 
-const snykDatabase = readJson(`${LH_ROOT}/third-party/snyk/snapshot.json`);
+// TODO: support readJson in inline-fs
+// const snykDatabase = readJson(`${LH_ROOT}/third-party/snyk/snapshot.json`);
+const snykDatabase = JSON.parse(
+  fs.readFileSync(`${LH_ROOT}/third-party/snyk/snapshot.json`, 'utf-8'));
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on Javascript libraries the page uses. This descriptive title is shown to users when all Javascript libraries are free of known security vulnerabilities. */
diff --git a/lighthouse-core/config/config-helpers.js b/lighthouse-core/config/config-helpers.js
index 3e31c1d76804..c95e2f4e4a8b 100644
--- a/lighthouse-core/config/config-helpers.js
+++ b/lighthouse-core/config/config-helpers.js
@@ -206,7 +206,7 @@ function expandAuditShorthand(audit) {
   }
 }
 
-/** @type {Map<string, any>} */
+/** @type {Map<string, Promise<any>>} */
 const bundledModules = new Map(/* BUILD_REPLACE_BUNDLED_MODULES */);
 
 /**
@@ -215,13 +215,17 @@ const bundledModules = new Map(/* BUILD_REPLACE_BUNDLED_MODULES */);
  * @param {string} requirePath
  */
 async function requireWrapper(requirePath) {
-  const bundledModule = bundledModules.get(requirePath);
-  if (bundledModule) return bundledModule;
+  /** @type {any} */
+  let module;
+  if (bundledModules.has(requirePath)) {
+    module = await bundledModules.get(requirePath);
+  } else if (requirePath.match(/\.(js|mjs|cjs)$/)) {
+    module = await import(requirePath);
+  } else {
+    requirePath += '.js';
+    module = await import(requirePath);
+  }
 
-  const importPath = requirePath.match(/\.(js|mjs|cjs)$/) ?
-    requirePath :
-    `${requirePath}.js`;
-  const module = await import(importPath);
   if (module.default) return module.default;
 
   // Find a valid named export.
@@ -233,10 +237,10 @@ async function requireWrapper(requirePath) {
   });
   if (possibleNamedExports.length === 1) return possibleNamedExports[0];
   if (possibleNamedExports.length > 1) {
-    throw new Error(`module '${importPath}' has too many possible exports`);
+    throw new Error(`module '${requirePath}' has too many possible exports`);
   }
 
-  throw new Error(`module '${importPath}' missing default export`);
+  throw new Error(`module '${requirePath}' missing default export`);
 }
 
 /**

From 7e0eb2e68fa657a26b8de4b9cc8997d909f20f0e Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 13 May 2022 17:39:10 -0700
Subject: [PATCH 43/96] convert chromium-synchronization esm

---
 .../inspector-issueAdded-types-test.js                    | 6 +++---
 .../installability-errors-test.js                         | 8 +++++---
 third-party/package.json                                  | 4 ----
 3 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 third-party/package.json

diff --git a/third-party/chromium-synchronization/inspector-issueAdded-types-test.js b/third-party/chromium-synchronization/inspector-issueAdded-types-test.js
index 8f47c77ceb5c..6b3004decd4e 100644
--- a/third-party/chromium-synchronization/inspector-issueAdded-types-test.js
+++ b/third-party/chromium-synchronization/inspector-issueAdded-types-test.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const fs = require('fs');
-const fetch = require('node-fetch');
-const {LH_ROOT} = require('../../root.js');
+import fs from 'fs';
+import fetch from 'node-fetch';
+import { LH_ROOT } from '../../root.js';
 
 const inspectorIssuesGathererPath = LH_ROOT +
   '/lighthouse-core/gather/gatherers/inspector-issues.js';
diff --git a/third-party/chromium-synchronization/installability-errors-test.js b/third-party/chromium-synchronization/installability-errors-test.js
index b4dc05c65af2..5ef61a9dce69 100644
--- a/third-party/chromium-synchronization/installability-errors-test.js
+++ b/third-party/chromium-synchronization/installability-errors-test.js
@@ -5,9 +5,11 @@
  */
 'use strict';
 
-const fetch = require('node-fetch');
+import {jest} from '@jest/globals';
 
-const InstallableManifestAudit = require('../../lighthouse-core/audits/installable-manifest.js');
+import fetch from 'node-fetch';
+
+import {UIStrings} from '../../lighthouse-core/audits/installable-manifest.js';
 
 jest.setTimeout(20_000);
 
@@ -76,7 +78,7 @@ Array [
   });
 
   it('are each handled explicitly in the gatherer', () => {
-    const errorStrings = Object.keys(InstallableManifestAudit.UIStrings)
+    const errorStrings = Object.keys(UIStrings)
       .filter(key => chromiumErrorIds.includes(key))
       .sort();
     expect(errorStrings).toEqual(chromiumErrorIds);
diff --git a/third-party/package.json b/third-party/package.json
deleted file mode 100644
index 8d10bc1dfd36..000000000000
--- a/third-party/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "type": "commonjs",
-  "//": "Preserve commonjs in this directory. Temporary file until converted to type: module"
-}

From 6a4e52414b265daaed0b1019cf841e9b87e6930b Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 13 May 2022 17:45:06 -0700
Subject: [PATCH 44/96] fix collect strings

---
 lighthouse-core/lib/sd-validation/json-expander.js    | 8 +++++++-
 lighthouse-core/lib/sd-validation/schema-validator.js | 8 +++++++-
 third-party/axe/valid-langs.js                        | 2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lighthouse-core/lib/sd-validation/json-expander.js b/lighthouse-core/lib/sd-validation/json-expander.js
index ec15dcba57b2..96f9011b65e3 100644
--- a/lighthouse-core/lib/sd-validation/json-expander.js
+++ b/lighthouse-core/lib/sd-validation/json-expander.js
@@ -5,11 +5,17 @@
  */
 'use strict';
 
+import fs from 'fs';
 import URL from '../url-shim.js';
 import jsonld from 'jsonld';
-import schemaOrgContext from './assets/jsonldcontext.json';
+import {LH_ROOT} from '../../../root.js';
+
 const SCHEMA_ORG_HOST = 'schema.org';
 
+/** @type {import('./assets/jsonldcontext.json')} */
+const schemaOrgContext = JSON.parse(fs.readFileSync(
+  LH_ROOT + '/lighthouse-core/lib/sd-validation/assets/jsonldcontext.json', 'utf-8'));
+
 /**
  * Custom loader that prevents network calls and allows us to return local version of the
  * schema.org document
diff --git a/lighthouse-core/lib/sd-validation/schema-validator.js b/lighthouse-core/lib/sd-validation/schema-validator.js
index 821fdf4c176e..f213d7fbd63d 100644
--- a/lighthouse-core/lib/sd-validation/schema-validator.js
+++ b/lighthouse-core/lib/sd-validation/schema-validator.js
@@ -5,8 +5,14 @@
  */
 'use strict';
 
+import fs from 'fs';
 import walkObject from './helpers/walk-object.js';
-import schemaStructure from './assets/schema-tree.json';
+import {LH_ROOT} from '../../../root.js';
+
+/** @type {import('./assets/schema-tree.json')} */
+const schemaStructure = JSON.parse(fs.readFileSync(
+  LH_ROOT + '/lighthouse-core/lib/sd-validation/assets/schema-tree.json', 'utf-8'));
+
 const TYPE_KEYWORD = '@type';
 const SCHEMA_ORG_URL_REGEX = /https?:\/\/schema\.org\//;
 
diff --git a/third-party/axe/valid-langs.js b/third-party/axe/valid-langs.js
index a9776f10de51..ff4dcdfcd49d 100644
--- a/third-party/axe/valid-langs.js
+++ b/third-party/axe/valid-langs.js
@@ -107,4 +107,4 @@ function validLangs(langArray) {
   return codes;
 }
 
-module.exports = {isValidLang};
+export {isValidLang};

From 381ca39bf7e2297edeecdb300099cdc9664f3bfb Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Mon, 16 May 2022 10:20:12 -0700
Subject: [PATCH 45/96] run-jest.sh for dum v8 workaround

---
 lighthouse-core/scripts/run-jest.sh | 35 +++++++++++++++++++++++++++++
 package.json                        |  2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 lighthouse-core/scripts/run-jest.sh

diff --git a/lighthouse-core/scripts/run-jest.sh b/lighthouse-core/scripts/run-jest.sh
new file mode 100644
index 000000000000..00de76bc7ad3
--- /dev/null
+++ b/lighthouse-core/scripts/run-jest.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+##
+# @license Copyright 2022 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.
+##
+
+# This wrapper around jest is only meant to help avoid the "Test environment has been torn down" error
+# caused by a bug in v8's compilation cache. In short, due to that bug Jest will randomly use the wrong
+# test environment for dynamic imports. It happens less often when fewer tests run, so a hacky workaround
+# for now is to re-run the failed tests when this error occurs.
+# See https://github.com/facebook/jest/issues/11438#issuecomment-923835189
+# and https://bugs.chromium.org/p/v8/issues/detail?id=10284
+
+DIRNAME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+LH_ROOT="$DIRNAME/../.."
+
+exec 3>&1
+node --experimental-vm-modules ./node_modules/jest/bin/jest.js $* 2>&1 >&3 | tee >(sed 's/.*\r//' >.tmp/jest-stderr.txt)
+jest_exit=$?
+if [ $jest_exit -eq 0 ];
+then
+  exit 0
+fi
+
+if grep -Fq "Test environment has been torn down" .tmp/jest-stderr.txt
+then
+  echo "====================================================="
+  echo "Noticed a v8 bug, so re-running just the failed tests"
+  echo "====================================================="
+  node --experimental-vm-modules ./node_modules/jest/bin/jest.js -f $*
+else
+  exit $jest_exit
+fi
diff --git a/package.json b/package.json
index db31bc3b8fb5..0e6cc6f021dd 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "smoke": "node lighthouse-cli/test/smokehouse/frontends/smokehouse-bin.js",
     "debug": "node --inspect-brk ./lighthouse-cli/index.js",
     "start": "yarn build-report --standalone && node ./lighthouse-cli/index.js",
-    "jest": "node --experimental-vm-modules ./node_modules/jest/bin/jest.js",
+    "jest": "bash ./lighthouse-core/scripts/run-jest.sh",
     "test": "yarn diff:sample-json && yarn lint --quiet && yarn unit && yarn type-check",
     "test-bundle": "yarn smoke --runner bundle --retries=2",
     "test-clients": "yarn jest \"$PWD/clients/\" && yarn jest --testMatch=\"**/clients/test/**/*-test-pptr.js\"",

From 1953e40ce1050ed33716d2f5a698c7bd08fd2d64 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Mon, 16 May 2022 10:21:34 -0700
Subject: [PATCH 46/96] wip shared

---
 shared/test/localization/format-test.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/shared/test/localization/format-test.js b/shared/test/localization/format-test.js
index f96cc14c2333..d9e12b97a40c 100644
--- a/shared/test/localization/format-test.js
+++ b/shared/test/localization/format-test.js
@@ -109,14 +109,14 @@ describe('format', () => {
   describe('#getFormatted', () => {
     it('returns the formatted string', () => {
       const UIStrings = {testMessage: 'happy test'};
-      const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+      const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
       const formattedStr = format.getFormatted(str_(UIStrings.testMessage), 'en');
       expect(formattedStr).toEqual('happy test');
     });
 
     it('returns the formatted string with replacements', () => {
       const UIStrings = {testMessage: 'replacement test ({errorCode})'};
-      const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+      const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
       const formattedStr = format.getFormatted(str_(UIStrings.testMessage,
           {errorCode: 'BOO'}), 'en');
       expect(formattedStr).toEqual('replacement test (BOO)');
@@ -125,7 +125,7 @@ describe('format', () => {
     it('throws an error for invalid locales', () => {
       // Populate a string to try to localize to a bad locale.
       const UIStrings = {testMessage: 'testy test'};
-      const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+      const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
 
       expect(_ => format.getFormatted(str_(UIStrings.testMessage), 'still-not-a-locale'))
         .toThrow(`Unsupported locale 'still-not-a-locale'`);
@@ -135,7 +135,7 @@ describe('format', () => {
       const UIStrings = {
         testMessage: 'needs {count, number, bytes}KB test {str} in {timeInMs, number, seconds}s',
       };
-      const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+      const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
 
       const replacements = {
         count: 2555,
@@ -178,7 +178,7 @@ describe('format', () => {
       format.registerLocaleData('en-XZ', localeData);
 
       const UIStrings = {testString: 'en-US string!'};
-      const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+      const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
       const formattedStr = format.getFormatted(str_(UIStrings.testString), 'en-XZ');
       expect(formattedStr).toEqual('en-XZ cuerda!');
     });
@@ -315,7 +315,7 @@ describe('format', () => {
           '=1{hellos 1 goodbye {in, number, bytes}} ' +
           'other{hellos, goodbyes {in, number, bytes}}}}}',
     };
-    const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+    const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
 
     it('formats a basic message', () => {
       const helloStr = str_(UIStrings.helloWorld);

From 86dca8e75e3ef339ede1dce874f90b7b76b76020 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Mon, 16 May 2022 10:43:11 -0700
Subject: [PATCH 47/96] fix shared/ tests

---
 lighthouse-core/scripts/run-jest.sh          |  3 ++
 shared/test/localization/format-test.js      | 36 +++++++++++++-------
 shared/test/localization/swap-locale-test.js |  1 +
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/lighthouse-core/scripts/run-jest.sh b/lighthouse-core/scripts/run-jest.sh
index 00de76bc7ad3..6f44b7a82f00 100644
--- a/lighthouse-core/scripts/run-jest.sh
+++ b/lighthouse-core/scripts/run-jest.sh
@@ -16,6 +16,9 @@
 DIRNAME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 LH_ROOT="$DIRNAME/../.."
 
+# Copy jest stderr to file, while keeping the output in the terminal and not messing up carriage returns.
+# https://unix.stackexchange.com/a/333204
+# https://superuser.com/a/1124144
 exec 3>&1
 node --experimental-vm-modules ./node_modules/jest/bin/jest.js $* 2>&1 >&3 | tee >(sed 's/.*\r//' >.tmp/jest-stderr.txt)
 jest_exit=$?
diff --git a/shared/test/localization/format-test.js b/shared/test/localization/format-test.js
index d9e12b97a40c..6162f758b545 100644
--- a/shared/test/localization/format-test.js
+++ b/shared/test/localization/format-test.js
@@ -8,10 +8,16 @@
 const path = require('path');
 
 const format = require('../../localization/format.js');
-const i18n = require('../../../lighthouse-core/lib/i18n/i18n.js');
-const constants = require('../../../lighthouse-core/config/constants.js');
 const locales = require('../../localization/locales.js');
 
+// TODO(esmodules): remove when shared/ is esm
+let i18n;
+let constants;
+beforeAll(async () => {
+  i18n = await import('../../../lighthouse-core/lib/i18n/i18n.js');
+  constants = await import('../../../lighthouse-core/config/constants.js');
+});
+
 describe('format', () => {
   describe('DEFAULT_LOCALE', () => {
     it('is the same as the default config locale', () => {
@@ -183,9 +189,9 @@ describe('format', () => {
       expect(formattedStr).toEqual('en-XZ cuerda!');
     });
 
-    it('overwrites existing locale strings', () => {
+    it('overwrites existing locale strings', async () => {
       const filename = 'lighthouse-core/audits/is-on-https.js';
-      const UIStrings = require('../../../lighthouse-core/audits/is-on-https.js').UIStrings;
+      const {UIStrings} = await import('../../../lighthouse-core/audits/is-on-https.js');
       const str_ = i18n.createMessageInstanceIdFn(filename, UIStrings);
 
       // To start with, we get back the intended string..
@@ -305,17 +311,21 @@ describe('format', () => {
       helloWorldMultiReplace: '{hello} {world}',
       helloPlural: '{itemCount, plural, =1{1 hello} other{hellos}}',
       helloPluralNestedICU: '{itemCount, plural, ' +
-        '=1{1 hello {in, number, bytes}} ' +
-        'other{hellos {in, number, bytes}}}',
+      '=1{1 hello {in, number, bytes}} ' +
+      'other{hellos {in, number, bytes}}}',
       helloPluralNestedPluralAndICU: '{itemCount, plural, ' +
-        '=1{{innerItemCount, plural, ' +
-          '=1{1 hello 1 goodbye {in, number, bytes}} ' +
-          'other{1 hello, goodbyes {in, number, bytes}}}} ' +
-        'other{{innerItemCount, plural, ' +
-          '=1{hellos 1 goodbye {in, number, bytes}} ' +
-          'other{hellos, goodbyes {in, number, bytes}}}}}',
+      '=1{{innerItemCount, plural, ' +
+      '=1{1 hello 1 goodbye {in, number, bytes}} ' +
+      'other{1 hello, goodbyes {in, number, bytes}}}} ' +
+      'other{{innerItemCount, plural, ' +
+      '=1{hellos 1 goodbye {in, number, bytes}} ' +
+      'other{hellos, goodbyes {in, number, bytes}}}}}',
     };
-    const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+
+    let str_;
+    beforeAll(() => {
+      str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+    });
 
     it('formats a basic message', () => {
       const helloStr = str_(UIStrings.helloWorld);
diff --git a/shared/test/localization/swap-locale-test.js b/shared/test/localization/swap-locale-test.js
index 50272f6e1d67..41829e47b6c9 100644
--- a/shared/test/localization/swap-locale-test.js
+++ b/shared/test/localization/swap-locale-test.js
@@ -8,6 +8,7 @@
 const swapLocale = require('../../localization/swap-locale.js');
 
 const lhr = require('../../../lighthouse-core/test/results/sample_v2.json');
+
 describe('swap-locale', () => {
   it('does not mutate the original lhr', () => {
     /** @type {LH.Result} */

From 3d812642afd258f7fcf3a851d6eb8750942ae8bd Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Mon, 16 May 2022 12:42:17 -0700
Subject: [PATCH 48/96] changes

---
 build/plugins/inline-fs.js                         | 14 +-------------
 .../audits/byte-efficiency/legacy-javascript.js    |  3 ---
 .../audits/dobetterweb/no-vulnerable-libraries.js  |  2 --
 root.js                                            |  4 ++++
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/build/plugins/inline-fs.js b/build/plugins/inline-fs.js
index 08d314c29ca9..d84f7f8d8b8c 100644
--- a/build/plugins/inline-fs.js
+++ b/build/plugins/inline-fs.js
@@ -50,7 +50,6 @@ async function inlineFs(code, filepath) {
   // - if no expressions found or all are skipped, return null
 
   const fsSearch = /fs\.(?:readFileSync|readdirSync)\(/g;
-  // const fsSearch = /readJson|fs\.(?:readFileSync|readdirSync)\(/g;
   const foundIndices = [...code.matchAll(fsSearch)].map(e => e.index);
 
   // Return null for not-applicable files with as little work as possible.
@@ -74,17 +73,6 @@ async function inlineFs(code, filepath) {
       continue;
     }
 
-    // TODO ...
-    // assertEqualString(parsed.type, 'CallExpression');
-    // if (parsed.callee.type === 'Identifier' && parsed.callee.name === 'readJson') {
-    //   const content = await getReadFileReplacement(parsed, filepath);
-    //   const offsets = getNodeOffsets(parsed);
-    //   // TODO(bckenny): use options to customize `storeName` for source maps.
-    //   output.overwrite(offsets.start, offsets.end, content);
-    //   madeChange = true;
-    //   continue;
-    // }
-
     // If root of expression isn't the fs call, descend down chained methods on
     // the result (e.g. `fs.readdirSync().map(...)`) until reaching the fs call.
     for (;;) {
@@ -289,7 +277,7 @@ function collapseToStringLiteral(node, filepath) {
     }
 
     case 'Identifier': {
-      if (node.name === '__dirname' || node.name === 'dir') {
+      if (node.name === '__dirname') {
         return path.dirname(filepath);
       } else if (node.name === '__filename') {
         return filepath;
diff --git a/lighthouse-core/audits/byte-efficiency/legacy-javascript.js b/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
index a1efabc9e5db..dccf5d4b220e 100644
--- a/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
+++ b/lighthouse-core/audits/byte-efficiency/legacy-javascript.js
@@ -337,9 +337,6 @@ class LegacyJavascript extends ByteEfficiencyAudit {
     const transformResults = matches.filter(m => m.name.startsWith('@'));
 
     let estimatedWastedBytesFromPolyfills = 0;
-    // TODO(esmoudles): if we want to use readJson, the inline-fs plugin needs to handle this.
-    // /** @type {import('../../scripts/legacy-javascript/create-polyfill-size-estimation.js').PolyfillSizeEstimator} */
-    // const graph = readJson('./polyfill-graph-data.json', import.meta);
     const modulesSeen = new Set();
     for (const result of polyfillResults) {
       const modules = graph.dependencies[result.name];
diff --git a/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js b/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
index 15380bc90137..8fd5df0cda30 100644
--- a/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
+++ b/lighthouse-core/audits/dobetterweb/no-vulnerable-libraries.js
@@ -19,8 +19,6 @@ import semver from 'semver';
 import * as i18n from '../../lib/i18n/i18n.js';
 import {LH_ROOT} from '../../../root.js';
 
-// TODO: support readJson in inline-fs
-// const snykDatabase = readJson(`${LH_ROOT}/third-party/snyk/snapshot.json`);
 const snykDatabase = JSON.parse(
   fs.readFileSync(`${LH_ROOT}/third-party/snyk/snapshot.json`, 'utf-8'));
 
diff --git a/root.js b/root.js
index 4d648dee4e9a..8e4b54302942 100644
--- a/root.js
+++ b/root.js
@@ -17,6 +17,10 @@ const lighthouseVersion = pkg.version;
 /**
  * Return parsed json object.
  * Resolves path relative to importMeta.url (if provided) or LH_ROOT (if not provided).
+ *
+ * Note: Do not use this in lighthouse-core/ outside tests or scripts, as it
+ * will not be inlined when bundled. Instead, use `fs.readFileSync`.
+ *
  * @param {string} filePath Can be an absolute or relative path.
  * @param {ImportMeta=} importMeta
  */

From e59ca47fc78a8849ea92e431bd57ccfe8190b4ca Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Mon, 16 May 2022 12:50:31 -0700
Subject: [PATCH 49/96] delete old code in build

---
 build/build-bundle.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/build/build-bundle.js b/build/build-bundle.js
index 496fdb5cb2be..85b9b93a33b5 100644
--- a/build/build-bundle.js
+++ b/build/build-bundle.js
@@ -106,7 +106,6 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
     '@sentry/node',
     'source-map',
     'ws',
-    // require.resolve('../lighthouse-core/gather/connections/cri.js'),
   ];
 
   shimsObj[require.resolve('../lighthouse-core/gather/connections/cri.js')] =
@@ -138,9 +137,6 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
         delimiters: ['', ''],
         values: {
           '/* BUILD_REPLACE_BUNDLED_MODULES */': `[\n${bundledMapEntriesCode},\n]`,
-          // TODO(esmodules): remove
-          // '__dirname': (id) => `'${path.relative(LH_ROOT, path.dirname(id))}'`,
-          // '__filename': (id) => `'${path.relative(LH_ROOT, id)}'`,
           // This package exports to default in a way that causes Rollup to get confused,
           // resulting in MessageFormat being undefined.
           'require(\'intl-messageformat\').default': 'require(\'intl-messageformat\')',

From 44c7a83ea5b109161166c3e77ac0d9d634654cb1 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Mon, 16 May 2022 13:11:21 -0700
Subject: [PATCH 50/96] keep retrying

---
 lighthouse-core/scripts/run-jest.sh | 47 +++++++++++++++++------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/lighthouse-core/scripts/run-jest.sh b/lighthouse-core/scripts/run-jest.sh
index 6f44b7a82f00..c202775ba3c5 100644
--- a/lighthouse-core/scripts/run-jest.sh
+++ b/lighthouse-core/scripts/run-jest.sh
@@ -13,26 +13,35 @@
 # See https://github.com/facebook/jest/issues/11438#issuecomment-923835189
 # and https://bugs.chromium.org/p/v8/issues/detail?id=10284
 
+set -o pipefail
+
 DIRNAME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 LH_ROOT="$DIRNAME/../.."
 
-# Copy jest stderr to file, while keeping the output in the terminal and not messing up carriage returns.
-# https://unix.stackexchange.com/a/333204
-# https://superuser.com/a/1124144
-exec 3>&1
-node --experimental-vm-modules ./node_modules/jest/bin/jest.js $* 2>&1 >&3 | tee >(sed 's/.*\r//' >.tmp/jest-stderr.txt)
-jest_exit=$?
-if [ $jest_exit -eq 0 ];
-then
-  exit 0
-fi
+EXTRA_FLAGS=()
+
+# Repeating once is typically enough, but just in case...
+count=5
+for i in $(seq $count); do
+  # Copy jest stderr to file, while keeping the output in the terminal and not messing up carriage returns.
+  # https://unix.stackexchange.com/a/333204
+  # https://superuser.com/a/1124144
+  exec 3>&1
+  node --experimental-vm-modules ./node_modules/jest/bin/jest.js ${EXTRA_FLAGS[*]} $* 2>&1 >&3 | tee >(sed 's/.*\r//' >.tmp/jest-stderr.txt)
+  jest_status=$?
+  echo "$jest_status"
+  if [ $jest_status -eq 0 ];
+  then
+    exit 0
+  fi
 
-if grep -Fq "Test environment has been torn down" .tmp/jest-stderr.txt
-then
-  echo "====================================================="
-  echo "Noticed a v8 bug, so re-running just the failed tests"
-  echo "====================================================="
-  node --experimental-vm-modules ./node_modules/jest/bin/jest.js -f $*
-else
-  exit $jest_exit
-fi
+  if grep -Fq "Test environment has been torn down" .tmp/jest-stderr.txt
+  then
+    echo "====================================================="
+    echo "Noticed a v8 bug, so re-running just the failed tests"
+    echo "====================================================="
+    EXTRA_FLAGS=(-f)
+  else
+    exit $jest_status
+  fi
+done

From 7262cf8fb595eaa6bac8d6b40208029cd6de58e1 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Mon, 16 May 2022 13:22:07 -0700
Subject: [PATCH 51/96] fix inline js

---
 build/plugins/inline-fs.js |  2 +-
 lighthouse-core/runner.js  | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/build/plugins/inline-fs.js b/build/plugins/inline-fs.js
index d84f7f8d8b8c..f25f2c7ec33b 100644
--- a/build/plugins/inline-fs.js
+++ b/build/plugins/inline-fs.js
@@ -277,7 +277,7 @@ function collapseToStringLiteral(node, filepath) {
     }
 
     case 'Identifier': {
-      if (node.name === '__dirname') {
+      if (node.name === '__dirname' || node.name === 'moduleDir') {
         return path.dirname(filepath);
       } else if (node.name === '__filename') {
         return filepath;
diff --git a/lighthouse-core/runner.js b/lighthouse-core/runner.js
index 7ae4fd643644..5d4d45694c7b 100644
--- a/lighthouse-core/runner.js
+++ b/lighthouse-core/runner.js
@@ -22,6 +22,8 @@ import {LighthouseError} from './lib/lh-error.js';
 import {lighthouseVersion} from '../root.js';
 import {getModuleDirectory} from './scripts/esm-utils.js';
 
+const moduleDir = getModuleDirectory(import.meta);
+
 /** @typedef {import('./gather/connections/connection.js').Connection} Connection */
 /** @typedef {import('./lib/arbitrary-equality-map.js').ArbitraryEqualityMap} ArbitraryEqualityMap */
 /** @typedef {LH.Config.Config} Config */
@@ -464,20 +466,19 @@ class Runner {
       'manual/manual-audit.js',
     ];
 
-    const dir = getModuleDirectory(import.meta);
     const fileList = [
-      ...fs.readdirSync(path.join(dir, './audits')),
-      ...fs.readdirSync(path.join(dir, './audits/dobetterweb')).map(f => `dobetterweb/${f}`),
-      ...fs.readdirSync(path.join(dir, './audits/metrics')).map(f => `metrics/${f}`),
-      ...fs.readdirSync(path.join(dir, './audits/seo')).map(f => `seo/${f}`),
-      ...fs.readdirSync(path.join(dir, './audits/seo/manual')).map(f => `seo/manual/${f}`),
-      ...fs.readdirSync(path.join(dir, './audits/accessibility'))
+      ...fs.readdirSync(path.join(moduleDir, './audits')),
+      ...fs.readdirSync(path.join(moduleDir, './audits/dobetterweb')).map(f => `dobetterweb/${f}`),
+      ...fs.readdirSync(path.join(moduleDir, './audits/metrics')).map(f => `metrics/${f}`),
+      ...fs.readdirSync(path.join(moduleDir, './audits/seo')).map(f => `seo/${f}`),
+      ...fs.readdirSync(path.join(moduleDir, './audits/seo/manual')).map(f => `seo/manual/${f}`),
+      ...fs.readdirSync(path.join(moduleDir, './audits/accessibility'))
           .map(f => `accessibility/${f}`),
-      ...fs.readdirSync(path.join(dir, './audits/accessibility/manual'))
+      ...fs.readdirSync(path.join(moduleDir, './audits/accessibility/manual'))
           .map(f => `accessibility/manual/${f}`),
-      ...fs.readdirSync(path.join(dir, './audits/byte-efficiency'))
+      ...fs.readdirSync(path.join(moduleDir, './audits/byte-efficiency'))
           .map(f => `byte-efficiency/${f}`),
-      ...fs.readdirSync(path.join(dir, './audits/manual')).map(f => `manual/${f}`),
+      ...fs.readdirSync(path.join(moduleDir, './audits/manual')).map(f => `manual/${f}`),
     ];
     return fileList.filter(f => {
       return /\.js$/.test(f) && !ignoredFiles.includes(f);
@@ -489,11 +490,10 @@ class Runner {
    * @return {Array<string>}
    */
   static getGathererList() {
-    const dir = getModuleDirectory(import.meta);
     const fileList = [
-      ...fs.readdirSync(path.join(dir, './gather/gatherers')),
-      ...fs.readdirSync(path.join(dir, './gather/gatherers/seo')).map(f => `seo/${f}`),
-      ...fs.readdirSync(path.join(dir, './gather/gatherers/dobetterweb'))
+      ...fs.readdirSync(path.join(moduleDir, './gather/gatherers')),
+      ...fs.readdirSync(path.join(moduleDir, './gather/gatherers/seo')).map(f => `seo/${f}`),
+      ...fs.readdirSync(path.join(moduleDir, './gather/gatherers/dobetterweb'))
           .map(f => `dobetterweb/${f}`),
     ];
     return fileList.filter(f => /\.js$/.test(f) && f !== 'gatherer.js').sort();

From 9249e61a44062bd8b3cd5b381ee84c396b9ce7a2 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Mon, 16 May 2022 13:41:34 -0700
Subject: [PATCH 52/96] convert download content shell script

---
 .../download-content-shell.js                    | 11 ++++++-----
 third-party/download-content-shell/utils.js      | 16 ++++++++--------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/third-party/download-content-shell/download-content-shell.js b/third-party/download-content-shell/download-content-shell.js
index 507aec516b10..819fe0f66c10 100644
--- a/third-party/download-content-shell/download-content-shell.js
+++ b/third-party/download-content-shell/download-content-shell.js
@@ -7,11 +7,12 @@
 
 // Grabbed from https://github.com/ChromeDevTools/devtools-frontend/commit/26bb5ad91b147e9c918819711542ec2337d6b268
 
-const fs = require('fs');
-const path = require('path');
-const shell = require('child_process').execSync;
-const utils = require('./utils.js');
-const {LH_ROOT} = require('../../root.js');
+import fs from 'fs';
+
+import path from 'path';
+import { execSync as shell } from 'child_process';
+import * as utils from './utils.js';
+import { LH_ROOT } from '../../root.js';
 
 const TARGET = 'Release';
 const CONTENT_SHELL_ZIP = 'content-shell.zip';
diff --git a/third-party/download-content-shell/utils.js b/third-party/download-content-shell/utils.js
index 38f87225ddb1..6629fe51635c 100644
--- a/third-party/download-content-shell/utils.js
+++ b/third-party/download-content-shell/utils.js
@@ -3,13 +3,13 @@
 // found in the LICENSE file.
 'use strict';
 
-const fs = require('fs');
-const http = require('http');
-const https = require('https');
-const path = require('path');
-const parseURL = require('url').parse;
-const shell = require('child_process').execSync;
-const Stream = require('stream').Transform;
+import fs from 'fs';
+import http from 'http';
+import https from 'https';
+import path from 'path';
+import { parse as parseURL } from 'url';
+import { execSync as shell } from 'child_process';
+import { Transform as Stream } from 'stream';
 
 function fetch(url) {
   return new Promise(fetchPromise);
@@ -115,7 +115,7 @@ function parseArgs(args) {
   return argObject;
 }
 
-module.exports = {
+export {
   fetch,
   atob,
   isFile,

From b841b28c24cfc61065a915918a4f17e2cc52fc0b Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Mon, 16 May 2022 13:53:27 -0700
Subject: [PATCH 53/96] fix dt entry

---
 clients/devtools/devtools-entry.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/clients/devtools/devtools-entry.js b/clients/devtools/devtools-entry.js
index 7a6b9b5197fb..5f309b960efd 100644
--- a/clients/devtools/devtools-entry.js
+++ b/clients/devtools/devtools-entry.js
@@ -52,7 +52,8 @@ function createConfig(categoryIDs, device) {
 
   return {
     extends: 'lighthouse:default',
-    plugins: ['lighthouse-plugin-publisher-ads'],
+    // TODO(esmodules): re-enable when pubads works again
+    // plugins: ['lighthouse-plugin-publisher-ads'],
     settings,
   };
 }
@@ -89,7 +90,7 @@ if (typeof self !== 'undefined') {
   // @ts-expect-error
   self.setUpWorkerConnection = setUpWorkerConnection;
   // @ts-expect-error
-  self.runLighthouse = lighthouse.legacyNavigation;
+  self.runLighthouse = legacyNavigation;
   // @ts-expect-error
   self.runLighthouseNavigation = navigation;
   // @ts-expect-error

From 7d8b36161fc46240b3f5414e7a9c74c6a713260a Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Mon, 16 May 2022 13:54:02 -0700
Subject: [PATCH 54/96] temp: run ci

---
 .github/workflows/ci.yml       | 2 +-
 .github/workflows/devtools.yml | 2 +-
 .github/workflows/smoke.yml    | 2 +-
 .github/workflows/unit.yml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3874150c1f29..7662e49d6e0c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [master]
+    # branches: [master]
   pull_request: # run on all PRs, not just PRs to a particular branch
 
 jobs:
diff --git a/.github/workflows/devtools.yml b/.github/workflows/devtools.yml
index 5146d5b81b68..23458de97f28 100644
--- a/.github/workflows/devtools.yml
+++ b/.github/workflows/devtools.yml
@@ -2,7 +2,7 @@ name: DevTools
 
 on:
   push:
-    branches: [master]
+    # branches: [master]
   pull_request: # run on all PRs, not just PRs to a particular branch
 
 env:
diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
index 65b3b09fd3f6..9b3b8cdbb614 100644
--- a/.github/workflows/smoke.yml
+++ b/.github/workflows/smoke.yml
@@ -2,7 +2,7 @@ name: smoke
 
 on:
   push:
-    branches: [master]
+    # branches: [master]
   pull_request: # run on all PRs, not just PRs to a particular branch
 
 jobs:
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
index 6d2f0e059960..3c3b44e7015c 100644
--- a/.github/workflows/unit.yml
+++ b/.github/workflows/unit.yml
@@ -2,7 +2,7 @@ name: unit
 
 on:
   push:
-    branches: [master]
+    # branches: [master]
   pull_request: # run on all PRs, not just PRs to a particular branch
 
 jobs:

From 1dd3968c3bdcc1c9fb37e467eb8e324b42d89cae Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Mon, 16 May 2022 13:57:52 -0700
Subject: [PATCH 55/96] mkdir -p

---
 lighthouse-core/scripts/run-jest.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lighthouse-core/scripts/run-jest.sh b/lighthouse-core/scripts/run-jest.sh
index c202775ba3c5..3a08f18271d5 100644
--- a/lighthouse-core/scripts/run-jest.sh
+++ b/lighthouse-core/scripts/run-jest.sh
@@ -20,6 +20,8 @@ LH_ROOT="$DIRNAME/../.."
 
 EXTRA_FLAGS=()
 
+mkdir -p .tmp
+
 # Repeating once is typically enough, but just in case...
 count=5
 for i in $(seq $count); do

From 23b4add7bb59f1fbaad2c3d0c7278b78c6e01616 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Mon, 16 May 2022 15:42:39 -0700
Subject: [PATCH 56/96] hmm

---
 .github/workflows/unit.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
index 3c3b44e7015c..280da8cacc51 100644
--- a/.github/workflows/unit.yml
+++ b/.github/workflows/unit.yml
@@ -11,6 +11,8 @@ jobs:
     strategy:
       matrix:
         node: ['14', '16', '17']
+      # TODO remove
+      fail-fast: false
     runs-on: ubuntu-latest
     name: node ${{ matrix.node }}
     env:

From ebb1ca388da9be8e8682718b569e02c06cdb9cc7 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Tue, 17 May 2022 10:24:47 -0700
Subject: [PATCH 57/96] more c8

---
 package.json |  2 +-
 yarn.lock    | 96 ++++++++++++++++++++++++++++++++--------------------
 2 files changed, 60 insertions(+), 38 deletions(-)

diff --git a/package.json b/package.json
index 0e6cc6f021dd..7f4e8f288ab9 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "acorn": "^8.5.0",
     "angular": "^1.7.4",
     "archiver": "^3.0.0",
-    "c8": "^7.4.0",
+    "c8": "^7.11.3",
     "chalk": "^2.4.1",
     "chrome-devtools-frontend": "1.0.922924",
     "concurrently": "^6.4.0",
diff --git a/yarn.lock b/yarn.lock
index 33d8d06bb700..59f4f6c386ad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -965,6 +965,11 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
   integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
 
+"@istanbuljs/schema@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
+  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
+
 "@jest/console@^27.2.0":
   version "27.2.0"
   resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.2.0.tgz#57f702837ec52899be58c3794dce5941c77a8b63"
@@ -1145,6 +1150,24 @@
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe"
+  integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==
+
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.13"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c"
+  integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==
+
+"@jridgewell/trace-mapping@^0.3.7":
+  version "0.3.13"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea"
+  integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -1576,11 +1599,6 @@
   resolved "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.8.tgz#e6908b76d4c88be3db642846bb8b455f0bfb1c4e"
   integrity sha512-OP6L9VuZNdskgNN3zFQQ54ceYD8OLq5IbqO4VK91ORLfOm7WdT/CiT/pHEBSQEqCInJ2y3O6iCm/zGtPElpgJQ==
 
-"@types/is-windows@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/is-windows/-/is-windows-1.0.0.tgz#1011fa129d87091e2f6faf9042d6704cdf2e7be0"
-  integrity sha512-tJ1rq04tGKuIJoWIH0Gyuwv4RQ3+tIu7wQrC0MV47raQ44kIzXSSFKfrxFUOWVRvesoF7mrTqigXmqoZJsXwTg==
-
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
@@ -2415,24 +2433,23 @@ builtin-modules@^3.1.0:
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887"
   integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==
 
-c8@^7.4.0:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/c8/-/c8-7.4.0.tgz#098ba30ba4a58de9e080645116ba8ae3d545fd5c"
-  integrity sha512-K8I7MEe2i4L91YBX3HtV10kKpU5uqGeyjtsdGS2FxfT0pk15d9jthujjR1ORRLrCJ4tXuDK9PSH2vChzRDoAZw==
+c8@^7.11.3:
+  version "7.11.3"
+  resolved "https://registry.yarnpkg.com/c8/-/c8-7.11.3.tgz#88c8459c1952ed4f701b619493c9ae732b057163"
+  integrity sha512-6YBmsaNmqRm9OS3ZbIiL2EZgi1+Xc4O24jL3vMYGE6idixYuGdy76rIfIdltSKDj9DpLNrcXSonUTR1miBD0wA==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@istanbuljs/schema" "^0.1.2"
+    "@istanbuljs/schema" "^0.1.3"
     find-up "^5.0.0"
     foreground-child "^2.0.0"
-    furi "^2.0.0"
-    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-coverage "^3.2.0"
     istanbul-lib-report "^3.0.0"
-    istanbul-reports "^3.0.2"
-    rimraf "^3.0.0"
+    istanbul-reports "^3.1.4"
+    rimraf "^3.0.2"
     test-exclude "^6.0.0"
-    v8-to-istanbul "^7.1.0"
-    yargs "^16.0.0"
-    yargs-parser "^20.0.0"
+    v8-to-istanbul "^9.0.0"
+    yargs "^16.2.0"
+    yargs-parser "^20.2.9"
 
 cache-base@^1.0.1:
   version "1.0.1"
@@ -3981,14 +3998,6 @@ functional-red-black-tree@^1.0.1:
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
-furi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/furi/-/furi-2.0.0.tgz#13d85826a1af21acc691da6254b3888fc39f0b4a"
-  integrity sha512-uKuNsaU0WVaK/vmvj23wW1bicOFfyqSsAIH71bRZx8kA4Xj+YCHin7CJKJJjkIsmxYaPFLk9ljmjEyB7xF7WvQ==
-  dependencies:
-    "@types/is-windows" "^1.0.0"
-    is-windows "^1.0.2"
-
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -4871,6 +4880,11 @@ istanbul-lib-coverage@^3.0.0:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
   integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
 
+istanbul-lib-coverage@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
+  integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
+
 istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
@@ -4907,6 +4921,14 @@ istanbul-reports@^3.0.2:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
+istanbul-reports@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.4.tgz#1b6f068ecbc6c331040aab5741991273e609e40c"
+  integrity sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==
+  dependencies:
+    html-escaper "^2.0.0"
+    istanbul-lib-report "^3.0.0"
+
 jest-changed-files@^27.1.1:
   version "27.1.1"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.1.1.tgz#9b3f67a34cc58e3e811e2e1e21529837653e4200"
@@ -7926,15 +7948,6 @@ v8-compile-cache@^2.0.3:
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
-v8-to-istanbul@^7.1.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.1.tgz#04bfd1026ba4577de5472df4f5e89af49de5edda"
-  integrity sha512-p0BB09E5FRjx0ELN6RgusIPsSPhtgexSRcKETybEs6IGOTXJSZqfwxp7r//55nnu0f1AxltY5VvdVqy2vZf9AA==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.1"
-    convert-source-map "^1.6.0"
-    source-map "^0.7.3"
-
 v8-to-istanbul@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz#4229f2a99e367f3f018fa1d5c2b8ec684667c69c"
@@ -7944,6 +7957,15 @@ v8-to-istanbul@^8.0.0:
     convert-source-map "^1.6.0"
     source-map "^0.7.3"
 
+v8-to-istanbul@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.0.tgz#be0dae58719fc53cb97e5c7ac1d7e6d4f5b19511"
+  integrity sha512-HcvgY/xaRm7isYmyx+lFKA4uQmfUbN0J4M0nNItvzTvH/iQ9kW5j/t4YSR+Ge323/lrgDAWJoF46tzGQHwBHFw==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.7"
+    "@types/istanbul-lib-coverage" "^2.0.1"
+    convert-source-map "^1.6.0"
+
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -8194,7 +8216,7 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yargs-parser@20.x, yargs-parser@^20.2.3:
+yargs-parser@20.x, yargs-parser@^20.2.3, yargs-parser@^20.2.9:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
@@ -8207,7 +8229,7 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^20.0.0, yargs-parser@^20.2.2:
+yargs-parser@^20.2.2:
   version "20.2.4"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
   integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
@@ -8234,7 +8256,7 @@ yargs@^15.0.0:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
-yargs@^16.0.0, yargs@^16.0.3, yargs@^16.1.1, yargs@^16.2.0:
+yargs@^16.0.3, yargs@^16.1.1, yargs@^16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
   integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==

From dcf65e3918388664b5a127293b8c5d9096490a6a Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Tue, 17 May 2022 10:37:15 -0700
Subject: [PATCH 58/96] segfault handler

---
 lighthouse-core/test/jest-setup/setup.js |  6 ++++++
 package.json                             |  1 +
 yarn.lock                                | 25 ++++++++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/lighthouse-core/test/jest-setup/setup.js b/lighthouse-core/test/jest-setup/setup.js
index 767156a459a2..9cd3d8c47f48 100644
--- a/lighthouse-core/test/jest-setup/setup.js
+++ b/lighthouse-core/test/jest-setup/setup.js
@@ -5,9 +5,15 @@
  */
 
 const {default: {toBeCloseTo}} = require('expect/build/matchers.js');
+const SegfaultHandler = require('segfault-handler');
 
 const format = require('../../../shared/localization/format.js');
 
+SegfaultHandler.registerHandler('crash.log', function(signal, address, stack) {
+  console.error('segfault!');
+  console.error({signal, address, stack});
+});
+
 expect.extend({
   toBeDisplayString(received, expected) {
     if (!format.isIcuMessage(received)) {
diff --git a/package.json b/package.json
index 7f4e8f288ab9..2d5204baf899 100644
--- a/package.json
+++ b/package.json
@@ -172,6 +172,7 @@
     "rollup-plugin-replace": "^2.2.0",
     "rollup-plugin-shim": "^1.0.0",
     "rollup-plugin-terser": "^7.0.2",
+    "segfault-handler": "^1.3.0",
     "tabulator-tables": "^4.9.3",
     "terser": "^5.3.8",
     "ts-jest": "^27.0.4",
diff --git a/yarn.lock b/yarn.lock
index 59f4f6c386ad..0bab8f4e106b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2292,6 +2292,13 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+bindings@^1.2.1:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  dependencies:
+    file-uri-to-path "1.0.0"
+
 bl@^1.0.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7"
@@ -3809,6 +3816,11 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
 filename-reserved-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz#e61cf805f0de1c984567d0386dc5df50ee5af7e4"
@@ -5995,6 +6007,11 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
+nan@^2.14.0:
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
+  integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
+
 nanomatch@^1.2.9:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
@@ -7051,6 +7068,14 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
+segfault-handler@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/segfault-handler/-/segfault-handler-1.3.0.tgz#054bc847832fa14f218ba6a79e42877501c8870e"
+  integrity sha512-p7kVHo+4uoYkr0jmIiTBthwV5L2qmWtben/KDunDZ834mbos+tY+iO0//HpAJpOFSQZZ+wxKWuRo4DxV02B7Lg==
+  dependencies:
+    bindings "^1.2.1"
+    nan "^2.14.0"
+
 selenium-webdriver@4.0.0-beta.1:
   version "4.0.0-beta.1"
   resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.0.0-beta.1.tgz#db645b0d775f26e4e12235db05796a1bc1e7efda"

From 9c9321f05e60be1a4948e79bd16c23b024d375e4 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Tue, 17 May 2022 10:53:34 -0700
Subject: [PATCH 59/96] hmm

---
 lighthouse-core/test/test-utils.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lighthouse-core/test/test-utils.js b/lighthouse-core/test/test-utils.js
index 13c43f823921..ee9640a81ec7 100644
--- a/lighthouse-core/test/test-utils.js
+++ b/lighthouse-core/test/test-utils.js
@@ -281,6 +281,10 @@ function getURLArtifactFromDevtoolsLog(devtoolsLog) {
  * @return {Promise<Record<string, jest.Mock>>}
  */
 const importMock = async (modulePath, importMeta) => {
+  if (process.env.CI) {
+    throw new Error('TODO: dynamic import crashes node in CI...');
+  }
+
   const dir = path.dirname(url.fileURLToPath(importMeta.url));
   modulePath = path.resolve(dir, modulePath);
   const mock = await import(modulePath);

From baded1dba2098d2c1703e6e2a8350d60df632da7 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Tue, 17 May 2022 12:03:39 -0700
Subject: [PATCH 60/96] nvm

---
 lighthouse-core/test/test-utils.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lighthouse-core/test/test-utils.js b/lighthouse-core/test/test-utils.js
index ee9640a81ec7..13c43f823921 100644
--- a/lighthouse-core/test/test-utils.js
+++ b/lighthouse-core/test/test-utils.js
@@ -281,10 +281,6 @@ function getURLArtifactFromDevtoolsLog(devtoolsLog) {
  * @return {Promise<Record<string, jest.Mock>>}
  */
 const importMock = async (modulePath, importMeta) => {
-  if (process.env.CI) {
-    throw new Error('TODO: dynamic import crashes node in CI...');
-  }
-
   const dir = path.dirname(url.fileURLToPath(importMeta.url));
   modulePath = path.resolve(dir, modulePath);
   const mock = await import(modulePath);

From 21a57c3ae27a7967857a53fed7eee9c8002a2fc4 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Tue, 17 May 2022 14:14:34 -0700
Subject: [PATCH 61/96] try runInBand

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2d5204baf899..0dec1bd0ef23 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "unit-viewer": "yarn jest \"viewer/.*-test.js\"",
     "unit-flow": "yarn jest \"flow-report/.*-test.[tj]s[x]?\"",
     "unit": "yarn jest",
-    "unit:ci": "NODE_OPTIONS=--max-old-space-size=8192 npm run jest --ci .",
+    "unit:ci": "NODE_OPTIONS=--max-old-space-size=8192 npm run jest --runInBand --ci .",
     "core-unit": "yarn unit-core",
     "cli-unit": "yarn unit-cli",
     "viewer-unit": "yarn unit-viewer",

From b3c05799078d2d822fa83bf4dd97e39b901451cb Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Mon, 23 May 2022 13:18:06 -0700
Subject: [PATCH 62/96] tmp

---
 .github/workflows/unit.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
index 280da8cacc51..4ffa212f9401 100644
--- a/.github/workflows/unit.yml
+++ b/.github/workflows/unit.yml
@@ -59,15 +59,16 @@ jobs:
 
     - run: sudo apt-get install xvfb
 
-    - name: yarn unit
+    # TODO undo
+    - name: yarn unit-core
       if: ${{ matrix.node != env.LATEST_NODE }}
       run: xvfb-run --auto-servernum yarn unit:ci
 
     # Only gather coverage on latest node, where c8 is the most accurate.
-    - name: yarn unit:coverage
+    - name: yarn unit-core
       if: ${{ matrix.node == env.LATEST_NODE }}
       run: |
-        xvfb-run --auto-servernum yarn unit:cicoverage
+        xvfb-run --auto-servernum yarn unit-core
         yarn c8 report --reporter text-lcov > unit-coverage.lcov
     - name: Upload test coverage to Codecov
       if: ${{ matrix.node == env.LATEST_NODE }}

From 52d7e58aa9f55f97cc820cb71b73e480a8bd878b Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 26 May 2022 14:23:56 -0700
Subject: [PATCH 63/96] fix merge

---
 .../byte-efficiency/render-blocking-resources-test.js  | 10 +++++-----
 .../test/audits/metrics/speed-index-test.js            |  2 +-
 lighthouse-core/test/audits/uses-rel-preload-test.js   |  2 +-
 lighthouse-core/test/create-test-trace.js              |  1 +
 .../test/lib/tracehouse/trace-processor-test.js        |  2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lighthouse-core/test/audits/byte-efficiency/render-blocking-resources-test.js b/lighthouse-core/test/audits/byte-efficiency/render-blocking-resources-test.js
index 10ea14fe0f07..daf1dfe49fa4 100644
--- a/lighthouse-core/test/audits/byte-efficiency/render-blocking-resources-test.js
+++ b/lighthouse-core/test/audits/byte-efficiency/render-blocking-resources-test.js
@@ -7,11 +7,11 @@
 import {strict as assert} from 'assert';
 
 import RenderBlockingResourcesAudit from '../../../audits/byte-efficiency/render-blocking-resources.js'; // eslint-disable-line max-len
-import constants from '../../../config/constants.js';
-import NetworkNode from '../../../lib/dependency-graph/network-node.js';
-import CPUNode from '../../../lib/dependency-graph/cpu-node.js';
-import Simulator from '../../../lib/dependency-graph/simulator/simulator.js';
-import NetworkRequest from '../../../lib/network-request.js';
+import * as constants from '../../../config/constants.js';
+import {NetworkNode} from '../../../lib/dependency-graph/network-node.js';
+import {CPUNode} from '../../../lib/dependency-graph/cpu-node.js';
+import {Simulator} from '../../../lib/dependency-graph/simulator/simulator.js';
+import {NetworkRequest} from '../../../lib/network-request.js';
 import {getURLArtifactFromDevtoolsLog} from '../../test-utils.js';
 import {readJson} from '../../../../root.js';
 
diff --git a/lighthouse-core/test/audits/metrics/speed-index-test.js b/lighthouse-core/test/audits/metrics/speed-index-test.js
index 51e7c10809b4..720ab2e07eeb 100644
--- a/lighthouse-core/test/audits/metrics/speed-index-test.js
+++ b/lighthouse-core/test/audits/metrics/speed-index-test.js
@@ -7,7 +7,7 @@
 import {strict as assert} from 'assert';
 
 import {readJson} from '../../../../root.js';
-import {Audit} from '../../../audits/metrics/speed-index.js';
+import Audit from '../../../audits/metrics/speed-index.js';
 import * as constants from '../../../config/constants.js';
 
 const pwaTrace = readJson('../../fixtures/traces/progressive-app-m60.json', import.meta);
diff --git a/lighthouse-core/test/audits/uses-rel-preload-test.js b/lighthouse-core/test/audits/uses-rel-preload-test.js
index ab746e9cf29f..75c76ccee550 100644
--- a/lighthouse-core/test/audits/uses-rel-preload-test.js
+++ b/lighthouse-core/test/audits/uses-rel-preload-test.js
@@ -8,7 +8,7 @@ import {strict as assert} from 'assert';
 
 import UsesRelPreload from '../../audits/uses-rel-preload.js';
 import {networkRecordsToDevtoolsLog} from '../network-records-to-devtools-log.js';
-import {createTestTrace} from '../create-test-trace.js';
+import createTestTrace from '../create-test-trace.js';
 import {getURLArtifactFromDevtoolsLog} from '../test-utils.js';
 import {readJson} from '../../../root.js';
 
diff --git a/lighthouse-core/test/create-test-trace.js b/lighthouse-core/test/create-test-trace.js
index 7b085da75477..cfaf56dc58aa 100644
--- a/lighthouse-core/test/create-test-trace.js
+++ b/lighthouse-core/test/create-test-trace.js
@@ -199,4 +199,5 @@ function createTestTrace(options) {
   return {traceEvents};
 }
 
+// TODO(esmodules)
 export default createTestTrace;
diff --git a/lighthouse-core/test/lib/tracehouse/trace-processor-test.js b/lighthouse-core/test/lib/tracehouse/trace-processor-test.js
index 35a44b5d19f1..3829da027dba 100644
--- a/lighthouse-core/test/lib/tracehouse/trace-processor-test.js
+++ b/lighthouse-core/test/lib/tracehouse/trace-processor-test.js
@@ -8,7 +8,7 @@ import {strict as assert} from 'assert';
 
 import {readJson} from '../../../../root.js';
 import {TraceProcessor} from '../../../lib/tracehouse/trace-processor.js';
-import {createTestTrace} from '../../create-test-trace.js';
+import createTestTrace from '../../create-test-trace.js';
 
 const pwaTrace = readJson('../../fixtures/traces/progressive-app.json', import.meta);
 const badNavStartTrace = readJson('../../fixtures/traces/bad-nav-start-ts.json', import.meta);

From ce17c7d0a5807959b7b81004033831baf7813b0b Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Tue, 28 Jun 2022 17:50:49 -0700
Subject: [PATCH 64/96] wip: merge mocha and esm core branches

---
 .../scripts/{jest-retry.sh => test-retry.sh}  |    2 +-
 .github/workflows/ci.yml                      |    6 +-
 .github/workflows/cron-weekly.yml             |    2 +-
 .github/workflows/devtools.yml                |    2 +
 .github/workflows/unit.yml                    |    2 +-
 .gitignore                                    |    1 +
 build/test/plugins/.eslintrc.cjs              |    5 +-
 clients/test/.eslintrc.cjs                    |    5 +-
 clients/test/extension/popup-test-pptr.js     |    4 +-
 .../test/lightrider/lightrider-entry-test.js  |   14 +-
 docs/recipes/auth/.eslintrc.js                |    5 +-
 docs/recipes/integration-test/.eslintrc.cjs   |    2 +-
 .../integration-test/docs-jest.config.js      |   14 -
 .../integration-test/example-lh-auth.test.js  |    9 +-
 docs/recipes/integration-test/package.json    |    4 +-
 docs/recipes/package.json                     |    4 +-
 docs/recipes/test-recipes.sh                  |   21 +
 flow-report/test/common-test.tsx              |   10 +-
 flow-report/test/flow-report-pptr-test.ts     |   11 +-
 flow-report/test/run-flow-report-tests.sh     |   20 +
 flow-report/test/setup/env-setup.ts           |   68 +-
 flow-report/test/setup/global-setup.ts        |   11 -
 flow-report/test/sidebar/sidebar-test.tsx     |    1 -
 flow-report/test/topbar-test.tsx              |   10 +-
 flow-report/test/util-test.tsx                |    6 +-
 flow-report/tsconfig.json                     |    5 +-
 lighthouse-cli/cli-flags.js                   |  618 ++---
 lighthouse-cli/test/.eslintrc.cjs             |    5 +-
 lighthouse-cli/test/cli/bin-test.js           |   52 +-
 lighthouse-cli/test/cli/cli-flags-test.js     |   11 +-
 lighthouse-cli/test/cli/run-test.js           |   10 +-
 .../test/fixtures/static-server-test.js       |    4 +-
 .../fraggle-rock/gather/navigation-runner.js  |    5 +-
 .../gather/gatherers/main-document-content.js |    2 -
 lighthouse-core/lib/lh-env.js                 |    2 +-
 lighthouse-core/runner.js                     |    7 +-
 .../scripts/i18n/collect-strings.js           |    2 +-
 lighthouse-core/test/.eslintrc.cjs            |    5 +-
 .../uses-long-cache-ttl-test.js               |    4 +-
 lighthouse-core/test/audits/metrics-test.js   |    4 +-
 .../test/audits/script-treemap-data-test.js   |    4 +-
 .../lantern-largest-contentful-paint-test.js  |    1 -
 .../test/config/config-helpers-test.js        |   12 +-
 lighthouse-core/test/config/config-test.js    |    7 +-
 .../test/fraggle-rock/config/config-test.js   |   12 +-
 .../test/fraggle-rock/gather/mock-driver.js   |   59 +-
 .../gather/navigation-runner-test.js          |   28 +-
 .../test/fraggle-rock/gather/session-test.js  |   12 +-
 .../gather/snapshot-runner-test.js            |   11 +-
 .../gather/timespan-runner-test.js            |    9 +-
 .../fraggle-rock/scenarios/api-test-pptr.js   |   11 +-
 .../scenarios/cross-origin-test-pptr.js       |   10 +-
 .../scenarios/disconnect-test-pptr.js         |   10 +-
 .../fraggle-rock/scenarios/pptr-test-utils.js |    8 +-
 .../start-end-navigation-test-pptr.js         |   10 +-
 .../test/fraggle-rock/user-flow-test.js       |   23 +-
 lighthouse-core/test/gather/driver-test.js    |    9 +-
 .../gather/driver/execution-context-test.js   |    7 +-
 .../test/gather/driver/navigation-test.js     |    8 +-
 .../test/gather/driver/prepare-test.js        |   14 +-
 .../gather/driver/service-workers-test.js     |    8 +-
 .../gather/driver/wait-for-condition-test.js  |   11 +-
 lighthouse-core/test/gather/fetcher-test.js   |    2 +-
 .../test/gather/gather-runner-test.js         |   33 +-
 .../gather/gatherers/accessibility-test.js    |    4 +-
 .../test/gather/gatherers/css-usage-test.js   |    6 +-
 .../gather/gatherers/devtools-log-test.js     |    2 +-
 .../dobetterweb/response-compression-test.js  |    2 +-
 .../gatherers/full-page-screenshot-test.js    |    4 -
 .../gather/gatherers/image-elements-test.js   |   14 +-
 .../gather/gatherers/inspector-issues-test.js |    6 +-
 .../test/gather/gatherers/js-usage-test.js    |    8 +-
 .../gather/gatherers/link-elements-test.js    |   11 +-
 .../gather/gatherers/script-elements-test.js  |    2 +-
 .../gather/gatherers/service-worker-test.js   |    9 +-
 .../test/gather/gatherers/source-maps-test.js |    7 +-
 .../test/gather/gatherers/stacks-test.js      |    2 +-
 .../gather/gatherers/trace-elements-test.js   |    6 +-
 .../test/gather/gatherers/trace-test.js       |    6 +-
 lighthouse-core/test/jest-setup/package.json  |    4 -
 lighthouse-core/test/lib/asset-saver-test.js  |    4 +-
 .../simulator/simulator-test.js               |    4 +-
 lighthouse-core/test/lib/i18n/i18n-test.js    |    4 +-
 .../test/lib/page-functions-test.js           |    6 +-
 lighthouse-core/test/lib/sentry-test.js       |   38 +-
 lighthouse-core/test/runner-test.js           |   62 +-
 lighthouse-core/test/scripts/run-tests.js     |  320 +++
 .../setup.js => test-env/expect-setup.js}     |   57 +-
 .../test/test-env/fake-timers.js              |   48 +-
 lighthouse-core/test/test-env/mocha-setup.js  |  210 ++
 lighthouse-core/test/test-utils.js            |   98 +-
 lighthouse-core/util-commonjs.js              |   13 +-
 package.json                                  |   39 +-
 report/renderer/util.js                       |   13 +-
 report/test/.eslintrc.cjs                     |    5 +-
 report/test/clients/bundle-test.js            |    8 +-
 .../test/generator/report-generator-test.js   |    4 +-
 .../test/renderer/category-renderer-test.js   |    4 +-
 report/test/renderer/components-test.js       |   70 +-
 .../renderer/crc-details-renderer-test.js     |    4 +-
 report/test/renderer/details-renderer-test.js |    4 +-
 report/test/renderer/dom-test.js              |    8 +-
 .../element-screenshot-renderer-test.js       |    5 +-
 .../performance-category-renderer-test.js     |    6 +-
 .../renderer/pwa-category-renderer-test.js    |    4 +-
 .../test/renderer/report-renderer-axe-test.js |   16 +-
 report/test/renderer/report-renderer-test.js  |    8 +-
 .../test/renderer/report-ui-features-test.js  |   14 +-
 report/test/renderer/snippet-renderer-test.js |    4 +-
 report/test/renderer/text-encoding-test.js    |    4 +-
 shared/test/localization/.eslintrc.cjs        |    5 +-
 shared/test/localization/format-test.js       |    4 +-
 .../inspector-issueAdded-types-test.js        |    2 +-
 .../installability-errors-test.js             |    4 +-
 treemap/test/.eslintrc.cjs                    |    5 +-
 treemap/test/treemap-test-pptr.js             |    9 +-
 types/jest.d.ts                               |   25 -
 types/test.d.ts                               |   53 +
 viewer/test/.eslintrc.cjs                     |    5 +-
 viewer/test/drag-and-drop-test.js             |   12 +-
 viewer/test/viewer-test-pptr.js               |   17 +-
 yarn.lock                                     | 2358 ++++++-----------
 122 files changed, 2500 insertions(+), 2470 deletions(-)
 rename .github/scripts/{jest-retry.sh => test-retry.sh} (94%)
 delete mode 100644 docs/recipes/integration-test/docs-jest.config.js
 create mode 100644 docs/recipes/test-recipes.sh
 create mode 100644 flow-report/test/run-flow-report-tests.sh
 delete mode 100644 flow-report/test/setup/global-setup.ts
 delete mode 100644 lighthouse-core/test/jest-setup/package.json
 create mode 100644 lighthouse-core/test/scripts/run-tests.js
 rename lighthouse-core/test/{jest-setup/setup.js => test-env/expect-setup.js} (64%)
 rename flow-report/jest.config.js => lighthouse-core/test/test-env/fake-timers.js (50%)
 create mode 100644 lighthouse-core/test/test-env/mocha-setup.js
 delete mode 100644 types/jest.d.ts
 create mode 100644 types/test.d.ts

diff --git a/.github/scripts/jest-retry.sh b/.github/scripts/test-retry.sh
similarity index 94%
rename from .github/scripts/jest-retry.sh
rename to .github/scripts/test-retry.sh
index 2f902e98a079..2ab24e1ef1fc 100644
--- a/.github/scripts/jest-retry.sh
+++ b/.github/scripts/test-retry.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Ex: bash jest-retry.sh yarn test-viewer
+# Ex: bash test-retry.sh yarn test-viewer
 
 ##
 # @license Copyright 2021 The Lighthouse Authors. All Rights Reserved.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7662e49d6e0c..40acc9eaa768 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,13 +41,13 @@ jobs:
     # Run tests that require headfull Chrome.
     - run: sudo apt-get install xvfb
     - name: yarn test-clients
-      run: xvfb-run --auto-servernum bash $GITHUB_WORKSPACE/.github/scripts/jest-retry.sh yarn test-clients
+      run: xvfb-run --auto-servernum bash $GITHUB_WORKSPACE/.github/scripts/test-retry.sh yarn test-clients
     - name: yarn test-docs
       run: xvfb-run --auto-servernum yarn test-docs
     - name: yarn test-viewer
-      run: xvfb-run --auto-servernum bash $GITHUB_WORKSPACE/.github/scripts/jest-retry.sh yarn test-viewer
+      run: xvfb-run --auto-servernum bash $GITHUB_WORKSPACE/.github/scripts/test-retry.sh yarn test-viewer
     - name: yarn test-treemap
-      run: xvfb-run --auto-servernum bash $GITHUB_WORKSPACE/.github/scripts/jest-retry.sh yarn test-treemap
+      run: xvfb-run --auto-servernum bash $GITHUB_WORKSPACE/.github/scripts/test-retry.sh yarn test-treemap
 
     - run: yarn diff:sample-json
     - run: yarn diff:flow-sample-json
diff --git a/.github/workflows/cron-weekly.yml b/.github/workflows/cron-weekly.yml
index 688364ebe489..ecde32d236ba 100644
--- a/.github/workflows/cron-weekly.yml
+++ b/.github/workflows/cron-weekly.yml
@@ -37,4 +37,4 @@ jobs:
         node-version: 14.x
     - run: yarn --frozen-lockfile
 
-    - run: yarn jest --testMatch="**/third-party/chromium-synchronization/*-test.js"
+    - run: yarn mocha --testMatch= 'third-party/chromium-synchronization/*-test.js'
diff --git a/.github/workflows/devtools.yml b/.github/workflows/devtools.yml
index c3cd45d9ab2d..41c39ef5684d 100644
--- a/.github/workflows/devtools.yml
+++ b/.github/workflows/devtools.yml
@@ -66,6 +66,8 @@ jobs:
     - name: Download DevTools Frontend
       run: bash $GITHUB_WORKSPACE/lighthouse/lighthouse-core/test/chromium-web-tests/download-devtools.sh
 
+    - run: npx patch-package # TODO: remove when mocha replaces jest
+      working-directory: ${{ github.workspace }}/lighthouse
     - name: Roll Lighthouse + build DevTools
       run: bash $GITHUB_WORKSPACE/lighthouse/lighthouse-core/test/chromium-web-tests/roll-devtools.sh
 
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
index 4ffa212f9401..d7501b984af9 100644
--- a/.github/workflows/unit.yml
+++ b/.github/workflows/unit.yml
@@ -65,7 +65,7 @@ jobs:
       run: xvfb-run --auto-servernum yarn unit:ci
 
     # Only gather coverage on latest node, where c8 is the most accurate.
-    - name: yarn unit-core
+    - name: yarn unit:cicoverage
       if: ${{ matrix.node == env.LATEST_NODE }}
       run: |
         xvfb-run --auto-servernum yarn unit-core
diff --git a/.gitignore b/.gitignore
index 04bacf7b9988..4a2257ce695a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ lcov.info
 lighthouse-cli/results
 results.html
 last-run-results.html
+/lighthouse-plugin-simple
 
 *.trace.json
 *.devtoolslog.json
diff --git a/build/test/plugins/.eslintrc.cjs b/build/test/plugins/.eslintrc.cjs
index 2a53a730a857..cc18671c736b 100644
--- a/build/test/plugins/.eslintrc.cjs
+++ b/build/test/plugins/.eslintrc.cjs
@@ -6,6 +6,9 @@
 
 module.exports = {
   env: {
-    jest: true,
+    mocha: true,
+  },
+  globals: {
+    expect: true,
   },
 };
diff --git a/clients/test/.eslintrc.cjs b/clients/test/.eslintrc.cjs
index 2a53a730a857..cc18671c736b 100644
--- a/clients/test/.eslintrc.cjs
+++ b/clients/test/.eslintrc.cjs
@@ -6,6 +6,9 @@
 
 module.exports = {
   env: {
-    jest: true,
+    mocha: true,
+  },
+  globals: {
+    expect: true,
   },
 };
diff --git a/clients/test/extension/popup-test-pptr.js b/clients/test/extension/popup-test-pptr.js
index 243b17c58ae8..3dd3892cbc5c 100644
--- a/clients/test/extension/popup-test-pptr.js
+++ b/clients/test/extension/popup-test-pptr.js
@@ -35,7 +35,7 @@ describe('Lighthouse chrome popup', function() {
   let page;
   const pageErrors = [];
 
-  beforeAll(async function() {
+  before(async function() {
     // start puppeteer
     browser = await puppeteer.launch({
       headless: false,
@@ -78,7 +78,7 @@ describe('Lighthouse chrome popup', function() {
     await page.goto('file://' + path.join(lighthouseExtensionPath, 'popup.html'), {waitUntil: 'networkidle2'});
   }, 10 * 1000);
 
-  afterAll(async () => {
+  after(async () => {
     if (browser) {
       await browser.close();
     }
diff --git a/clients/test/lightrider/lightrider-entry-test.js b/clients/test/lightrider/lightrider-entry-test.js
index 71b941806e0e..e138a678ce31 100644
--- a/clients/test/lightrider/lightrider-entry-test.js
+++ b/clients/test/lightrider/lightrider-entry-test.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-import {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
 import {strict as assert} from 'assert';
 import {runLighthouseInLR} from '../../lightrider/lightrider-entry.js';
 import {Runner} from '../../../lighthouse-core/runner.js';
@@ -58,7 +58,7 @@ describe('lightrider-entry', () => {
     });
 
     it('specifies the channel as lr', async () => {
-      const runStub = jest.spyOn(Runner, 'gather');
+      const runStub = jestMock.spyOn(Runner, 'gather');
 
       const mockConnection = {};
       const url = 'https://example.com';
@@ -71,7 +71,7 @@ describe('lightrider-entry', () => {
     });
 
     it('uses the desktop config preset when device is desktop', async () => {
-      const runStub = jest.spyOn(Runner, 'gather');
+      const runStub = jestMock.spyOn(Runner, 'gather');
 
       const mockConnection = {};
       const url = 'https://example.com';
@@ -85,7 +85,7 @@ describe('lightrider-entry', () => {
     });
 
     it('uses the mobile config preset when device is mobile', async () => {
-      const runStub = jest.spyOn(Runner, 'gather');
+      const runStub = jestMock.spyOn(Runner, 'gather');
 
       const mockConnection = {};
       const url = 'https://example.com';
@@ -99,7 +99,7 @@ describe('lightrider-entry', () => {
     });
 
     it('overrides the default config when one is provided', async () => {
-      const runStub = jest.spyOn(Runner, 'gather');
+      const runStub = jestMock.spyOn(Runner, 'gather');
 
       const mockConnection = {};
       const url = 'https://example.com';
@@ -127,8 +127,8 @@ describe('lightrider-entry', () => {
     });
 
     it('exposes artifacts when logAssets is true', async () => {
-      Runner.gather = jest.fn();
-      Runner.audit = jest.fn(Runner.audit).mockReturnValue(Promise.resolve({
+      Runner.gather = jestMock.fn();
+      Runner.audit = jestMock.fn(Runner.audit).mockReturnValue(Promise.resolve({
         lhr: {},
         artifacts: {
           Artifact: new Error('some error'),
diff --git a/docs/recipes/auth/.eslintrc.js b/docs/recipes/auth/.eslintrc.js
index 0982cd77aea0..805c3e2b3691 100644
--- a/docs/recipes/auth/.eslintrc.js
+++ b/docs/recipes/auth/.eslintrc.js
@@ -8,7 +8,10 @@
 module.exports = {
   extends: '../../../.eslintrc.cjs',
   env: {
-    jest: true,
+    mocha: true,
+  },
+  globals: {
+    expect: true,
   },
   rules: {
     'new-cap': 0,
diff --git a/docs/recipes/integration-test/.eslintrc.cjs b/docs/recipes/integration-test/.eslintrc.cjs
index 2a53a730a857..966eb88b96d1 100644
--- a/docs/recipes/integration-test/.eslintrc.cjs
+++ b/docs/recipes/integration-test/.eslintrc.cjs
@@ -6,6 +6,6 @@
 
 module.exports = {
   env: {
-    jest: true,
+    mocha: true,
   },
 };
diff --git a/docs/recipes/integration-test/docs-jest.config.js b/docs/recipes/integration-test/docs-jest.config.js
deleted file mode 100644
index 7422f954a0ae..000000000000
--- a/docs/recipes/integration-test/docs-jest.config.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @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';
-
-module.exports = {
-  testMatch: [
-    '**/*.test.js',
-  ],
-  transform: {},
-  prettierPath: null,
-};
diff --git a/docs/recipes/integration-test/example-lh-auth.test.js b/docs/recipes/integration-test/example-lh-auth.test.js
index 303e9f0a402a..029ba62607cd 100644
--- a/docs/recipes/integration-test/example-lh-auth.test.js
+++ b/docs/recipes/integration-test/example-lh-auth.test.js
@@ -7,7 +7,7 @@
 /* eslint-disable new-cap */
 
 /**
- * @fileoverview Example Jest tests for demonstrating how to run Lighthouse on an authenticated
+ * @fileoverview Example Mocha tests for demonstrating how to run Lighthouse on an authenticated
  * page as integration tests. See docs/recipes/auth/README.md for more.
  */
 
@@ -15,6 +15,7 @@
 
 const puppeteer = require('puppeteer');
 const lighthouse = require('lighthouse');
+const {expect} = require('expect');
 const server = require('../auth/server/server.js');
 const {login, logout} = require('../auth/example-lh-auth.js');
 
@@ -22,8 +23,6 @@ const CHROME_DEBUG_PORT = 8042;
 const SERVER_PORT = 10632;
 const ORIGIN = `http://localhost:${SERVER_PORT}`;
 
-jest.setTimeout(30000);
-
 // Provide a nice way to assert a score for a category.
 // Note, you could just use `expect(lhr.categories.seo.score).toBeGreaterThanOrEqual(0.9)`,
 // but by using a custom matcher a better error report is generated.
@@ -78,7 +77,7 @@ describe('my site', () => {
   /** @type {import('puppeteer').Page} */
   let page;
 
-  beforeAll(async () => {
+  before(async () => {
     await new Promise(resolve => server.listen(SERVER_PORT, resolve));
     browser = await puppeteer.launch({
       args: [`--remote-debugging-port=${CHROME_DEBUG_PORT}`],
@@ -87,7 +86,7 @@ describe('my site', () => {
     });
   });
 
-  afterAll(async () => {
+  after(async () => {
     await browser.close();
     await new Promise(resolve => server.close(resolve));
   });
diff --git a/docs/recipes/integration-test/package.json b/docs/recipes/integration-test/package.json
index 59218e3f7d0b..2fe386a94acf 100644
--- a/docs/recipes/integration-test/package.json
+++ b/docs/recipes/integration-test/package.json
@@ -1,10 +1,10 @@
 {
   "private": true,
   "scripts": {
-    "test": "jest example-lh-auth.test.js"
+    "test": "mocha --timeout 30000 example-lh-auth.test.js"
   },
   "dependencies": {
-    "jest": "^24.9.0",
+    "mocha": "^10.0.0",
     "lighthouse": "file:../../../dist/lighthouse.tgz"
   }
 }
diff --git a/docs/recipes/package.json b/docs/recipes/package.json
index b21d7b74cc93..a0fa8fcfefe3 100644
--- a/docs/recipes/package.json
+++ b/docs/recipes/package.json
@@ -2,8 +2,8 @@
   "private": true,
   "scripts": {
     "install-all": "rm -rf /tmp/.junk && rm -f {auth,custom-gatherer-puppeteer,integration-test}/yarn.lock && yarn --cwd auth/ --cache-folder /tmp/.junk && yarn --cwd integration-test/ --cache-folder /tmp/.junk && yarn --cwd custom-gatherer-puppeteer/ --cache-folder /tmp/.junk",
-    "integration-test": "yarn --cwd integration-test/ jest --config-path=docs-jest.config.js",
+    "integration-test": "yarn --cwd integration-test/ test",
     "custom-gatherer-puppeteer-test": "yarn --cwd custom-gatherer-puppeteer/ test",
-    "test": "yarn install-all && yarn integration-test && yarn custom-gatherer-puppeteer-test"
+    "test": "sh test-recipes.sh"
   }
 }
diff --git a/docs/recipes/test-recipes.sh b/docs/recipes/test-recipes.sh
new file mode 100644
index 000000000000..56e346ab1e14
--- /dev/null
+++ b/docs/recipes/test-recipes.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+##
+# @license Copyright 2022 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.
+##
+
+set -eux
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd "$SCRIPT_DIR"
+
+# Locally, make sure dist/lighthouse.tgz is the latest code.
+if [ -z "${CI:-}" ]; then
+  yarn --cwd ../.. build-pack
+fi
+
+yarn install-all
+yarn integration-test
+yarn custom-gatherer-puppeteer-test
diff --git a/flow-report/test/common-test.tsx b/flow-report/test/common-test.tsx
index b2e6ce24ab18..15fa773cf669 100644
--- a/flow-report/test/common-test.tsx
+++ b/flow-report/test/common-test.tsx
@@ -4,18 +4,20 @@
  * 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 {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
 import {act, render} from '@testing-library/preact';
 
+// @ts-ignore: File is not under 'rootDir'
+import {timers} from '../../lighthouse-core/test/test-env/fake-timers.js';
 import {FlowStepThumbnail} from '../src/common';
 
 let lhr: LH.Result;
 
-jest.useFakeTimers();
+timers.useFakeTimers();
 
 describe('FlowStepThumbnail', () => {
   beforeEach(() => {
-    global.console.warn = jest.fn();
+    global.console.warn = jestMock.fn();
 
     lhr = {
       gatherMode: 'navigation',
@@ -97,7 +99,7 @@ describe('FlowStepThumbnail', () => {
 
     expect(thumbnail.src).toContain('frame1');
     await act(() => {
-      jest.advanceTimersByTime(501);
+      timers.advanceTimersByTime(501);
     });
     expect(thumbnail.src).toContain('frame2');
   });
diff --git a/flow-report/test/flow-report-pptr-test.ts b/flow-report/test/flow-report-pptr-test.ts
index 2d548d7cf26c..9348fa3b5e2a 100644
--- a/flow-report/test/flow-report-pptr-test.ts
+++ b/flow-report/test/flow-report-pptr-test.ts
@@ -4,14 +4,11 @@
  * 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 {jest} from '@jest/globals';
 import puppeteer, {Browser, Page} from 'puppeteer';
 
 import ReportGenerator from '../../report/generator/report-generator.js';
 import {flowResult} from './sample-flow';
 
-jest.setTimeout(35_000);
-
 describe('Lighthouse Flow Report', () => {
   console.log('\n✨ Be sure to have recently run this: yarn build-report');
 
@@ -19,7 +16,7 @@ describe('Lighthouse Flow Report', () => {
   let page: Page;
   const pageErrors: Error[] = [];
 
-  beforeAll(async () => {
+  before(async () => {
     browser = await puppeteer.launch({
       headless: true,
     });
@@ -27,14 +24,14 @@ describe('Lighthouse Flow Report', () => {
     page.on('pageerror', pageError => pageErrors.push(pageError));
   });
 
-  afterAll(async () => {
+  after(async () => {
     if (pageErrors.length > 0) console.error(pageErrors);
 
     await browser.close();
   });
 
   describe('Renders the flow report', () => {
-    beforeAll(async () => {
+    before(async () => {
       const html = ReportGenerator.generateFlowReportHtml(flowResult);
       await page.setContent(html);
     });
@@ -43,4 +40,4 @@ describe('Lighthouse Flow Report', () => {
       expect(pageErrors).toHaveLength(0);
     });
   });
-});
+}).timeout(35_000);
diff --git a/flow-report/test/run-flow-report-tests.sh b/flow-report/test/run-flow-report-tests.sh
new file mode 100644
index 000000000000..5eb1e67045b9
--- /dev/null
+++ b/flow-report/test/run-flow-report-tests.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+##
+# @license Copyright 2022 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.
+##
+
+set -eux
+
+ARGS=(
+  --testMatch='{flow-report/**/*-test.ts,flow-report/**/*-test.tsx}'
+  --require=flow-report/test/setup/env-setup.ts
+  --loader=@esbuild-kit/esm-loader
+  # util-test.tsx won't finish on its own because of an open MessagePort, so help it out.
+  # See https://github.com/jsdom/jsdom/issues/2448#issuecomment-802288244
+  --exit
+)
+
+yarn mocha ${ARGS[*]} "$@"
diff --git a/flow-report/test/setup/env-setup.ts b/flow-report/test/setup/env-setup.ts
index 7559a7116a1a..d2a6ecadc9cf 100644
--- a/flow-report/test/setup/env-setup.ts
+++ b/flow-report/test/setup/env-setup.ts
@@ -4,29 +4,49 @@
  * 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 {jest} from '@jest/globals';
+import fs from 'fs';
+import {MessageChannel} from 'worker_threads';
+
+import jestMock from 'jest-mock';
 import {JSDOM} from 'jsdom';
+import * as preact from 'preact';
 
-/**
- * The jest environment "jsdom" does not work when preact is combined with the report renderer.
- * This sets up our own environment with JSDOM globals.
- */
-beforeEach(() => {
-  const {window} = new JSDOM(undefined, {
-    url: 'file:///Users/example/report.html/',
-  });
-  global.window = window as any;
-  global.document = window.document;
-  global.location = window.location;
-  global.self = global.window;
-
-  // Use JSDOM types as necessary.
-  global.Blob = window.Blob;
-  global.HTMLInputElement = window.HTMLInputElement;
-
-  // Functions not implemented in JSDOM.
-  window.Element.prototype.scrollIntoView = jest.fn();
-  global.self.matchMedia = jest.fn<any, any>(() => ({
-    addListener: jest.fn(),
-  }));
-});
+import {LH_ROOT} from '../../../root.js';
+
+// These modules aren't imported correctly if these directories aren't defined to use ES modules.
+// Similar to this, which was resolved but their fix didn't work for us:
+// https://github.com/testing-library/preact-testing-library/issues/36#issuecomment-1136484478
+fs.writeFileSync(`${LH_ROOT}/node_modules/@testing-library/preact/dist/esm/package.json`,
+  '{"type": "module"}');
+fs.writeFileSync(`${LH_ROOT}/node_modules/@testing-library/preact-hooks/src/package.json`,
+  '{"type": "module"}');
+
+// @ts-expect-error
+global.React = preact;
+
+export default {
+  mochaHooks: {
+    beforeEach() {
+      const {window} = new JSDOM(undefined, {
+        url: 'file:///Users/example/report.html/',
+      });
+      global.window = window as any;
+      global.document = window.document;
+      global.location = window.location;
+      global.self = global.window;
+
+      // Use JSDOM types as necessary.
+      global.Blob = window.Blob;
+      global.HTMLInputElement = window.HTMLInputElement;
+
+      // Functions not implemented in JSDOM.
+      window.Element.prototype.scrollIntoView = jestMock.fn();
+      global.self.matchMedia = jestMock.fn<any, any>(() => ({
+        addListener: jestMock.fn(),
+      }));
+
+      // @ts-expect-error: for @testing-library/preact-hooks
+      global.MessageChannel = MessageChannel;
+    },
+  },
+};
diff --git a/flow-report/test/setup/global-setup.ts b/flow-report/test/setup/global-setup.ts
deleted file mode 100644
index 4c1753b07f09..000000000000
--- a/flow-report/test/setup/global-setup.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @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.
- */
-
-export default async () => {
-  // Use consistent TZ across testing environments.
-  // Timezone is used to construct date strings.
-  process.env.TZ = 'UTC';
-};
diff --git a/flow-report/test/sidebar/sidebar-test.tsx b/flow-report/test/sidebar/sidebar-test.tsx
index 6967050f45c0..b0a85e52eb51 100644
--- a/flow-report/test/sidebar/sidebar-test.tsx
+++ b/flow-report/test/sidebar/sidebar-test.tsx
@@ -12,7 +12,6 @@ import {SidebarHeader, SidebarRuntimeSettings, SidebarSummary} from '../../src/s
 import {FlowResultContext} from '../../src/util';
 import {flowResult} from '../sample-flow';
 
-
 let wrapper: FunctionComponent;
 
 beforeEach(() => {
diff --git a/flow-report/test/topbar-test.tsx b/flow-report/test/topbar-test.tsx
index b03c0178b4ab..8039136e11da 100644
--- a/flow-report/test/topbar-test.tsx
+++ b/flow-report/test/topbar-test.tsx
@@ -4,7 +4,7 @@
  * 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 {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
 import {FunctionComponent} from 'preact';
 import {act, render} from '@testing-library/preact';
 
@@ -12,7 +12,7 @@ import {FlowResultContext, OptionsContext} from '../src/util';
 import {I18nProvider} from '../src/i18n/i18n';
 import {Topbar, saveHtml} from '../src/topbar';
 
-const mockSaveFile = jest.fn();
+const mockSaveFile = jestMock.fn();
 const defaultSaveFile = saveHtml.saveFile;
 
 const flowResult = {
@@ -27,7 +27,7 @@ const flowResult = {
 let wrapper: FunctionComponent;
 let options: LH.FlowReportOptions;
 
-beforeEach(() => {
+before(() => {
   mockSaveFile.mockReset();
   options = {};
   wrapper = ({children}) => (
@@ -41,7 +41,7 @@ beforeEach(() => {
   );
 });
 
-afterEach(() => {
+after(() => {
   saveHtml.saveFile = defaultSaveFile;
 });
 
@@ -60,7 +60,7 @@ it('save button opens save dialog for HTML file', async () => {
 });
 
 it('provides save as gist option if defined', async () => {
-  const saveAsGist = jest.fn();
+  const saveAsGist = jestMock.fn();
   options = {saveAsGist};
   const root = render(<Topbar onMenuClick={() => {}}/>, {wrapper});
 
diff --git a/flow-report/test/util-test.tsx b/flow-report/test/util-test.tsx
index eaec865f4380..2684d757d4bb 100644
--- a/flow-report/test/util-test.tsx
+++ b/flow-report/test/util-test.tsx
@@ -4,9 +4,9 @@
  * 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 {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
 import {render} from '@testing-library/preact';
-import {renderHook} from '@testing-library/preact-hooks';
+import {renderHook} from '@testing-library/preact-hooks/src/index';
 import {FunctionComponent} from 'preact';
 import {act} from 'preact/test-utils';
 
@@ -16,7 +16,7 @@ import {flowResult} from './sample-flow';
 let wrapper: FunctionComponent;
 
 beforeEach(() => {
-  global.console.warn = jest.fn();
+  global.console.warn = jestMock.fn();
   wrapper = ({children}) => (
     <FlowResultContext.Provider value={flowResult}>{children}</FlowResultContext.Provider>
   );
diff --git a/flow-report/tsconfig.json b/flow-report/tsconfig.json
index 99ac92db8b3e..2278734dd802 100644
--- a/flow-report/tsconfig.json
+++ b/flow-report/tsconfig.json
@@ -4,7 +4,7 @@
     // Limit to base JS and DOM defs.
     "lib": ["es2020", "dom", "dom.iterable"],
     // Selectively include types from node_modules/.
-    "types": ["node", "jest"],
+    "types": ["node", "mocha"],
 
     "jsx": "react-jsx",
     "jsxImportSource": "preact",
@@ -19,5 +19,8 @@
     "**/*.ts",
     "**/*.tsx",
     "./types",
+    "../types/test.d.ts",
+    "../root.js",
+    "../esm-utils.mjs",
   ],
 }
diff --git a/lighthouse-cli/cli-flags.js b/lighthouse-cli/cli-flags.js
index 49f9eb86217d..cff56fecb016 100644
--- a/lighthouse-cli/cli-flags.js
+++ b/lighthouse-cli/cli-flags.js
@@ -16,319 +16,326 @@ import {isObjectOfUnknownValues} from '../shared/type-verifiers.js';
 
 /**
  * @param {string=} manualArgv
- * @param {{noExitOnFailure?: boolean}=} options
- * @return {LH.CliFlags}
  */
-function getFlags(manualArgv, options = {}) {
+function getYargsParser(manualArgv) {
   const y = manualArgv ?
     // @ts-expect-error - undocumented, but yargs() supports parsing a single `string`.
     yargs(manualArgv) :
     yargs(yargsHelpers.hideBin(process.argv));
 
-  let parser = y.help('help')
-      .version(JSON.parse(fs.readFileSync(`${LH_ROOT}/package.json`, 'utf-8')).version)
-      .showHelpOnFail(false, 'Specify --help for available options')
-
-      .usage('lighthouse <url> <options>')
-      .example(
-          'lighthouse <url> --view', 'Opens the HTML report in a browser after the run completes')
-      .example(
-          'lighthouse <url> --config-path=./myconfig.js',
-          'Runs Lighthouse with your own configuration: custom audits, report generation, etc.')
-      .example(
-          'lighthouse <url> --output=json --output-path=./report.json --save-assets',
-          'Save trace, screenshots, and named JSON report.')
-      .example(
-          'lighthouse <url> --screenEmulation.disabled --throttling-method=provided --no-emulated-user-agent',
-          'Disable emulation and all throttling')
-      .example(
-          'lighthouse <url> --chrome-flags="--window-size=412,660"',
-          'Launch Chrome with a specific window size')
-      .example(
-          'lighthouse <url> --quiet --chrome-flags="--headless"',
-          'Launch Headless Chrome, turn off logging')
-      .example(
-          'lighthouse <url> --extra-headers "{\\"Cookie\\":\\"monster=blue\\", \\"x-men\\":\\"wolverine\\"}"',
-          'Stringify\'d JSON HTTP Header key/value pairs to send in requests')
-      .example(
-          'lighthouse <url> --extra-headers=./path/to/file.json',
-          'Path to JSON file of HTTP Header key/value pairs to send in requests')
-      .example(
-          'lighthouse <url> --only-categories=performance,pwa',
-          'Only run the specified categories. Available categories: accessibility, best-practices, performance, pwa, seo')
-
-      // We only have the single string positional argument, the url.
-      .option('_', {
-        array: true, // Always an array, but this lets the type system know.
+  return y.help('help')
+    .version(JSON.parse(fs.readFileSync(`${LH_ROOT}/package.json`, 'utf-8')).version)
+    .showHelpOnFail(false, 'Specify --help for available options')
+
+    .usage('lighthouse <url> <options>')
+    .example(
+        'lighthouse <url> --view', 'Opens the HTML report in a browser after the run completes')
+    .example(
+        'lighthouse <url> --config-path=./myconfig.js',
+        'Runs Lighthouse with your own configuration: custom audits, report generation, etc.')
+    .example(
+        'lighthouse <url> --output=json --output-path=./report.json --save-assets',
+        'Save trace, screenshots, and named JSON report.')
+    .example(
+        'lighthouse <url> --screenEmulation.disabled --throttling-method=provided --no-emulated-user-agent',
+        'Disable emulation and all throttling')
+    .example(
+        'lighthouse <url> --chrome-flags="--window-size=412,660"',
+        'Launch Chrome with a specific window size')
+    .example(
+        'lighthouse <url> --quiet --chrome-flags="--headless"',
+        'Launch Headless Chrome, turn off logging')
+    .example(
+        'lighthouse <url> --extra-headers "{\\"Cookie\\":\\"monster=blue\\", \\"x-men\\":\\"wolverine\\"}"',
+        'Stringify\'d JSON HTTP Header key/value pairs to send in requests')
+    .example(
+        'lighthouse <url> --extra-headers=./path/to/file.json',
+        'Path to JSON file of HTTP Header key/value pairs to send in requests')
+    .example(
+        'lighthouse <url> --only-categories=performance,pwa',
+        'Only run the specified categories. Available categories: accessibility, best-practices, performance, pwa, seo')
+
+    // We only have the single string positional argument, the url.
+    .option('_', {
+      array: true, // Always an array, but this lets the type system know.
+      type: 'string',
+    })
+
+    /*
+     * Also accept a file for all of these flags. Yargs will merge in and override the file-based
+     * flags with the command-line flags.
+     *
+     * i.e. when command-line `--throttling-method=provided` and file `throttlingMethod: "devtools"`,
+     * throttlingMethod will be `provided`.
+     *
+     * @see https://github.com/yargs/yargs/blob/a6e67f15a61558d0ba28bfe53385332f0ce5d431/docs/api.md#config
+     */
+    .option('cli-flags-path', {
+      config: true,
+      describe: 'The path to a JSON file that contains the desired CLI flags to apply. Flags specified at the command line will still override the file-based ones.',
+    })
+
+    // Logging
+    .options({
+      'verbose': {
+        type: 'boolean',
+        default: false,
+        describe: 'Displays verbose logging',
+      },
+      'quiet': {
+        type: 'boolean',
+        default: false,
+        describe: 'Displays no progress, debug logs, or errors',
+      },
+    })
+    .group(['verbose', 'quiet'], 'Logging:')
+
+    // Configuration
+    .options({
+      'save-assets': {
+        type: 'boolean',
+        default: false,
+        describe: 'Save the trace contents & devtools logs to disk',
+      },
+      'list-all-audits': {
+        type: 'boolean',
+        default: false,
+        describe: 'Prints a list of all available audits and exits',
+      },
+      'list-locales': {
+        type: 'boolean',
+        default: false,
+        describe: 'Prints a list of all supported locales and exits',
+      },
+      'list-trace-categories': {
+        type: 'boolean',
+        default: false,
+        describe: 'Prints a list of all required trace categories and exits',
+      },
+      'print-config': {
+        type: 'boolean',
+        default: false,
+        describe: 'Print the normalized config for the given config and options, then exit.',
+      },
+      'debug-navigation': {
+        type: 'boolean',
+        describe: 'Pause after page load to wait for permission to continue the run, evaluate `continueLighthouseRun` in the console to continue.',
+      },
+      'legacy-navigation': {
+        type: 'boolean',
+        default: false,
+        describe: '[DEPRECATED] Use the legacy navigation runner to gather results. Only use this if you are using a pre-10.0 custom Lighthouse config, or if Lighthouse unexpectedly fails after updating to 10.0. Please file a bug if you need this flag for Lighthouse to work.',
+      },
+      'additional-trace-categories': {
         type: 'string',
-      })
-
-      /*
-       * Also accept a file for all of these flags. Yargs will merge in and override the file-based
-       * flags with the command-line flags.
-       *
-       * i.e. when command-line `--throttling-method=provided` and file `throttlingMethod: "devtools"`,
-       * throttlingMethod will be `provided`.
-       *
-       * @see https://github.com/yargs/yargs/blob/a6e67f15a61558d0ba28bfe53385332f0ce5d431/docs/api.md#config
-       */
-      .option('cli-flags-path', {
-        config: true,
-        describe: 'The path to a JSON file that contains the desired CLI flags to apply. Flags specified at the command line will still override the file-based ones.',
-      })
-
-      // Logging
-      .options({
-        'verbose': {
-          type: 'boolean',
-          default: false,
-          describe: 'Displays verbose logging',
-        },
-        'quiet': {
-          type: 'boolean',
-          default: false,
-          describe: 'Displays no progress, debug logs, or errors',
-        },
-      })
-      .group(['verbose', 'quiet'], 'Logging:')
-
-      // Configuration
-      .options({
-        'save-assets': {
-          type: 'boolean',
-          default: false,
-          describe: 'Save the trace contents & devtools logs to disk',
-        },
-        'list-all-audits': {
-          type: 'boolean',
-          default: false,
-          describe: 'Prints a list of all available audits and exits',
-        },
-        'list-locales': {
-          type: 'boolean',
-          default: false,
-          describe: 'Prints a list of all supported locales and exits',
-        },
-        'list-trace-categories': {
-          type: 'boolean',
-          default: false,
-          describe: 'Prints a list of all required trace categories and exits',
-        },
-        'print-config': {
-          type: 'boolean',
-          default: false,
-          describe: 'Print the normalized config for the given config and options, then exit.',
-        },
-        'debug-navigation': {
-          type: 'boolean',
-          describe: 'Pause after page load to wait for permission to continue the run, evaluate `continueLighthouseRun` in the console to continue.',
-        },
-        'legacy-navigation': {
-          type: 'boolean',
-          default: false,
-          describe: '[DEPRECATED] Use the legacy navigation runner to gather results. Only use this if you are using a pre-10.0 custom Lighthouse config, or if Lighthouse unexpectedly fails after updating to 10.0. Please file a bug if you need this flag for Lighthouse to work.',
-        },
-        'additional-trace-categories': {
-          type: 'string',
-          describe: 'Additional categories to capture with the trace (comma-delimited).',
-        },
-        'config-path': {
-          type: 'string',
-          describe: `The path to the config JSON.
-            An example config file: lighthouse-core/config/lr-desktop-config.js`,
-        },
-        'preset': {
-          type: 'string',
-          describe: `Use a built-in configuration.
-          WARNING: If the --config-path flag is provided, this preset will be ignored.`,
-        },
-        'chrome-flags': {
-          type: 'string',
-          default: '',
-          describe: `Custom flags to pass to Chrome (space-delimited). For a full list of flags, see https://bit.ly/chrome-flags
-            Additionally, use the CHROME_PATH environment variable to use a specific Chrome binary. Requires Chromium version 66.0 or later. If omitted, any detected Chrome Canary or Chrome stable will be used.`,
-        },
-        'port': {
-          type: 'number',
-          default: 0,
-          describe: 'The port to use for the debugging protocol. Use 0 for a random port',
-        },
-        'hostname': {
-          type: 'string',
-          default: '127.0.0.1',
-          describe: 'The hostname to use for the debugging protocol.',
-        },
-        'form-factor': {
-          type: 'string',
-          describe: 'Determines how performance metrics are scored and if mobile-only audits are skipped. For desktop, --preset=desktop instead.',
-        },
-        'screenEmulation': {
-          describe: 'Sets screen emulation parameters. See also --preset. Use --screenEmulation.disabled to disable. Otherwise set these 4 parameters individually: --screenEmulation.mobile --screenEmulation.width=360 --screenEmulation.height=640 --screenEmulation.deviceScaleFactor=2',
-          coerce: coerceScreenEmulation,
-        },
-        'emulatedUserAgent': {
-          type: 'string',
-          coerce: coerceOptionalStringBoolean,
-          describe: 'Sets useragent emulation',
-        },
-        'max-wait-for-load': {
-          type: 'number',
-          describe: 'The timeout (in milliseconds) to wait before the page is considered done loading and the run should continue. WARNING: Very high values can lead to large traces and instability',
-        },
-        'enable-error-reporting': {
-          type: 'boolean',
-          describe: 'Enables error reporting, overriding any saved preference. --no-enable-error-reporting will do the opposite. More: https://github.com/GoogleChrome/lighthouse/blob/master/docs/error-reporting.md',
-        },
-        'gather-mode': {
-          alias: 'G',
-          coerce: coerceOptionalStringBoolean,
-          describe: 'Collect artifacts from a connected browser and save to disk. (Artifacts folder path may optionally be provided). If audit-mode is not also enabled, the run will quit early.',
-        },
-        'audit-mode': {
-          alias: 'A',
-          coerce: coerceOptionalStringBoolean,
-          describe: 'Process saved artifacts from disk. (Artifacts folder path may be provided, otherwise defaults to ./latest-run/)',
-        },
-        'only-audits': {
-          array: true,
-          type: 'string',
-          coerce: splitCommaSeparatedValues,
-          describe: 'Only run the specified audits',
-        },
-        'only-categories': {
-          array: true,
-          type: 'string',
-          coerce: splitCommaSeparatedValues,
-          describe: 'Only run the specified categories. Available categories: accessibility, best-practices, performance, pwa, seo',
-        },
-        'skip-audits': {
-          array: true,
-          type: 'string',
-          coerce: splitCommaSeparatedValues,
-          describe: 'Run everything except these audits',
-        },
-        'budget-path': {
-          type: 'string',
-          describe: 'The path to the budget.json file for LightWallet.',
-        },
-      })
-      .group([
-        'save-assets', 'list-all-audits', 'list-locales', 'list-trace-categories', 'print-config', 'additional-trace-categories',
-        'config-path', 'preset', 'chrome-flags', 'port', 'hostname', 'form-factor', 'screenEmulation', 'emulatedUserAgent',
-        'max-wait-for-load', 'enable-error-reporting', 'gather-mode', 'audit-mode',
-        'only-audits', 'only-categories', 'skip-audits', 'budget-path',
-      ], 'Configuration:')
-
-      // Output
-      .options({
-        'output': {
-          type: 'array',
-          default: /** @type {const} */ (['html']),
-          coerce: coerceOutput,
-          describe: 'Reporter for the results, supports multiple values. choices: "json", "html", "csv"',
-        },
-        'output-path': {
-          type: 'string',
-          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.
-  If using multiple outputs, --output-path is appended with the standard extension for each output type. "reports/my-run" -> "reports/my-run.report.html", "reports/my-run.report.json", etc.
-  Example: --output-path=./lighthouse-results.html`,
-        },
-        'view': {
-          type: 'boolean',
-          default: false,
-          describe: 'Open HTML report in your browser',
-        },
-      })
-      .group(['output', 'output-path', 'view'], 'Output:')
-
-      // Other options.
-      .options({
-        'locale': {
-          coerce: coerceLocale,
-          describe: 'The locale/language the report should be formatted in',
-        },
-        'blocked-url-patterns': {
-          array: true,
-          type: 'string',
-          describe: 'Block any network requests to the specified URL patterns',
-        },
-        'disable-storage-reset': {
-          type: 'boolean',
-          describe: 'Disable clearing the browser cache and other storage APIs before a run',
-        },
-        'throttling-method': {
-          type: 'string',
-          describe: 'Controls throttling method',
-        },
-      })
-
-      // Throttling settings, parsed as an object.
-      .option('throttling', {
-        coerce: coerceThrottling,
-      })
-      .describe({
-        'throttling.rttMs': 'Controls simulated network RTT (TCP layer)',
-        'throttling.throughputKbps': 'Controls simulated network download throughput',
-        'throttling.requestLatencyMs': 'Controls emulated network RTT (HTTP layer)',
-        'throttling.downloadThroughputKbps': 'Controls emulated network download throughput',
-        'throttling.uploadThroughputKbps': 'Controls emulated network upload throughput',
-        'throttling.cpuSlowdownMultiplier': 'Controls simulated + emulated CPU throttling',
-      })
-
-      .options({
-        'extra-headers': {
-          coerce: coerceExtraHeaders,
-          describe: 'Set extra HTTP Headers to pass with request',
-        },
-        'precomputed-lantern-data-path': {
-          type: 'string',
-          describe: 'Path to the file where lantern simulation data should be read from, overwriting the lantern observed estimates for RTT and server latency.',
-        },
-        'lantern-data-output-path': {
-          type: 'string',
-          describe: 'Path to the file where lantern simulation data should be written to, can be used in a future run with the `precomputed-lantern-data-path` flag.',
-        },
-        'plugins': {
-          array: true,
-          type: 'string',
-          coerce: splitCommaSeparatedValues,
-          describe: 'Run the specified plugins',
-        },
-        'channel': {
-          type: 'string',
-          default: 'cli',
-        },
-        'chrome-ignore-default-flags': {
-          type: 'boolean',
-          default: false,
-        },
-      })
-
-      // Choices added outside of `options()` and cast so tsc picks them up.
-      .choices('form-factor', /** @type {const} */ (['mobile', 'desktop']))
-      .choices('throttling-method', /** @type {const} */ (['devtools', 'provided', 'simulate']))
-      .choices('preset', /** @type {const} */ (['perf', 'experimental', 'desktop']))
-
-      .check(argv => {
-        // Lighthouse doesn't need a URL if...
-        //   - We're just listing the available options.
-        //   - We're just printing the config.
-        //   - We're in auditMode (and we have artifacts already)
-        // If one of these don't apply, if no URL, stop the program and ask for one.
-        const isPrintSomethingMode = argv.listAllAudits || argv.listLocales || argv.listTraceCategories || argv.printConfig;
-        const isOnlyAuditMode = !!argv.auditMode && !argv.gatherMode;
-        if (isPrintSomethingMode || isOnlyAuditMode) {
-          return true;
-        } else if (argv._.length > 0) {
-          return true;
-        }
+        describe: 'Additional categories to capture with the trace (comma-delimited).',
+      },
+      'config-path': {
+        type: 'string',
+        describe: `The path to the config JSON.
+          An example config file: lighthouse-core/config/lr-desktop-config.js`,
+      },
+      'preset': {
+        type: 'string',
+        describe: `Use a built-in configuration.
+        WARNING: If the --config-path flag is provided, this preset will be ignored.`,
+      },
+      'chrome-flags': {
+        type: 'string',
+        default: '',
+        describe: `Custom flags to pass to Chrome (space-delimited). For a full list of flags, see https://bit.ly/chrome-flags
+          Additionally, use the CHROME_PATH environment variable to use a specific Chrome binary. Requires Chromium version 66.0 or later. If omitted, any detected Chrome Canary or Chrome stable will be used.`,
+      },
+      'port': {
+        type: 'number',
+        default: 0,
+        describe: 'The port to use for the debugging protocol. Use 0 for a random port',
+      },
+      'hostname': {
+        type: 'string',
+        default: '127.0.0.1',
+        describe: 'The hostname to use for the debugging protocol.',
+      },
+      'form-factor': {
+        type: 'string',
+        describe: 'Determines how performance metrics are scored and if mobile-only audits are skipped. For desktop, --preset=desktop instead.',
+      },
+      'screenEmulation': {
+        describe: 'Sets screen emulation parameters. See also --preset. Use --screenEmulation.disabled to disable. Otherwise set these 4 parameters individually: --screenEmulation.mobile --screenEmulation.width=360 --screenEmulation.height=640 --screenEmulation.deviceScaleFactor=2',
+        coerce: coerceScreenEmulation,
+      },
+      'emulatedUserAgent': {
+        type: 'string',
+        coerce: coerceOptionalStringBoolean,
+        describe: 'Sets useragent emulation',
+      },
+      'max-wait-for-load': {
+        type: 'number',
+        describe: 'The timeout (in milliseconds) to wait before the page is considered done loading and the run should continue. WARNING: Very high values can lead to large traces and instability',
+      },
+      'enable-error-reporting': {
+        type: 'boolean',
+        describe: 'Enables error reporting, overriding any saved preference. --no-enable-error-reporting will do the opposite. More: https://github.com/GoogleChrome/lighthouse/blob/master/docs/error-reporting.md',
+      },
+      'gather-mode': {
+        alias: 'G',
+        coerce: coerceOptionalStringBoolean,
+        describe: 'Collect artifacts from a connected browser and save to disk. (Artifacts folder path may optionally be provided). If audit-mode is not also enabled, the run will quit early.',
+      },
+      'audit-mode': {
+        alias: 'A',
+        coerce: coerceOptionalStringBoolean,
+        describe: 'Process saved artifacts from disk. (Artifacts folder path may be provided, otherwise defaults to ./latest-run/)',
+      },
+      'only-audits': {
+        array: true,
+        type: 'string',
+        coerce: splitCommaSeparatedValues,
+        describe: 'Only run the specified audits',
+      },
+      'only-categories': {
+        array: true,
+        type: 'string',
+        coerce: splitCommaSeparatedValues,
+        describe: 'Only run the specified categories. Available categories: accessibility, best-practices, performance, pwa, seo',
+      },
+      'skip-audits': {
+        array: true,
+        type: 'string',
+        coerce: splitCommaSeparatedValues,
+        describe: 'Run everything except these audits',
+      },
+      'budget-path': {
+        type: 'string',
+        describe: 'The path to the budget.json file for LightWallet.',
+      },
+    })
+    .group([
+      'save-assets', 'list-all-audits', 'list-locales', 'list-trace-categories', 'print-config', 'additional-trace-categories',
+      'config-path', 'preset', 'chrome-flags', 'port', 'hostname', 'form-factor', 'screenEmulation', 'emulatedUserAgent',
+      'max-wait-for-load', 'enable-error-reporting', 'gather-mode', 'audit-mode',
+      'only-audits', 'only-categories', 'skip-audits', 'budget-path',
+    ], 'Configuration:')
+
+    // Output
+    .options({
+      'output': {
+        type: 'array',
+        default: /** @type {const} */ (['html']),
+        coerce: coerceOutput,
+        describe: 'Reporter for the results, supports multiple values. choices: "json", "html", "csv"',
+      },
+      'output-path': {
+        type: 'string',
+        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.
+If using multiple outputs, --output-path is appended with the standard extension for each output type. "reports/my-run" -> "reports/my-run.report.html", "reports/my-run.report.json", etc.
+Example: --output-path=./lighthouse-results.html`,
+      },
+      'view': {
+        type: 'boolean',
+        default: false,
+        describe: 'Open HTML report in your browser',
+      },
+    })
+    .group(['output', 'output-path', 'view'], 'Output:')
+
+    // Other options.
+    .options({
+      'locale': {
+        coerce: coerceLocale,
+        describe: 'The locale/language the report should be formatted in',
+      },
+      'blocked-url-patterns': {
+        array: true,
+        type: 'string',
+        describe: 'Block any network requests to the specified URL patterns',
+      },
+      'disable-storage-reset': {
+        type: 'boolean',
+        describe: 'Disable clearing the browser cache and other storage APIs before a run',
+      },
+      'throttling-method': {
+        type: 'string',
+        describe: 'Controls throttling method',
+      },
+    })
+
+    // Throttling settings, parsed as an object.
+    .option('throttling', {
+      coerce: coerceThrottling,
+    })
+    .describe({
+      'throttling.rttMs': 'Controls simulated network RTT (TCP layer)',
+      'throttling.throughputKbps': 'Controls simulated network download throughput',
+      'throttling.requestLatencyMs': 'Controls emulated network RTT (HTTP layer)',
+      'throttling.downloadThroughputKbps': 'Controls emulated network download throughput',
+      'throttling.uploadThroughputKbps': 'Controls emulated network upload throughput',
+      'throttling.cpuSlowdownMultiplier': 'Controls simulated + emulated CPU throttling',
+    })
+
+    .options({
+      'extra-headers': {
+        coerce: coerceExtraHeaders,
+        describe: 'Set extra HTTP Headers to pass with request',
+      },
+      'precomputed-lantern-data-path': {
+        type: 'string',
+        describe: 'Path to the file where lantern simulation data should be read from, overwriting the lantern observed estimates for RTT and server latency.',
+      },
+      'lantern-data-output-path': {
+        type: 'string',
+        describe: 'Path to the file where lantern simulation data should be written to, can be used in a future run with the `precomputed-lantern-data-path` flag.',
+      },
+      'plugins': {
+        array: true,
+        type: 'string',
+        coerce: splitCommaSeparatedValues,
+        describe: 'Run the specified plugins',
+      },
+      'channel': {
+        type: 'string',
+        default: 'cli',
+      },
+      'chrome-ignore-default-flags': {
+        type: 'boolean',
+        default: false,
+      },
+    })
+
+    // Choices added outside of `options()` and cast so tsc picks them up.
+    .choices('form-factor', /** @type {const} */ (['mobile', 'desktop']))
+    .choices('throttling-method', /** @type {const} */ (['devtools', 'provided', 'simulate']))
+    .choices('preset', /** @type {const} */ (['perf', 'experimental', 'desktop']))
+
+    .check(argv => {
+      // Lighthouse doesn't need a URL if...
+      //   - We're just listing the available options.
+      //   - We're just printing the config.
+      //   - We're in auditMode (and we have artifacts already)
+      // If one of these don't apply, if no URL, stop the program and ask for one.
+      const isPrintSomethingMode = argv.listAllAudits || argv.listLocales || argv.listTraceCategories || argv.printConfig;
+      const isOnlyAuditMode = !!argv.auditMode && !argv.gatherMode;
+      if (isPrintSomethingMode || isOnlyAuditMode) {
+        return true;
+      } else if (argv._.length > 0) {
+        return true;
+      }
+
+      throw new Error('Please provide a url');
+    })
+    .epilogue('For more information on Lighthouse, see https://developers.google.com/web/tools/lighthouse/.')
+    .wrap(y.terminalWidth());
+}
 
-        throw new Error('Please provide a url');
-      })
-      .epilogue('For more information on Lighthouse, see https://developers.google.com/web/tools/lighthouse/.')
-      .wrap(y.terminalWidth());
+/**
+ * @param {string=} manualArgv
+ * @param {{noExitOnFailure?: boolean}=} options
+ * @return {LH.CliFlags}
+ */
+function getFlags(manualArgv, options = {}) {
+  let parser = getYargsParser(manualArgv);
 
   if (options.noExitOnFailure) {
     // Silence console.error() logging and don't process.exit().
@@ -526,4 +533,5 @@ function coerceScreenEmulation(value) {
 
 export {
   getFlags,
+  getYargsParser,
 };
diff --git a/lighthouse-cli/test/.eslintrc.cjs b/lighthouse-cli/test/.eslintrc.cjs
index 2a53a730a857..cc18671c736b 100644
--- a/lighthouse-cli/test/.eslintrc.cjs
+++ b/lighthouse-cli/test/.eslintrc.cjs
@@ -6,6 +6,9 @@
 
 module.exports = {
   env: {
-    jest: true,
+    mocha: true,
+  },
+  globals: {
+    expect: true,
   },
 };
diff --git a/lighthouse-cli/test/cli/bin-test.js b/lighthouse-cli/test/cli/bin-test.js
index 03af45f48a9a..bcc329e58e60 100644
--- a/lighthouse-cli/test/cli/bin-test.js
+++ b/lighthouse-cli/test/cli/bin-test.js
@@ -6,39 +6,33 @@
 
 import fs from 'fs';
 
-import {jest} from '@jest/globals';
+import * as td from 'testdouble';
+import jestMock from 'jest-mock';
 
-import {LH_ROOT} from '../../../root.js';
+import {LH_ROOT, readJson} from '../../../root.js';
 
-const mockRunLighthouse = jest.fn();
-
-jest.unstable_mockModule('../../run.js', () => {
-  return {runLighthouse: mockRunLighthouse};
-});
-
-const mockGetFlags = jest.fn();
-jest.unstable_mockModule('../../cli-flags.js', () => {
-  return {getFlags: mockGetFlags};
-});
-
-const mockAskPermission = jest.fn();
-jest.unstable_mockModule('../../sentry-prompt.js', () => {
-  return {askPermission: mockAskPermission};
-});
-
-const mockSentryInit = jest.fn();
-jest.mock('../../../lighthouse-core/lib/sentry.js', () => {
-  return {init: mockSentryInit};
-});
-
-const mockLoggerSetLevel = jest.fn();
-jest.unstable_mockModule('lighthouse-logger', () => {
-  return {default: {setLevel: mockLoggerSetLevel}};
-});
+const mockRunLighthouse = jestMock.fn();
+const mockGetFlags = jestMock.fn();
+const mockAskPermission = jestMock.fn();
+const mockSentryInit = jestMock.fn();
+const mockLoggerSetLevel = jestMock.fn();
 
 /** @type {import('../../bin.js')} */
 let bin;
-beforeAll(async () => {
+before(async () => {
+  td.replaceEsm('../../run.js', {
+    runLighthouse: mockRunLighthouse,
+  });
+  td.replaceEsm('../../cli-flags.js', {
+    getFlags: mockGetFlags,
+  });
+  td.replaceEsm('../../sentry-prompt.js', {
+    askPermission: mockAskPermission,
+  });
+  td.replace('../../../lighthouse-core/lib/sentry.js', {
+    init: mockSentryInit,
+  });
+  td.replaceEsm('lighthouse-logger', undefined, {setLevel: mockLoggerSetLevel});
   bin = await import('../../bin.js');
 });
 
@@ -177,7 +171,7 @@ describe('CLI bin', function() {
       await bin.begin();
 
       expect(getRunLighthouseArgs()[1]).toMatchObject({
-        precomputedLanternData: (await import(lanternDataFile)).default,
+        precomputedLanternData: readJson(lanternDataFile),
         precomputedLanternDataPath: lanternDataFile,
       });
     });
diff --git a/lighthouse-cli/test/cli/cli-flags-test.js b/lighthouse-cli/test/cli/cli-flags-test.js
index 444f64c5ee46..b2925659e880 100644
--- a/lighthouse-cli/test/cli/cli-flags-test.js
+++ b/lighthouse-cli/test/cli/cli-flags-test.js
@@ -7,9 +7,7 @@
 import {strict as assert} from 'assert';
 import fs from 'fs';
 
-import yargs from 'yargs';
-
-import {getFlags} from '../../cli-flags.js';
+import {getFlags, getYargsParser} from '../../cli-flags.js';
 import {LH_ROOT} from '../../../root.js';
 
 /**
@@ -37,10 +35,9 @@ function snapshot(flags) {
 
 describe('CLI flags', function() {
   it('all options should have descriptions', () => {
-    getFlags('chrome://version');
-
+    const parser = getYargsParser();
     // @ts-expect-error - getGroups is private
-    const optionGroups = yargs.getGroups();
+    const optionGroups = parser.getGroups();
     /** @type {string[]} */
     const allOptions = [];
     Object.keys(optionGroups).forEach(key => {
@@ -48,7 +45,7 @@ describe('CLI flags', function() {
     });
     const optionsWithDescriptions =
       // @ts-expect-error - getUsageInstance is private
-      Object.keys(yargs.getInternalMethods().getUsageInstance().getDescriptions());
+      Object.keys(parser.getInternalMethods().getUsageInstance().getDescriptions());
 
     allOptions.forEach(opt => {
       assert.ok(optionsWithDescriptions.includes(opt), `cli option '${opt}' has no description`);
diff --git a/lighthouse-cli/test/cli/run-test.js b/lighthouse-cli/test/cli/run-test.js
index 8fbc29a378b5..5ff16549e54e 100644
--- a/lighthouse-cli/test/cli/run-test.js
+++ b/lighthouse-cli/test/cli/run-test.js
@@ -29,7 +29,7 @@ describe('CLI run', function() {
     /** @type {LH.Result} */
     let fileResults;
 
-    beforeAll(async () => {
+    before(async () => {
       const url = 'http://localhost:10200/dobetterweb/dbw_tester.html';
       // eslint-disable-next-line max-len
       const samplev2ArtifactsPath = LH_ROOT + '/lighthouse-core/test/results/artifacts/';
@@ -38,8 +38,6 @@ describe('CLI run', function() {
       const flags = getFlags([
         '--output=json',
         `--output-path=${filename}`,
-        // Jest allows us to resolve this module with no setup.
-        // https://github.com/GoogleChrome/lighthouse/pull/13045#discussion_r708690607
         '--plugins=lighthouse-plugin-simple',
         // Use sample artifacts to avoid gathering during a unit test.
         `--audit-mode=${samplev2ArtifactsPath}`,
@@ -55,9 +53,9 @@ describe('CLI run', function() {
 
       assert.ok(fs.existsSync(filename));
       fileResults = JSON.parse(fs.readFileSync(filename, 'utf-8'));
-    }, 60 * 1000);
+    });
 
-    afterAll(() => {
+    after(() => {
       fs.unlinkSync(filename);
     });
 
@@ -90,7 +88,7 @@ describe('CLI run', function() {
       assert.ok(groupNames.includes('lighthouse-plugin-simple-new-group'));
     });
   });
-});
+}).timeout(60_000);
 
 describe('flag coercing', () => {
   it('should force to array', () => {
diff --git a/lighthouse-cli/test/fixtures/static-server-test.js b/lighthouse-cli/test/fixtures/static-server-test.js
index 97cba992daf1..841c6993e9e9 100644
--- a/lighthouse-cli/test/fixtures/static-server-test.js
+++ b/lighthouse-cli/test/fixtures/static-server-test.js
@@ -12,11 +12,11 @@ import {server} from './static-server.js';
 
 
 describe('Server', () => {
-  beforeAll(async () => {
+  before(async () => {
     await server.listen(10200, 'localhost');
   });
 
-  afterAll(async () => {
+  after(async () => {
     await server.close();
   });
 
diff --git a/lighthouse-core/fraggle-rock/gather/navigation-runner.js b/lighthouse-core/fraggle-rock/gather/navigation-runner.js
index dcd176cebcab..c5cd26b89770 100644
--- a/lighthouse-core/fraggle-rock/gather/navigation-runner.js
+++ b/lighthouse-core/fraggle-rock/gather/navigation-runner.js
@@ -104,7 +104,10 @@ async function _navigate(navigationContext) {
     });
     return {requestedUrl, mainDocumentUrl, navigationError: undefined, warnings};
   } catch (err) {
-    if (!(err instanceof LighthouseError)) throw err;
+    // TODO: for some reason, when under test LighthouseError !== the LighthouseError from the test file.
+    // yarn mocha navigation-runner-test -t 'should retain PageLoadError'
+    // if (!(err instanceof LighthouseError)) throw err;
+    if (err.name !== 'LighthouseError') throw err;
     if (err.code !== 'NO_FCP' && err.code !== 'PAGE_HUNG') throw err;
     if (typeof requestor !== 'string') throw err;
 
diff --git a/lighthouse-core/gather/gatherers/main-document-content.js b/lighthouse-core/gather/gatherers/main-document-content.js
index 09bd8dc36cca..df66bcb677af 100644
--- a/lighthouse-core/gather/gatherers/main-document-content.js
+++ b/lighthouse-core/gather/gatherers/main-document-content.js
@@ -21,7 +21,6 @@ class MainDocumentContent extends FRGatherer {
   };
 
   /**
-   *
    * @param {LH.Gatherer.FRTransitionalContext} context
    * @param {LH.Artifacts['DevtoolsLog']} devtoolsLog
    * @return {Promise<LH.Artifacts['MainDocumentContent']>}
@@ -34,7 +33,6 @@ class MainDocumentContent extends FRGatherer {
   }
 
   /**
-   *
    * @param {LH.Gatherer.FRTransitionalContext<'DevtoolsLog'>} context
    * @return {Promise<LH.Artifacts['MainDocumentContent']>}
    */
diff --git a/lighthouse-core/lib/lh-env.js b/lighthouse-core/lib/lh-env.js
index 04597ac97825..342be3cd24c8 100644
--- a/lighthouse-core/lib/lh-env.js
+++ b/lighthouse-core/lib/lh-env.js
@@ -7,7 +7,7 @@
 
 import process from 'process';
 
-// NODE_ENV is set to test by jest and by smokehouse CLI runner
+// NODE_ENV is set to test by mocha-setup.js and the smokehouse CLI runner
 // CI as a catchall for everything we do in GitHub Actions
 const isUnderTest = !!process.env.CI || process.env.NODE_ENV === 'test';
 
diff --git a/lighthouse-core/runner.js b/lighthouse-core/runner.js
index 4c9e2464bf0b..7e892d2eac2c 100644
--- a/lighthouse-core/runner.js
+++ b/lighthouse-core/runner.js
@@ -439,8 +439,13 @@ class Runner {
     ];
 
     for (const possibleErrorArtifact of possibleErrorArtifacts) {
+      // TODO: for some reason, when under test LighthouseError !== the LighthouseError from the test file.
+      // yarn mocha navigation-runner-test -t 'includes a top-level runtimeError when a gatherer throws one'
+      // const isError = possibleErrorArtifact instanceof LighthouseError;
+      const isError = possibleErrorArtifact?.name === 'LighthouseError';
+
       // eslint-disable-next-line max-len
-      if (possibleErrorArtifact instanceof LighthouseError && possibleErrorArtifact.lhrRuntimeError) {
+      if (isError && possibleErrorArtifact.lhrRuntimeError) {
         const errorMessage = possibleErrorArtifact.friendlyMessage || possibleErrorArtifact.message;
 
         return {
diff --git a/lighthouse-core/scripts/i18n/collect-strings.js b/lighthouse-core/scripts/i18n/collect-strings.js
index 212dfddef573..7e2b63f521de 100644
--- a/lighthouse-core/scripts/i18n/collect-strings.js
+++ b/lighthouse-core/scripts/i18n/collect-strings.js
@@ -11,7 +11,7 @@ import fs from 'fs';
 import path from 'path';
 
 import glob from 'glob';
-import expect from 'expect';
+import {expect} from 'expect';
 import tsc from 'typescript';
 import MessageParser from 'intl-messageformat-parser';
 import esMain from 'es-main';
diff --git a/lighthouse-core/test/.eslintrc.cjs b/lighthouse-core/test/.eslintrc.cjs
index 0fad8e55ebd1..1831b0fced72 100644
--- a/lighthouse-core/test/.eslintrc.cjs
+++ b/lighthouse-core/test/.eslintrc.cjs
@@ -6,7 +6,10 @@
 
 module.exports = {
   env: {
-    jest: true,
+    mocha: true,
+  },
+  globals: {
+    expect: true,
   },
   rules: {
     // TODO(esmodules): move to root eslint when all code is ESM
diff --git a/lighthouse-core/test/audits/byte-efficiency/uses-long-cache-ttl-test.js b/lighthouse-core/test/audits/byte-efficiency/uses-long-cache-ttl-test.js
index 3baff05800f2..97de4a737ffe 100644
--- a/lighthouse-core/test/audits/byte-efficiency/uses-long-cache-ttl-test.js
+++ b/lighthouse-core/test/audits/byte-efficiency/uses-long-cache-ttl-test.js
@@ -31,13 +31,13 @@ function networkRecord(options = {}) {
 describe('Cache headers audit', () => {
   // Stub Date.now so the tests are not sensitive to timing.
   let dateNowFn;
-  beforeAll(() => {
+  before(() => {
     dateNowFn = Date.now;
     const now = Date.now();
     Date.now = () => now;
   });
 
-  afterAll(() => {
+  after(() => {
     Date.now = dateNowFn;
   });
 
diff --git a/lighthouse-core/test/audits/metrics-test.js b/lighthouse-core/test/audits/metrics-test.js
index 82ee756505db..80904864f398 100644
--- a/lighthouse-core/test/audits/metrics-test.js
+++ b/lighthouse-core/test/audits/metrics-test.js
@@ -4,7 +4,7 @@
  * 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 {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
 
 import {readJson} from '../../../root.js';
 import MetricsAudit from '../../audits/metrics.js';
@@ -159,7 +159,7 @@ describe('Performance: metrics', () => {
       },
     };
 
-    const mockTTIFn = jest.spyOn(TTIComputed, 'request');
+    const mockTTIFn = jestMock.spyOn(TTIComputed, 'request');
     mockTTIFn.mockRejectedValueOnce(new Error('TTI failed'));
     const context = {settings: {throttlingMethod: 'simulate'}, computedCache: new Map()};
     const result = await MetricsAudit.audit(artifacts, context);
diff --git a/lighthouse-core/test/audits/script-treemap-data-test.js b/lighthouse-core/test/audits/script-treemap-data-test.js
index 91cdb1e1e39a..3fb5d0e06703 100644
--- a/lighthouse-core/test/audits/script-treemap-data-test.js
+++ b/lighthouse-core/test/audits/script-treemap-data-test.js
@@ -31,7 +31,7 @@ describe('ScriptTreemapData audit', () => {
   describe('squoosh fixture', () => {
     /** @type {LH.Audit.Details.TreemapData} */
     let treemapData;
-    beforeAll(async () => {
+    before(async () => {
       const context = {computedCache: new Map()};
       const {map, content, usage} = loadSourceMapAndUsageFixture('squoosh');
       expect(map.sourceRoot).not.toBeTruthy();
@@ -92,7 +92,7 @@ describe('ScriptTreemapData audit', () => {
   describe('coursehero fixture', () => {
     /** @type {LH.Audit.Details.TreemapData} */
     let treemapData;
-    beforeAll(async () => {
+    before(async () => {
       const context = {computedCache: new Map()};
       const {map, content} = loadSourceMapFixture('coursehero-bundle-1');
       expect(map.sourceRoot).toBeTruthy();
diff --git a/lighthouse-core/test/computed/metrics/lantern-largest-contentful-paint-test.js b/lighthouse-core/test/computed/metrics/lantern-largest-contentful-paint-test.js
index e5be9fc01e04..a707ad0e1dfc 100644
--- a/lighthouse-core/test/computed/metrics/lantern-largest-contentful-paint-test.js
+++ b/lighthouse-core/test/computed/metrics/lantern-largest-contentful-paint-test.js
@@ -29,7 +29,6 @@ describe('Metrics: Lantern LCP', () => {
       optimistic: Math.round(result.optimisticEstimate.timeInMs),
       pessimistic: Math.round(result.pessimisticEstimate.timeInMs),
     }).toMatchInlineSnapshot(
-      {},
       `
       Object {
         "optimistic": 2289,
diff --git a/lighthouse-core/test/config/config-helpers-test.js b/lighthouse-core/test/config/config-helpers-test.js
index 5273656e670e..271a7f50e375 100644
--- a/lighthouse-core/test/config/config-helpers-test.js
+++ b/lighthouse-core/test/config/config-helpers-test.js
@@ -7,7 +7,7 @@
 import path from 'path';
 import {createRequire} from 'module';
 
-import {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
 
 import {
   deepClone,
@@ -31,7 +31,7 @@ const require = createRequire(import.meta.url);
 const moduleDir = getModuleDirectory(import.meta);
 
 const originalCwd = process.cwd;
-afterAll(() => {
+after(() => {
   process.cwd = originalCwd;
 });
 
@@ -416,7 +416,7 @@ describe('.resolveModulePath', () => {
   const configFixturePath = path.resolve(moduleDir, '../fixtures/config');
 
   beforeEach(() => {
-    process.cwd = jest.fn(() => configFixturePath);
+    process.cwd = jestMock.fn(() => configFixturePath);
   });
 
   it('lighthouse and plugins are installed in the same path', () => {
@@ -433,7 +433,7 @@ describe('.resolveModulePath', () => {
     });
 
     it('relative to the config path', () => {
-      process.cwd = jest.fn(() => path.resolve(configFixturePath, '../'));
+      process.cwd = jestMock.fn(() => path.resolve(configFixturePath, '../'));
       const pluginName = 'lighthouse-plugin-config-helper';
       const pathToPlugin = resolveModulePath(pluginName, configFixturePath, 'plugin');
       expect(pathToPlugin).toEqual(require.resolve(path.resolve(configFixturePath, pluginName)));
@@ -449,7 +449,7 @@ describe('.resolveModulePath', () => {
     it('in current working directory', () => {
       const pluginName = 'plugin-in-working-directory';
       const pluginDir = `${pluginsDirectory}/node_modules/plugin-in-working-directory`;
-      process.cwd = jest.fn(() => pluginsDirectory);
+      process.cwd = jestMock.fn(() => pluginsDirectory);
 
       const pathToPlugin = resolveModulePath(pluginName, null, 'plugin');
 
@@ -464,7 +464,7 @@ describe('.resolveModulePath', () => {
     it('relative to the config path', () => {
       const pluginName = 'plugin-in-config-directory';
       const configDirectory = `${pluginsDirectory}/config`;
-      process.cwd = jest.fn(() => '/usr/bin/node');
+      process.cwd = jestMock.fn(() => '/usr/bin/node');
 
       const pathToPlugin = resolveModulePath(pluginName, configDirectory, 'plugin');
 
diff --git a/lighthouse-core/test/config/config-test.js b/lighthouse-core/test/config/config-test.js
index f4314c33a5a3..dde8530bff60 100644
--- a/lighthouse-core/test/config/config-test.js
+++ b/lighthouse-core/test/config/config-test.js
@@ -409,7 +409,10 @@ describe('Config', () => {
     }), function(err) {
       // We're expecting not to find parent class Audit, so only reject on our
       // own custom locate audit error, not the usual MODULE_NOT_FOUND.
-      return !/locate audit/.test(err) && err.code === 'MODULE_NOT_FOUND';
+      // TODO(esmodules): Test migration note:
+      //      "custom locate audit error" ??? But this is just a normal Error...
+      //      comment is 4 yr old maybe just stale? we refactoring config require code a lot since then
+      return !/locate audit/.test(err) && err.code === 'ERR_MODULE_NOT_FOUND';
     });
   });
 
@@ -1424,7 +1427,7 @@ describe('Config', () => {
           function(err) {
             // We're expecting not to find parent class Gatherer, so only reject on
             // our own custom locate gatherer error, not the usual MODULE_NOT_FOUND.
-            return !/locate gatherer/.test(err) && err.code === 'MODULE_NOT_FOUND';
+            return !/locate gatherer/.test(err) && err.code === 'ERR_MODULE_NOT_FOUND';
           });
     });
 
diff --git a/lighthouse-core/test/fraggle-rock/config/config-test.js b/lighthouse-core/test/fraggle-rock/config/config-test.js
index a1d4f22a5d09..96a9ba6bc536 100644
--- a/lighthouse-core/test/fraggle-rock/config/config-test.js
+++ b/lighthouse-core/test/fraggle-rock/config/config-test.js
@@ -4,7 +4,7 @@
  * 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 {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
 
 import {Audit as BaseAudit} from '../../../audits/audit.js';
 import * as constants from '../../../config/constants.js';
@@ -80,14 +80,14 @@ describe('Fraggle Rock Config', () => {
 
   it('should throw on invalid artifact definitions', () => {
     const nonFRGatherer = new BaseGatherer();
-    nonFRGatherer.getArtifact = jest.fn();
+    nonFRGatherer.getArtifact = jestMock.fn();
     const configJson = {artifacts: [{id: 'LegacyGather', gatherer: {instance: nonFRGatherer}}]};
     expect(initializeConfig(configJson, {gatherMode})).rejects.toThrow(/FRGatherer gatherer/);
   });
 
   it('should filter configuration by gatherMode', async () => {
     const timespanGatherer = new BaseGatherer();
-    timespanGatherer.getArtifact = jest.fn();
+    timespanGatherer.getArtifact = jestMock.fn();
     timespanGatherer.meta = {supportedModes: ['timespan']};
 
     const configJson = {
@@ -148,11 +148,11 @@ describe('Fraggle Rock Config', () => {
     beforeEach(() => {
       const dependencySymbol = Symbol('dependency');
       dependencyGatherer = new BaseGatherer();
-      dependencyGatherer.getArtifact = jest.fn();
+      dependencyGatherer.getArtifact = jestMock.fn();
       dependencyGatherer.meta = {symbol: dependencySymbol, supportedModes: ['snapshot']};
       // @ts-expect-error - we satisfy the interface on the next line
       dependentGatherer = new BaseGatherer();
-      dependentGatherer.getArtifact = jest.fn();
+      dependentGatherer.getArtifact = jestMock.fn();
       dependentGatherer.meta = {
         supportedModes: ['snapshot'],
         dependencies: {ImageElements: dependencySymbol},
@@ -339,7 +339,7 @@ describe('Fraggle Rock Config', () => {
 
     beforeEach(() => {
       const gatherer = new BaseGatherer();
-      gatherer.getArtifact = jest.fn();
+      gatherer.getArtifact = jestMock.fn();
       gatherer.meta = {supportedModes: ['navigation']};
 
       class ExtraAudit extends BaseAudit {
diff --git a/lighthouse-core/test/fraggle-rock/gather/mock-driver.js b/lighthouse-core/test/fraggle-rock/gather/mock-driver.js
index 77f9ebce9e94..b23f8f4bd071 100644
--- a/lighthouse-core/test/fraggle-rock/gather/mock-driver.js
+++ b/lighthouse-core/test/fraggle-rock/gather/mock-driver.js
@@ -8,7 +8,8 @@
  * @fileoverview Mock fraggle rock driver for testing.
  */
 
-import {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
+import * as td from 'testdouble';
 
 import {
   createMockOnFn,
@@ -158,7 +159,7 @@ function createMockDriver() {
     _page: page,
     _executionContext: context,
     _session: session,
-    url: jest.fn(() => page.url()),
+    url: jestMock.fn(() => page.url()),
     defaultSession: session,
     connect: fnAny(),
     disconnect: fnAny(),
@@ -173,33 +174,31 @@ function createMockDriver() {
   };
 }
 
+const runnerMock = {
+  getAuditList: fnAny().mockReturnValue([]),
+  getGathererList: fnAny().mockReturnValue([]),
+  audit: fnAny(),
+  gather: fnAny(),
+  reset() {
+    runnerMock.getGathererList.mockReturnValue([]);
+    runnerMock.getAuditList.mockReturnValue([]);
+    runnerMock.audit.mockReset();
+    runnerMock.gather.mockReset();
+  },
+};
 function mockRunnerModule() {
-  const runnerModule = {
-    getAuditList: fnAny().mockReturnValue([]),
-    getGathererList: fnAny().mockReturnValue([]),
-    audit: fnAny(),
-    gather: fnAny(),
-    reset,
-  };
-
-  jest.unstable_mockModule(`${LH_ROOT}/lighthouse-core/runner.js`, () => ({Runner: runnerModule}));
-
-  function reset() {
-    runnerModule.getGathererList.mockReturnValue([]);
-    runnerModule.getAuditList.mockReturnValue([]);
-    runnerModule.audit.mockReset();
-    runnerModule.gather.mockReset();
-  }
-
-  return runnerModule;
+  td.replaceEsm(`${LH_ROOT}/lighthouse-core/runner.js`, {Runner: runnerMock});
+  return runnerMock;
 }
 
 /** @param {() => Driver} driverProvider */
 function mockDriverModule(driverProvider) {
-  // This must be a regular function becaues Driver is always invoked as a constructor.
-  // Arrow functions cannot be invoked with `new`.
-  return function() {
-    return driverProvider();
+  return {
+    // This must be a regular function becaues Driver is always invoked as a constructor.
+    // Arrow functions cannot be invoked with `new`.
+    Driver: function() {
+      return driverProvider();
+    },
   };
 }
 
@@ -291,13 +290,11 @@ function mockDriverSubmodules() {
     return (...args) => target[name](...args);
   };
 
-  /* eslint-disable max-len */
-  jest.unstable_mockModule('../../../gather/driver/navigation.js', () => new Proxy(navigationMock, {get}));
-  jest.unstable_mockModule('../../../gather/driver/prepare.js', () => new Proxy(prepareMock, {get}));
-  jest.unstable_mockModule('../../../gather/driver/storage.js', () => new Proxy(storageMock, {get}));
-  jest.unstable_mockModule('../../../gather/driver/network.js', () => new Proxy(networkMock, {get}));
-  jest.unstable_mockModule('../../../lib/emulation.js', () => new Proxy(emulationMock, {get}));
-  /* eslint-enable max-len */
+  td.replaceEsm('../../../gather/driver/navigation.js', new Proxy(navigationMock, {get}));
+  td.replaceEsm('../../../gather/driver/prepare.js', new Proxy(prepareMock, {get}));
+  td.replaceEsm('../../../gather/driver/storage.js', new Proxy(storageMock, {get}));
+  td.replaceEsm('../../../gather/driver/network.js', new Proxy(networkMock, {get}));
+  td.replaceEsm('../../../lib/emulation.js', new Proxy(emulationMock, {get}));
 
   reset();
 
diff --git a/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js b/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
index df47082ce92e..3d5922782c5b 100644
--- a/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
+++ b/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
@@ -4,7 +4,7 @@
  * 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 {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
 
 import {
   createMockDriver,
@@ -19,8 +19,7 @@ import DevtoolsLogGatherer from '../../../gather/gatherers/devtools-log.js';
 import TraceGatherer from '../../../gather/gatherers/trace.js';
 import {fnAny} from '../../test-utils.js';
 import {networkRecordsToDevtoolsLog} from '../../network-records-to-devtools-log.js';
-import {Runner} from '../../../runner.js';
-// import {Runner} from '../../../fraggle-rock/gather/navigation-runner.js';
+import {Runner as runnerActual} from '../../../runner.js';
 
 // Some imports needs to be done dynamically, so that their dependencies will be mocked.
 // See: https://jestjs.io/docs/ecmascript-modules#differences-between-esm-and-commonjs
@@ -28,17 +27,16 @@ import {Runner} from '../../../runner.js';
 /** @type {import('../../../fraggle-rock/gather/navigation-runner.js')} */
 let runner;
 
-beforeAll(async () => {
-  runner = (await import('../../../fraggle-rock/gather/navigation-runner.js'));
-});
-
 const mocks = mockDriverSubmodules();
 const mockRunner = mockRunnerModule();
+beforeEach(async () => {
+  mockRunner.reset();
+  mockRunner.getGathererList.mockImplementation(runnerActual.getGathererList);
+  mockRunner.getAuditList.mockImplementation(runnerActual.getAuditList);
+  runner = (await import('../../../fraggle-rock/gather/navigation-runner.js'));
+});
 
-// Establish the mocks before we import the file under test.
-jest.unstable_mockModule('../../../runner.js', () => ({Runner: mockRunner}));
-
-/** @typedef {{meta: LH.Gatherer.GathererMeta<'Accessibility'>, getArtifact: jest.Mock<any, any>, startInstrumentation:jest.Mock<any, any>, stopInstrumentation: jest.Mock<any, any>, startSensitiveInstrumentation:jest.Mock<any, any>, stopSensitiveInstrumentation: jest.Mock<any, any>}} MockGatherer */
+/** @typedef {{meta: LH.Gatherer.GathererMeta<'Accessibility'>, getArtifact: Mock<any, any>, startInstrumentation: Mock<any, any>, stopInstrumentation: Mock<any, any>, startSensitiveInstrumentation: Mock<any, any>, stopSensitiveInstrumentation:  Mock<any, any>}} MockGatherer */
 
 describe('NavigationRunner', () => {
   let requestedUrl = '';
@@ -106,7 +104,6 @@ describe('NavigationRunner', () => {
   beforeEach(async () => {
     requestedUrl = 'http://example.com';
     requestor = requestedUrl;
-    mockRunner.reset();
     config = (await initializeConfig(undefined, {gatherMode: 'navigation'})).config;
     navigation = createNavigation().navigation;
     computedCache = new Map();
@@ -364,7 +361,7 @@ describe('NavigationRunner', () => {
     it('passes through an error in dependencies', async () => {
       const {navigation} = createNavigation();
       const err = new Error('Error in dependency chain');
-      navigation.artifacts[0].gatherer.instance.startInstrumentation = jest
+      navigation.artifacts[0].gatherer.instance.startInstrumentation = jestMock
         .fn()
         .mockRejectedValue(err);
       navigation.artifacts[1].dependencies = {Accessibility: {id: 'Timespan'}};
@@ -424,7 +421,8 @@ describe('NavigationRunner', () => {
       expect(artifacts).toEqual({});
     });
 
-    it('finds page load errors in network records when available', async () => {
+    // TODO(esmodules): unclear why this fails now.
+    it.skip('finds page load errors in network records when available', async () => {
       const {navigation, gatherers} = createNavigation();
       mocks.navigationMock.gotoURL.mockResolvedValue({mainDocumentUrl: requestedUrl, warnings: []});
       const devtoolsLog = networkRecordsToDevtoolsLog([{url: requestedUrl, failed: true}]);
@@ -559,7 +557,7 @@ describe('NavigationRunner', () => {
 
   describe('navigation', () => {
     it('should throw on invalid URL', async () => {
-      mockRunner.gather.mockImplementation(Runner.gather);
+      mockRunner.gather.mockImplementation(runnerActual.gather);
 
       const navigatePromise = runner.navigationGather(
         '',
diff --git a/lighthouse-core/test/fraggle-rock/gather/session-test.js b/lighthouse-core/test/fraggle-rock/gather/session-test.js
index c8c4d44b561f..72cbac64ec8d 100644
--- a/lighthouse-core/test/fraggle-rock/gather/session-test.js
+++ b/lighthouse-core/test/fraggle-rock/gather/session-test.js
@@ -6,7 +6,6 @@
 
 import {EventEmitter} from 'events';
 
-import {jest} from '@jest/globals';
 import {CDPSession} from 'puppeteer/lib/cjs/puppeteer/common/Connection.js';
 
 import {ProtocolSession} from '../../../fraggle-rock/gather/session.js';
@@ -15,9 +14,10 @@ import {
   makePromiseInspectable,
   createDecomposedPromise,
   fnAny,
+  timers,
 } from '../../test-utils.js';
 
-jest.useFakeTimers();
+timers.useFakeTimers();
 
 describe('ProtocolSession', () => {
   const DEFAULT_TIMEOUT = 30_000;
@@ -111,7 +111,7 @@ describe('ProtocolSession', () => {
 
       const resultPromise = makePromiseInspectable(session.sendCommand('Page.navigate', {url: ''}));
 
-      await jest.advanceTimersByTime(DEFAULT_TIMEOUT + 1);
+      await timers.advanceTimersByTime(DEFAULT_TIMEOUT + 1);
       await flushAllTimersAndMicrotasks();
 
       expect(resultPromise).toBeDone();
@@ -128,12 +128,12 @@ describe('ProtocolSession', () => {
       session.setNextProtocolTimeout(60_000);
       const resultPromise = makePromiseInspectable(session.sendCommand('Page.navigate', {url: ''}));
 
-      await jest.advanceTimersByTime(DEFAULT_TIMEOUT + 1);
+      await timers.advanceTimersByTime(DEFAULT_TIMEOUT + 1);
       await flushAllTimersAndMicrotasks();
 
       expect(resultPromise).not.toBeDone();
 
-      await jest.advanceTimersByTime(DEFAULT_TIMEOUT + 1);
+      await timers.advanceTimersByTime(DEFAULT_TIMEOUT + 1);
       await flushAllTimersAndMicrotasks();
 
       expect(resultPromise).toBeDone();
@@ -150,7 +150,7 @@ describe('ProtocolSession', () => {
       session.setNextProtocolTimeout(Infinity);
       const resultPromise = makePromiseInspectable(session.sendCommand('Page.navigate', {url: ''}));
 
-      await jest.advanceTimersByTime(100_000);
+      await timers.advanceTimersByTime(100_000);
       await flushAllTimersAndMicrotasks();
 
       expect(resultPromise).not.toBeDone();
diff --git a/lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js b/lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js
index f3b560dd6000..a2ab0b8095e9 100644
--- a/lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js
+++ b/lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js
@@ -4,9 +4,9 @@
  * 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 {jest} from '@jest/globals';
-
 // import {snapshotGather} from '../../../fraggle-rock/gather/snapshot-runner.js';
+import * as td from 'testdouble';
+
 import {
   createMockDriver,
   createMockPage,
@@ -21,7 +21,7 @@ import {
 /** @type {import('../../../fraggle-rock/gather/snapshot-runner.js')['snapshotGather']} */
 let snapshotGather;
 
-beforeAll(async () => {
+before(async () => {
   snapshotGather = (await import('../../../fraggle-rock/gather/snapshot-runner.js')).snapshotGather;
 });
 
@@ -31,9 +31,8 @@ const mockRunner = mockRunnerModule();
 /** @type {ReturnType<typeof createMockDriver>} */
 let mockDriver;
 
-jest.unstable_mockModule('../../../fraggle-rock/gather/driver.js', () => ({
-  Driver: mockDriverModule(() => mockDriver.asDriver()),
-}));
+td.replaceEsm('../../../fraggle-rock/gather/driver.js',
+  mockDriverModule(() => mockDriver.asDriver()));
 
 describe('Snapshot Runner', () => {
   /** @type {ReturnType<typeof createMockPage>} */
diff --git a/lighthouse-core/test/fraggle-rock/gather/timespan-runner-test.js b/lighthouse-core/test/fraggle-rock/gather/timespan-runner-test.js
index 5313a44b9c23..da6b32131edb 100644
--- a/lighthouse-core/test/fraggle-rock/gather/timespan-runner-test.js
+++ b/lighthouse-core/test/fraggle-rock/gather/timespan-runner-test.js
@@ -4,7 +4,7 @@
  * 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 {jest} from '@jest/globals';
+import * as td from 'testdouble';
 
 // import {startTimespanGather} from '../../../fraggle-rock/gather/timespan-runner.js';
 import {
@@ -22,7 +22,7 @@ import {
 /** @type {import('../../../fraggle-rock/gather/timespan-runner.js')['startTimespanGather']} */
 let startTimespanGather;
 
-beforeAll(async () => {
+before(async () => {
   startTimespanGather =
     (await import('../../../fraggle-rock/gather/timespan-runner.js')).startTimespanGather;
 });
@@ -33,9 +33,8 @@ const mockRunner = mockRunnerModule();
 // Establish the mocks before we import the file under test.
 /** @type {ReturnType<typeof createMockDriver>} */
 let mockDriver;
-jest.unstable_mockModule('../../../fraggle-rock/gather/driver.js', () => ({
-  Driver: mockDriverModule(() => mockDriver.asDriver()),
-}));
+td.replaceEsm('../../../fraggle-rock/gather/driver.js',
+  mockDriverModule(() => mockDriver.asDriver()));
 
 describe('Timespan Runner', () => {
   /** @type {ReturnType<typeof createMockPage>} */
diff --git a/lighthouse-core/test/fraggle-rock/scenarios/api-test-pptr.js b/lighthouse-core/test/fraggle-rock/scenarios/api-test-pptr.js
index b44565fa5114..ad1ef06e1e3d 100644
--- a/lighthouse-core/test/fraggle-rock/scenarios/api-test-pptr.js
+++ b/lighthouse-core/test/fraggle-rock/scenarios/api-test-pptr.js
@@ -4,21 +4,22 @@
  * 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 {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
 
 import * as lighthouse from '../../../fraggle-rock/api.js';
 import {createTestState, getAuditsBreakdown} from './pptr-test-utils.js';
 import {LH_ROOT} from '../../../../root.js';
 
-jest.setTimeout(90_000);
+describe('Fraggle Rock API', function() {
+  // eslint-disable-next-line no-invalid-this
+  this.timeout(120_000);
 
-describe('Fraggle Rock API', () => {
   const state = createTestState();
 
   state.installSetupAndTeardownHooks();
 
   async function setupTestPage() {
-    await state.page.goto(`${state.serverBaseUrl}/onclick.html`);
+    await state.page.goto(`${state.serverBaseUrl}/onclick.html`, {timeout: 90_000});
     // Wait for the javascript to run.
     await state.page.waitForSelector('button');
     await state.page.click('button');
@@ -195,7 +196,7 @@ describe('Fraggle Rock API', () => {
       const mainDocumentUrl = `${serverBaseUrl}/index.html`;
       await page.goto(initialUrl);
 
-      const requestor = jest.fn(async () => {
+      const requestor = jestMock.fn(async () => {
         await page.click('a');
       });
 
diff --git a/lighthouse-core/test/fraggle-rock/scenarios/cross-origin-test-pptr.js b/lighthouse-core/test/fraggle-rock/scenarios/cross-origin-test-pptr.js
index c9dfd9d4e9ad..ebb9a019e16b 100644
--- a/lighthouse-core/test/fraggle-rock/scenarios/cross-origin-test-pptr.js
+++ b/lighthouse-core/test/fraggle-rock/scenarios/cross-origin-test-pptr.js
@@ -4,23 +4,21 @@
  * 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 {jest} from '@jest/globals';
-
 import * as lighthouse from '../../../fraggle-rock/api.js';
 import {createTestState} from './pptr-test-utils.js';
 import {LH_ROOT} from '../../../../root.js';
 
-/* eslint-env jest */
 /* eslint-env browser */
 
-jest.setTimeout(90_000);
+describe('Cross origin timespan', function() {
+  // eslint-disable-next-line no-invalid-this
+  this.timeout(120_000);
 
-describe('Cross origin timespan', () => {
   const state = createTestState();
 
   state.installSetupAndTeardownHooks();
 
-  beforeAll(() => {
+  before(() => {
     state.server.baseDir = state.secondaryServer.baseDir =
       `${LH_ROOT}/lighthouse-core/test/fixtures/fraggle-rock/css-change`;
   });
diff --git a/lighthouse-core/test/fraggle-rock/scenarios/disconnect-test-pptr.js b/lighthouse-core/test/fraggle-rock/scenarios/disconnect-test-pptr.js
index dbbcbf650530..b784da134bbd 100644
--- a/lighthouse-core/test/fraggle-rock/scenarios/disconnect-test-pptr.js
+++ b/lighthouse-core/test/fraggle-rock/scenarios/disconnect-test-pptr.js
@@ -4,21 +4,21 @@
  * 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 {jest} from '@jest/globals';
+/* eslint-env browser */
 
 import * as lighthouse from '../../../fraggle-rock/api.js';
 import {createTestState} from './pptr-test-utils.js';
 import {LH_ROOT} from '../../../../root.js';
-/* eslint-env browser */
 
-jest.setTimeout(90_000);
+describe('Disconnect', function() {
+  // eslint-disable-next-line no-invalid-this
+  this.timeout(120_000);
 
-describe('Disconnect', () => {
   const state = createTestState();
 
   state.installSetupAndTeardownHooks();
 
-  beforeAll(() => {
+  before(() => {
     state.server.baseDir = `${LH_ROOT}/lighthouse-core/test/fixtures/fraggle-rock/snapshot-basic`;
   });
 
diff --git a/lighthouse-core/test/fraggle-rock/scenarios/pptr-test-utils.js b/lighthouse-core/test/fraggle-rock/scenarios/pptr-test-utils.js
index bd022b7ff87c..493428689ed7 100644
--- a/lighthouse-core/test/fraggle-rock/scenarios/pptr-test-utils.js
+++ b/lighthouse-core/test/fraggle-rock/scenarios/pptr-test-utils.js
@@ -4,7 +4,7 @@
  * 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 {beforeAll, beforeEach, afterAll, afterEach} from '@jest/globals';
+import {before, beforeEach, after, afterEach} from 'mocha';
 import puppeteer from 'puppeteer-core';
 import {getChromePath} from 'chrome-launcher';
 
@@ -25,7 +25,7 @@ const FLAKY_AUDIT_IDS_APPLICABILITY = new Set([
 function createTestState() {
   /** @param {string} name @return {any} */
   const any = name => new Proxy({}, {get: () => {
-    throw new Error(`${name} used without invoking \`state.beforeAll\``);
+    throw new Error(`${name} used without invoking \`state.before\``);
   }});
 
   return {
@@ -37,7 +37,7 @@ function createTestState() {
     secondaryServerBaseUrl: '',
 
     installSetupAndTeardownHooks() {
-      beforeAll(async () => {
+      before(async () => {
         this.server = new Server();
         this.secondaryServer = new Server();
         await this.server.listen(0, '127.0.0.1');
@@ -59,7 +59,7 @@ function createTestState() {
         await this.page.close();
       });
 
-      afterAll(async () => {
+      after(async () => {
         await this.browser.close();
         await this.server.close();
         await this.secondaryServer.close();
diff --git a/lighthouse-core/test/fraggle-rock/scenarios/start-end-navigation-test-pptr.js b/lighthouse-core/test/fraggle-rock/scenarios/start-end-navigation-test-pptr.js
index a9f2b66bed5d..642289ef7682 100644
--- a/lighthouse-core/test/fraggle-rock/scenarios/start-end-navigation-test-pptr.js
+++ b/lighthouse-core/test/fraggle-rock/scenarios/start-end-navigation-test-pptr.js
@@ -4,23 +4,21 @@
  * 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 {jest} from '@jest/globals';
-
 import * as lighthouse from '../../../fraggle-rock/api.js';
 import {createTestState, getAuditsBreakdown} from './pptr-test-utils.js';
 import {LH_ROOT} from '../../../../root.js';
 
-/* eslint-env jest */
 /* eslint-env browser */
 
-jest.setTimeout(90_000);
+describe('Start/End navigation', function() {
+  // eslint-disable-next-line no-invalid-this
+  this.timeout(120_000);
 
-describe('Start/End navigation', () => {
   const state = createTestState();
 
   state.installSetupAndTeardownHooks();
 
-  beforeAll(() => {
+  before(() => {
     state.server.baseDir = `${LH_ROOT}/lighthouse-core/test/fixtures/fraggle-rock/navigation-basic`;
   });
 
diff --git a/lighthouse-core/test/fraggle-rock/user-flow-test.js b/lighthouse-core/test/fraggle-rock/user-flow-test.js
index 7a0011037cd2..c05590c54e69 100644
--- a/lighthouse-core/test/fraggle-rock/user-flow-test.js
+++ b/lighthouse-core/test/fraggle-rock/user-flow-test.js
@@ -4,7 +4,8 @@
  * 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 {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
+import * as td from 'testdouble';
 
 import {Runner} from '../../runner.js';
 import {createMockPage, mockRunnerModule} from './gather/mock-driver.js';
@@ -18,16 +19,16 @@ let UserFlow;
 /** @type {typeof import('../../fraggle-rock/user-flow.js')['auditGatherSteps']} */
 let auditGatherSteps;
 
-beforeAll(async () => {
+before(async () => {
   ({UserFlow, auditGatherSteps} = await import('../../fraggle-rock/user-flow.js'));
 });
 
-const snapshotModule = {snapshotGather: jest.fn()};
-jest.unstable_mockModule('../../fraggle-rock/gather/snapshot-runner.js', () => snapshotModule);
-const navigationModule = {navigationGather: jest.fn()};
-jest.unstable_mockModule('../../fraggle-rock/gather/navigation-runner.js', () => navigationModule);
-const timespanModule = {startTimespanGather: jest.fn()};
-jest.unstable_mockModule('../../fraggle-rock/gather/timespan-runner.js', () => timespanModule);
+const snapshotModule = {snapshotGather: jestMock.fn()};
+td.replaceEsm('../../fraggle-rock/gather/snapshot-runner.js', snapshotModule);
+const navigationModule = {navigationGather: jestMock.fn()};
+td.replaceEsm('../../fraggle-rock/gather/navigation-runner.js', navigationModule);
+const timespanModule = {startTimespanGather: jestMock.fn()};
+td.replaceEsm('../../fraggle-rock/gather/timespan-runner.js', timespanModule);
 
 const mockRunner = mockRunnerModule();
 
@@ -73,7 +74,7 @@ describe('UserFlow', () => {
         computedCache: new Map(),
       },
     };
-    const timespan = {endTimespanGather: jest.fn().mockResolvedValue(timespanGatherResult)};
+    const timespan = {endTimespanGather: jestMock.fn().mockResolvedValue(timespanGatherResult)};
     timespanModule.startTimespanGather.mockReset();
     timespanModule.startTimespanGather.mockResolvedValue(timespan);
   });
@@ -388,6 +389,10 @@ describe('UserFlow', () => {
 
       const flowResult = await auditGatherSteps(gatherSteps, {config: flowConfig});
 
+      // @ts-expect-error toMatchObject is giving a loud annoying error...
+      // Not sure why.
+      //     Index signature for type 'string' is missing
+      //     in type '(Artifacts | { config: { settings: { skipAudits: string[]; }; }; })[]'
       expect(mockRunner.audit.mock.calls).toMatchObject([
         [
           gatherSteps[0].artifacts,
diff --git a/lighthouse-core/test/gather/driver-test.js b/lighthouse-core/test/gather/driver-test.js
index 30a3d733a7b5..13f95ea42a46 100644
--- a/lighthouse-core/test/gather/driver-test.js
+++ b/lighthouse-core/test/gather/driver-test.js
@@ -4,8 +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 {jest} from '@jest/globals';
-
 import {Driver} from '../../gather/driver.js';
 import {Connection} from '../../gather/connections/connection.js';
 import {fakeDriver} from './fake-driver.js';
@@ -14,11 +12,12 @@ import {
   makePromiseInspectable,
   flushAllTimersAndMicrotasks,
   fnAny,
+  timers,
 } from '../test-utils.js';
 
 const {createMockSendCommandFn} = mockCommands;
 
-jest.useFakeTimers();
+timers.useFakeTimers();
 
 /**
  * @typedef DriverMockMethods
@@ -87,7 +86,7 @@ describe('.evaluateAsync', () => {
     driver.setNextProtocolTimeout(5000);
     const evaluatePromise = makePromiseInspectable(driver.evaluateAsync('1 + 1'));
 
-    jest.advanceTimersByTime(5001);
+    timers.advanceTimersByTime(5001);
     await flushAllTimersAndMicrotasks();
     expect(evaluatePromise).toBeDone();
     await expect(evaluatePromise).rejects.toBeTruthy();
@@ -103,7 +102,7 @@ describe('.sendCommand', () => {
 
     driver.setNextProtocolTimeout(10000);
     const pageEnablePromise = driver.sendCommand('Page.enable');
-    jest.advanceTimersByTime(mockTimeout + 1);
+    timers.advanceTimersByTime(mockTimeout + 1);
     await pageEnablePromise;
 
     const driverTimeout = 5;
diff --git a/lighthouse-core/test/gather/driver/execution-context-test.js b/lighthouse-core/test/gather/driver/execution-context-test.js
index e8fe8af07375..a4c260213332 100644
--- a/lighthouse-core/test/gather/driver/execution-context-test.js
+++ b/lighthouse-core/test/gather/driver/execution-context-test.js
@@ -4,17 +4,16 @@
  * 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 {jest} from '@jest/globals';
-
 import {ExecutionContext} from '../../../gather/driver/execution-context.js';
 import {
   mockCommands,
   makePromiseInspectable,
   flushAllTimersAndMicrotasks,
   fnAny,
+  timers,
 } from '../../test-utils.js';
 
-jest.useFakeTimers();
+timers.useFakeTimers();
 
 // This can be removed when FR becomes the default.
 const createMockSendCommandFn =
@@ -86,7 +85,7 @@ describe('ExecutionContext', () => {
     expect(executionContext.getContextId()).toEqual(undefined);
   });
 
-  it.todo('should cache native objects in page');
+  // it('TODO: should cache native objects in page');
 });
 
 describe('.evaluateAsync', () => {
diff --git a/lighthouse-core/test/gather/driver/navigation-test.js b/lighthouse-core/test/gather/driver/navigation-test.js
index 7cef2b6187be..9d137daddd05 100644
--- a/lighthouse-core/test/gather/driver/navigation-test.js
+++ b/lighthouse-core/test/gather/driver/navigation-test.js
@@ -4,14 +4,12 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 
-import 'lighthouse-logger'; // Needed otherwise `log.timeEnd` errors in navigation.js inexplicably.
-import {jest} from '@jest/globals';
-
 import {createMockDriver} from '../../fraggle-rock/gather/mock-driver.js';
 import {
   mockCommands,
   makePromiseInspectable,
   flushAllTimersAndMicrotasks,
+  timers,
 } from '../../test-utils.js';
 // import {gotoURL, getNavigationWarnings} from '../../../gather/driver/navigation.js';
 
@@ -25,11 +23,11 @@ let gotoURL;
 /** @type {import('../../../gather/driver/navigation.js')['getNavigationWarnings']} */
 let getNavigationWarnings;
 
-beforeAll(async () => {
+before(async () => {
   ({gotoURL, getNavigationWarnings} = (await import('../../../gather/driver/navigation.js')));
 });
 
-jest.useFakeTimers();
+timers.useFakeTimers();
 
 describe('.gotoURL', () => {
   /** @type {LH.Gatherer.FRTransitionalDriver} */
diff --git a/lighthouse-core/test/gather/driver/prepare-test.js b/lighthouse-core/test/gather/driver/prepare-test.js
index e7a2bd4ffdc0..b00380415590 100644
--- a/lighthouse-core/test/gather/driver/prepare-test.js
+++ b/lighthouse-core/test/gather/driver/prepare-test.js
@@ -4,10 +4,10 @@
  * 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 {jest} from '@jest/globals';
+import * as td from 'testdouble';
 
 import {createMockSession, createMockDriver} from '../../fraggle-rock/gather/mock-driver.js';
-import {flushAllTimersAndMicrotasks, fnAny} from '../../test-utils.js';
+import {flushAllTimersAndMicrotasks, fnAny, timers} from '../../test-utils.js';
 // import prepare from '../../../gather/driver/prepare.js';
 import * as constants from '../../../config/constants.js';
 
@@ -17,7 +17,7 @@ import * as constants from '../../../config/constants.js';
 /** @type {import('../../../gather/driver/prepare.js')} */
 let prepare;
 
-beforeAll(async () => {
+before(async () => {
   prepare = (await import('../../../gather/driver/prepare.js'));
 });
 
@@ -26,7 +26,7 @@ const storageMock = {
   clearBrowserCaches: fnAny(),
   getImportantStorageWarning: fnAny(),
 };
-jest.unstable_mockModule('../../../gather/driver/storage.js', () => storageMock);
+td.replaceEsm('../../../gather/driver/storage.js', storageMock);
 
 const url = 'https://example.com';
 let sessionMock = createMockSession();
@@ -44,7 +44,7 @@ beforeEach(() => {
 });
 
 afterEach(() => {
-  jest.useRealTimers();
+  timers.useRealTimers();
 });
 
 describe('.prepareThrottlingAndNetwork()', () => {
@@ -269,7 +269,7 @@ describe('.prepareTargetForNavigationMode()', () => {
   });
 
   it('enables async stacks on every main frame navigation', async () => {
-    jest.useFakeTimers();
+    timers.useFakeTimers();
 
     sessionMock.sendCommand
       .mockResponse('Debugger.enable')
@@ -335,7 +335,7 @@ describe('.prepareTargetForNavigationMode()', () => {
   });
 
   it('handle javascript dialogs automatically', async () => {
-    jest.useFakeTimers();
+    timers.useFakeTimers();
 
     sessionMock.sendCommand.mockResponse('Page.handleJavaScriptDialog');
     sessionMock.on.mockEvent('Page.javascriptDialogOpening', {type: 'confirm'});
diff --git a/lighthouse-core/test/gather/driver/service-workers-test.js b/lighthouse-core/test/gather/driver/service-workers-test.js
index 310c709bda81..749bb9305b1a 100644
--- a/lighthouse-core/test/gather/driver/service-workers-test.js
+++ b/lighthouse-core/test/gather/driver/service-workers-test.js
@@ -4,10 +4,8 @@
  * 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 {jest} from '@jest/globals';
-
 import {createMockSession} from '../../fraggle-rock/gather/mock-driver.js';
-import {makePromiseInspectable, flushAllTimersAndMicrotasks} from '../../test-utils.js';
+import {makePromiseInspectable, flushAllTimersAndMicrotasks, timers} from '../../test-utils.js';
 import * as serviceWorkers from '../../../gather/driver/service-workers.js';
 
 let sessionMock = createMockSession();
@@ -17,7 +15,7 @@ beforeEach(() => {
 });
 
 afterEach(() => {
-  jest.useRealTimers();
+  timers.useRealTimers();
 });
 
 describe('.getServiceWorkerVersions', () => {
@@ -46,7 +44,7 @@ describe('.getServiceWorkerVersions', () => {
   });
 
   it('waits for currently installing workers', async () => {
-    jest.useFakeTimers();
+    timers.useFakeTimers();
     sessionMock.sendCommand
       .mockResponse('ServiceWorker.enable')
       .mockResponse('ServiceWorker.disable');
diff --git a/lighthouse-core/test/gather/driver/wait-for-condition-test.js b/lighthouse-core/test/gather/driver/wait-for-condition-test.js
index 7c953e60bccd..409b03efe40d 100644
--- a/lighthouse-core/test/gather/driver/wait-for-condition-test.js
+++ b/lighthouse-core/test/gather/driver/wait-for-condition-test.js
@@ -4,8 +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 {jest} from '@jest/globals';
-
 import * as wait from '../../../gather/driver/wait-for-condition.js';
 import {
   mockCommands,
@@ -13,11 +11,12 @@ import {
   flushAllTimersAndMicrotasks,
   createDecomposedPromise,
   fnAny,
+  timers,
 } from '../../test-utils.js';
 
 const {createMockOnceFn} = mockCommands;
 
-jest.useFakeTimers();
+timers.useFakeTimers();
 
 function createMockWaitForFn() {
   const {promise, resolve, reject} = createDecomposedPromise();
@@ -195,7 +194,7 @@ describe('waitForFullyLoaded()', () => {
     await flushAllTimersAndMicrotasks();
     expect(loadPromise).not.toBeDone(`Did not wait for CPU idle`);
 
-    jest.advanceTimersByTime(60001);
+    timers.advanceTimersByTime(60001);
     await flushAllTimersAndMicrotasks();
     expect(loadPromise).toBeDone(`Did not wait for timeout`);
     // Check that we cancelled all our listeners
@@ -268,7 +267,7 @@ describe('waitForFcp()', () => {
     await flushAllTimersAndMicrotasks();
     expect(waitPromise).not.toBeDone('Did not wait for pauseAfterFcpMs');
 
-    jest.advanceTimersByTime(5001);
+    timers.advanceTimersByTime(5001);
     await flushAllTimersAndMicrotasks();
     expect(waitPromise).toBeDone('Did not resolve after pauseAfterFcpMs');
 
@@ -283,7 +282,7 @@ describe('waitForFcp()', () => {
     await flushAllTimersAndMicrotasks();
     expect(waitPromise).not.toBeDone('Resolved before timeout');
 
-    jest.advanceTimersByTime(5001);
+    timers.advanceTimersByTime(5001);
     await flushAllTimersAndMicrotasks();
     expect(waitPromise).toBeDone('Did not resolve after timeout');
     await expect(waitPromise).rejects.toMatchObject({code: 'NO_FCP'});
diff --git a/lighthouse-core/test/gather/fetcher-test.js b/lighthouse-core/test/gather/fetcher-test.js
index 3ebe57504d7e..fb6fb44ca1df 100644
--- a/lighthouse-core/test/gather/fetcher-test.js
+++ b/lighthouse-core/test/gather/fetcher-test.js
@@ -19,7 +19,7 @@ let Driver;
 /** @type {typeof import('../../gather/fetcher.js').Fetcher} */
 let Fetcher;
 
-beforeAll(async () => {
+before(async () => {
   Driver = (await import('../../gather/driver.js')).Driver;
   Fetcher = (await import('../../gather/fetcher.js')).Fetcher;
 });
diff --git a/lighthouse-core/test/gather/gather-runner-test.js b/lighthouse-core/test/gather/gather-runner-test.js
index 1b7710ae2b3c..343410048c14 100644
--- a/lighthouse-core/test/gather/gather-runner-test.js
+++ b/lighthouse-core/test/gather/gather-runner-test.js
@@ -6,7 +6,7 @@
 
 import {strict as assert} from 'assert';
 
-import {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
 
 import {Gatherer} from '../../gather/gatherers/gatherer.js';
 // import GathererRunner_ from '../../gather/gather-runner.js';
@@ -22,6 +22,7 @@ import {
   makePromiseInspectable,
   flushAllTimersAndMicrotasks,
   fnAny,
+  timers,
   importMock,
 } from '../test-utils.js';
 import {fakeDriver} from './fake-driver.js';
@@ -31,6 +32,9 @@ const unresolvedPerfLog = readJson('./../fixtures/unresolved-perflog.json', impo
 
 makeMocksForGatherRunner();
 
+/** @type {jestMock.SpyInstance<Promise<void>, [session: any, pageUrl: string]>} */
+let assertNoSameOriginServiceWorkerClientsMock;
+
 function createTypeHackedGatherRunner() {
   return {
     afterPass: makeParamsOptional(GatherRunner_.afterPass),
@@ -42,9 +46,6 @@ function createTypeHackedGatherRunner() {
     run: makeParamsOptional(GatherRunner_.run),
     runPass: makeParamsOptional(GatherRunner_.runPass),
     setupDriver: makeParamsOptional(GatherRunner_.setupDriver),
-    // Spies that should have mock implemenations most of the time.
-    assertNoSameOriginServiceWorkerClients: jest.spyOn(GatherRunner_,
-      'assertNoSameOriginServiceWorkerClients'),
   };
 }
 
@@ -62,10 +63,12 @@ let Config;
 
 /** @type {ReturnType<createTypeHackedGatherRunner>} */
 let GatherRunner;
-beforeAll(async () => {
+before(async () => {
   Driver = (await import('../../gather/driver.js')).Driver;
   GatherRunner_ = (await import('../../gather/gather-runner.js')).GatherRunner;
   Config = (await import('../../config/config.js')).Config;
+  assertNoSameOriginServiceWorkerClientsMock =
+    jestMock.spyOn(GatherRunner_, 'assertNoSameOriginServiceWorkerClients');
   GatherRunner = createTypeHackedGatherRunner();
 });
 
@@ -106,10 +109,10 @@ let driver;
 let connectionStub;
 
 function resetDefaultMockResponses() {
-  GatherRunner.assertNoSameOriginServiceWorkerClients = jest.spyOn(GatherRunner_,
-    'assertNoSameOriginServiceWorkerClients');
-  GatherRunner.assertNoSameOriginServiceWorkerClients.mockReset();
-  GatherRunner.assertNoSameOriginServiceWorkerClients.mockResolvedValue();
+  assertNoSameOriginServiceWorkerClientsMock =
+    jestMock.spyOn(GatherRunner_, 'assertNoSameOriginServiceWorkerClients');
+  assertNoSameOriginServiceWorkerClientsMock.mockReset();
+  assertNoSameOriginServiceWorkerClientsMock.mockResolvedValue();
 
   connectionStub.sendCommand = createMockSendCommandFn()
     .mockResponse('Debugger.enable')
@@ -141,7 +144,7 @@ beforeEach(async () => {
     }
   }
 
-  jest.useFakeTimers();
+  timers.useFakeTimers();
   // @ts-expect-error - connectionStub has a mocked version of sendCommand implemented in each test
   connectionStub = new Connection();
   // @ts-expect-error
@@ -160,8 +163,8 @@ beforeEach(async () => {
 });
 
 afterEach(() => {
-  GatherRunner.assertNoSameOriginServiceWorkerClients.mockRestore();
-  jest.useRealTimers();
+  assertNoSameOriginServiceWorkerClientsMock.mockRestore();
+  timers.useRealTimers();
 });
 
 describe('GatherRunner', function() {
@@ -306,7 +309,7 @@ describe('GatherRunner', function() {
     let assertNoSameOriginServiceWorkerClients;
 
     beforeEach(() => {
-      GatherRunner.assertNoSameOriginServiceWorkerClients.mockRestore();
+      assertNoSameOriginServiceWorkerClientsMock.mockRestore();
       assertNoSameOriginServiceWorkerClients = GatherRunner_.assertNoSameOriginServiceWorkerClients;
       session = driver.defaultSession;
       connectionStub.sendCommand = createMockSendCommandFn()
@@ -693,7 +696,7 @@ describe('GatherRunner', function() {
 
     const url = 'https://example.com';
     const driver = Object.assign({}, fakeDriver);
-    const scrollToSpy = jest.spyOn(driver, 'scrollTo');
+    const scrollToSpy = jestMock.spyOn(driver, 'scrollTo');
 
     const passConfig = {
       recordTrace: true,
@@ -872,7 +875,7 @@ describe('GatherRunner', function() {
   describe('artifact collection', () => {
     // Make sure our gatherers never execute in parallel
     it('runs gatherer lifecycle methods strictly in sequence', async () => {
-      jest.useRealTimers();
+      timers.useRealTimers();
       /** @type {Record<string, number>} */
       const counter = {
         beforePass: 0,
diff --git a/lighthouse-core/test/gather/gatherers/accessibility-test.js b/lighthouse-core/test/gather/gatherers/accessibility-test.js
index baacff0bc3cc..1a54fa35eabc 100644
--- a/lighthouse-core/test/gather/gatherers/accessibility-test.js
+++ b/lighthouse-core/test/gather/gatherers/accessibility-test.js
@@ -40,11 +40,11 @@ describe('Accessibility gatherer', () => {
 describe('a11y audits + aXe', () => {
   let browser;
 
-  beforeAll(async () => {
+  before(async () => {
     browser = await puppeteer.launch();
   });
 
-  afterAll(async () => {
+  after(async () => {
     await browser.close();
   });
 
diff --git a/lighthouse-core/test/gather/gatherers/css-usage-test.js b/lighthouse-core/test/gather/gatherers/css-usage-test.js
index 967a41032e13..a5dddb52b62a 100644
--- a/lighthouse-core/test/gather/gatherers/css-usage-test.js
+++ b/lighthouse-core/test/gather/gatherers/css-usage-test.js
@@ -4,14 +4,12 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 
-import {jest} from '@jest/globals';
-
 import CSSUsage from '../../../gather/gatherers/css-usage.js';
 import {defaultSettings} from '../../../config/constants.js';
 import {createMockDriver, createMockBaseArtifacts} from '../../fraggle-rock/gather/mock-driver.js';
-import {flushAllTimersAndMicrotasks} from '../../test-utils.js';
+import {flushAllTimersAndMicrotasks, timers} from '../../test-utils.js';
 
-jest.useFakeTimers();
+timers.useFakeTimers();
 
 describe('.getArtifact', () => {
   it('gets CSS usage', async () => {
diff --git a/lighthouse-core/test/gather/gatherers/devtools-log-test.js b/lighthouse-core/test/gather/gatherers/devtools-log-test.js
index 45341e00b8ec..c9e5b010f4f3 100644
--- a/lighthouse-core/test/gather/gatherers/devtools-log-test.js
+++ b/lighthouse-core/test/gather/gatherers/devtools-log-test.js
@@ -6,7 +6,7 @@
 
 import {strict as assert} from 'assert';
 
-import {DevtoolsMessageLog} from '../../gather/devtools-log.js';
+import {DevtoolsMessageLog} from '../../../gather/gatherers/devtools-log.js';
 
 describe('DevtoolsMessageLog', () => {
   let messageLog;
diff --git a/lighthouse-core/test/gather/gatherers/dobetterweb/response-compression-test.js b/lighthouse-core/test/gather/gatherers/dobetterweb/response-compression-test.js
index d9619a422f0b..fcefe4a77827 100644
--- a/lighthouse-core/test/gather/gatherers/dobetterweb/response-compression-test.js
+++ b/lighthouse-core/test/gather/gatherers/dobetterweb/response-compression-test.js
@@ -14,7 +14,7 @@ import {createMockContext, mockDriverSubmodules} from '../../../fraggle-rock/gat
 /** @type {typeof import('../../../../gather/gatherers/dobetterweb/response-compression.js')} */
 let ResponseCompression;
 
-beforeAll(async () => {
+before(async () => {
   ResponseCompression =
     (await import('../../../../gather/gatherers/dobetterweb/response-compression.js')).default;
 });
diff --git a/lighthouse-core/test/gather/gatherers/full-page-screenshot-test.js b/lighthouse-core/test/gather/gatherers/full-page-screenshot-test.js
index 802f2a767643..3899f4a41c3f 100644
--- a/lighthouse-core/test/gather/gatherers/full-page-screenshot-test.js
+++ b/lighthouse-core/test/gather/gatherers/full-page-screenshot-test.js
@@ -4,8 +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 {jest} from '@jest/globals';
-
 import {createMockContext} from '../../fraggle-rock/gather/mock-driver.js';
 import FullPageScreenshotGatherer from '../../../gather/gatherers/full-page-screenshot.js';
 
@@ -20,8 +18,6 @@ let screenSize;
 let screenshotData;
 let mockContext = createMockContext();
 
-jest.setTimeout(10_000);
-
 beforeEach(() => {
   contentSize = {width: 100, height: 100};
   screenSize = {width: 100, height: 100, dpr: 1};
diff --git a/lighthouse-core/test/gather/gatherers/image-elements-test.js b/lighthouse-core/test/gather/gatherers/image-elements-test.js
index 6198e7104e29..6cfb95f0091a 100644
--- a/lighthouse-core/test/gather/gatherers/image-elements-test.js
+++ b/lighthouse-core/test/gather/gatherers/image-elements-test.js
@@ -4,20 +4,20 @@
  * 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 {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
 
 import {readJson} from '../../../../root.js';
 import ImageElements from '../../../gather/gatherers/image-elements.js';
 import {NetworkRecorder} from '../../../lib/network-recorder.js';
 import {createMockContext, createMockDriver, createMockSession} from
   '../../fraggle-rock/gather/mock-driver.js';
-import {fnAny} from '../../test-utils.js';
+import {fnAny, timers} from '../../test-utils.js';
 
 const devtoolsLog = readJson('../../fixtures/traces/lcp-m78.devtools.log.json', import.meta);
 
 const networkRecords = NetworkRecorder.recordsFromLogs(devtoolsLog);
 
-jest.useFakeTimers();
+timers.useFakeTimers();
 
 /**
  * @param {Partial<LH.Artifacts.ImageElement>=} partial
@@ -64,9 +64,9 @@ function mockElement(partial = {}) {
 
 function makeImageElements() {
   const gatherer = new ImageElements();
-  jest.spyOn(gatherer, 'collectExtraDetails');
-  jest.spyOn(gatherer, 'fetchSourceRules');
-  jest.spyOn(gatherer, 'fetchElementWithSizeInformation');
+  jestMock.spyOn(gatherer, 'collectExtraDetails');
+  jestMock.spyOn(gatherer, 'fetchSourceRules');
+  jestMock.spyOn(gatherer, 'fetchElementWithSizeInformation');
   return gatherer;
 }
 
@@ -247,7 +247,7 @@ describe('.collectExtraDetails', () => {
       mockElement({isInShadowDOM: false, isCss: false}),
     ];
     gatherer.fetchSourceRules = fnAny().mockImplementation(async () => {
-      jest.advanceTimersByTime(6000);
+      timers.advanceTimersByTime(6000);
     });
 
     await gatherer.collectExtraDetails(driver, elements);
diff --git a/lighthouse-core/test/gather/gatherers/inspector-issues-test.js b/lighthouse-core/test/gather/gatherers/inspector-issues-test.js
index b106b4bb3904..3436008738af 100644
--- a/lighthouse-core/test/gather/gatherers/inspector-issues-test.js
+++ b/lighthouse-core/test/gather/gatherers/inspector-issues-test.js
@@ -4,15 +4,13 @@
  * 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 {jest} from '@jest/globals';
-
 import InspectorIssues from '../../../gather/gatherers/inspector-issues.js';
 import {NetworkRequest} from '../../../lib/network-request.js';
 import {createMockContext} from '../../fraggle-rock/gather/mock-driver.js';
-import {flushAllTimersAndMicrotasks} from '../../test-utils.js';
+import {flushAllTimersAndMicrotasks, timers} from '../../test-utils.js';
 import {networkRecordsToDevtoolsLog} from '../../network-records-to-devtools-log.js';
 
-jest.useFakeTimers();
+timers.useFakeTimers();
 
 /**
  * @param {Partial<LH.Artifacts.NetworkRequest>=} partial
diff --git a/lighthouse-core/test/gather/gatherers/js-usage-test.js b/lighthouse-core/test/gather/gatherers/js-usage-test.js
index f534884302b7..2c061654db3f 100644
--- a/lighthouse-core/test/gather/gatherers/js-usage-test.js
+++ b/lighthouse-core/test/gather/gatherers/js-usage-test.js
@@ -4,16 +4,14 @@
  * 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 {jest} from '@jest/globals';
-
-jest.useFakeTimers();
-
 import {Driver} from '../../../gather/driver.js';
 import {Connection} from '../../../gather/connections/connection.js';
 import JsUsage from '../../../gather/gatherers/js-usage.js';
 import {createMockSendCommandFn, createMockOnFn} from '../mock-commands.js';
 import {createMockContext} from '../../fraggle-rock/gather/mock-driver.js';
-import {flushAllTimersAndMicrotasks} from '../../test-utils.js';
+import {flushAllTimersAndMicrotasks, timers} from '../../test-utils.js';
+
+timers.useFakeTimers();
 
 describe('JsUsage gatherer', () => {
   /**
diff --git a/lighthouse-core/test/gather/gatherers/link-elements-test.js b/lighthouse-core/test/gather/gatherers/link-elements-test.js
index 36b55ca63d9f..308cc89c15c4 100644
--- a/lighthouse-core/test/gather/gatherers/link-elements-test.js
+++ b/lighthouse-core/test/gather/gatherers/link-elements-test.js
@@ -4,7 +4,8 @@
  * 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 {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
+import * as td from 'testdouble';
 
 // Some imports needs to be done dynamically, so that their dependencies will be mocked.
 // See: https://jestjs.io/docs/ecmascript-modules#differences-between-esm-and-commonjs
@@ -13,14 +14,12 @@ import {jest} from '@jest/globals';
 /** @type {typeof import('../../../gather/gatherers/link-elements.js').default} */
 let LinkElements;
 
-beforeAll(async () => {
+before(async () => {
   LinkElements = (await import('../../../gather/gatherers/link-elements.js')).default;
 });
 
-const mockMainResource = jest.fn();
-jest.unstable_mockModule('../../../computed/main-resource.js', () => ({
-  default: {request: mockMainResource},
-}));
+const mockMainResource = jestMock.fn();
+td.replaceEsm('../../../computed/main-resource.js', undefined, {request: mockMainResource});
 
 beforeEach(() => {
   mockMainResource.mockReset();
diff --git a/lighthouse-core/test/gather/gatherers/script-elements-test.js b/lighthouse-core/test/gather/gatherers/script-elements-test.js
index 6052e2e7ce99..17665bf7578c 100644
--- a/lighthouse-core/test/gather/gatherers/script-elements-test.js
+++ b/lighthouse-core/test/gather/gatherers/script-elements-test.js
@@ -15,7 +15,7 @@ import {NetworkRequest} from '../../../lib/network-request.js';
 /** @type {typeof import('../../../gather/gatherers/script-elements.js').default} */
 let ScriptElements;
 
-beforeAll(async () => {
+before(async () => {
   ScriptElements = (await import('../../../gather/gatherers/script-elements.js')).default;
 });
 
diff --git a/lighthouse-core/test/gather/gatherers/service-worker-test.js b/lighthouse-core/test/gather/gatherers/service-worker-test.js
index 801fa4285294..0598f937286a 100644
--- a/lighthouse-core/test/gather/gatherers/service-worker-test.js
+++ b/lighthouse-core/test/gather/gatherers/service-worker-test.js
@@ -6,7 +6,7 @@
 
 import {strict as assert} from 'assert';
 
-import {jest} from '@jest/globals';
+import * as td from 'testdouble';
 
 import {fnAny} from '../../test-utils.js';
 
@@ -18,16 +18,17 @@ import {fnAny} from '../../test-utils.js';
 /** @type {typeof import('../../../gather/gatherers/service-worker.js').default} */
 let ServiceWorkerGather;
 
-beforeAll(async () => {
+before(async () => {
   ServiceWorkerGather = (await import('../../../gather/gatherers/service-worker.js')).default;
 });
 
 const getServiceWorkerVersions = fnAny();
 const getServiceWorkerRegistrations = fnAny();
-jest.unstable_mockModule('../../../gather/driver/service-workers.js', () => ({
+
+td.replaceEsm('../../../gather/driver/service-workers.js', {
   getServiceWorkerVersions,
   getServiceWorkerRegistrations,
-}));
+});
 
 describe('service worker gatherer', () => {
   it('obtains the active service worker registration', async () => {
diff --git a/lighthouse-core/test/gather/gatherers/source-maps-test.js b/lighthouse-core/test/gather/gatherers/source-maps-test.js
index d70581d47915..5770afa0a4a1 100644
--- a/lighthouse-core/test/gather/gatherers/source-maps-test.js
+++ b/lighthouse-core/test/gather/gatherers/source-maps-test.js
@@ -4,15 +4,14 @@
  * 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 {jest} from '@jest/globals';
-
-jest.useFakeTimers();
 
 import {Driver} from '../../../gather/driver.js';
 import {Connection} from '../../../gather/connections/connection.js';
 import SourceMaps from '../../../gather/gatherers/source-maps.js';
 import {createMockSendCommandFn, createMockOnFn} from '../mock-commands.js';
-import {flushAllTimersAndMicrotasks, fnAny} from '../../test-utils.js';
+import {flushAllTimersAndMicrotasks, fnAny, timers} from '../../test-utils.js';
+
+timers.useFakeTimers();
 
 const mapJson = JSON.stringify({
   version: 3,
diff --git a/lighthouse-core/test/gather/gatherers/stacks-test.js b/lighthouse-core/test/gather/gatherers/stacks-test.js
index fbfe4ba6c8a3..9f7ef8ef45ee 100644
--- a/lighthouse-core/test/gather/gatherers/stacks-test.js
+++ b/lighthouse-core/test/gather/gatherers/stacks-test.js
@@ -8,7 +8,7 @@ import StacksGatherer from '../../../gather/gatherers/stacks.js';
 import {fnAny} from '../../test-utils.js';
 
 describe('StacksGatherer', () => {
-  /** @type {{executionContext: {evaluate: jest.Mock}}} */
+  /** @type {{executionContext: {evaluate: Mock<any, any>}}} */
   let driver;
 
   beforeEach(() => {
diff --git a/lighthouse-core/test/gather/gatherers/trace-elements-test.js b/lighthouse-core/test/gather/gatherers/trace-elements-test.js
index 2ea5500b8082..cc692b384f35 100644
--- a/lighthouse-core/test/gather/gatherers/trace-elements-test.js
+++ b/lighthouse-core/test/gather/gatherers/trace-elements-test.js
@@ -4,19 +4,17 @@
  * 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 {jest} from '@jest/globals';
-
 import TraceElementsGatherer from '../../../gather/gatherers/trace-elements.js';
 import {Driver} from '../../../gather/driver.js';
 import {Connection} from '../../../gather/connections/connection.js';
 import createTestTrace from '../../create-test-trace.js';
 import {createMockSendCommandFn, createMockOnFn} from '../mock-commands.js';
-import {flushAllTimersAndMicrotasks, fnAny} from '../../test-utils.js';
+import {flushAllTimersAndMicrotasks, fnAny, timers} from '../../test-utils.js';
 import {readJson} from '../../../../root.js';
 
 const animationTrace = readJson('../../fixtures/traces/animation.json', import.meta);
 
-jest.useFakeTimers();
+timers.useFakeTimers();
 
 function makeLayoutShiftTraceEvent(score, impactedNodes, had_recent_input = false) { // eslint-disable-line camelcase
   return {
diff --git a/lighthouse-core/test/gather/gatherers/trace-test.js b/lighthouse-core/test/gather/gatherers/trace-test.js
index 1df8d8a859dc..54b1b0b6ef2d 100644
--- a/lighthouse-core/test/gather/gatherers/trace-test.js
+++ b/lighthouse-core/test/gather/gatherers/trace-test.js
@@ -4,13 +4,11 @@
  * 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 {jest} from '@jest/globals';
-
-import {makePromiseInspectable, flushAllTimersAndMicrotasks} from '../../test-utils.js';
+import {makePromiseInspectable, flushAllTimersAndMicrotasks, timers} from '../../test-utils.js';
 import {createMockContext} from '../../fraggle-rock/gather/mock-driver.js';
 import TraceGatherer from '../../../gather/gatherers/trace.js';
 
-jest.useFakeTimers();
+timers.useFakeTimers();
 
 describe('TraceGatherer', () => {
   let gatherer = new TraceGatherer();
diff --git a/lighthouse-core/test/jest-setup/package.json b/lighthouse-core/test/jest-setup/package.json
deleted file mode 100644
index eccf4f16536b..000000000000
--- a/lighthouse-core/test/jest-setup/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "type": "commonjs",
-  "//": "jest only supports commonjs for setup modules"
-}
\ No newline at end of file
diff --git a/lighthouse-core/test/lib/asset-saver-test.js b/lighthouse-core/test/lib/asset-saver-test.js
index 95e8ff2ca95c..2417deca88de 100644
--- a/lighthouse-core/test/lib/asset-saver-test.js
+++ b/lighthouse-core/test/lib/asset-saver-test.js
@@ -33,7 +33,7 @@ describe('asset-saver helper', () => {
   describe('saves files', function() {
     const tmpDir = `${LH_ROOT}/.tmp/asset-saver-test`;
 
-    beforeAll(() => {
+    before(() => {
       fs.mkdirSync(tmpDir, {recursive: true});
       const artifacts = {
         devtoolsLogs: {
@@ -89,7 +89,7 @@ describe('asset-saver helper', () => {
   describe('saveTrace', () => {
     const traceFilename = `${LH_ROOT}/.tmp/test-trace-0.json`;
 
-    beforeAll(() => {
+    before(() => {
       fs.mkdirSync(`${LH_ROOT}/.tmp`, {recursive: true});
     });
 
diff --git a/lighthouse-core/test/lib/dependency-graph/simulator/simulator-test.js b/lighthouse-core/test/lib/dependency-graph/simulator/simulator-test.js
index d274addd4829..d4e966c50dbe 100644
--- a/lighthouse-core/test/lib/dependency-graph/simulator/simulator-test.js
+++ b/lighthouse-core/test/lib/dependency-graph/simulator/simulator-test.js
@@ -44,12 +44,12 @@ describe('DependencyGraph/Simulator', () => {
   // Insulate the simulator tests from DNS multiplier changes
   let originalDNSMultiplier;
 
-  beforeAll(() => {
+  before(() => {
     originalDNSMultiplier = DNSCache.RTT_MULTIPLIER;
     DNSCache.RTT_MULTIPLIER = 1;
   });
 
-  afterAll(() => {
+  after(() => {
     DNSCache.RTT_MULTIPLIER = originalDNSMultiplier;
   });
 
diff --git a/lighthouse-core/test/lib/i18n/i18n-test.js b/lighthouse-core/test/lib/i18n/i18n-test.js
index 175d19796dc6..9a2c7520dcb5 100644
--- a/lighthouse-core/test/lib/i18n/i18n-test.js
+++ b/lighthouse-core/test/lib/i18n/i18n-test.js
@@ -6,8 +6,8 @@
 
 import path from 'path';
 
-import {jest} from '@jest/globals';
 import log from 'lighthouse-logger';
+import jestMock from 'jest-mock';
 
 import * as i18n from '../../../lib/i18n/i18n.js';
 import {getModuleDirectory} from '../../../../esm-utils.mjs';
@@ -47,7 +47,7 @@ describe('i18n', () => {
     });
 
     it('logs a warning if locale is not available and the default is used', () => {
-      const logListener = jest.fn();
+      const logListener = jestMock.fn();
       log.events.on('warning', logListener);
 
       expect(i18n.lookupLocale(invalidLocale)).toEqual('en-US');
diff --git a/lighthouse-core/test/lib/page-functions-test.js b/lighthouse-core/test/lib/page-functions-test.js
index 0012ce9ebd97..47001b217a68 100644
--- a/lighthouse-core/test/lib/page-functions-test.js
+++ b/lighthouse-core/test/lib/page-functions-test.js
@@ -15,7 +15,7 @@ import {pageFunctions} from '../../lib/page-functions.js';
 describe('Page Functions', () => {
   const url = 'http://www.example.com';
 
-  beforeAll(async () => {
+  before(async () => {
     const {document, ShadowRoot, Node, HTMLElement} = new jsdom.JSDOM('', {url}).window;
     global.ShadowRoot = ShadowRoot;
     global.Node = Node;
@@ -26,7 +26,7 @@ describe('Page Functions', () => {
     };
   });
 
-  afterAll(() => {
+  after(() => {
     global.ShadowRoot = undefined;
     global.Node = undefined;
     global.window = undefined;
@@ -67,7 +67,7 @@ describe('Page Functions', () => {
         name: 'Error',
         message: 'unknown error',
         // eslint-disable-next-line max-len
-        stack: expect.stringMatching(/^Error:.*wrapRuntimeEvalErrorInBrowser.*page-functions\.js:\d+:\d+/s),
+        stack: expect.stringMatching(/^Error.*wrapRuntimeEvalErrorInBrowser.*page-functions\.js:\d+:\d+/s),
       });
     });
   });
diff --git a/lighthouse-core/test/lib/sentry-test.js b/lighthouse-core/test/lib/sentry-test.js
index fb2a8d042bc7..0bca03175e03 100644
--- a/lighthouse-core/test/lib/sentry-test.js
+++ b/lighthouse-core/test/lib/sentry-test.js
@@ -4,32 +4,28 @@
  * 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 {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
+import * as td from 'testdouble';
 
-// import sentryNode from '@sentry/node';
 import {Sentry} from '../../lib/sentry.js';
 
-let sentryNodeMock;
-jest.unstable_mockModule('@sentry/node', () => (sentryNodeMock = {
-  init: jest.fn().mockReturnValue({install: jest.fn()}),
-  setExtras: jest.fn(),
-  captureException: jest.fn(),
-  withScope: (fn) => fn({
-    setLevel: () => {},
-    setTags: () => {},
-    setExtras: () => {},
-  }),
-}));
-
-beforeAll(async () => {
-  await import('@sentry/node');
-});
-
 describe('Sentry', () => {
+  let sentryNodeMock;
   let configPayload;
   let originalSentry;
 
   beforeEach(() => {
+    td.replaceEsm('@sentry/node', (sentryNodeMock = {
+      init: jestMock.fn().mockReturnValue({install: jestMock.fn()}),
+      setExtras: jestMock.fn(),
+      captureException: jestMock.fn(),
+      withScope: (fn) => fn({
+        setLevel: () => {},
+        setTags: () => {},
+        setExtras: () => {},
+      }),
+    }));
+
     configPayload = {
       url: 'http://example.com',
       flags: {enableErrorReporting: true},
@@ -40,11 +36,7 @@ describe('Sentry', () => {
     // We want to have a fresh state for every test.
     originalSentry = {...Sentry};
 
-    sentryNodeMock.init.mockReset().mockReturnValue({install: jest.fn()});
-    sentryNodeMock.setExtras.mockReset();
-    sentryNodeMock.captureException.mockReset();
-
-    Sentry._shouldSample = jest.fn().mockReturnValue(true);
+    Sentry._shouldSample = jestMock.fn().mockReturnValue(true);
   });
 
   afterEach(() => {
diff --git a/lighthouse-core/test/runner-test.js b/lighthouse-core/test/runner-test.js
index 113a2d0a2948..b4ae2027e7b1 100644
--- a/lighthouse-core/test/runner-test.js
+++ b/lighthouse-core/test/runner-test.js
@@ -8,10 +8,11 @@ import fs from 'fs';
 import {strict as assert} from 'assert';
 import path from 'path';
 
-import {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
+import * as td from 'testdouble';
 
 // import Runner from '../runner.js';
-// import GatherRunner from '../gather/gather-runner.js';
+// import {GatherRunner} from '../gather/gather-runner.js';
 import {fakeDriver as driverMock} from './gather/fake-driver.js';
 // import {Config} from '../config/config.js';
 import {Audit} from '../audits/audit.js';
@@ -24,6 +25,8 @@ import {getModuleDirectory} from '../../esm-utils.mjs';
 
 const moduleDir = getModuleDirectory(import.meta);
 
+makeMocksForGatherRunner();
+
 // Some imports needs to be done dynamically, so that their dependencies will be mocked.
 // See: https://jestjs.io/docs/ecmascript-modules#differences-between-esm-and-commonjs
 //      https://github.com/facebook/jest/issues/10025
@@ -34,54 +37,47 @@ let GatherRunner;
 /** @type {typeof import('../config/config.js').Config} */
 let Config;
 
-/** @type {jest.Mock} */
+/** @type {jestMock.Mock} */
 let saveArtifactsSpy;
-/** @type {jest.Mock} */
+/** @type {jestMock.Mock} */
 let saveLhrSpy;
-/** @type {jest.Mock} */
+/** @type {jestMock.Mock} */
 let loadArtifactsSpy;
-/** @type {jest.Mock} */
+/** @type {jestMock.Mock} */
 let gatherRunnerRunSpy;
-/** @type {jest.Mock} */
+/** @type {jestMock.Mock} */
 let runAuditSpy;
 
-jest.unstable_mockModule('../lib/asset-saver.js', () => ({
-  saveArtifacts: saveArtifactsSpy = jest.fn(),
-  saveLhr: saveLhrSpy = jest.fn(),
-  loadArtifacts: loadArtifactsSpy = jest.fn(),
-  gatherRunnerRun: gatherRunnerRunSpy = jest.fn(),
-  runAudit: runAuditSpy = jest.fn(),
-}));
+td.replaceEsm('../lib/asset-saver.js', {
+  saveArtifacts: saveArtifactsSpy = jestMock.fn(assetSaver.saveArtifacts),
+  saveLhr: saveLhrSpy = jestMock.fn(),
+  loadArtifacts: loadArtifactsSpy = jestMock.fn(assetSaver.loadArtifacts),
+});
+
+td.replaceEsm('../gather/driver/service-workers.js', {
+  getServiceWorkerVersions: jestMock.fn().mockResolvedValue({versions: []}),
+  getServiceWorkerRegistrations: jestMock.fn().mockResolvedValue({registrations: []}),
+});
 
-beforeAll(async () => {
+before(async () => {
   Runner = (await import('../runner.js')).Runner;
   GatherRunner = (await import('../gather/gather-runner.js')).GatherRunner;
   Config = (await import('../config/config.js')).Config;
 });
 
 beforeEach(() => {
-  saveArtifactsSpy.mockImplementation(assetSaver.saveArtifacts);
-  saveLhrSpy.mockImplementation(() => {});
-  loadArtifactsSpy.mockImplementation(assetSaver.loadArtifacts);
-  gatherRunnerRunSpy = jest.spyOn(GatherRunner, 'run');
-  runAuditSpy = jest.spyOn(Runner, '_runAudit');
+  gatherRunnerRunSpy = jestMock.spyOn(GatherRunner, 'run');
+  runAuditSpy = jestMock.spyOn(Runner, '_runAudit');
 });
 
 afterEach(() => {
-  saveArtifactsSpy.mockReset();
-  saveLhrSpy.mockReset();
-  loadArtifactsSpy.mockReset();
+  saveArtifactsSpy.mockClear();
+  saveLhrSpy.mockClear();
+  loadArtifactsSpy.mockClear();
   gatherRunnerRunSpy.mockRestore();
   runAuditSpy.mockRestore();
 });
 
-makeMocksForGatherRunner();
-
-jest.unstable_mockModule('../gather/driver/service-workers.js', () => ({
-  getServiceWorkerVersions: jest.fn().mockResolvedValue({versions: []}),
-  getServiceWorkerRegistrations: jest.fn().mockResolvedValue({registrations: []}),
-}));
-
 describe('Runner', () => {
   const createGatherFn = url => {
     return opts => {
@@ -118,7 +114,7 @@ describe('Runner', () => {
     const artifactsPath = '.tmp/test_artifacts';
     const resolvedPath = path.resolve(process.cwd(), artifactsPath);
 
-    afterAll(() => {
+    after(() => {
       fs.rmSync(resolvedPath, {recursive: true, force: true});
     });
 
@@ -510,7 +506,7 @@ describe('Runner', () => {
         }
       }
 
-      const auditMockFn = SimpleAudit.audit = jest.fn().mockReturnValue({score: 1});
+      const auditMockFn = SimpleAudit.audit = jestMock.fn().mockReturnValue({score: 1});
       const config = await Config.fromJson({
         settings: {
           auditMode: moduleDir + '/fixtures/artifacts/alphabet-artifacts/',
@@ -543,7 +539,7 @@ describe('Runner', () => {
         }
       }
 
-      const auditMockFn = SimpleAudit.audit = jest.fn().mockReturnValue({score: 1});
+      const auditMockFn = SimpleAudit.audit = jestMock.fn().mockReturnValue({score: 1});
       const config = await Config.fromJson({
         settings: {
           auditMode: moduleDir + '/fixtures/artifacts/alphabet-artifacts/',
diff --git a/lighthouse-core/test/scripts/run-tests.js b/lighthouse-core/test/scripts/run-tests.js
new file mode 100644
index 000000000000..859f48dc1dcb
--- /dev/null
+++ b/lighthouse-core/test/scripts/run-tests.js
@@ -0,0 +1,320 @@
+/**
+ * @license Copyright 2022 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.
+ */
+
+/**
+ * @fileoverview
+ * CLI tool for running mocha tests. Run with `yarn mocha`
+ */
+
+import {execFileSync} from 'child_process';
+import fs from 'fs';
+import path from 'path';
+
+import yargs from 'yargs';
+import * as yargsHelpers from 'yargs/helpers';
+import glob from 'glob';
+
+import {LH_ROOT} from '../../../root.js';
+
+/** @param {string} text */
+function escapeRegex(text) {
+  return text.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&');
+}
+
+const failedTestsDir = `${LH_ROOT}/.tmp/failing-tests`;
+
+function getFailedTests() {
+  const allFailedTests = [];
+  for (const file of glob.sync('*.json', {cwd: failedTestsDir, absolute: true})) {
+    allFailedTests.push(...JSON.parse(fs.readFileSync(file, 'utf-8')));
+  }
+  return allFailedTests;
+}
+
+// Some tests replace real modules with mocks in the global scope of the test file
+// (outside 'before' lifecycle / a test unit). Before doing any lifecycle stuff, Mocha will load
+// all test files (everything if --no-parallel, else each worker will load a subset of the files
+// all at once). This results in unexpected mocks contaminating other test files.
+//
+// Tests do other undesired things in the global scope too, such as enabling fake timers.
+//
+// For now, we isolate a number of tests until they can be refactored.
+//
+// To run tests without isolation, and all in one process:
+//    yarn mocha --no-isolation --no-parallel lighthouse-core/test
+//
+// Because mocha workers can divide up test files that mess with global scope in a way that
+// _just happens_ to not cause anything to fail, use this command works to verify that
+// all necessary tests are isolated:
+//    yarn mocha --no-parallel lighthouse-core/test
+const testsToIsolate = new Set([
+  // grep -lRE '^timers\.useFakeTimers' --include='*-test.*' --exclude-dir=node_modules
+  'flow-report/test/common-test.tsx',
+  'lighthouse-core/test/fraggle-rock/gather/session-test.js',
+  'lighthouse-core/test/gather/driver-test.js',
+  'lighthouse-core/test/gather/driver/execution-context-test.js',
+  'lighthouse-core/test/gather/driver/navigation-test.js',
+  'lighthouse-core/test/gather/driver/wait-for-condition-test.js',
+  'lighthouse-core/test/gather/gatherers/css-usage-test.js',
+  'lighthouse-core/test/gather/gatherers/image-elements-test.js',
+  'lighthouse-core/test/gather/gatherers/inspector-issues-test.js',
+  'lighthouse-core/test/gather/gatherers/js-usage-test.js',
+  'lighthouse-core/test/gather/gatherers/source-maps-test.js',
+  'lighthouse-core/test/gather/gatherers/trace-elements-test.js',
+  'lighthouse-core/test/gather/gatherers/trace-test.js',
+
+  // grep -lRE '^td\.replace' --include='*-test.*' --exclude-dir=node_modules
+  'lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js',
+  'lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js',
+  'lighthouse-core/test/fraggle-rock/gather/timespan-runner-test.js',
+  'lighthouse-core/test/fraggle-rock/user-flow-test.js',
+  'lighthouse-core/test/gather/driver/prepare-test.js',
+  'lighthouse-core/test/gather/gatherers/link-elements-test.js',
+  'lighthouse-core/test/gather/gatherers/service-worker-test.js',
+  'lighthouse-core/test/lib/sentry-test.js',
+  'lighthouse-core/test/runner-test.js',
+
+  // grep -lRE --include='-test.js' 'mockDriverSubmodules|mockRunnerModule|mockDriverModule|mockDriverSubmodules|makeMocksForGatherRunner' --include='*-test.*' --exclude-dir=node_modules
+  'lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js',
+  'lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js',
+  'lighthouse-core/test/fraggle-rock/gather/timespan-runner-test.js',
+  'lighthouse-core/test/fraggle-rock/user-flow-test.js',
+  'lighthouse-core/test/gather/gather-runner-test.js',
+  'lighthouse-core/test/gather/gatherers/dobetterweb/response-compression-test.js',
+  'lighthouse-core/test/gather/gatherers/script-elements-test.js',
+  'lighthouse-core/test/runner-test.js',
+
+  // These tend to timeout in puppeteer when run in parallel with other tests.
+  'lighthouse-core/test/fraggle-rock/scenarios/api-test-pptr.js',
+  'lighthouse-core/test/fraggle-rock/scenarios/cross-origin-test-pptr.js',
+  'lighthouse-core/test/fraggle-rock/scenarios/disconnect-test-pptr.js',
+
+  // ?
+  'clients/test/lightrider/lightrider-entry-test.js', // Runner overrides.
+  'flow-report/test/flow-report-pptr-test.ts',
+  'lighthouse-core/test/config/config-test.js',
+  'lighthouse-core/test/fraggle-rock/config/config-test.js',
+  'lighthouse-core/test/lib/emulation-test.js',
+  'report/test/clients/bundle-test.js',
+  'report/test/clients/bundle-test.js',
+  'shared/test/localization/format-test.js',
+]);
+
+const y = yargs(yargsHelpers.hideBin(process.argv));
+// TODO: -t => --fgrep
+const rawArgv = y
+  .help('help')
+  .usage('node $0 [<options>] <paths>')
+  .parserConfiguration({'unknown-options-as-args': true})
+  .option('_', {
+    array: true,
+    type: 'string',
+  })
+  .options({
+    'testMatch': {
+      type: 'string',
+      describe: 'Glob pattern for collecting test files',
+    },
+    'update': {
+      alias: 'u',
+      type: 'boolean',
+      default: false,
+      describe: 'Update snapshots',
+    },
+    'isolation': {
+      type: 'boolean',
+      default: true,
+    },
+    'parallel': {
+      type: 'boolean',
+      // Although much faster, mocha's parallel test runner defers printing errors until
+      // all tests have finished. This may be undesired for local development, so enable
+      // parallel mode by default only in CI.
+      // Also, good to default to false locally because that avoids missing cross-file
+      // test contamination by chance of mocha splitting up the work in a way that hides it.
+      default: Boolean(process.env.CI),
+    },
+    'bail': {
+      alias: 'b',
+      type: 'boolean',
+      default: false,
+    },
+    't': {
+      type: 'string',
+      describe: 'an alias for --grep, to run only tests with matching titles',
+    },
+    'onlyFailures': {
+      type: 'boolean',
+    },
+  })
+  .wrap(y.terminalWidth())
+  .argv;
+const argv =
+  /** @type {Awaited<typeof rawArgv> & CamelCasify<Awaited<typeof rawArgv>>} */ (rawArgv);
+
+// This captures all of our mocha tests except for:
+// * flow-report, because it needs to provide additional mocha flags
+// * various *-test-pptr.js integration tests, which are long so are handled explicitly in
+//   specific package.json scripts
+const defaultTestMatches = [
+  'build/**/*-test.js',
+  'clients/test/**/*-test.js',
+  'lighthouse-cli/**/*-test.js',
+  'lighthouse-core/**/*-test.js',
+  'lighthouse-core/test/fraggle-rock/**/*-test-pptr.js',
+  'report/**/*-test.js',
+  'shared/**/*-test.js',
+  'third-party/**/*-test.js',
+  'treemap/**/*-test.js',
+  'viewer/**/*-test.js',
+];
+
+const mochaPassThruArgs = argv._.filter(arg => typeof arg !== 'string' || arg.startsWith('--'));
+const filterFilePatterns = argv._.filter(arg => !(typeof arg !== 'string' || arg.startsWith('--')));
+
+function getTestFiles() {
+  // Collect all the possible test files, based off the provided testMatch glob pattern
+  // or the default patterns defined above.
+  const testsGlob = argv.testMatch || `{${defaultTestMatches.join(',')}}`;
+  const allTestFiles = glob.sync(testsGlob, {cwd: LH_ROOT, absolute: true});
+
+  // If provided, filter the test files using a basic string includes on the absolute path of
+  // each test file. Map back to a relative path because it's nice to keep the printed commands shorter.
+  // Why pass `absolute: true` to glob above? So that this works:
+  //     yarn mocha /Users/cjamcl/src/lighthouse/lighthouse-core/test/runner-test.js
+  let filteredTests = (
+    filterFilePatterns.length ?
+      allTestFiles.filter((file) => filterFilePatterns.some(pattern => file.includes(pattern))) :
+      allTestFiles
+  ).map(testPath => path.relative(process.cwd(), testPath));
+
+  if (argv.onlyFailures) {
+    const failedTests = getFailedTests();
+    if (failedTests.length === 0) throw new Error('no tests failed');
+
+    const titles = getFailedTests().map(failed => failed.title);
+    baseArgs.push(`--grep="${titles.map(escapeRegex).join('|')}"`);
+
+    filteredTests = filteredTests.filter(file => failedTests.some(failed => failed.file === file));
+  }
+
+  if (filterFilePatterns.length) {
+    console.log(`applied test filters: ${JSON.stringify(filterFilePatterns, null, 2)}`);
+  }
+  console.log(`running ${filteredTests.length} test files`);
+
+  return filteredTests;
+}
+
+const baseArgs = [
+  '--require=lighthouse-core/test/test-env/mocha-setup.js',
+  '--timeout=20000',
+  // TODO(esmodules): this is only utilized for CLI tests, since only CLI is ESM + mocks.
+  '--loader=testdouble',
+];
+if (argv.t) baseArgs.push(`--grep='${argv.t}'`);
+if (!argv.t) baseArgs.push('--fail-zero');
+if (argv.bail) baseArgs.push('--bail');
+if (argv.parallel) baseArgs.push('--parallel');
+baseArgs.push(...mochaPassThruArgs);
+
+const testsToRun = getTestFiles();
+const testsToRunTogether = [];
+const testsToRunIsolated = [];
+for (const test of testsToRun) {
+  if (argv.isolation && testsToIsolate.has(test)) {
+    testsToRunIsolated.push(test);
+  } else {
+    testsToRunTogether.push(test);
+  }
+}
+
+fs.rmSync(failedTestsDir, {recursive: true, force: true});
+fs.mkdirSync(failedTestsDir, {recursive: true});
+
+/**
+ * @param {number} code
+ */
+function exit(code) {
+  if (code === 0) {
+    console.log('Tests passed');
+    process.exit(0);
+  }
+
+  if (numberMochaInvocations === 1) {
+    console.log('Tests failed');
+    process.exit(code);
+  }
+
+  // If running many instances of mocha, failed results can get lost in the output.
+  // So keep track of failures and re-print them at the very end.
+  // See mocha-setup.js afterAll.
+
+  const allFailedTests = getFailedTests();
+  const groupedByFile = new Map();
+  for (const failedTest of allFailedTests) {
+    const failedTests = groupedByFile.get(failedTest.file) || [];
+    failedTests.push(failedTest);
+    groupedByFile.set(failedTest.file, failedTests);
+  }
+
+  console.log(`${allFailedTests.length} tests failed`);
+  console.log('Printing failing tests:\n===========\n');
+
+  for (const [file, failedTests] of groupedByFile) {
+    console.log(`${file}\n`);
+    for (const failedTest of failedTests) {
+      console.log(`= ${failedTest.title}\n`);
+      console.log(`${failedTest.error}\n`);
+    }
+  }
+
+  process.exit(code);
+}
+
+let numberMochaInvocations = 0;
+let didFail = false;
+
+/**
+ * @param {string[]} tests
+ */
+function runMochaCLI(tests) {
+  const file = 'node_modules/.bin/mocha';
+  const args = [
+    ...baseArgs,
+    ...tests,
+  ];
+  console.log(
+    `Running command: ${argv.update ? 'SNAPSHOT_UPDATE=1 ' : ''}${file} ${args.join(' ')}`);
+  try {
+    execFileSync(file, args, {
+      cwd: LH_ROOT,
+      env: {
+        ...process.env,
+        SNAPSHOT_UPDATE: argv.update ? '1' : undefined,
+        TS_NODE_TRANSPILE_ONLY: '1',
+        LH_FAILED_TESTS_FILE: `${failedTestsDir}/output-${numberMochaInvocations}.json`,
+      },
+      stdio: 'inherit',
+    });
+  } catch {
+    if (argv.bail) {
+      exit(1);
+    } else {
+      didFail = true;
+    }
+  } finally {
+    numberMochaInvocations += 1;
+  }
+}
+
+if (testsToRunTogether.length) runMochaCLI(testsToRunTogether);
+for (const test of testsToRunIsolated) {
+  console.log(`Running test in isolation: ${test}`);
+  runMochaCLI([test]);
+}
+
+exit(didFail ? 1 : 0);
diff --git a/lighthouse-core/test/jest-setup/setup.js b/lighthouse-core/test/test-env/expect-setup.js
similarity index 64%
rename from lighthouse-core/test/jest-setup/setup.js
rename to lighthouse-core/test/test-env/expect-setup.js
index 9cd3d8c47f48..94ff67509784 100644
--- a/lighthouse-core/test/jest-setup/setup.js
+++ b/lighthouse-core/test/test-env/expect-setup.js
@@ -4,15 +4,24 @@
  * 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.
  */
 
-const {default: {toBeCloseTo}} = require('expect/build/matchers.js');
-const SegfaultHandler = require('segfault-handler');
+import {expect} from 'expect';
 
-const format = require('../../../shared/localization/format.js');
+import * as format from '../../../shared/localization/format.js';
 
-SegfaultHandler.registerHandler('crash.log', function(signal, address, stack) {
-  console.error('segfault!');
-  console.error({signal, address, stack});
-});
+// TODO: the `message` value of these matchers seems to be ignored. Ex:
+//
+//        expect({a: 'A'}).toMatchObject({
+//          a: expect.toBeDisplayString('B'),
+//        });
+//
+// Error: expect(received).toMatchObject(expected)
+// - Expected  - 1
+// + Received  + 1
+//
+//   Object {
+// -   "a": toBeDisplayString<B>,
+// +   "a": "A",
+//   }
 
 expect.extend({
   toBeDisplayString(received, expected) {
@@ -44,17 +53,31 @@ expect.extend({
 
     return {message, pass};
   },
+  toBeApproximately(received, expected, precision = 2) {
+    let pass = false;
+    let expectedDiff = 0;
+    let receivedDiff = 0;
+
+    if (received === Infinity && expected === Infinity) {
+      pass = true; // Infinity - Infinity is NaN
+    } else if (received === -Infinity && expected === -Infinity) {
+      pass = true; // -Infinity - -Infinity is NaN
+    } else {
+      expectedDiff = Math.pow(10, -precision) / 2;
+      receivedDiff = Math.abs(expected - received);
+      pass = receivedDiff < expectedDiff;
+    }
+
+    const message = () =>
+      [
+        `${this.utils.matcherHint('.toBeDisplayString')}\n`,
+        `Expected number to be close to:`,
+        `  ${this.utils.printExpected(expected)}`,
+        `Received:`,
+        `  ${this.utils.printReceived(received)}`,
+      ].join('\n');
 
-  // Expose toBeCloseTo() so it can be used as an asymmetric matcher.
-  toBeApproximately(...args) {
-    // If called asymmetrically, a fake matcher `this` object needs to be passed
-    // in (see https://github.com/facebook/jest/issues/8295). There's no effect
-    // because it's only used for the printing of full failures, which isn't
-    // done for asymmetric matchers anyways.
-    const thisObj = (this && this.utils) ? this :
-        {isNot: false, promise: ''};
-    // @ts-expect-error
-    return toBeCloseTo.call(thisObj, ...args);
+    return {message, pass};
   },
   /**
     * Asserts that an inspectable promise created by makePromiseInspectable is currently resolved or rejected.
diff --git a/flow-report/jest.config.js b/lighthouse-core/test/test-env/fake-timers.js
similarity index 50%
rename from flow-report/jest.config.js
rename to lighthouse-core/test/test-env/fake-timers.js
index 13c075b209a2..4b4b8f67dd3e 100644
--- a/flow-report/jest.config.js
+++ b/lighthouse-core/test/test-env/fake-timers.js
@@ -1,24 +1,38 @@
 /**
- * @license Copyright 2021 The Lighthouse Authors. All Rights Reserved.
+ * @license Copyright 2022 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.
  */
 
-export default {
-  testEnvironment: 'node',
-  preset: 'ts-jest',
-  globalSetup: './test/setup/global-setup.ts',
-  setupFilesAfterEnv: [
-    './test/setup/env-setup.ts',
-  ],
-  testMatch: [
-    '**/test/**/*-test.ts',
-    '**/test/**/*-test.tsx',
-  ],
-  extensionsToTreatAsEsm: ['.ts', '.tsx'],
-  globals: {
-    'ts-jest': {
-      useESM: true,
+import {ModernFakeTimers} from '@jest/fake-timers';
+
+/**
+ * @param {string} id
+ */
+function timerIdToRef(id) {
+  return {
+    id,
+    ref() {
+      return this;
     },
+    unref() {
+      return this;
+    },
+  };
+}
+
+/**
+ * @param {{id: string}} timer
+ */
+const timerRefToId = timer => (timer && timer.id) || undefined;
+
+const timers = new ModernFakeTimers({
+  global,
+  config: {
+    // @ts-expect-error
+    idToRef: timerIdToRef,
+    refToId: timerRefToId,
   },
-};
+});
+
+export {timers};
diff --git a/lighthouse-core/test/test-env/mocha-setup.js b/lighthouse-core/test/test-env/mocha-setup.js
new file mode 100644
index 000000000000..598ba34fd60c
--- /dev/null
+++ b/lighthouse-core/test/test-env/mocha-setup.js
@@ -0,0 +1,210 @@
+/**
+ * @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.
+ */
+
+/**
+ * @fileoverview
+ *    - sets global.expect
+ *    - configures mocha to use jest-snapshot
+ *    - symlinks `fixtures/config-plugins/lighthouse-plugin-simple` to a place where the default
+ *      config module resolution will find it
+ *    - saves failed test results if env LH_FAILED_TESTS_FILE is set
+ */
+
+/* eslint-disable import/order */
+
+// TODO: all of test-env should be moved to a root test folder
+
+import fs from 'fs';
+
+import path from 'path';
+import {expect} from 'expect';
+import * as td from 'testdouble';
+import jestSnapshot from 'jest-snapshot';
+
+import {LH_ROOT} from '../../../root.js';
+import './expect-setup.js';
+import {timers} from './fake-timers.js';
+
+const {SnapshotState, toMatchSnapshot, toMatchInlineSnapshot} = jestSnapshot;
+
+// Use consistent TZ across testing environments.
+// Timezone is used to construct date strings.
+process.env.TZ = 'UTC';
+
+// Expected to be set by lh-env.js
+process.env.NODE_TEST = 'test';
+
+global.expect = expect;
+
+// Force marky to not use Node's performance, which is messed up by fake timers.
+const performance = global.performance;
+// @ts-expect-error
+global.performance = undefined;
+// @ts-expect-error: no types
+await import('marky');
+global.performance = performance;
+
+/** @type {Map<string, SnapshotState['prototype']>} */
+const snapshotStatesByTestFile = new Map();
+let snapshotTestFailed = false;
+
+/**
+ * @param {string} testFile
+ */
+function getSnapshotState(testFile) {
+  // For every test file, persist the same snapshot state object so there is
+  // not a read/write per snapshot access/change, but one per file.
+  let snapshotState = snapshotStatesByTestFile.get(testFile);
+  if (snapshotState) return snapshotState;
+
+  const snapshotDir = path.join(path.dirname(testFile), '__snapshots__');
+  const snapshotFile = path.join(snapshotDir, path.basename(testFile) + '.snap');
+  snapshotState = new SnapshotState(snapshotFile, {
+    updateSnapshot: process.env.SNAPSHOT_UPDATE ? 'all' : 'new',
+    prettierPath: '',
+    snapshotFormat: {},
+  });
+  snapshotStatesByTestFile.set(testFile, snapshotState);
+  return snapshotState;
+}
+
+/**
+ * @param {Mocha.Test} test
+ * @return {string}
+ */
+function makeTestTitle(test) {
+  /** @type {Mocha.Test | Mocha.Suite} */
+  let next = test;
+  const title = [];
+
+  while (next.parent) {
+    title.push(next.title);
+    next = next.parent;
+  }
+
+  return title.reverse().join(' ');
+}
+
+expect.extend({
+  /**
+   * @param {any} actual
+   */
+  toMatchSnapshot(actual) {
+    const test = mochaCurrentTest;
+    if (!test.file) throw new Error('unexpected value');
+
+    const title = makeTestTitle(test);
+    const snapshotState = getSnapshotState(test.file);
+    const context = {snapshotState, currentTestName: title};
+    // @ts-expect-error - this is enough for snapshots to work.
+    const matcher = toMatchSnapshot.bind(context);
+    const result = matcher(actual);
+    // @ts-expect-error - not sure why these types are so wrong
+    if (!result.pass) snapshotTestFailed = true;
+    return result;
+  },
+  /**
+   * @param {any} actual
+   * @param {any} expected
+   */
+  toMatchInlineSnapshot(actual, expected) {
+    const test = mochaCurrentTest;
+    if (!test.file) throw new Error('unexpected value');
+
+    const title = makeTestTitle(test);
+    const snapshotState = getSnapshotState(test.file);
+    const context = {snapshotState, currentTestName: title};
+    // @ts-expect-error - this is enough for snapshots to work.
+    const matcher = toMatchInlineSnapshot.bind(context);
+    // @ts-expect-error - not sure why these types are so wrong
+    const result = matcher(actual, expected);
+    // @ts-expect-error - not sure why these types are so wrong
+    if (!result.pass) snapshotTestFailed = true;
+    return result;
+  },
+});
+
+const testPlugins = [
+  'lighthouse-plugin-no-category',
+  'lighthouse-plugin-no-groups',
+  'lighthouse-plugin-simple',
+];
+
+/** @type {Mocha.Test} */
+let mochaCurrentTest;
+
+/** @type {any[]} */
+const failedTests = [];
+
+export default {
+  mochaHooks: {
+    /** @this {Mocha.Context} */
+    beforeEach() {
+      if (!this.currentTest) throw new Error('unexpected value');
+
+      // Needed so `expect` extension method can access information about the current test.
+      mochaCurrentTest = this.currentTest;
+    },
+    /** @this {Mocha.Context} */
+    afterEach() {
+      if (!this.currentTest) throw new Error('unexpected value');
+
+      const {file, title, state} = this.currentTest;
+      if (!file) throw new Error('unexpected value');
+
+      if (state === 'failed') {
+        failedTests.push({
+          file: path.relative(LH_ROOT, file),
+          title,
+          error: this.currentTest.err?.toString(),
+        });
+      }
+    },
+    async afterAll() {
+      timers.dispose();
+      td.reset();
+
+      for (const snapshotState of snapshotStatesByTestFile.values()) {
+        // Jest adds `file://` to inline snapshot paths, and uses its own fs module to read things,
+        // falling back to fs.readFileSync if not defined. node `fs` does not support
+        // protocols in the path specifier, so we remove it here.
+        // @ts-expect-error - private property.
+        for (const snapshot of snapshotState._inlineSnapshots) {
+          snapshot.frame.file = snapshot.frame.file.replace('file://', '');
+        }
+
+        snapshotState.save();
+      }
+
+      if (!process.env.SNAPSHOT_UPDATE && snapshotTestFailed) {
+        process.on('exit', () => {
+          console.log('To update snapshots, run again with `yarn mocha -u`');
+        });
+      }
+
+      if (process.env.LH_FAILED_TESTS_FILE && failedTests.length) {
+        fs.writeFileSync(process.env.LH_FAILED_TESTS_FILE, JSON.stringify(failedTests, null, 2));
+      }
+    },
+  },
+  mochaGlobalSetup() {
+    for (const plugin of testPlugins) {
+      try {
+        fs.symlinkSync(
+          `${LH_ROOT}/lighthouse-core/test/fixtures/config-plugins/${plugin}`,
+          `${LH_ROOT}/node_modules/${plugin}`
+        );
+      } catch {
+        // Might exist already because process was killed before tests finished.
+      }
+    }
+  },
+  mochaGlobalTeardown() {
+    for (const plugin of testPlugins) {
+      fs.unlinkSync(`${LH_ROOT}/node_modules/${plugin}`);
+    }
+  },
+};
diff --git a/lighthouse-core/test/test-utils.js b/lighthouse-core/test/test-utils.js
index 4d944105c003..61f96cf47cb9 100644
--- a/lighthouse-core/test/test-utils.js
+++ b/lighthouse-core/test/test-utils.js
@@ -9,11 +9,13 @@ import path from 'path';
 import url from 'url';
 import {createRequire} from 'module';
 
-import {jest} from '@jest/globals';
+import * as td from 'testdouble';
+import jestMock from 'jest-mock';
 
 import {LH_ROOT} from '../../root.js';
 import * as mockCommands from './gather/mock-commands.js';
 import {NetworkRecorder} from '../lib/network-recorder.js';
+import {timers} from './test-env/fake-timers.js';
 
 const require = createRequire(import.meta.url);
 
@@ -169,7 +171,7 @@ function createDecomposedPromise() {
  */
 async function flushAllTimersAndMicrotasks(ms = 1000) {
   for (let i = 0; i < ms; i++) {
-    jest.advanceTimersByTime(1);
+    timers.advanceTimersByTime(1);
     await Promise.resolve();
   }
 }
@@ -179,46 +181,47 @@ async function flushAllTimersAndMicrotasks(ms = 1000) {
  * shouldn't concern themselves about.
  */
 function makeMocksForGatherRunner() {
-  jest.unstable_mockModule(require.resolve('../gather/driver/environment.js'), () => ({
+  td.replaceEsm(require.resolve('../gather/driver/environment.js'), {
     getBenchmarkIndex: () => Promise.resolve(150),
     getBrowserVersion: async () => ({userAgent: 'Chrome', milestone: 80}),
     getEnvironmentWarnings: () => [],
-  }));
-  jest.mock(require.resolve('../gather/gatherers/stacks.js'),
-    () => ({collectStacks: () => Promise.resolve([])}));
-  jest.mock(require.resolve('../gather/gatherers/installability-errors.js'), () => ({
+  });
+  td.replaceEsm(require.resolve('../gather/gatherers/stacks.js'), undefined, {
+    collectStacks: () => Promise.resolve([]),
+  });
+  td.replaceEsm(require.resolve('../gather/gatherers/installability-errors.js'), undefined, {
     getInstallabilityErrors: async () => ({errors: []}),
-  }));
-  jest.mock(require.resolve('../gather/gatherers/web-app-manifest.js'), () => ({
+  });
+  td.replaceEsm(require.resolve('../gather/gatherers/web-app-manifest.js'), undefined, {
     getWebAppManifest: async () => null,
-  }));
-  jest.unstable_mockModule(require.resolve('../lib/emulation.js'), () => ({
-    emulate: jest.fn(),
-    throttle: jest.fn(),
-    clearThrottling: jest.fn(),
-  }));
-  jest.unstable_mockModule(require.resolve('../gather/driver/prepare.js'), () => ({
-    prepareTargetForNavigationMode: jest.fn(),
-    prepareTargetForIndividualNavigation: jest.fn().mockResolvedValue({warnings: []}),
-  }));
-  jest.unstable_mockModule(require.resolve('../gather/driver/storage.js'), () => ({
-    clearDataForOrigin: jest.fn(),
-    cleanBrowserCaches: jest.fn(),
-    getImportantStorageWarning: jest.fn(),
-  }));
-  jest.unstable_mockModule(require.resolve('../gather/driver/navigation.js'), () => ({
-    gotoURL: jest.fn().mockResolvedValue({
+  });
+  td.replaceEsm(require.resolve('../lib/emulation.js'), {
+    emulate: jestMock.fn(),
+    throttle: jestMock.fn(),
+    clearThrottling: jestMock.fn(),
+  });
+  td.replaceEsm(require.resolve('../gather/driver/prepare.js'), {
+    prepareTargetForNavigationMode: jestMock.fn(),
+    prepareTargetForIndividualNavigation: jestMock.fn().mockResolvedValue({warnings: []}),
+  });
+  td.replaceEsm(require.resolve('../gather/driver/storage.js'), {
+    clearDataForOrigin: jestMock.fn(),
+    cleanBrowserCaches: jestMock.fn(),
+    getImportantStorageWarning: jestMock.fn(),
+  });
+  td.replaceEsm(require.resolve('../gather/driver/navigation.js'), {
+    gotoURL: jestMock.fn().mockResolvedValue({
       mainDocumentUrl: 'http://example.com',
       warnings: [],
     }),
-  }));
+  });
 }
 
 /**
- * Same as jest.fn(), but uses `any` instead of `unknown`.
+ * Same as jestMock.fn(), but uses `any` instead of `unknown`.
  */
 const fnAny = () => {
-  return /** @type {jest.Mock<any, any>} */ (jest.fn());
+  return /** @type {Mock<any, any>} */ (jestMock.fn());
 };
 
 /**
@@ -269,26 +272,44 @@ function getURLArtifactFromDevtoolsLog(devtoolsLog) {
 }
 
 /**
- * Same as jest.requireMock(), but:
- * 1) returns a Mock record instead of `unknown`
- * 2) uses `import` instead of `require`
- * Use only for modules that were mocked with unstable_mockModule.
- *
+ * Use to import a module in tests with Mock types.
+ * Asserts that the module is actually a mock.
  * Resolves module path relative to importMeta.url.
  *
  * @param {string} modulePath
  * @param {ImportMeta} importMeta
- * @return {Promise<Record<string, jest.Mock>>}
+ * @return {Promise<Record<string, Mock<any, any>>>}
  */
-const importMock = async (modulePath, importMeta) => {
+async function importMock(modulePath, importMeta) {
   const dir = path.dirname(url.fileURLToPath(importMeta.url));
   modulePath = path.resolve(dir, modulePath);
   const mock = await import(modulePath);
-  if (!mock[Object.keys(mock)[0]].mock) throw new Error(`${modulePath} was not mocked!`);
+  if (!Object.keys(mock).some(key => mock[key]?.mock)) {
+    throw new Error(`${modulePath} was not mocked!`);
+  }
   return mock;
-};
+}
+
+/**
+ * Same as importMock, but uses require instead to avoid
+ * an unnecessary `.default` or Promise return value.
+ *
+ * @param {string} modulePath
+ * @param {ImportMeta} importMeta
+ * @return {Record<string, Mock<any, any>>}
+ */
+function requireMock(modulePath, importMeta) {
+  const dir = path.dirname(url.fileURLToPath(importMeta.url));
+  modulePath = path.resolve(dir, modulePath);
+  const mock = require(modulePath);
+  if (!Object.keys(mock).some(key => mock[key]?.mock)) {
+    throw new Error(`${modulePath} was not mocked!`);
+  }
+  return mock;
+}
 
 export {
+  timers,
   getProtoRoundTrip,
   loadSourceMapFixture,
   loadSourceMapAndUsageFixture,
@@ -302,4 +323,5 @@ export {
   createScript,
   getURLArtifactFromDevtoolsLog,
   importMock,
+  requireMock,
 };
diff --git a/lighthouse-core/util-commonjs.js b/lighthouse-core/util-commonjs.js
index 22d49d53585f..2bea46619812 100644
--- a/lighthouse-core/util-commonjs.js
+++ b/lighthouse-core/util-commonjs.js
@@ -572,15 +572,16 @@ class Util {
  */
 Util.reportJson = null;
 
+let svgSuffix = 0;
 /**
  * An always-increasing counter for making unique SVG ID suffixes.
  */
-Util.getUniqueSuffix = (() => {
-  let svgSuffix = 0;
-  return function() {
-    return svgSuffix++;
-  };
-})();
+Util.getUniqueSuffix = () => {
+  return svgSuffix++;
+};
+Util.resetUniqueSuffix = () => {
+  svgSuffix = 0;
+};
 
 /**
  * Report-renderer-specific strings.
diff --git a/package.json b/package.json
index 42064991690f..6efdb300b0e4 100644
--- a/package.json
+++ b/package.json
@@ -36,24 +36,24 @@
     "smoke": "node lighthouse-cli/test/smokehouse/frontends/smokehouse-bin.js",
     "debug": "node --inspect-brk ./lighthouse-cli/index.js",
     "start": "yarn build-report --standalone && node ./lighthouse-cli/index.js",
-    "jest": "bash ./lighthouse-core/scripts/run-jest.sh",
+    "mocha": "node lighthouse-core/test/scripts/run-tests.js",
     "test": "yarn diff:sample-json && yarn lint --quiet && yarn unit && yarn type-check",
     "test-bundle": "yarn smoke --runner bundle --retries=2",
-    "test-clients": "yarn jest \"$PWD/clients/\" && yarn jest --testMatch=\"**/clients/test/**/*-test-pptr.js\"",
-    "test-viewer": "yarn unit-viewer && yarn jest --testMatch=\"**/viewer/**/*-test-pptr.js\"",
-    "test-treemap": "yarn unit-treemap && yarn jest --testMatch=\"**/treemap/**/*-test-pptr.js\"",
+    "test-clients": "yarn mocha --testMatch 'clients/**/*-test.js' && yarn mocha --testMatch 'clients/**/*-test-pptr.js'",
+    "test-viewer": "yarn unit-viewer && yarn mocha --testMatch 'viewer/**/*-test-pptr.js' --timeout 35000",
+    "test-treemap": "yarn unit-treemap && yarn mocha --testMatch 'treemap/**/*-test-pptr.js' --timeout 35000",
     "test-lantern": "bash lighthouse-core/scripts/test-lantern.sh",
     "test-legacy-javascript": "bash lighthouse-core/scripts/test-legacy-javascript.sh",
     "test-docs": "yarn --cwd docs/recipes/ test",
     "test-proto": "yarn compile-proto && yarn build-proto-roundtrip",
-    "unit-core": "yarn jest \"lighthouse-core\"",
-    "unit-cli": "yarn jest \"lighthouse-cli/\"",
-    "unit-report": "yarn jest \"report/\"",
-    "unit-treemap": "yarn jest \"treemap/.*-test.js\"",
-    "unit-viewer": "yarn jest \"viewer/.*-test.js\"",
-    "unit-flow": "yarn jest \"flow-report/.*-test.[tj]s[x]?\"",
-    "unit": "yarn jest",
-    "unit:ci": "NODE_OPTIONS=--max-old-space-size=8192 npm run jest --runInBand --ci .",
+    "unit-core": "yarn mocha lighthouse-core",
+    "unit-cli": "yarn mocha --testMatch 'lighthouse-cli/**/*-test.js'",
+    "unit-report": "yarn mocha --testMatch 'report/**/*-test.js'",
+    "unit-treemap": "yarn mocha --testMatch 'treemap/**/*-test.js'",
+    "unit-viewer": "yarn mocha --testMatch 'viewer/**/*-test.js'",
+    "unit-flow": "sh flow-report/test/run-flow-report-tests.sh",
+    "unit": "yarn mocha",
+    "unit:ci": "NODE_OPTIONS=--max-old-space-size=8192 npm run unit --forbid-only",
     "core-unit": "yarn unit-core",
     "cli-unit": "yarn unit-cli",
     "viewer-unit": "yarn unit-viewer",
@@ -97,6 +97,8 @@
   },
   "devDependencies": {
     "@build-tracker/cli": "^1.0.0-beta.15",
+    "@esbuild-kit/esm-loader": "^2.1.1",
+    "@jest/fake-timers": "^28.1.0",
     "@rollup/plugin-alias": "^3.1.2",
     "@rollup/plugin-commonjs": "^20.0.0",
     "@rollup/plugin-dynamic-import-vars": "^1.1.1",
@@ -104,7 +106,7 @@
     "@rollup/plugin-node-resolve": "^13.0.4",
     "@rollup/plugin-typescript": "^8.2.5",
     "@stadtlandnetz/rollup-plugin-postprocess": "^1.1.0",
-    "@testing-library/preact": "^2.0.1",
+    "@testing-library/preact": "^3.1.1",
     "@testing-library/preact-hooks": "^1.1.0",
     "@types/archiver": "^2.1.2",
     "@types/chrome": "^0.0.154",
@@ -114,10 +116,10 @@
     "@types/estree": "^0.0.50",
     "@types/gh-pages": "^2.0.0",
     "@types/google.analytics": "0.0.39",
-    "@types/jest": "^27.0.3",
     "@types/jpeg-js": "^0.3.7",
     "@types/jsdom": "^16.2.13",
     "@types/lodash": "^4.14.178",
+    "@types/mocha": "^9.0.0",
     "@types/node": "*",
     "@types/pako": "^1.0.1",
     "@types/resize-observer-browser": "^0.1.1",
@@ -147,22 +149,25 @@
     "eslint-plugin-import": "^2.25.3",
     "eslint-plugin-local-rules": "1.1.0",
     "event-target-shim": "^6.0.2",
+    "expect": "^28.1.0",
     "firebase": "^9.0.2",
     "gh-pages": "^2.0.1",
     "glob": "^7.1.3",
     "idb-keyval": "2.2.0",
     "intl-messageformat-parser": "^1.8.1",
-    "jest": "27.1.1",
+    "jest-mock": "^27.3.0",
+    "jest-snapshot": "^28.1.0",
     "jsdom": "^12.2.0",
     "jsonld": "^5.2.0",
     "jsonlint-mod": "^1.7.6",
     "lighthouse-plugin-publisher-ads": "^1.5.4",
     "magic-string": "^0.25.7",
     "mime-types": "^2.1.30",
+    "mocha": "^10.0.0",
     "node-fetch": "^2.6.1",
     "npm-run-posix-or-windows": "^2.0.2",
     "pako": "^2.0.3",
-    "preact": "^10.5.14",
+    "preact": "^10.7.2",
     "pretty-json-stringify": "^0.0.2",
     "puppeteer": "13.7.0",
     "resolve": "^1.20.0",
@@ -175,7 +180,7 @@
     "segfault-handler": "^1.3.0",
     "tabulator-tables": "^4.9.3",
     "terser": "^5.3.8",
-    "ts-jest": "^27.0.4",
+    "testdouble": "^3.16.5",
     "typed-query-selector": "^2.6.1",
     "typescript": "^4.7.3",
     "wait-for-expect": "^3.0.2",
diff --git a/report/renderer/util.js b/report/renderer/util.js
index c240036f62bc..c712e3b73bdf 100644
--- a/report/renderer/util.js
+++ b/report/renderer/util.js
@@ -568,15 +568,16 @@ class Util {
  */
 Util.reportJson = null;
 
+let svgSuffix = 0;
 /**
  * An always-increasing counter for making unique SVG ID suffixes.
  */
-Util.getUniqueSuffix = (() => {
-  let svgSuffix = 0;
-  return function() {
-    return svgSuffix++;
-  };
-})();
+Util.getUniqueSuffix = () => {
+  return svgSuffix++;
+};
+Util.resetUniqueSuffix = () => {
+  svgSuffix = 0;
+};
 
 /**
  * Report-renderer-specific strings.
diff --git a/report/test/.eslintrc.cjs b/report/test/.eslintrc.cjs
index 2a53a730a857..cc18671c736b 100644
--- a/report/test/.eslintrc.cjs
+++ b/report/test/.eslintrc.cjs
@@ -6,6 +6,9 @@
 
 module.exports = {
   env: {
-    jest: true,
+    mocha: true,
+  },
+  globals: {
+    expect: true,
   },
 };
diff --git a/report/test/clients/bundle-test.js b/report/test/clients/bundle-test.js
index 5b1879c5a1dd..2e52c56ab17e 100644
--- a/report/test/clients/bundle-test.js
+++ b/report/test/clients/bundle-test.js
@@ -7,7 +7,7 @@
 import fs from 'fs';
 
 import jsdom from 'jsdom';
-import {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
 
 import * as lighthouseRenderer from '../../clients/bundle.js';
 import {LH_ROOT} from '../../../root.js';
@@ -17,8 +17,8 @@ const sampleResultsStr =
 
 describe('lighthouseRenderer bundle', () => {
   let document;
-  beforeAll(() => {
-    global.console.warn = jest.fn();
+  before(() => {
+    global.console.warn = jestMock.fn();
 
     const {window} = new jsdom.JSDOM();
     document = window.document;
@@ -38,7 +38,7 @@ describe('lighthouseRenderer bundle', () => {
     };
   });
 
-  afterAll(() => {
+  after(() => {
     global.window = global.self = undefined;
     global.HTMLInputElement = undefined;
   });
diff --git a/report/test/generator/report-generator-test.js b/report/test/generator/report-generator-test.js
index ee78b3644d63..ced8ebf93d95 100644
--- a/report/test/generator/report-generator-test.js
+++ b/report/test/generator/report-generator-test.js
@@ -13,7 +13,9 @@ const fs = require('fs');
 const csvValidator = require('csv-validator');
 
 const ReportGenerator = require('../../generator/report-generator.js');
-const sampleResults = require('../../../lighthouse-core/test/results/sample_v2.json');
+const {readJson} = require('../../../root.js');
+
+const sampleResults = readJson('lighthouse-core/test/results/sample_v2.json');
 
 describe('ReportGenerator', () => {
   describe('#replaceStrings', () => {
diff --git a/report/test/renderer/category-renderer-test.js b/report/test/renderer/category-renderer-test.js
index 11f214aa0db2..086086c65b11 100644
--- a/report/test/renderer/category-renderer-test.js
+++ b/report/test/renderer/category-renderer-test.js
@@ -21,7 +21,7 @@ describe('CategoryRenderer', () => {
   let renderer;
   let sampleResults;
 
-  beforeAll(() => {
+  before(() => {
     Util.i18n = new I18n('en', {...Util.UIStrings});
 
     const {document} = new jsdom.JSDOM().window;
@@ -32,7 +32,7 @@ describe('CategoryRenderer', () => {
     sampleResults = Util.prepareReportResult(sampleResultsOrig);
   });
 
-  afterAll(() => {
+  after(() => {
     Util.i18n = undefined;
   });
 
diff --git a/report/test/renderer/components-test.js b/report/test/renderer/components-test.js
index 96a8982a4e55..106e8080ce64 100644
--- a/report/test/renderer/components-test.js
+++ b/report/test/renderer/components-test.js
@@ -7,7 +7,6 @@
 import fs from 'fs';
 
 import jsdom from 'jsdom';
-import expect from 'expect';
 
 import {DOM} from '../../renderer/dom.js';
 import {LH_ROOT} from '../../../root.js';
@@ -82,41 +81,44 @@ async function assertDOMTreeMatches(tmplEl) {
   }
 }
 
-const originalCreateElement = DOM.prototype.createElement;
-const originalCreateElementNS = DOM.prototype.createElementNS;
-beforeAll(() => {
-  /**
-   * @param {string} classNames
-   */
-  function checkPrefix(classNames) {
-    if (!classNames) return;
-
-    for (const className of classNames.split(' ')) {
-      if (!className.startsWith('lh-')) {
-        throw new Error(`expected classname to start with lh-, got: ${className}`);
+describe('Components', () => {
+  const originalCreateElement = DOM.prototype.createElement;
+  const originalCreateElementNS = DOM.prototype.createElementNS;
+
+  before(() => {
+    /**
+     * @param {string} classNames
+     */
+    function checkPrefix(classNames) {
+      if (!classNames) return;
+
+      for (const className of classNames.split(' ')) {
+        if (!className.startsWith('lh-')) {
+          throw new Error(`expected classname to start with lh-, got: ${className}`);
+        }
       }
     }
-  }
-
-  DOM.prototype.createElement = function(...args) {
-    const classNames = args[1];
-    checkPrefix(classNames);
-    return originalCreateElement.call(this, ...args);
-  };
-  DOM.prototype.createElementNS = function(...args) {
-    const classNames = args[2];
-    checkPrefix(classNames);
-    return originalCreateElementNS.call(this, ...args);
-  };
-});
 
-afterAll(() => {
-  DOM.prototype.createElement = originalCreateElement;
-  DOM.prototype.createElementNS = originalCreateElementNS;
-});
+    DOM.prototype.createElement = function(...args) {
+      const classNames = args[1];
+      checkPrefix(classNames);
+      return originalCreateElement.call(this, ...args);
+    };
+    DOM.prototype.createElementNS = function(...args) {
+      const classNames = args[2];
+      checkPrefix(classNames);
+      return originalCreateElementNS.call(this, ...args);
+    };
+  });
 
-for (const tmpEl of tmplEls) {
-  it(`${tmpEl.id} component matches HTML source`, async () => {
-    await assertDOMTreeMatches(tmpEl);
+  after(() => {
+    DOM.prototype.createElement = originalCreateElement;
+    DOM.prototype.createElementNS = originalCreateElementNS;
   });
-}
+
+  for (const tmpEl of tmplEls) {
+    it(`${tmpEl.id} component matches HTML source`, async () => {
+      await assertDOMTreeMatches(tmpEl);
+    });
+  }
+});
diff --git a/report/test/renderer/crc-details-renderer-test.js b/report/test/renderer/crc-details-renderer-test.js
index 438c6c6f4921..502ed9b35da6 100644
--- a/report/test/renderer/crc-details-renderer-test.js
+++ b/report/test/renderer/crc-details-renderer-test.js
@@ -72,7 +72,7 @@ describe('DetailsRenderer', () => {
   let dom;
   let detailsRenderer;
 
-  beforeAll(() => {
+  before(() => {
     Util.i18n = new I18n('en', {...Util.UIStrings});
 
     const {document} = new jsdom.JSDOM().window;
@@ -80,7 +80,7 @@ describe('DetailsRenderer', () => {
     detailsRenderer = new DetailsRenderer(dom);
   });
 
-  afterAll(() => {
+  after(() => {
     Util.i18n = undefined;
   });
 
diff --git a/report/test/renderer/details-renderer-test.js b/report/test/renderer/details-renderer-test.js
index 18d5c63e6fee..70ee3f8beebd 100644
--- a/report/test/renderer/details-renderer-test.js
+++ b/report/test/renderer/details-renderer-test.js
@@ -22,12 +22,12 @@ describe('DetailsRenderer', () => {
     renderer = new DetailsRenderer(dom, options);
   }
 
-  beforeAll(() => {
+  before(() => {
     Util.i18n = new I18n('en', {...Util.UIStrings});
     createRenderer();
   });
 
-  afterAll(() => {
+  after(() => {
     Util.i18n = undefined;
   });
 
diff --git a/report/test/renderer/dom-test.js b/report/test/renderer/dom-test.js
index c678be02aaaa..8b2b1dc9c91d 100644
--- a/report/test/renderer/dom-test.js
+++ b/report/test/renderer/dom-test.js
@@ -6,7 +6,7 @@
 
 import {strict as assert} from 'assert';
 
-import {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
 import jsdom from 'jsdom';
 
 import {DOM} from '../../renderer/dom.js';
@@ -19,20 +19,20 @@ describe('DOM', () => {
   let window;
   let nativeCreateObjectURL;
 
-  beforeAll(() => {
+  before(() => {
     Util.i18n = new I18n('en', {...Util.UIStrings});
     window = new jsdom.JSDOM().window;
 
     // The Node version of URL.createObjectURL isn't compatible with the jsdom blob type,
     // so we stub it.
     nativeCreateObjectURL = URL.createObjectURL;
-    URL.createObjectURL = jest.fn(_ => `https://fake-origin/blahblah-blobid`);
+    URL.createObjectURL = jestMock.fn(_ => `https://fake-origin/blahblah-blobid`);
 
     dom = new DOM(window.document);
     dom.setLighthouseChannel('someChannel');
   });
 
-  afterAll(() => {
+  after(() => {
     Util.i18n = undefined;
     URL.createObjectURL = nativeCreateObjectURL;
   });
diff --git a/report/test/renderer/element-screenshot-renderer-test.js b/report/test/renderer/element-screenshot-renderer-test.js
index 0e7685f87836..502a4e52f359 100644
--- a/report/test/renderer/element-screenshot-renderer-test.js
+++ b/report/test/renderer/element-screenshot-renderer-test.js
@@ -26,14 +26,15 @@ function makeRect(opts) {
 describe('ElementScreenshotRenderer', () => {
   let dom;
 
-  beforeAll(() => {
+  before(() => {
     Util.i18n = new I18n('en', {...Util.UIStrings});
 
     const {document} = new jsdom.JSDOM().window;
     dom = new DOM(document);
+    Util.resetUniqueSuffix();
   });
 
-  afterAll(() => {
+  after(() => {
     Util.i18n = undefined;
   });
 
diff --git a/report/test/renderer/performance-category-renderer-test.js b/report/test/renderer/performance-category-renderer-test.js
index 5b69f6e318ce..92450f248a49 100644
--- a/report/test/renderer/performance-category-renderer-test.js
+++ b/report/test/renderer/performance-category-renderer-test.js
@@ -23,7 +23,7 @@ describe('PerfCategoryRenderer', () => {
   let renderer;
   let sampleResults;
 
-  beforeAll(() => {
+  before(() => {
     Util.i18n = new I18n('en', {...Util.UIStrings});
 
     const {document} = new jsdom.JSDOM().window;
@@ -36,7 +36,7 @@ describe('PerfCategoryRenderer', () => {
     category = sampleResults.categories.performance;
   });
 
-  afterAll(() => {
+  after(() => {
     Util.i18n = undefined;
   });
 
@@ -390,7 +390,7 @@ Array [
     let getDescriptionsAfterCheckedToggle;
 
     describe('works if there is a performance category', () => {
-      beforeAll(() => {
+      before(() => {
         container = renderer.render(category, sampleResults.categoryGroups);
         const metricsAuditGroup = container.querySelector(metricsSelector);
         toggle = metricsAuditGroup.querySelector(toggleSelector);
diff --git a/report/test/renderer/pwa-category-renderer-test.js b/report/test/renderer/pwa-category-renderer-test.js
index 915a9fb2a6c1..924b8c365595 100644
--- a/report/test/renderer/pwa-category-renderer-test.js
+++ b/report/test/renderer/pwa-category-renderer-test.js
@@ -22,7 +22,7 @@ describe('PwaCategoryRenderer', () => {
   let pwaRenderer;
   let sampleResults;
 
-  beforeAll(() => {
+  before(() => {
     Util.i18n = new I18n('en', {...Util.UIStrings});
 
     const {document} = new jsdom.JSDOM().window;
@@ -39,7 +39,7 @@ describe('PwaCategoryRenderer', () => {
     category = JSON.parse(JSON.stringify(pwaCategory));
   });
 
-  afterAll(() => {
+  after(() => {
     Util.i18n = undefined;
   });
 
diff --git a/report/test/renderer/report-renderer-axe-test.js b/report/test/renderer/report-renderer-axe-test.js
index 6539825b0907..ad07207a6bbe 100644
--- a/report/test/renderer/report-renderer-axe-test.js
+++ b/report/test/renderer/report-renderer-axe-test.js
@@ -7,7 +7,7 @@
 import puppeteer from 'puppeteer';
 
 import reportGenerator from '../../generator/report-generator.js';
-import axeLib from '../../../lighthouse-core/lib/axe.js';
+import {axeSource} from '../../../lighthouse-core/lib/axe.js';
 import {readJson} from '../../../root.js';
 
 const sampleResults = readJson('../../../lighthouse-core/test/results/sample_v2.json', import.meta);
@@ -16,14 +16,16 @@ describe('ReportRendererAxe', () => {
   describe('with aXe', () => {
     let browser;
 
-    beforeAll(async () => {
+    before(async () => {
       browser = await puppeteer.launch();
     });
 
-    afterAll(async () => {
+    after(async () => {
       await browser.close();
     });
 
+    // This test takes 10s on fast hardware, but can take longer in CI.
+    // https://github.com/dequelabs/axe-core/tree/b573b1c1/doc/examples/jest_react#timeout-issues
     it('renders without axe violations', async () => {
       const page = await browser.newPage();
       const htmlReport = reportGenerator.generateReportHtml(sampleResults);
@@ -50,7 +52,7 @@ describe('ReportRendererAxe', () => {
         },
       };
 
-      await page.evaluate(axeLib.source);
+      await page.evaluate(axeSource);
       // eslint-disable-next-line no-undef
       const axeResults = await page.evaluate(config => axe.run(config), config);
 
@@ -78,10 +80,6 @@ describe('ReportRendererAxe', () => {
         };
       });
       expect(axeSummary).toMatchSnapshot();
-    },
-    // This test takes 10s on fast hardware, but can take longer in CI.
-    // https://github.com/dequelabs/axe-core/tree/b573b1c1/doc/examples/jest_react#timeout-issues
-    /* timeout= */ 20_000
-    );
+    });
   });
 });
diff --git a/report/test/renderer/report-renderer-test.js b/report/test/renderer/report-renderer-test.js
index 230ab5c5e523..b738f4e80ba0 100644
--- a/report/test/renderer/report-renderer-test.js
+++ b/report/test/renderer/report-renderer-test.js
@@ -7,7 +7,7 @@
 import {strict as assert} from 'assert';
 
 import jsdom from 'jsdom';
-import {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
 
 import {Util} from '../../renderer/util.js';
 import URL from '../../../lighthouse-core/lib/url-shim.js';
@@ -25,8 +25,8 @@ describe('ReportRenderer', () => {
   let renderer;
   let sampleResults;
 
-  beforeAll(() => {
-    global.console.warn = jest.fn();
+  before(() => {
+    global.console.warn = jestMock.fn();
 
     // Stub out matchMedia for Node.
     global.matchMedia = function() {
@@ -45,7 +45,7 @@ describe('ReportRenderer', () => {
     sampleResults = Util.prepareReportResult(sampleResultsOrig);
   });
 
-  afterAll(() => {
+  after(() => {
     global.self = undefined;
     global.matchMedia = undefined;
   });
diff --git a/report/test/renderer/report-ui-features-test.js b/report/test/renderer/report-ui-features-test.js
index 45a6dfbc7186..f4d565b71101 100644
--- a/report/test/renderer/report-ui-features-test.js
+++ b/report/test/renderer/report-ui-features-test.js
@@ -7,7 +7,7 @@
 import {strict as assert} from 'assert';
 
 import jsdom from 'jsdom';
-import {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
 
 import reportAssets from '../../generator/report-assets.js';
 import {Util} from '../../renderer/util.js';
@@ -40,8 +40,8 @@ describe('ReportUIFeatures', () => {
     return container;
   }
 
-  beforeAll(() => {
-    global.console.warn = jest.fn();
+  before(() => {
+    global.console.warn = jestMock.fn();
 
     // Stub out matchMedia for Node.
     global.matchMedia = function() {
@@ -80,7 +80,7 @@ describe('ReportUIFeatures', () => {
     render(sampleResults);
   });
 
-  afterAll(() => {
+  after(() => {
     global.window = undefined;
     global.HTMLElement = undefined;
     global.HTMLInputElement = undefined;
@@ -105,7 +105,7 @@ describe('ReportUIFeatures', () => {
     describe('third-party filtering', () => {
       let container;
 
-      beforeAll(() => {
+      before(() => {
         const lhr = JSON.parse(JSON.stringify(sampleResults));
         lhr.requestedUrl = lhr.finalUrl = 'http://www.example.com';
         const webpAuditItemTemplate = {
@@ -283,7 +283,7 @@ describe('ReportUIFeatures', () => {
       const getSaveEl = () => dom.find('a[data-action="save-html"]', container);
       expect(getSaveEl().classList.contains('lh-hidden')).toBeTruthy();
 
-      const getHtmlMock = jest.fn();
+      const getHtmlMock = jestMock.fn();
       container = render(sampleResults, {
         getStandaloneReportHTML: getHtmlMock,
       });
@@ -428,7 +428,7 @@ describe('ReportUIFeatures', () => {
     describe('_getNextSelectableNode', () => {
       let createDiv;
 
-      beforeAll(() => {
+      before(() => {
         createDiv = () => dom.document().createElement('div');
       });
 
diff --git a/report/test/renderer/snippet-renderer-test.js b/report/test/renderer/snippet-renderer-test.js
index dad1a740a02c..f4384888d636 100644
--- a/report/test/renderer/snippet-renderer-test.js
+++ b/report/test/renderer/snippet-renderer-test.js
@@ -54,13 +54,13 @@ function makeSnippetDetails({
 describe('DetailsRenderer', () => {
   let dom;
 
-  beforeAll(() => {
+  before(() => {
     Util.i18n = new I18n('en', {...Util.UIStrings});
     const {document} = new jsdom.JSDOM().window;
     dom = new DOM(document);
   });
 
-  afterAll(() => {
+  after(() => {
     Util.i18n = undefined;
   });
 
diff --git a/report/test/renderer/text-encoding-test.js b/report/test/renderer/text-encoding-test.js
index eea6f38f2bb4..abd85f91715a 100644
--- a/report/test/renderer/text-encoding-test.js
+++ b/report/test/renderer/text-encoding-test.js
@@ -12,11 +12,11 @@ import {TextEncoding} from '../../renderer/text-encoding.js';
 import {LH_ROOT} from '../../../root.js';
 
 describe('TextEncoding', () => {
-  beforeAll(() => {
+  before(() => {
     global.window = {pako};
   });
 
-  afterAll(() => {
+  after(() => {
     global.window = undefined;
   });
 
diff --git a/shared/test/localization/.eslintrc.cjs b/shared/test/localization/.eslintrc.cjs
index 2a53a730a857..cc18671c736b 100644
--- a/shared/test/localization/.eslintrc.cjs
+++ b/shared/test/localization/.eslintrc.cjs
@@ -6,6 +6,9 @@
 
 module.exports = {
   env: {
-    jest: true,
+    mocha: true,
+  },
+  globals: {
+    expect: true,
   },
 };
diff --git a/shared/test/localization/format-test.js b/shared/test/localization/format-test.js
index 746b76c92541..215485883486 100644
--- a/shared/test/localization/format-test.js
+++ b/shared/test/localization/format-test.js
@@ -13,7 +13,7 @@ const locales = require('../../localization/locales.js');
 // TODO(esmodules): remove when shared/ is esm
 let i18n;
 let constants;
-beforeAll(async () => {
+before(async () => {
   i18n = await import('../../../lighthouse-core/lib/i18n/i18n.js');
   constants = await import('../../../lighthouse-core/config/constants.js');
 });
@@ -323,7 +323,7 @@ describe('format', () => {
     };
 
     let str_;
-    beforeAll(() => {
+    before(() => {
       str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
     });
 
diff --git a/third-party/chromium-synchronization/inspector-issueAdded-types-test.js b/third-party/chromium-synchronization/inspector-issueAdded-types-test.js
index 6b3004decd4e..8d9984e5de3d 100644
--- a/third-party/chromium-synchronization/inspector-issueAdded-types-test.js
+++ b/third-party/chromium-synchronization/inspector-issueAdded-types-test.js
@@ -17,7 +17,7 @@ describe('issueAdded types', () => {
   /** @type {Array<LH.Crdp.Audits.InspectorIssueDetails>} */
   let inspectorIssueDetailsTypes;
 
-  beforeAll(async () => {
+  before(async () => {
     const browserProtocolUrl =
       'https://raw.githubusercontent.com/ChromeDevTools/devtools-protocol/master/json/browser_protocol.json';
     const json = await fetch(browserProtocolUrl).then(r => r.json());
diff --git a/third-party/chromium-synchronization/installability-errors-test.js b/third-party/chromium-synchronization/installability-errors-test.js
index 5ef61a9dce69..29e00351511b 100644
--- a/third-party/chromium-synchronization/installability-errors-test.js
+++ b/third-party/chromium-synchronization/installability-errors-test.js
@@ -11,12 +11,10 @@ import fetch from 'node-fetch';
 
 import {UIStrings} from '../../lighthouse-core/audits/installable-manifest.js';
 
-jest.setTimeout(20_000);
-
 describe('installabilityErrors', () => {
   let chromiumErrorIds;
 
-  beforeAll(async () => {
+  before(async () => {
     const installableLoggingGitTilesUrl =
       'https://chromium.googlesource.com/chromium/src/+/main/components/webapps/browser/installable/installable_logging.cc?format=TEXT';
     const resp = await fetch(installableLoggingGitTilesUrl);
diff --git a/treemap/test/.eslintrc.cjs b/treemap/test/.eslintrc.cjs
index 2a53a730a857..cc18671c736b 100644
--- a/treemap/test/.eslintrc.cjs
+++ b/treemap/test/.eslintrc.cjs
@@ -6,6 +6,9 @@
 
 module.exports = {
   env: {
-    jest: true,
+    mocha: true,
+  },
+  globals: {
+    expect: true,
   },
 };
diff --git a/treemap/test/treemap-test-pptr.js b/treemap/test/treemap-test-pptr.js
index 7be0d8c6ad13..d8989af52585 100644
--- a/treemap/test/treemap-test-pptr.js
+++ b/treemap/test/treemap-test-pptr.js
@@ -6,7 +6,6 @@
 
 import fs from 'fs';
 
-import {jest} from '@jest/globals';
 import puppeteer from 'puppeteer';
 
 import {server} from '../../lighthouse-cli/test/fixtures/static-server.js';
@@ -18,10 +17,6 @@ const debugOptions = JSON.parse(
 const portNumber = 20202;
 const treemapUrl = `http://localhost:${portNumber}/dist/gh-pages/treemap/index.html`;
 
-// These tests run in Chromium and have their own timeouts.
-// Make sure we get the more helpful test-specific timeout error instead of jest's generic one.
-jest.setTimeout(35_000);
-
 function getTextEncodingCode() {
   const code = fs.readFileSync(LH_ROOT + '/report/renderer/text-encoding.js', 'utf-8');
   return code.replace('export ', '');
@@ -38,11 +33,11 @@ describe('Lighthouse Treemap', () => {
   /** @type {Error[]} */
   let pageErrors = [];
 
-  beforeAll(async function() {
+  before(async function() {
     await server.listen(portNumber, 'localhost');
   });
 
-  afterAll(async function() {
+  after(async function() {
     await Promise.all([
       server.close(),
       browser && browser.close(),
diff --git a/types/jest.d.ts b/types/jest.d.ts
deleted file mode 100644
index c23c5a7bf491..000000000000
--- a/types/jest.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @license Copyright 2019 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.
- */
-
-declare namespace jest {
-  interface Matchers<R> {
-    /**
-     * Jest's `toBeCloseTo()` exposed as an asymmetric matcher. This allows
-     * approximate numeric testing within matchers like `toMatchObject()`.
-     * The default for `numDigits` is 2.
-     */
-    toBeApproximately(expected: number, numDigits?: number): R;
-    /**
-     * Asserts that an inspectable promise created by makePromiseInspectable is currently resolved or rejected.
-     * This is useful for situations where we want to test that we are actually waiting for a particular event.
-     */
-    toBeDone: (failureMessage?: string) => R;
-    /**
-     * Asserts that an i18n string (using en-US) matches an expected pattern.
-     */
-    toBeDisplayString: (pattern: RegExp | string) => R;
-  }
-}
diff --git a/types/test.d.ts b/types/test.d.ts
new file mode 100644
index 000000000000..af106254c85a
--- /dev/null
+++ b/types/test.d.ts
@@ -0,0 +1,53 @@
+/**
+ * @license Copyright 2022 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.
+ */
+
+declare global {
+  var expect: import('expect').Expect;
+  type Mock<T, Y> = import('jest-mock').Mock<T, Y>;
+}
+
+declare module 'expect' {
+  interface Matchers<R extends void | Promise<void>, T={}> {
+    /**
+     * This ensures that a value matches the most recent snapshot with property matchers.
+     * Check out [the Snapshot Testing guide](http://facebook.github.io/jest/docs/snapshot-testing.html) for more information.
+     */
+    // tslint:disable-next-line: no-unnecessary-generics
+    toMatchSnapshot<U extends { [P in keyof T]: any }>(propertyMatchers: Partial<U>, snapshotName?: string): R;
+    /**
+     * This ensures that a value matches the most recent snapshot.
+     * Check out [the Snapshot Testing guide](http://facebook.github.io/jest/docs/snapshot-testing.html) for more information.
+     */
+    toMatchSnapshot(snapshotName?: string): R;
+    /**
+     * This ensures that a value matches the most recent snapshot with property matchers.
+     * Instead of writing the snapshot value to a .snap file, it will be written into the source code automatically.
+     * Check out [the Snapshot Testing guide](http://facebook.github.io/jest/docs/snapshot-testing.html) for more information.
+     */
+    // tslint:disable-next-line: no-unnecessary-generics
+    toMatchInlineSnapshot<U extends { [P in keyof T]: any }>(propertyMatchers: Partial<U>, snapshot?: string): R;
+
+    // The following are custom matchers defined in expect-setup.js
+
+    /**
+     * Jest's `toBeCloseTo()` exposed as an asymmetric matcher. This allows
+     * approximate numeric testing within matchers like `toMatchObject()`.
+     * The default for `numDigits` is 2.
+     */
+    toBeApproximately(expected: number, numDigits?: number): R;
+    /**
+     * Asserts that an inspectable promise created by makePromiseInspectable is currently resolved or rejected.
+     * This is useful for situations where we want to test that we are actually waiting for a particular event.
+     */
+    toBeDone: (failureMessage?: string) => R;
+    /**
+     * Asserts that an i18n string (using en-US) matches an expected pattern.
+     */
+    toBeDisplayString: (pattern: RegExp | string) => R;
+  }
+}
+
+export {};
diff --git a/viewer/test/.eslintrc.cjs b/viewer/test/.eslintrc.cjs
index 2a53a730a857..cc18671c736b 100644
--- a/viewer/test/.eslintrc.cjs
+++ b/viewer/test/.eslintrc.cjs
@@ -6,6 +6,9 @@
 
 module.exports = {
   env: {
-    jest: true,
+    mocha: true,
+  },
+  globals: {
+    expect: true,
   },
 };
diff --git a/viewer/test/drag-and-drop-test.js b/viewer/test/drag-and-drop-test.js
index fcd82a23a556..f8209b081af1 100644
--- a/viewer/test/drag-and-drop-test.js
+++ b/viewer/test/drag-and-drop-test.js
@@ -4,7 +4,7 @@
  * 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 {jest} from '@jest/globals';
+import jestMock from 'jest-mock';
 
 import {DragAndDrop} from '../app/src/drag-and-drop.js';
 import * as testHelpers from './test-helpers.js';
@@ -34,7 +34,7 @@ describe('DragAndDrop', () => {
   });
 
   it('document ignores drop event without file', () => {
-    const mockCallback = jest.fn();
+    const mockCallback = jestMock.fn();
     new DragAndDrop(mockCallback);
 
     document.dispatchEvent(new window.CustomEvent('drop'));
@@ -42,7 +42,7 @@ describe('DragAndDrop', () => {
   });
 
   it('document responds to dragover event with file', () => {
-    const mockCallback = jest.fn();
+    const mockCallback = jestMock.fn();
     new DragAndDrop(mockCallback);
 
     const event = new window.CustomEvent('dragover');
@@ -54,7 +54,7 @@ describe('DragAndDrop', () => {
   });
 
   it('document ignores dragover event without file', () => {
-    const mockCallback = jest.fn();
+    const mockCallback = jestMock.fn();
     new DragAndDrop(mockCallback);
 
     const event = new window.CustomEvent('dragover');
@@ -63,14 +63,14 @@ describe('DragAndDrop', () => {
   });
 
   it('document responds to mouseleave event when not dragging', () => {
-    new DragAndDrop(jest.fn);
+    new DragAndDrop(jestMock.fn);
 
     document.dispatchEvent(new window.CustomEvent('mouseleave'));
     expect(document.querySelector('.drop_zone').classList.contains('dropping')).toBeFalsy();
   });
 
   it('document responds to mouseleave and dragenter events', () => {
-    new DragAndDrop(jest.fn);
+    new DragAndDrop(jestMock.fn);
 
     document.dispatchEvent(new window.CustomEvent('dragenter'));
     expect(document.querySelector('.drop_zone').classList.contains('dropping')).toBeTruthy();
diff --git a/viewer/test/viewer-test-pptr.js b/viewer/test/viewer-test-pptr.js
index b7f7131f4820..cd2e738792fd 100644
--- a/viewer/test/viewer-test-pptr.js
+++ b/viewer/test/viewer-test-pptr.js
@@ -7,7 +7,6 @@
 import fs from 'fs';
 import assert from 'assert';
 
-import {jest} from '@jest/globals';
 import puppeteer from 'puppeteer';
 
 import {server} from '../../lighthouse-cli/test/fixtures/static-server.js';
@@ -24,10 +23,6 @@ const sampleFlowResult = LH_ROOT + '/lighthouse-core/test/fixtures/fraggle-rock/
 const lighthouseCategories = Object.keys(defaultConfig.categories);
 const getAuditsOfCategory = category => defaultConfig.categories[category].auditRefs;
 
-// These tests run in Chromium and have their own timeouts.
-// Make sure we get the more helpful test-specific timeout error instead of jest's generic one.
-jest.setTimeout(35_000);
-
 // TODO: should be combined in some way with clients/test/extension/extension-test.js
 describe('Lighthouse Viewer', () => {
   // eslint-disable-next-line no-console
@@ -60,7 +55,7 @@ describe('Lighthouse Viewer', () => {
       });
   }
 
-  beforeAll(async () => {
+  before(async () => {
     await server.listen(portNumber, 'localhost');
 
     // start puppeteer
@@ -71,7 +66,7 @@ describe('Lighthouse Viewer', () => {
     viewerPage.on('pageerror', pageError => pageErrors.push(pageError));
   });
 
-  afterAll(async function() {
+  after(async function() {
     // Log any page load errors encountered in case before() failed.
     // eslint-disable-next-line no-console
     if (pageErrors.length > 0) console.error(pageErrors);
@@ -83,7 +78,7 @@ describe('Lighthouse Viewer', () => {
   });
 
   describe('Renders the flow report', () => {
-    beforeAll(async () => {
+    before(async () => {
       await viewerPage.goto(viewerUrl, {waitUntil: 'networkidle2', timeout: 30000});
       const fileInput = await viewerPage.$('#hidden-file-input');
       await fileInput.uploadFile(sampleFlowResult);
@@ -108,7 +103,7 @@ describe('Lighthouse Viewer', () => {
   });
 
   describe('Renders the report', () => {
-    beforeAll(async function() {
+    before(async () => {
       await viewerPage.goto(viewerUrl, {waitUntil: 'networkidle2', timeout: 30000});
       const fileInput = await viewerPage.$('#hidden-file-input');
       await fileInput.uploadFile(sampleLhr);
@@ -280,12 +275,12 @@ describe('Lighthouse Viewer', () => {
       }
     }
 
-    beforeAll(async () => {
+    before(async () => {
       await viewerPage.setRequestInterception(true);
       viewerPage.on('request', onRequest);
     });
 
-    afterAll(async () => {
+    after(async () => {
       viewerPage.off('request', onRequest);
       await viewerPage.setRequestInterception(false);
     });
diff --git a/yarn.lock b/yarn.lock
index 231d61eadd0c..e36e71b91842 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,14 @@
 # yarn lockfile v1
 
 
+"@ampproject/remapping@^2.1.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
+  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.1.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
 "@babel/code-frame@7.12.11":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
@@ -30,66 +38,38 @@
   dependencies:
     "@babel/highlight" "^7.12.13"
 
-"@babel/compat-data@^7.13.12":
-  version "7.13.15"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.15.tgz#7e8eea42d0b64fda2b375b22d06c605222e848f4"
-  integrity sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==
-
-"@babel/compat-data@^7.14.4":
-  version "7.14.4"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.4.tgz#45720fe0cecf3fd42019e1d12cc3d27fadc98d58"
-  integrity sha512-i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ==
-
-"@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.13.15"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.15.tgz#a6d40917df027487b54312202a06812c4f7792d0"
-  integrity sha512-6GXmNYeNjS2Uz+uls5jalOemgIhnTMeaXo+yBUA72kC2uX/8VW6XyhVIo2L8/q0goKQA3EVKx0KOQpVKSeWadQ==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.9"
-    "@babel/helper-compilation-targets" "^7.13.13"
-    "@babel/helper-module-transforms" "^7.13.14"
-    "@babel/helpers" "^7.13.10"
-    "@babel/parser" "^7.13.15"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.15"
-    "@babel/types" "^7.13.14"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
-    semver "^6.3.0"
-    source-map "^0.5.0"
-
-"@babel/core@^7.7.2":
-  version "7.14.3"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.3.tgz#5395e30405f0776067fbd9cf0884f15bfb770a38"
-  integrity sha512-jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.14.3"
-    "@babel/helper-compilation-targets" "^7.13.16"
-    "@babel/helper-module-transforms" "^7.14.2"
-    "@babel/helpers" "^7.14.0"
-    "@babel/parser" "^7.14.3"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.14.2"
-    "@babel/types" "^7.14.2"
+"@babel/code-frame@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
+  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
+  dependencies:
+    "@babel/highlight" "^7.16.7"
+
+"@babel/compat-data@^7.17.10":
+  version "7.17.10"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.10.tgz#711dc726a492dfc8be8220028b1b92482362baab"
+  integrity sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==
+
+"@babel/core@^7.11.6", "@babel/core@^7.12.3":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.2.tgz#87b2fcd7cce9becaa7f5acebdc4f09f3dd19d876"
+  integrity sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==
+  dependencies:
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.18.2"
+    "@babel/helper-compilation-targets" "^7.18.2"
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helpers" "^7.18.2"
+    "@babel/parser" "^7.18.0"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.18.2"
+    "@babel/types" "^7.18.2"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
+    json5 "^2.2.1"
     semver "^6.3.0"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.13.9":
-  version "7.13.9"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"
-  integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==
-  dependencies:
-    "@babel/types" "^7.13.0"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
 
 "@babel/generator@^7.14.0", "@babel/generator@^7.7.2":
   version "7.14.1"
@@ -100,34 +80,29 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.14.2", "@babel/generator@^7.14.3":
-  version "7.14.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.3.tgz#0c2652d91f7bddab7cccc6ba8157e4f40dcedb91"
-  integrity sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA==
+"@babel/generator@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d"
+  integrity sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==
   dependencies:
-    "@babel/types" "^7.14.2"
+    "@babel/types" "^7.18.2"
+    "@jridgewell/gen-mapping" "^0.3.0"
     jsesc "^2.5.1"
-    source-map "^0.5.0"
 
-"@babel/helper-compilation-targets@^7.13.13":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz#2b2972a0926474853f41e4adbc69338f520600e5"
-  integrity sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==
+"@babel/helper-compilation-targets@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz#67a85a10cbd5fc7f1457fec2e7f45441dc6c754b"
+  integrity sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==
   dependencies:
-    "@babel/compat-data" "^7.13.12"
-    "@babel/helper-validator-option" "^7.12.17"
-    browserslist "^4.14.5"
+    "@babel/compat-data" "^7.17.10"
+    "@babel/helper-validator-option" "^7.16.7"
+    browserslist "^4.20.2"
     semver "^6.3.0"
 
-"@babel/helper-compilation-targets@^7.13.16":
-  version "7.14.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz#33ebd0ffc34248051ee2089350a929ab02f2a516"
-  integrity sha512-JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA==
-  dependencies:
-    "@babel/compat-data" "^7.14.4"
-    "@babel/helper-validator-option" "^7.12.17"
-    browserslist "^4.16.6"
-    semver "^6.3.0"
+"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz#8a6d2dedb53f6bf248e31b4baf38739ee4a637bd"
+  integrity sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ==
 
 "@babel/helper-function-name@^7.12.13":
   version "7.12.13"
@@ -138,14 +113,13 @@
     "@babel/template" "^7.12.13"
     "@babel/types" "^7.12.13"
 
-"@babel/helper-function-name@^7.14.2":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz#397688b590760b6ef7725b5f0860c82427ebaac2"
-  integrity sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ==
+"@babel/helper-function-name@^7.17.9":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12"
+  integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.12.13"
-    "@babel/template" "^7.12.13"
-    "@babel/types" "^7.14.2"
+    "@babel/template" "^7.16.7"
+    "@babel/types" "^7.17.0"
 
 "@babel/helper-get-function-arity@^7.12.13":
   version "7.12.13"
@@ -154,76 +128,45 @@
   dependencies:
     "@babel/types" "^7.12.13"
 
-"@babel/helper-member-expression-to-functions@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
-  integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==
-  dependencies:
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-module-imports@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
-  integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==
-  dependencies:
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-module-transforms@^7.13.14":
-  version "7.13.14"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz#e600652ba48ccb1641775413cb32cfa4e8b495ef"
-  integrity sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==
+"@babel/helper-hoist-variables@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
+  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
   dependencies:
-    "@babel/helper-module-imports" "^7.13.12"
-    "@babel/helper-replace-supers" "^7.13.12"
-    "@babel/helper-simple-access" "^7.13.12"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/helper-validator-identifier" "^7.12.11"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.13"
-    "@babel/types" "^7.13.14"
+    "@babel/types" "^7.16.7"
 
-"@babel/helper-module-transforms@^7.14.2":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz#ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5"
-  integrity sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA==
+"@babel/helper-module-imports@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
+  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
   dependencies:
-    "@babel/helper-module-imports" "^7.13.12"
-    "@babel/helper-replace-supers" "^7.13.12"
-    "@babel/helper-simple-access" "^7.13.12"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/helper-validator-identifier" "^7.14.0"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.14.2"
-    "@babel/types" "^7.14.2"
+    "@babel/types" "^7.16.7"
 
-"@babel/helper-optimise-call-expression@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
-  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
+"@babel/helper-module-transforms@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz#baf05dec7a5875fb9235bd34ca18bad4e21221cd"
+  integrity sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==
   dependencies:
-    "@babel/types" "^7.12.13"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/helper-simple-access" "^7.17.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.18.0"
+    "@babel/types" "^7.18.0"
 
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.8.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
   integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
 
-"@babel/helper-replace-supers@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
-  integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.13.12"
-    "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-simple-access@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
-  integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==
+"@babel/helper-simple-access@^7.17.7":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz#4dc473c2169ac3a1c9f4a51cfcd091d1c36fcff9"
+  integrity sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==
   dependencies:
-    "@babel/types" "^7.13.12"
+    "@babel/types" "^7.18.2"
 
 "@babel/helper-split-export-declaration@^7.12.13":
   version "7.12.13"
@@ -232,6 +175,13 @@
   dependencies:
     "@babel/types" "^7.12.13"
 
+"@babel/helper-split-export-declaration@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
+  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-validator-identifier@^7.12.11":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
@@ -252,28 +202,24 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
   integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
 
-"@babel/helper-validator-option@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
-  integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
+"@babel/helper-validator-identifier@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
+  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
 
-"@babel/helpers@^7.13.10":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8"
-  integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==
-  dependencies:
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
+"@babel/helper-validator-option@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
+  integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
 
-"@babel/helpers@^7.14.0":
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"
-  integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==
+"@babel/helpers@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.2.tgz#970d74f0deadc3f5a938bfa250738eb4ac889384"
+  integrity sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==
   dependencies:
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.14.0"
-    "@babel/types" "^7.14.0"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.18.2"
+    "@babel/types" "^7.18.2"
 
 "@babel/highlight@^7.10.4", "@babel/highlight@^7.16.0":
   version "7.16.0"
@@ -302,20 +248,29 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.15":
+"@babel/highlight@^7.16.7":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.12.tgz#257de56ee5afbd20451ac0a75686b6b404257351"
+  integrity sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.12.13":
   version "7.13.15"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.15.tgz#8e66775fb523599acb6a289e12929fa5ab0954d8"
   integrity sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ==
 
-"@babel/parser@^7.14.0", "@babel/parser@^7.7.2":
+"@babel/parser@^7.14.0":
   version "7.14.1"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.1.tgz#1bd644b5db3f5797c4479d89ec1817fe02b84c47"
   integrity sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q==
 
-"@babel/parser@^7.14.2", "@babel/parser@^7.14.3":
-  version "7.14.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.4.tgz#a5c560d6db6cd8e6ed342368dea8039232cbab18"
-  integrity sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA==
+"@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.18.0":
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.3.tgz#39e99c7b0c4c56cef4d1eed8de9f506411c2ebc2"
+  integrity sha512-rL50YcEuHbbauAFAysNsJA4/f89fGTOBRNs9P81sniKnKAr4xULe5AecolcsKbi88xu0ByWYDj/S1AJ3FSFuSQ==
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -408,22 +363,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/runtime-corejs3@^7.10.2":
-  version "7.15.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz#28754263988198f2a928c09733ade2fb4d28089d"
-  integrity sha512-30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A==
-  dependencies:
-    core-js-pure "^3.16.0"
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.5":
+"@babel/runtime@^7.12.5":
   version "7.15.3"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b"
   integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.12.13", "@babel/template@^7.3.3":
+"@babel/template@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
   integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
@@ -432,31 +379,28 @@
     "@babel/parser" "^7.12.13"
     "@babel/types" "^7.12.13"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15":
-  version "7.13.15"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.15.tgz#c38bf7679334ddd4028e8e1f7b3aa5019f0dada7"
-  integrity sha512-/mpZMNvj6bce59Qzl09fHEs8Bt8NnpEDQYleHUPZQ3wXUMvXi+HJPLars68oAbmp839fGoOkv2pSL2z9ajCIaQ==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.9"
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.13.15"
-    "@babel/types" "^7.13.14"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.14.0", "@babel/traverse@^7.14.2":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz#9201a8d912723a831c2679c7ebbf2fe1416d765b"
-  integrity sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.14.2"
-    "@babel/helper-function-name" "^7.14.2"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.14.2"
-    "@babel/types" "^7.14.2"
+"@babel/template@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
+  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/parser" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
+"@babel/traverse@^7.18.0", "@babel/traverse@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.2.tgz#b77a52604b5cc836a9e1e08dca01cba67a12d2e8"
+  integrity sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.18.2"
+    "@babel/helper-environment-visitor" "^7.18.2"
+    "@babel/helper-function-name" "^7.17.9"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.18.0"
+    "@babel/types" "^7.18.2"
     debug "^4.1.0"
     globals "^11.1.0"
 
@@ -474,7 +418,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
+"@babel/types@^7.12.13", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
   version "7.13.14"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.14.tgz#c35a4abb15c7cd45a2746d78ab328e362cbace0d"
   integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==
@@ -491,12 +435,12 @@
     "@babel/helper-validator-identifier" "^7.14.0"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.14.2":
-  version "7.14.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.4.tgz#bfd6980108168593b38b3eb48a24aa026b919bc0"
-  integrity sha512-lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw==
+"@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.18.0", "@babel/types@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.2.tgz#191abfed79ebe6f4242f643a9a5cbaa36b10b091"
+  integrity sha512-0On6B8A4/+mFUto5WERt3EEuG1NznDirvwca1O8UwXQHVY8g3R7OzYgxXdOfMwLO08UrpUD/2+3Bclyq+/C94Q==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.14.0"
+    "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
@@ -539,6 +483,22 @@
     ky "^0.25.1"
     ky-universal "^0.8.2"
 
+"@esbuild-kit/core-utils@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@esbuild-kit/core-utils/-/core-utils-1.2.0.tgz#3a9d01e69f82c415c961e7e5a3052a886a15475f"
+  integrity sha512-C+WS7LupKIvf/3hx6qHzHMroGI9Ypqvainghcuq8Le5LL8VA0lgZEG8sEa5YMuWEBvImHTJ6kBCNFws+bTbMjw==
+  dependencies:
+    esbuild "0.14.38"
+
+"@esbuild-kit/esm-loader@^2.1.1":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@esbuild-kit/esm-loader/-/esm-loader-2.1.3.tgz#fb40539f909bdc0140f8b1bf22a67a86610015a6"
+  integrity sha512-cpETLDjAUa1swka6liurVBsFLUzZihR7Nxl4q5DywwD6XGPIQr+frTcSxXi9TIm5oeDoi+4i/d+L4YOanLSIBQ==
+  dependencies:
+    "@esbuild-kit/core-utils" "^1.2.0"
+    es-module-lexer "^0.10.5"
+    get-tsconfig "^3.0.1"
+
 "@eslint/eslintrc@^1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.5.tgz#33f1b838dbf1f923bfa517e008362b78ddbbf318"
@@ -970,197 +930,109 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jest/console@^27.2.0":
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.2.0.tgz#57f702837ec52899be58c3794dce5941c77a8b63"
-  integrity sha512-35z+RqsK2CCgNxn+lWyK8X4KkaDtfL4BggT7oeZ0JffIiAiEYFYPo5B67V50ZubqDS1ehBrdCR2jduFnIrZOYw==
-  dependencies:
-    "@jest/types" "^27.1.1"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    jest-message-util "^27.2.0"
-    jest-util "^27.2.0"
-    slash "^3.0.0"
-
-"@jest/core@^27.1.1", "@jest/core@^27.2.0":
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.2.0.tgz#61fc27b244e9709170ed9ffe41b006add569f1b3"
-  integrity sha512-E/2NHhq+VMo18DpKkoty8Sjey8Kps5Cqa88A8NP757s6JjYqPdioMuyUBhDiIOGCdQByEp0ou3jskkTszMS0nw==
-  dependencies:
-    "@jest/console" "^27.2.0"
-    "@jest/reporters" "^27.2.0"
-    "@jest/test-result" "^27.2.0"
-    "@jest/transform" "^27.2.0"
-    "@jest/types" "^27.1.1"
-    "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    emittery "^0.8.1"
-    exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    jest-changed-files "^27.1.1"
-    jest-config "^27.2.0"
-    jest-haste-map "^27.2.0"
-    jest-message-util "^27.2.0"
-    jest-regex-util "^27.0.6"
-    jest-resolve "^27.2.0"
-    jest-resolve-dependencies "^27.2.0"
-    jest-runner "^27.2.0"
-    jest-runtime "^27.2.0"
-    jest-snapshot "^27.2.0"
-    jest-util "^27.2.0"
-    jest-validate "^27.2.0"
-    jest-watcher "^27.2.0"
-    micromatch "^4.0.4"
-    p-each-series "^2.1.0"
-    rimraf "^3.0.0"
-    slash "^3.0.0"
-    strip-ansi "^6.0.0"
-
-"@jest/environment@^27.2.0":
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.2.0.tgz#48d1dbfa65f8e4a5a5c6cbeb9c59d1a5c2776f6b"
-  integrity sha512-iPWmQI0wRIYSZX3wKu4FXHK4eIqkfq6n1DCDJS+v3uby7SOXrHvX4eiTBuEdSvtDRMTIH2kjrSkjHf/F9JIYyQ==
+"@jest/expect-utils@^28.1.0":
+  version "28.1.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-28.1.0.tgz#a5cde811195515a9809b96748ae8bcc331a3538a"
+  integrity sha512-5BrG48dpC0sB80wpeIX5FU6kolDJI4K0n5BM9a5V38MGx0pyRvUBSS0u2aNTdDzmOrCjhOg8pGs6a20ivYkdmw==
   dependencies:
-    "@jest/fake-timers" "^27.2.0"
-    "@jest/types" "^27.1.1"
-    "@types/node" "*"
-    jest-mock "^27.1.1"
+    jest-get-type "^28.0.2"
 
-"@jest/fake-timers@^27.2.0":
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.2.0.tgz#560841bc21ae7fbeff0cbff8de8f5cf43ad3561d"
-  integrity sha512-gSu3YHvQOoVaTWYGgHFB7IYFtcF2HBzX4l7s47VcjvkUgL4/FBnE20x7TNLa3W6ABERtGd5gStSwsA8bcn+c4w==
+"@jest/fake-timers@^28.1.0":
+  version "28.1.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-28.1.0.tgz#ea77878aabd5c5d50e1fc53e76d3226101e33064"
+  integrity sha512-Xqsf/6VLeAAq78+GNPzI7FZQRf5cCHj1qgQxCjws9n8rKw8r1UYoeaALwBvyuzOkpU3c1I6emeMySPa96rxtIg==
   dependencies:
-    "@jest/types" "^27.1.1"
-    "@sinonjs/fake-timers" "^7.0.2"
+    "@jest/types" "^28.1.0"
+    "@sinonjs/fake-timers" "^9.1.1"
     "@types/node" "*"
-    jest-message-util "^27.2.0"
-    jest-mock "^27.1.1"
-    jest-util "^27.2.0"
-
-"@jest/globals@^27.2.0":
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.2.0.tgz#4d7085f51df5ac70c8240eb3501289676503933d"
-  integrity sha512-raqk9Gf9WC3hlBa57rmRmJfRl9hom2b+qEE/ifheMtwn5USH5VZxzrHHOZg0Zsd/qC2WJ8UtyTwHKQAnNlDMdg==
-  dependencies:
-    "@jest/environment" "^27.2.0"
-    "@jest/types" "^27.1.1"
-    expect "^27.2.0"
-
-"@jest/reporters@^27.2.0":
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.2.0.tgz#629886d9a42218e504a424889a293abb27919e25"
-  integrity sha512-7wfkE3iRTLaT0F51h1mnxH3nQVwDCdbfgXiLuCcNkF1FnxXLH9utHqkSLIiwOTV1AtmiE0YagHbOvx4rnMP/GA==
-  dependencies:
-    "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^27.2.0"
-    "@jest/test-result" "^27.2.0"
-    "@jest/transform" "^27.2.0"
-    "@jest/types" "^27.1.1"
-    chalk "^4.0.0"
-    collect-v8-coverage "^1.0.0"
-    exit "^0.1.2"
-    glob "^7.1.2"
-    graceful-fs "^4.2.4"
-    istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-instrument "^4.0.3"
-    istanbul-lib-report "^3.0.0"
-    istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.0.2"
-    jest-haste-map "^27.2.0"
-    jest-resolve "^27.2.0"
-    jest-util "^27.2.0"
-    jest-worker "^27.2.0"
-    slash "^3.0.0"
-    source-map "^0.6.0"
-    string-length "^4.0.1"
-    terminal-link "^2.0.0"
-    v8-to-istanbul "^8.0.0"
+    jest-message-util "^28.1.0"
+    jest-mock "^28.1.0"
+    jest-util "^28.1.0"
 
-"@jest/source-map@^27.0.6":
-  version "27.0.6"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.6.tgz#be9e9b93565d49b0548b86e232092491fb60551f"
-  integrity sha512-Fek4mi5KQrqmlY07T23JRi0e7Z9bXTOOD86V/uS0EIW4PClvPDqZOyFlLpNJheS6QI0FNX1CgmPjtJ4EA/2M+g==
+"@jest/schemas@^28.0.2":
+  version "28.0.2"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-28.0.2.tgz#08c30df6a8d07eafea0aef9fb222c5e26d72e613"
+  integrity sha512-YVDJZjd4izeTDkij00vHHAymNXQ6WWsdChFRK86qck6Jpr3DCL5W3Is3vslviRlP+bLuMYRLbdp98amMvqudhA==
   dependencies:
-    callsites "^3.0.0"
-    graceful-fs "^4.2.4"
-    source-map "^0.6.0"
+    "@sinclair/typebox" "^0.23.3"
 
-"@jest/test-result@^27.2.0":
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.2.0.tgz#377b46a41a6415dd4839fd0bed67b89fecea6b20"
-  integrity sha512-JPPqn8h0RGr4HyeY1Km+FivDIjTFzDROU46iAvzVjD42ooGwYoqYO/MQTilhfajdz6jpVnnphFrKZI5OYrBONA==
+"@jest/transform@^28.1.0":
+  version "28.1.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-28.1.0.tgz#224a3c9ba4cc98e2ff996c0a89a2d59db15c74ce"
+  integrity sha512-omy2xe5WxlAfqmsTjTPxw+iXRTRnf+NtX0ToG+4S0tABeb4KsKmPUHq5UBuwunHg3tJRwgEQhEp0M/8oiatLEA==
   dependencies:
-    "@jest/console" "^27.2.0"
-    "@jest/types" "^27.1.1"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    collect-v8-coverage "^1.0.0"
-
-"@jest/test-sequencer@^27.2.0":
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.2.0.tgz#b02b507687825af2fdc84e90c539d36fd8cf7bc9"
-  integrity sha512-PrqarcpzOU1KSAK7aPwfL8nnpaqTMwPe7JBPnaOYRDSe/C6AoJiL5Kbnonqf1+DregxZIRAoDg69R9/DXMGqXA==
-  dependencies:
-    "@jest/test-result" "^27.2.0"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^27.2.0"
-    jest-runtime "^27.2.0"
-
-"@jest/transform@^27.2.0":
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.2.0.tgz#e7e6e49d2591792db2385c33cdbb4379d407068d"
-  integrity sha512-Q8Q/8xXIZYllk1AF7Ou5sV3egOZsdY/Wlv09CSbcexBRcC1Qt6lVZ7jRFAZtbHsEEzvOCyFEC4PcrwKwyjXtCg==
-  dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/types" "^27.1.1"
-    babel-plugin-istanbul "^6.0.0"
+    "@babel/core" "^7.11.6"
+    "@jest/types" "^28.1.0"
+    "@jridgewell/trace-mapping" "^0.3.7"
+    babel-plugin-istanbul "^6.1.1"
     chalk "^4.0.0"
     convert-source-map "^1.4.0"
     fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^27.2.0"
-    jest-regex-util "^27.0.6"
-    jest-util "^27.2.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^28.1.0"
+    jest-regex-util "^28.0.2"
+    jest-util "^28.1.0"
     micromatch "^4.0.4"
-    pirates "^4.0.1"
+    pirates "^4.0.4"
     slash "^3.0.0"
-    source-map "^0.6.1"
-    write-file-atomic "^3.0.0"
+    write-file-atomic "^4.0.1"
 
-"@jest/types@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
-  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
+"@jest/types@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80"
+  integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
     "@types/node" "*"
-    "@types/yargs" "^15.0.0"
+    "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
-"@jest/types@^27.0.6", "@jest/types@^27.1.1", "@jest/types@^27.4.2":
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.4.2.tgz#96536ebd34da6392c2b7c7737d693885b5dd44a5"
-  integrity sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==
+"@jest/types@^28.1.0":
+  version "28.1.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.1.0.tgz#508327a89976cbf9bd3e1cc74641a29fd7dfd519"
+  integrity sha512-xmEggMPr317MIOjjDoZ4ejCSr9Lpbt/u34+dvc99t7DS8YirW5rwZEhzKPC2BMUFkUhI48qs6qLUSGw5FuL0GA==
   dependencies:
+    "@jest/schemas" "^28.0.2"
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
     "@types/node" "*"
-    "@types/yargs" "^16.0.0"
+    "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
+"@jridgewell/gen-mapping@^0.1.0":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
+  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.0"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
+"@jridgewell/gen-mapping@^0.3.0":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9"
+  integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.0"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
 "@jridgewell/resolve-uri@^3.0.3":
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe"
   integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==
 
+"@jridgewell/set-array@^1.0.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea"
+  integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==
+
 "@jridgewell/sourcemap-codec@^1.4.10":
   version "1.4.13"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c"
   integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==
 
-"@jridgewell/trace-mapping@^0.3.7":
+"@jridgewell/trace-mapping@^0.3.7", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.13"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea"
   integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==
@@ -1398,6 +1270,11 @@
     "@sentry/types" "6.17.4"
     tslib "^1.9.3"
 
+"@sinclair/typebox@^0.23.3":
+  version "0.23.5"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.23.5.tgz#93f7b9f4e3285a7a9ade7557d9a8d36809cbc47d"
+  integrity sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg==
+
 "@sinonjs/commons@^1.7.0":
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
@@ -1405,10 +1282,10 @@
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/fake-timers@^7.0.2":
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.0.5.tgz#558a7f8145a01366c44b3dcbdd7172c05c461564"
-  integrity sha512-fUt6b15bjV/VW93UP5opNXJxdwZSbK1EdiwnhN7XrQrcpaOhMJpZ/CjwFpM3THpxwA+YviBUJKSuEqKlCK5alw==
+"@sinonjs/fake-timers@^9.1.1":
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c"
+  integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
@@ -1419,36 +1296,31 @@
   dependencies:
     magic-string "^0.25.7"
 
-"@testing-library/dom@^7.16.2":
-  version "7.31.2"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.31.2.tgz#df361db38f5212b88555068ab8119f5d841a8c4a"
-  integrity sha512-3UqjCpey6HiTZT92vODYLPxTBWlM8ZOOjr3LX5F37/VRipW2M1kX6I/Cm4VXzteZqfGfagg8yXywpcOgQBlNsQ==
+"@testing-library/dom@^8.11.1":
+  version "8.13.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.13.0.tgz#bc00bdd64c7d8b40841e27a70211399ad3af46f5"
+  integrity sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/runtime" "^7.12.5"
     "@types/aria-query" "^4.2.0"
-    aria-query "^4.2.2"
+    aria-query "^5.0.0"
     chalk "^4.1.0"
-    dom-accessibility-api "^0.5.6"
+    dom-accessibility-api "^0.5.9"
     lz-string "^1.4.4"
-    pretty-format "^26.6.2"
+    pretty-format "^27.0.2"
 
 "@testing-library/preact-hooks@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@testing-library/preact-hooks/-/preact-hooks-1.1.0.tgz#f4e197ec77b295ce6c122c560c46b5b03bc4f015"
   integrity sha512-+JIor+NsOHkK3oIrwMDGKGHXTN0JJi462dBJlj4FNbGaDPTlctE6eu2ranWQirh7/FJMkWfzQCP+tk7jmY8ZrQ==
 
-"@testing-library/preact@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/preact/-/preact-2.0.1.tgz#c69200b16c4eda58986c8d65e1043ad9cbe409d3"
-  integrity sha512-79kwVOY+3caoLgaPbiPzikjgY0Aya7Fc7TvGtR1upCnz2wrtmPDnN2t9vO7I7vDP2zoA+feSwOH5Q0BFErhaaQ==
+"@testing-library/preact@^3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/preact/-/preact-3.1.1.tgz#18abd722728bcbf37ed12d5a5a527741c977a0c6"
+  integrity sha512-RHjln1psbU4Sh/l8k9/gG3VNEDIEicUhzZ74uEnb4hJ4H9G9p1iOXEEMXB2oD5sZcjciQhpx1QUryM5/sAtTTQ==
   dependencies:
-    "@testing-library/dom" "^7.16.2"
-
-"@tootallnate/once@1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
-  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
+    "@testing-library/dom" "^8.11.1"
 
 "@tusbar/cache-control@^0.3.1":
   version "0.3.2"
@@ -1467,33 +1339,7 @@
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.2.tgz#ed4e0ad92306a704f9fb132a0cfcf77486dbe2bc"
   integrity sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==
 
-"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14":
-  version "7.1.14"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz#faaeefc4185ec71c389f4501ee5ec84b170cc402"
-  integrity sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    "@types/babel__generator" "*"
-    "@types/babel__template" "*"
-    "@types/babel__traverse" "*"
-
-"@types/babel__generator@*":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz#d2112a6b21fad600d7674274293c85dce0cb47fc"
-  integrity sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@types/babel__template@*":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
-  integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
+"@types/babel__traverse@^7.0.6":
   version "7.11.1"
   resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz#654f6c4f67568e24c23b367e947098c6206fa639"
   integrity sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==
@@ -1587,7 +1433,7 @@
   resolved "https://registry.yarnpkg.com/@types/google.analytics/-/google.analytics-0.0.39.tgz#19a952003dbf3c7373d655a5c3203b4726b8b802"
   integrity sha512-AwVtVYACQg26MJz+752H6uskn53BR7eilCOHksUGkzobZNKc7O3RFTJrbD3yKAluXy6favVdynnr9btijjcakQ==
 
-"@types/graceful-fs@^4.1.2":
+"@types/graceful-fs@^4.1.3":
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
   integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==
@@ -1618,14 +1464,6 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@^27.0.3":
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.4.0.tgz#037ab8b872067cae842a320841693080f9cb84ed"
-  integrity sha512-gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ==
-  dependencies:
-    jest-diff "^27.0.0"
-    pretty-format "^27.0.0"
-
 "@types/jpeg-js@^0.3.7":
   version "0.3.7"
   resolved "https://registry.yarnpkg.com/@types/jpeg-js/-/jpeg-js-0.3.7.tgz#efe18ac0078c09bae5fa1d58941b53799e7bbf1c"
@@ -1677,6 +1515,11 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
+"@types/mocha@^9.0.0":
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4"
+  integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==
+
 "@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0":
   version "16.11.2"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.2.tgz#31c249c136c3f9b35d4b60fb8e50e01a1f0cc9a5"
@@ -1871,6 +1714,11 @@
     "@typescript-eslint/types" "5.27.1"
     eslint-visitor-keys "^3.3.0"
 
+"@ungap/promise-all-settled@1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
+  integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
+
 JSONStream@^1.0.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
@@ -1884,7 +1732,7 @@ JSV@^4.0.2:
   resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57"
   integrity sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=
 
-abab@^2.0.0, abab@^2.0.3, abab@^2.0.5:
+abab@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
   integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
@@ -1904,14 +1752,6 @@ acorn-globals@^4.3.0:
     acorn "^6.0.1"
     acorn-walk "^6.0.1"
 
-acorn-globals@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
-  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
-  dependencies:
-    acorn "^7.1.1"
-    acorn-walk "^7.1.1"
-
 acorn-jsx@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
@@ -1922,22 +1762,12 @@ acorn-walk@^6.0.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
   integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
 
-acorn-walk@^7.1.1:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
-  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
-
 acorn@^6.0.1, acorn@^6.0.2:
   version "6.4.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
   integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
-acorn@^7.1.1:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
-acorn@^8.2.4, acorn@^8.5.0:
+acorn@^8.5.0:
   version "8.5.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
   integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
@@ -1982,19 +1812,12 @@ angular@^1.7.4:
   resolved "https://registry.yarnpkg.com/angular/-/angular-1.8.0.tgz#b1ec179887869215cab6dfd0df2e42caa65b1b51"
   integrity sha512-VdaMx+Qk0Skla7B5gw77a8hzlcOakwF8mjlW13DpIWIDlfqwAbSSLfd8N/qZnzEmQF4jC4iofInd3gE7vL8ZZg==
 
-ansi-colors@^4.1.1:
+ansi-colors@4.1.1, ansi-colors@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
   integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
-ansi-escapes@^4.2.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
-  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
-  dependencies:
-    type-fest "^0.11.0"
-
-ansi-regex@^5.0.0, ansi-regex@^5.0.1:
+ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -2018,7 +1841,7 @@ ansi-styles@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-anymatch@^3.0.3:
+anymatch@^3.0.3, anymatch@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
   integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
@@ -2069,13 +1892,10 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-aria-query@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"
-  integrity sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==
-  dependencies:
-    "@babel/runtime" "^7.10.2"
-    "@babel/runtime-corejs3" "^7.10.2"
+aria-query@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.0.0.tgz#210c21aaf469613ee8c9a62c7f86525e058db52c"
+  integrity sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==
 
 arr-diff@^4.0.0:
   version "4.0.0"
@@ -2206,41 +2026,17 @@ axe-core@4.4.1:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.1.tgz#7dbdc25989298f9ad006645cd396782443757413"
   integrity sha512-gd1kmb21kwNuWr6BQz8fv6GNECPBnUasepcoLbekws23NVBLODdsClRZ+bQ8+9Uomf3Sm3+Vwn0oYG9NvwnJCw==
 
-babel-jest@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.2.0.tgz#c0f129a81f1197028aeb4447acbc04564c8bfc52"
-  integrity sha512-bS2p+KGGVVmWXBa8+i6SO/xzpiz2Q/2LnqLbQknPKefWXVZ67YIjA4iXup/jMOEZplga9PpWn+wrdb3UdDwRaA==
-  dependencies:
-    "@jest/transform" "^27.2.0"
-    "@jest/types" "^27.1.1"
-    "@types/babel__core" "^7.1.14"
-    babel-plugin-istanbul "^6.0.0"
-    babel-preset-jest "^27.2.0"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    slash "^3.0.0"
-
-babel-plugin-istanbul@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
-  integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==
+babel-plugin-istanbul@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
+  integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@istanbuljs/load-nyc-config" "^1.0.0"
     "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-instrument "^4.0.0"
+    istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.2.0.tgz#79f37d43f7e5c4fdc4b2ca3e10cc6cf545626277"
-  integrity sha512-TOux9khNKdi64mW+0OIhcmbAn75tTlzKhxmiNXevQaPbrBYK7YKjP1jl6NHTJ6XR5UgUrJbCnWlKVnJn29dfjw==
-  dependencies:
-    "@babel/template" "^7.3.3"
-    "@babel/types" "^7.3.3"
-    "@types/babel__core" "^7.0.0"
-    "@types/babel__traverse" "^7.0.6"
-
 babel-preset-current-node-syntax@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
@@ -2259,14 +2055,6 @@ babel-preset-current-node-syntax@^1.0.0:
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-top-level-await" "^7.8.3"
 
-babel-preset-jest@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.2.0.tgz#556bbbf340608fed5670ab0ea0c8ef2449fba885"
-  integrity sha512-z7MgQ3peBwN5L5aCqBKnF6iqdlvZvFUQynEhu0J+X9nHLU72jO3iY331lcYrg+AssJ8q7xsv5/3AICzVmJ/wvg==
-  dependencies:
-    babel-plugin-jest-hoist "^27.2.0"
-    babel-preset-current-node-syntax "^1.0.0"
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -2302,6 +2090,11 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
 bindings@^1.2.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
@@ -2334,6 +2127,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
 braces@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb"
@@ -2352,7 +2152,7 @@ braces@^2.3.1:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.1:
+braces@^3.0.1, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -2371,24 +2171,22 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browserslist@^4.14.5, browserslist@^4.16.6:
-  version "4.19.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"
-  integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
+browser-stdout@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
+  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
+
+browserslist@^4.20.2:
+  version "4.20.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.3.tgz#eb7572f49ec430e054f56d52ff0ebe9be915f8bf"
+  integrity sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==
   dependencies:
-    caniuse-lite "^1.0.30001286"
-    electron-to-chromium "^1.4.17"
+    caniuse-lite "^1.0.30001332"
+    electron-to-chromium "^1.4.118"
     escalade "^3.1.1"
-    node-releases "^2.0.1"
+    node-releases "^2.0.3"
     picocolors "^1.0.0"
 
-bs-logger@0.x:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
-  integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
-  dependencies:
-    fast-json-stable-stringify "2.x"
-
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
@@ -2419,11 +2217,6 @@ buffer-fill@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
   integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
 
-buffer-from@1.x:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
-  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
-
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -2534,15 +2327,15 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
-  integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
+camelcase@^6.0.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
+  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30001286:
-  version "1.0.30001296"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001296.tgz#d99f0f3bee66544800b93d261c4be55a35f1cec8"
-  integrity sha512-WfrtPEoNSoeATDlf4y3QvkwiELl9GyPLISV5GejTbbQRtQx4LhsXmc9IQ6XCL2d7UxCyEzToEZNMeqR79OUw8Q==
+caniuse-lite@^1.0.30001332:
+  version "1.0.30001342"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001342.tgz#87152b1e3b950d1fbf0093e23f00b6c8e8f1da96"
+  integrity sha512-bn6sOCu7L7jcbBbyNhLg0qzXdJ/PMbybZTH/BA6Roet9wxYRm6Tr9D0s0uhLkOZ6MSG+QU6txUgdpr3MXIVqjA==
 
 canonicalize@^1.0.1:
   version "1.0.5"
@@ -2571,10 +2364,20 @@ chalk@^4.0.0, chalk@^4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-char-regex@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
-  integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
+chokidar@3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
 
 chownr@^1.1.1:
   version "1.1.4"
@@ -2596,15 +2399,10 @@ chrome-launcher@^0.15.1:
     is-wsl "^2.2.0"
     lighthouse-logger "^1.0.0"
 
-ci-info@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.1.1.tgz#9a32fcefdf7bcdb6f0a7e1c0f8098ec57897b80a"
-  integrity sha512-kdRWLBIJwdsYJWYJFtAFFYxybguqeF91qpZaggjG5Nf8QKdizFG2hjqvaTXbxFIcYbSaD74KpAXv6BSm17DHEQ==
-
-cjs-module-lexer@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.1.tgz#2fd46d9906a126965aa541345c499aaa18e8cd73"
-  integrity sha512-jVamGdJPDeuQilKhvVn1h3knuMOZzr8QDnpk+M9aMlCaMkTDd6fBWPhiDqFvFZ07pL0liqabAiuy8SY4jGHeaw==
+ci-info@^3.2.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.1.tgz#58331f6f472a25fe3a50a351ae3052936c2c7f32"
+  integrity sha512-SXgeMX9VwDe7iFFaEWkA5AstuER9YKqy4EhHqr4DVqkwmD9rpVimkMKWHdjn30Ja45txyjhSn63lVX69eVCckg==
 
 class-utils@^0.3.5:
   version "0.3.6"
@@ -2639,16 +2437,6 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
-collect-v8-coverage@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
-  integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
-
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -2688,13 +2476,6 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-combined-stream@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
 commander@^2.11.0, commander@^2.18.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -2931,11 +2712,6 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js-pure@^3.16.0:
-  version "3.16.1"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.16.1.tgz#b997df2669c957a5b29f06e95813a171f993592e"
-  integrity sha512-TyofCdMzx0KMhi84mVRS8rL1XsRk2SPUNz2azmth53iRN0/08Uim9fdhQTaZTG1LqaXHYVci4RDHka6WrXfnvg==
-
 core-js@3.6.5:
   version "3.6.5"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
@@ -3010,7 +2786,7 @@ cross-fetch@3.1.5:
   dependencies:
     node-fetch "2.6.7"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -3029,16 +2805,11 @@ csp_evaluator@1.1.0:
   resolved "https://registry.yarnpkg.com/csp_evaluator/-/csp_evaluator-1.1.0.tgz#7fb3378a08163de4caf0a5297e92a5f70ef42d21"
   integrity sha512-TcB+ZH9wZBG314jAUpKHPl1oYbRJV+nAT2YwZ9y4fmUN0FkEJa8e/hKZoOgzLYp1Z/CJdFhbhhGIGh0XG8W54Q==
 
-cssom@0.3.x, cssom@^0.3.4, cssom@~0.3.6:
+cssom@0.3.x, cssom@^0.3.4:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
   integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
 
-cssom@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
-  integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
-
 cssstyle@1.2.1, cssstyle@^1.1.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.2.1.tgz#3aceb2759eaf514ac1a21628d723d6043a819495"
@@ -3046,13 +2817,6 @@ cssstyle@1.2.1, cssstyle@^1.1.1:
   dependencies:
     cssom "0.3.x"
 
-cssstyle@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
-  integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
-  dependencies:
-    cssom "~0.3.6"
-
 csv-validator@^0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/csv-validator/-/csv-validator-0.0.3.tgz#b2acb8f46f197af44cc0a4992e63ef7b48279a2a"
@@ -3094,15 +2858,6 @@ data-urls@^1.0.1:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-data-urls@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
-  integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
-  dependencies:
-    abab "^2.0.3"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
-
 date-fns@^2.16.1:
   version "2.27.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.27.0.tgz#e1ff3c3ddbbab8a2eaadbb6106be2929a5a2d92b"
@@ -3147,21 +2902,16 @@ decamelize@^1.1.0, decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-decimal.js@^10.2.1:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3"
-  integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==
+decamelize@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837"
+  integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
-dedent@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
-  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
-
 deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -3211,20 +2961,20 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-detect-newline@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
-  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
-
 devtools-protocol@0.0.981744, devtools-protocol@0.0.995287:
   version "0.0.995287"
   resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.995287.tgz#843a846cff79d0f76a74818ec2d604a4fe90c2d0"
   integrity sha512-HvTDDBKzY5ojCNmxAF+N+kZGQsl+hPZPIaWpG0q1BMuvUHdRwL4IrGKIH+avNLzCrImi/kKYDnsmZi7jjm0xlw==
 
-diff-sequences@^27.4.0:
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.4.0.tgz#d783920ad8d06ec718a060d00196dfef25b132a5"
-  integrity sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==
+diff-sequences@^28.0.2:
+  version "28.0.2"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-28.0.2.tgz#40f8d4ffa081acbd8902ba35c798458d0ff1af41"
+  integrity sha512-YtEoNynLDFCRznv/XDalsKGSZDoj0U5kLnXvY0JSq3nBboRrZXjD81+eSiwi+nzcZDwedMmcowcxNwwgFW23mQ==
+
+diff@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
+  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
 
 dir-glob@^2.2.2:
   version "2.2.2"
@@ -3254,10 +3004,10 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dom-accessibility-api@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.7.tgz#8c2aa6325968f2933160a0b7dbb380893ddf3e7d"
-  integrity sha512-ml3lJIq9YjUfM9TUnEPvEYWFSwivwIGBPKpewX7tii7fwCazA8yCioGdqQcNsItPpfFvSJ3VIdMQPj60LJhcQA==
+dom-accessibility-api@^0.5.9:
+  version "0.5.14"
+  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.14.tgz#56082f71b1dc7aac69d83c4285eef39c15d93f56"
+  integrity sha512-NMt+m9zFMPZe0JcY9gN224Qvk6qLIdqex29clBvc/y75ZBX9YA9wNK3frsYvu2DI1xcCIwxwnX+TlsJ2DSOADg==
 
 domexception@^1.0.1:
   version "1.0.1"
@@ -3266,13 +3016,6 @@ domexception@^1.0.1:
   dependencies:
     webidl-conversions "^4.0.2"
 
-domexception@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
-  integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
-  dependencies:
-    webidl-conversions "^5.0.0"
-
 dot-prop@^5.1.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
@@ -3299,21 +3042,16 @@ ecc-jsbn@~0.1.1:
   dependencies:
     jsbn "~0.1.0"
 
-electron-to-chromium@^1.4.17:
-  version "1.4.34"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.34.tgz#7d87dc0e95c2c65cbd0687ae23146a662506d1ef"
-  integrity sha512-B7g6Y9No9XMYk1VNrQ8KAmSEo1Iltrz/5EjOGxl1DffQAb3z/XbpHRCfYKwV8D+CPXm4Q7Xg1sceSt9osNwRIA==
+electron-to-chromium@^1.4.118:
+  version "1.4.138"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.138.tgz#3ec41ca589aaf505dfe2034fde913329af801730"
+  integrity sha512-IOyp2Seq3w4QLln+yZWcMF3VXhhduz4bwg9gfI+CnP5TkzwNXQ8FCZuwwPsnes73AfWdf5J2n2OXdUwDUspDPQ==
 
 email-addresses@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/email-addresses/-/email-addresses-3.0.2.tgz#a31280d19baf86669840a0aa45be1d7f6e7df315"
   integrity sha512-IMn9dnwLMsgZjdUHswB/UZ0S8LQ/u+2/qjnHJ9tCtp3QHZsIYwJCiJOo2FT0i3CwwK/dtSODYtxuvzV4D9MY5g==
 
-emittery@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860"
-  integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==
-
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -3371,6 +3109,11 @@ es-main@^1.0.2:
   resolved "https://registry.yarnpkg.com/es-main/-/es-main-1.0.2.tgz#c9030d78796f609f865b66f4125a78d77fec3de3"
   integrity sha512-LLgW8Cby/FiyQygrI23q2EswulHiDKoyjWlDRgTGXjQ3iRim2R26VfoehpxI5oKRXSNams3L/80KtggoUdxdDQ==
 
+es-module-lexer@^0.10.5:
+  version "0.10.5"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.10.5.tgz#06f76d51fa53b1f78e3bd8bb36dd275eda2fdd53"
+  integrity sha512-+7IwY/kiGAacQfY+YBhKMvEmyAJnw5grTUgjG85Pe7vcUI/6b7pZjZG8nQ7+48YhzEAEqrEgD2dCz/JIK+AYvw==
+
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -3380,11 +3123,142 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
+esbuild-android-64@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.38.tgz#5b94a1306df31d55055f64a62ff6b763a47b7f64"
+  integrity sha512-aRFxR3scRKkbmNuGAK+Gee3+yFxkTJO/cx83Dkyzo4CnQl/2zVSurtG6+G86EQIZ+w+VYngVyK7P3HyTBKu3nw==
+
+esbuild-android-arm64@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.38.tgz#78acc80773d16007de5219ccce544c036abd50b8"
+  integrity sha512-L2NgQRWuHFI89IIZIlpAcINy9FvBk6xFVZ7xGdOwIm8VyhX1vNCEqUJO3DPSSy945Gzdg98cxtNt8Grv1CsyhA==
+
+esbuild-darwin-64@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.38.tgz#e02b1291f629ebdc2aa46fabfacc9aa28ff6aa46"
+  integrity sha512-5JJvgXkX87Pd1Og0u/NJuO7TSqAikAcQQ74gyJ87bqWRVeouky84ICoV4sN6VV53aTW+NE87qLdGY4QA2S7KNA==
+
+esbuild-darwin-arm64@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.38.tgz#01eb6650ec010b18c990e443a6abcca1d71290a9"
+  integrity sha512-eqF+OejMI3mC5Dlo9Kdq/Ilbki9sQBw3QlHW3wjLmsLh+quNfHmGMp3Ly1eWm981iGBMdbtSS9+LRvR2T8B3eQ==
+
+esbuild-freebsd-64@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.38.tgz#790b8786729d4aac7be17648f9ea8e0e16475b5e"
+  integrity sha512-epnPbhZUt93xV5cgeY36ZxPXDsQeO55DppzsIgWM8vgiG/Rz+qYDLmh5ts3e+Ln1wA9dQ+nZmVHw+RjaW3I5Ig==
+
+esbuild-freebsd-arm64@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.38.tgz#b66340ab28c09c1098e6d9d8ff656db47d7211e6"
+  integrity sha512-/9icXUYJWherhk+y5fjPI5yNUdFPtXHQlwP7/K/zg8t8lQdHVj20SqU9/udQmeUo5pDFHMYzcEFfJqgOVeKNNQ==
+
+esbuild-linux-32@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.38.tgz#7927f950986fd39f0ff319e92839455912b67f70"
+  integrity sha512-QfgfeNHRFvr2XeHFzP8kOZVnal3QvST3A0cgq32ZrHjSMFTdgXhMhmWdKzRXP/PKcfv3e2OW9tT9PpcjNvaq6g==
+
+esbuild-linux-64@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.38.tgz#4893d07b229d9cfe34a2b3ce586399e73c3ac519"
+  integrity sha512-uuZHNmqcs+Bj1qiW9k/HZU3FtIHmYiuxZ/6Aa+/KHb/pFKr7R3aVqvxlAudYI9Fw3St0VCPfv7QBpUITSmBR1Q==
+
+esbuild-linux-arm64@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.38.tgz#8442402e37d0b8ae946ac616784d9c1a2041056a"
+  integrity sha512-HlMGZTEsBrXrivr64eZ/EO0NQM8H8DuSENRok9d+Jtvq8hOLzrxfsAT9U94K3KOGk2XgCmkaI2KD8hX7F97lvA==
+
+esbuild-linux-arm@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.38.tgz#d5dbf32d38b7f79be0ec6b5fb2f9251fd9066986"
+  integrity sha512-FiFvQe8J3VKTDXG01JbvoVRXQ0x6UZwyrU4IaLBZeq39Bsbatd94Fuc3F1RGqPF5RbIWW7RvkVQjn79ejzysnA==
+
+esbuild-linux-mips64le@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.38.tgz#95081e42f698bbe35d8ccee0e3a237594b337eb5"
+  integrity sha512-qd1dLf2v7QBiI5wwfil9j0HG/5YMFBAmMVmdeokbNAMbcg49p25t6IlJFXAeLzogv1AvgaXRXvgFNhScYEUXGQ==
+
+esbuild-linux-ppc64le@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.38.tgz#dceb0a1b186f5df679618882a7990bd422089b47"
+  integrity sha512-mnbEm7o69gTl60jSuK+nn+pRsRHGtDPfzhrqEUXyCl7CTOCLtWN2bhK8bgsdp6J/2NyS/wHBjs1x8aBWwP2X9Q==
+
+esbuild-linux-riscv64@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.38.tgz#61fb8edb75f475f9208c4a93ab2bfab63821afd2"
+  integrity sha512-+p6YKYbuV72uikChRk14FSyNJZ4WfYkffj6Af0/Tw63/6TJX6TnIKE+6D3xtEc7DeDth1fjUOEqm+ApKFXbbVQ==
+
+esbuild-linux-s390x@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.38.tgz#34c7126a4937406bf6a5e69100185fd702d12fe0"
+  integrity sha512-0zUsiDkGJiMHxBQ7JDU8jbaanUY975CdOW1YDrurjrM0vWHfjv9tLQsW9GSyEb/heSK1L5gaweRjzfUVBFoybQ==
+
+esbuild-netbsd-64@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.38.tgz#322ea9937d9e529183ee281c7996b93eb38a5d95"
+  integrity sha512-cljBAApVwkpnJZfnRVThpRBGzCi+a+V9Ofb1fVkKhtrPLDYlHLrSYGtmnoTVWDQdU516qYI8+wOgcGZ4XIZh0Q==
+
+esbuild-openbsd-64@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.38.tgz#1ca29bb7a2bf09592dcc26afdb45108f08a2cdbd"
+  integrity sha512-CDswYr2PWPGEPpLDUO50mL3WO/07EMjnZDNKpmaxUPsrW+kVM3LoAqr/CE8UbzugpEiflYqJsGPLirThRB18IQ==
+
+esbuild-sunos-64@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.38.tgz#c9446f7d8ebf45093e7bb0e7045506a88540019b"
+  integrity sha512-2mfIoYW58gKcC3bck0j7lD3RZkqYA7MmujFYmSn9l6TiIcAMpuEvqksO+ntBgbLep/eyjpgdplF7b+4T9VJGOA==
+
+esbuild-windows-32@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.38.tgz#f8e9b4602fd0ccbd48e5c8d117ec0ba4040f2ad1"
+  integrity sha512-L2BmEeFZATAvU+FJzJiRLFUP+d9RHN+QXpgaOrs2klshoAm1AE6Us4X6fS9k33Uy5SzScn2TpcgecbqJza1Hjw==
+
+esbuild-windows-64@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.38.tgz#280f58e69f78535f470905ce3e43db1746518107"
+  integrity sha512-Khy4wVmebnzue8aeSXLC+6clo/hRYeNIm0DyikoEqX+3w3rcvrhzpoix0S+MF9vzh6JFskkIGD7Zx47ODJNyCw==
+
+esbuild-windows-arm64@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.38.tgz#d97e9ac0f95a4c236d9173fa9f86c983d6a53f54"
+  integrity sha512-k3FGCNmHBkqdJXuJszdWciAH77PukEyDsdIryEHn9cKLQFxzhT39dSumeTuggaQcXY57UlmLGIkklWZo2qzHpw==
+
+esbuild@0.14.38:
+  version "0.14.38"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.38.tgz#99526b778cd9f35532955e26e1709a16cca2fb30"
+  integrity sha512-12fzJ0fsm7gVZX1YQ1InkOE5f9Tl7cgf6JPYXRJtPIoE0zkWAbHdPHVPPaLi9tYAcEBqheGzqLn/3RdTOyBfcA==
+  optionalDependencies:
+    esbuild-android-64 "0.14.38"
+    esbuild-android-arm64 "0.14.38"
+    esbuild-darwin-64 "0.14.38"
+    esbuild-darwin-arm64 "0.14.38"
+    esbuild-freebsd-64 "0.14.38"
+    esbuild-freebsd-arm64 "0.14.38"
+    esbuild-linux-32 "0.14.38"
+    esbuild-linux-64 "0.14.38"
+    esbuild-linux-arm "0.14.38"
+    esbuild-linux-arm64 "0.14.38"
+    esbuild-linux-mips64le "0.14.38"
+    esbuild-linux-ppc64le "0.14.38"
+    esbuild-linux-riscv64 "0.14.38"
+    esbuild-linux-s390x "0.14.38"
+    esbuild-netbsd-64 "0.14.38"
+    esbuild-openbsd-64 "0.14.38"
+    esbuild-sunos-64 "0.14.38"
+    esbuild-windows-32 "0.14.38"
+    esbuild-windows-64 "0.14.38"
+    esbuild-windows-arm64 "0.14.38"
+
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
+escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -3395,11 +3269,6 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
-escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
 escodegen@^1.11.0:
   version "1.14.3"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
@@ -3412,18 +3281,6 @@ escodegen@^1.11.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-escodegen@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
-  integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^5.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
-
 eslint-config-google@^0.14.0:
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz#4f5f8759ba6e11b424294a219dbfa18c508bcc1a"
@@ -3628,26 +3485,6 @@ event-target-shim@^6.0.2:
   resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-6.0.2.tgz#ea5348c3618ee8b62ff1d344f01908ee2b8a2b71"
   integrity sha512-8q3LsZjRezbFZ2PN+uP+Q7pnHUMmAOziU2vA2OwoFaKIXxlxl38IylhSSgUorWu/rf4er67w0ikBqjBFk/pomA==
 
-execa@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376"
-  integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==
-  dependencies:
-    cross-spawn "^7.0.3"
-    get-stream "^6.0.0"
-    human-signals "^2.1.0"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.1"
-    onetime "^5.1.2"
-    signal-exit "^3.0.3"
-    strip-final-newline "^2.0.0"
-
-exit@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
-
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -3661,17 +3498,16 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expect@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-27.2.0.tgz#40eb89a492afb726a3929ccf3611ee0799ab976f"
-  integrity sha512-oOTbawMQv7AK1FZURbPTgGSzmhxkjFzoARSvDjOMnOpeWuYQx1tP6rXu9MIX5mrACmyCAM7fSNP8IJO2f1p0CQ==
+expect@^28.1.0:
+  version "28.1.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-28.1.0.tgz#10e8da64c0850eb8c39a480199f14537f46e8360"
+  integrity sha512-qFXKl8Pmxk8TBGfaFKRtcQjfXEnKAs+dmlxdwvukJZorwrAabT7M3h8oLOG01I2utEhkmUTi17CHaPBovZsKdw==
   dependencies:
-    "@jest/types" "^27.1.1"
-    ansi-styles "^5.0.0"
-    jest-get-type "^27.0.6"
-    jest-matcher-utils "^27.2.0"
-    jest-message-util "^27.2.0"
-    jest-regex-util "^27.0.6"
+    "@jest/expect-utils" "^28.1.0"
+    jest-get-type "^28.0.2"
+    jest-matcher-utils "^28.1.0"
+    jest-message-util "^28.1.0"
+    jest-util "^28.1.0"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
@@ -3756,11 +3592,6 @@ fast-glob@^3.2.9:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-json-stable-stringify@2.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
@@ -3855,6 +3686,14 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
+find-up@5.0.0, find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -3870,14 +3709,6 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-find-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
 firebase@^9.0.2:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/firebase/-/firebase-9.0.2.tgz#092019326f1c9a67ec00ec78d50f80244581c705"
@@ -3923,6 +3754,11 @@ flat-cache@^3.0.4:
     flatted "^3.1.0"
     rimraf "^3.0.2"
 
+flat@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
+  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
+
 flatted@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
@@ -3946,15 +3782,6 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-form-data@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
-  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -4046,11 +3873,6 @@ get-stream@^5.1.0:
   dependencies:
     pump "^3.0.0"
 
-get-stream@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
-  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
-
 get-symbol-description@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
@@ -4059,6 +3881,11 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
+get-tsconfig@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-3.0.1.tgz#02cadb5abc5f0d53033c8b2f3005b84134ba22e9"
+  integrity sha512-+m30eQjbcf3xMNdnacXH5IDAKUMbI7Mhbf3e1BHif1FzBlUhBzBlmOVc7kL4+kB035l8OCyBdI3dNXZ3of9HqA==
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -4127,7 +3954,7 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.1.2:
+glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -4146,10 +3973,10 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+glob@7.2.0, glob@^7.1.6:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -4158,10 +3985,10 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.6:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+glob@^7.0.0, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -4226,11 +4053,16 @@ globby@^9.2.0:
     pify "^4.0.1"
     slash "^2.0.0"
 
-graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.4:
+graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.2.6"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
   integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
 
+graceful-fs@^4.2.9:
+  version "4.2.10"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+
 gzip-size@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274"
@@ -4341,6 +4173,11 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+he@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
+
 hosted-git-info@^2.1.4:
   version "2.8.9"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
@@ -4360,13 +4197,6 @@ html-encoding-sniffer@^1.0.2:
   dependencies:
     whatwg-encoding "^1.0.1"
 
-html-encoding-sniffer@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
-  integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==
-  dependencies:
-    whatwg-encoding "^1.0.5"
-
 html-escaper@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
@@ -4382,15 +4212,6 @@ http-parser-js@>=0.5.1:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
   integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
 
-http-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
-  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
-  dependencies:
-    "@tootallnate/once" "1"
-    agent-base "6"
-    debug "4"
-
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -4416,11 +4237,6 @@ https-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
-human-signals@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
-  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
-
 humanize-url@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/humanize-url/-/humanize-url-1.0.1.tgz#f4ab99e0d288174ca4e1e50407c55fbae464efff"
@@ -4492,14 +4308,6 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-local@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6"
-  integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==
-  dependencies:
-    pkg-dir "^4.2.0"
-    resolve-cwd "^3.0.0"
-
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -4573,6 +4381,13 @@ is-bigint@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2"
   integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==
 
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
 is-boolean-object@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
@@ -4595,13 +4410,6 @@ is-callable@^1.2.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-ci@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz#c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994"
-  integrity sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==
-  dependencies:
-    ci-info "^3.1.1"
-
 is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
@@ -4683,11 +4491,6 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-generator-fn@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.0.0.tgz#038c31b774709641bda678b1f06a4e3227c10b3e"
-  integrity sha512-elzyIdM7iKoFHzcrndIqjYomImhxrFRnGP3galODoII4TB9gI7mZ+FnlLQmmjf27SxHS2gKEeyhX5/+YRS6H9g==
-
 is-glob@^3.0.0, is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -4702,7 +4505,7 @@ is-glob@^4.0.0, is-glob@^4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-glob@^4.0.3:
+is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -4758,6 +4561,11 @@ is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
+is-plain-obj@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
+  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
+
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -4765,11 +4573,6 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-potential-custom-element-name@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
-  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
-
 is-reference@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
@@ -4785,16 +4588,16 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
+is-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
+
 is-shared-array-buffer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
   integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
 
-is-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
-  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
-
 is-string@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
@@ -4826,6 +4629,11 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
@@ -4887,14 +4695,15 @@ istanbul-lib-coverage@^3.2.0:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
   integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
 
-istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
-  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
+istanbul-lib-instrument@^5.0.4:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz#31d18bdd127f825dd02ea7bfdfd906f8ab840e9f"
+  integrity sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==
   dependencies:
-    "@babel/core" "^7.7.5"
+    "@babel/core" "^7.12.3"
+    "@babel/parser" "^7.14.7"
     "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-coverage "^3.2.0"
     semver "^6.3.0"
 
 istanbul-lib-report@^3.0.0:
@@ -4906,23 +4715,6 @@ istanbul-lib-report@^3.0.0:
     make-dir "^3.0.0"
     supports-color "^7.1.0"
 
-istanbul-lib-source-maps@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"
-  integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==
-  dependencies:
-    debug "^4.1.1"
-    istanbul-lib-coverage "^3.0.0"
-    source-map "^0.6.1"
-
-istanbul-reports@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
-  integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==
-  dependencies:
-    html-escaper "^2.0.0"
-    istanbul-lib-report "^3.0.0"
-
 istanbul-reports@^3.1.4:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.4.tgz#1b6f068ecbc6c331040aab5741991273e609e40c"
@@ -4931,411 +4723,127 @@ istanbul-reports@^3.1.4:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jest-changed-files@^27.1.1:
-  version "27.1.1"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.1.1.tgz#9b3f67a34cc58e3e811e2e1e21529837653e4200"
-  integrity sha512-5TV9+fYlC2A6hu3qtoyGHprBwCAn0AuGA77bZdUgYvVlRMjHXo063VcWTEAyx6XAZ85DYHqp0+aHKbPlfRDRvA==
-  dependencies:
-    "@jest/types" "^27.1.1"
-    execa "^5.0.0"
-    throat "^6.0.1"
-
-jest-circus@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.2.0.tgz#ad0d6d75514050f539d422bae41344224d2328f9"
-  integrity sha512-WwENhaZwOARB1nmcboYPSv/PwHBUGRpA4MEgszjr9DLCl97MYw0qZprBwLb7rNzvMwfIvNGG7pefQ5rxyBlzIA==
-  dependencies:
-    "@jest/environment" "^27.2.0"
-    "@jest/test-result" "^27.2.0"
-    "@jest/types" "^27.1.1"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    co "^4.6.0"
-    dedent "^0.7.0"
-    expect "^27.2.0"
-    is-generator-fn "^2.0.0"
-    jest-each "^27.2.0"
-    jest-matcher-utils "^27.2.0"
-    jest-message-util "^27.2.0"
-    jest-runtime "^27.2.0"
-    jest-snapshot "^27.2.0"
-    jest-util "^27.2.0"
-    pretty-format "^27.2.0"
-    slash "^3.0.0"
-    stack-utils "^2.0.3"
-    throat "^6.0.1"
-
-jest-cli@^27.1.1:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.2.0.tgz#6da5ecca5bd757e20449f5ec1f1cad5b0303d16b"
-  integrity sha512-bq1X/B/b1kT9y1zIFMEW3GFRX1HEhFybiqKdbxM+j11XMMYSbU9WezfyWIhrSOmPT+iODLATVjfsCnbQs7cfIA==
-  dependencies:
-    "@jest/core" "^27.2.0"
-    "@jest/test-result" "^27.2.0"
-    "@jest/types" "^27.1.1"
-    chalk "^4.0.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    import-local "^3.0.2"
-    jest-config "^27.2.0"
-    jest-util "^27.2.0"
-    jest-validate "^27.2.0"
-    prompts "^2.0.1"
-    yargs "^16.0.3"
-
-jest-config@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.2.0.tgz#d1c359253927005c53d11ab3e50d3b2f402a673a"
-  integrity sha512-Z1romHpxeNwLxQtouQ4xt07bY6HSFGKTo0xJcvOK3u6uJHveA4LB2P+ty9ArBLpTh3AqqPxsyw9l9GMnWBYS9A==
-  dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^27.2.0"
-    "@jest/types" "^27.1.1"
-    babel-jest "^27.2.0"
-    chalk "^4.0.0"
-    deepmerge "^4.2.2"
-    glob "^7.1.1"
-    graceful-fs "^4.2.4"
-    is-ci "^3.0.0"
-    jest-circus "^27.2.0"
-    jest-environment-jsdom "^27.2.0"
-    jest-environment-node "^27.2.0"
-    jest-get-type "^27.0.6"
-    jest-jasmine2 "^27.2.0"
-    jest-regex-util "^27.0.6"
-    jest-resolve "^27.2.0"
-    jest-runner "^27.2.0"
-    jest-util "^27.2.0"
-    jest-validate "^27.2.0"
-    micromatch "^4.0.4"
-    pretty-format "^27.2.0"
-
-jest-diff@^27.0.0, jest-diff@^27.2.0:
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.4.2.tgz#786b2a5211d854f848e2dcc1e324448e9481f36f"
-  integrity sha512-ujc9ToyUZDh9KcqvQDkk/gkbf6zSaeEg9AiBxtttXW59H/AcqEYp1ciXAtJp+jXWva5nAf/ePtSsgWwE5mqp4Q==
-  dependencies:
-    chalk "^4.0.0"
-    diff-sequences "^27.4.0"
-    jest-get-type "^27.4.0"
-    pretty-format "^27.4.2"
-
-jest-docblock@^27.0.6:
-  version "27.0.6"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.6.tgz#cc78266acf7fe693ca462cbbda0ea4e639e4e5f3"
-  integrity sha512-Fid6dPcjwepTFraz0YxIMCi7dejjJ/KL9FBjPYhBp4Sv1Y9PdhImlKZqYU555BlN4TQKaTc+F2Av1z+anVyGkA==
-  dependencies:
-    detect-newline "^3.0.0"
-
-jest-each@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.2.0.tgz#4c531c7223de289429fc7b2473a86e653c86d61f"
-  integrity sha512-biDmmUQjg+HZOB7MfY2RHSFL3j418nMoC3TK3pGAj880fQQSxvQe1y2Wy23JJJNUlk6YXiGU0yWy86Le1HBPmA==
+jest-diff@^28.1.0:
+  version "28.1.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-28.1.0.tgz#77686fef899ec1873dbfbf9330e37dd429703269"
+  integrity sha512-8eFd3U3OkIKRtlasXfiAQfbovgFgRDb0Ngcs2E+FMeBZ4rUezqIaGjuyggJBp+llosQXNEWofk/Sz4Hr5gMUhA==
   dependencies:
-    "@jest/types" "^27.1.1"
     chalk "^4.0.0"
-    jest-get-type "^27.0.6"
-    jest-util "^27.2.0"
-    pretty-format "^27.2.0"
-
-jest-environment-jsdom@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.2.0.tgz#c654dfae50ca2272c2a2e2bb95ff0af298283a3c"
-  integrity sha512-wNQJi6Rd/AkUWqTc4gWhuTIFPo7tlMK0RPZXeM6AqRHZA3D3vwvTa9ktAktyVyWYmUoXdYstOfyYMG3w4jt7eA==
-  dependencies:
-    "@jest/environment" "^27.2.0"
-    "@jest/fake-timers" "^27.2.0"
-    "@jest/types" "^27.1.1"
-    "@types/node" "*"
-    jest-mock "^27.1.1"
-    jest-util "^27.2.0"
-    jsdom "^16.6.0"
-
-jest-environment-node@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.2.0.tgz#73ef2151cb62206669becb94cd84f33276252de5"
-  integrity sha512-WbW+vdM4u88iy6Q3ftUEQOSgMPtSgjm3qixYYK2AKEuqmFO2zmACTw1vFUB0qI/QN88X6hA6ZkVKIdIWWzz+yg==
-  dependencies:
-    "@jest/environment" "^27.2.0"
-    "@jest/fake-timers" "^27.2.0"
-    "@jest/types" "^27.1.1"
-    "@types/node" "*"
-    jest-mock "^27.1.1"
-    jest-util "^27.2.0"
-
-jest-get-type@^27.0.6, jest-get-type@^27.4.0:
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.4.0.tgz#7503d2663fffa431638337b3998d39c5e928e9b5"
-  integrity sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==
-
-jest-haste-map@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.2.0.tgz#703b3a473e3f2e27d75ab07864ffd7bbaad0d75e"
-  integrity sha512-laFet7QkNlWjwZtMGHCucLvF8o9PAh2cgePRck1+uadSM4E4XH9J4gnx4do+a6do8ZV5XHNEAXEkIoNg5XUH2Q==
-  dependencies:
-    "@jest/types" "^27.1.1"
-    "@types/graceful-fs" "^4.1.2"
+    diff-sequences "^28.0.2"
+    jest-get-type "^28.0.2"
+    pretty-format "^28.1.0"
+
+jest-get-type@^28.0.2:
+  version "28.0.2"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-28.0.2.tgz#34622e628e4fdcd793d46db8a242227901fcf203"
+  integrity sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==
+
+jest-haste-map@^28.1.0:
+  version "28.1.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-28.1.0.tgz#6c1ee2daf1c20a3e03dbd8e5b35c4d73d2349cf0"
+  integrity sha512-xyZ9sXV8PtKi6NCrJlmq53PyNVHzxmcfXNVvIRHpHmh1j/HChC4pwKgyjj7Z9us19JMw8PpQTJsFWOsIfT93Dw==
+  dependencies:
+    "@jest/types" "^28.1.0"
+    "@types/graceful-fs" "^4.1.3"
     "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-regex-util "^27.0.6"
-    jest-serializer "^27.0.6"
-    jest-util "^27.2.0"
-    jest-worker "^27.2.0"
+    graceful-fs "^4.2.9"
+    jest-regex-util "^28.0.2"
+    jest-util "^28.1.0"
+    jest-worker "^28.1.0"
     micromatch "^4.0.4"
     walker "^1.0.7"
   optionalDependencies:
     fsevents "^2.3.2"
 
-jest-jasmine2@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.2.0.tgz#1ece0ee37c348b59ed3dfcfe509fc24e3377b12d"
-  integrity sha512-NcPzZBk6IkDW3Z2V8orGueheGJJYfT5P0zI/vTO/Jp+R9KluUdgFrgwfvZ0A34Kw6HKgiWFILZmh3oQ/eS+UxA==
-  dependencies:
-    "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^27.2.0"
-    "@jest/source-map" "^27.0.6"
-    "@jest/test-result" "^27.2.0"
-    "@jest/types" "^27.1.1"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    co "^4.6.0"
-    expect "^27.2.0"
-    is-generator-fn "^2.0.0"
-    jest-each "^27.2.0"
-    jest-matcher-utils "^27.2.0"
-    jest-message-util "^27.2.0"
-    jest-runtime "^27.2.0"
-    jest-snapshot "^27.2.0"
-    jest-util "^27.2.0"
-    pretty-format "^27.2.0"
-    throat "^6.0.1"
-
-jest-leak-detector@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.2.0.tgz#9a7ca2dad1a21c4e49ad2a8ad7f1214ffdb86a28"
-  integrity sha512-e91BIEmbZw5+MHkB4Hnrq7S86coTxUMCkz4n7DLmQYvl9pEKmRx9H/JFH87bBqbIU5B2Ju1soKxRWX6/eGFGpA==
-  dependencies:
-    jest-get-type "^27.0.6"
-    pretty-format "^27.2.0"
-
-jest-matcher-utils@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.2.0.tgz#b4d224ab88655d5fab64b96b989ac349e2f5da43"
-  integrity sha512-F+LG3iTwJ0gPjxBX6HCyrARFXq6jjiqhwBQeskkJQgSLeF1j6ui1RTV08SR7O51XTUhtc8zqpDj8iCG4RGmdKw==
+jest-matcher-utils@^28.1.0:
+  version "28.1.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-28.1.0.tgz#2ae398806668eeabd293c61712227cb94b250ccf"
+  integrity sha512-onnax0n2uTLRQFKAjC7TuaxibrPSvZgKTcSCnNUz/tOjJ9UhxNm7ZmPpoQavmTDUjXvUQ8KesWk2/VdrxIFzTQ==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^27.2.0"
-    jest-get-type "^27.0.6"
-    pretty-format "^27.2.0"
+    jest-diff "^28.1.0"
+    jest-get-type "^28.0.2"
+    pretty-format "^28.1.0"
 
-jest-message-util@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.2.0.tgz#2f65c71df55267208686b1d7514e18106c91ceaf"
-  integrity sha512-y+sfT/94CiP8rKXgwCOzO1mUazIEdEhrLjuiu+RKmCP+8O/TJTSne9dqQRbFIHBtlR2+q7cddJlWGir8UATu5w==
+jest-message-util@^28.1.0:
+  version "28.1.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-28.1.0.tgz#7e8f0b9049e948e7b94c2a52731166774ba7d0af"
+  integrity sha512-RpA8mpaJ/B2HphDMiDlrAZdDytkmwFqgjDZovM21F35lHGeUeCvYmm6W+sbQ0ydaLpg5bFAUuWG1cjqOl8vqrw==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@jest/types" "^27.1.1"
+    "@jest/types" "^28.1.0"
     "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
-    graceful-fs "^4.2.4"
+    graceful-fs "^4.2.9"
     micromatch "^4.0.4"
-    pretty-format "^27.2.0"
+    pretty-format "^28.1.0"
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-mock@^27.1.1:
-  version "27.1.1"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.1.1.tgz#c7a2e81301fdcf3dab114931d23d89ec9d0c3a82"
-  integrity sha512-SClsFKuYBf+6SSi8jtAYOuPw8DDMsTElUWEae3zq7vDhH01ayVSIHUSIa8UgbDOUalCFp6gNsaikN0rbxN4dbw==
+jest-mock@^27.3.0:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.1.tgz#19948336d49ef4d9c52021d34ac7b5f36ff967d6"
+  integrity sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==
   dependencies:
-    "@jest/types" "^27.1.1"
+    "@jest/types" "^27.5.1"
     "@types/node" "*"
 
-jest-pnp-resolver@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
-  integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
-
-jest-regex-util@^27.0.6:
-  version "27.0.6"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.6.tgz#02e112082935ae949ce5d13b2675db3d8c87d9c5"
-  integrity sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ==
-
-jest-resolve-dependencies@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.2.0.tgz#b56a1aab95b0fd21e0a69a15fda985c05f902b8a"
-  integrity sha512-EY5jc/Y0oxn+oVEEldTidmmdVoZaknKPyDORA012JUdqPyqPL+lNdRyI3pGti0RCydds6coaw6xt4JQY54dKsg==
-  dependencies:
-    "@jest/types" "^27.1.1"
-    jest-regex-util "^27.0.6"
-    jest-snapshot "^27.2.0"
-
-jest-resolve@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.2.0.tgz#f5d053693ab3806ec2f778e6df8b0aa4cfaef95f"
-  integrity sha512-v09p9Ib/VtpHM6Cz+i9lEAv1Z/M5NVxsyghRHRMEUOqwPQs3zwTdwp1xS3O/k5LocjKiGS0OTaJoBSpjbM2Jlw==
-  dependencies:
-    "@jest/types" "^27.1.1"
-    chalk "^4.0.0"
-    escalade "^3.1.1"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^27.2.0"
-    jest-pnp-resolver "^1.2.2"
-    jest-util "^27.2.0"
-    jest-validate "^27.2.0"
-    resolve "^1.20.0"
-    slash "^3.0.0"
-
-jest-runner@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.2.0.tgz#281b255d88a473aebc0b5cb46e58a83a1251cab3"
-  integrity sha512-Cl+BHpduIc0cIVTjwoyx0pQk4Br8gn+wkr35PmKCmzEdOUnQ2wN7QVXA8vXnMQXSlFkN/+KWnk20TAVBmhgrww==
+jest-mock@^28.1.0:
+  version "28.1.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.1.0.tgz#ccc7cc12a9b330b3182db0c651edc90d163ff73e"
+  integrity sha512-H7BrhggNn77WhdL7O1apG0Q/iwl0Bdd5E1ydhCJzL3oBLh/UYxAwR3EJLsBZ9XA3ZU4PA3UNw4tQjduBTCTmLw==
   dependencies:
-    "@jest/console" "^27.2.0"
-    "@jest/environment" "^27.2.0"
-    "@jest/test-result" "^27.2.0"
-    "@jest/transform" "^27.2.0"
-    "@jest/types" "^27.1.1"
+    "@jest/types" "^28.1.0"
     "@types/node" "*"
-    chalk "^4.0.0"
-    emittery "^0.8.1"
-    exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    jest-docblock "^27.0.6"
-    jest-environment-jsdom "^27.2.0"
-    jest-environment-node "^27.2.0"
-    jest-haste-map "^27.2.0"
-    jest-leak-detector "^27.2.0"
-    jest-message-util "^27.2.0"
-    jest-resolve "^27.2.0"
-    jest-runtime "^27.2.0"
-    jest-util "^27.2.0"
-    jest-worker "^27.2.0"
-    source-map-support "^0.5.6"
-    throat "^6.0.1"
-
-jest-runtime@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.2.0.tgz#998295ccd80008b3031eeb5cc60e801e8551024b"
-  integrity sha512-6gRE9AVVX49hgBbWQ9PcNDeM4upMUXzTpBs0kmbrjyotyUyIJixLPsYjpeTFwAA07PVLDei1iAm2chmWycdGdQ==
-  dependencies:
-    "@jest/console" "^27.2.0"
-    "@jest/environment" "^27.2.0"
-    "@jest/fake-timers" "^27.2.0"
-    "@jest/globals" "^27.2.0"
-    "@jest/source-map" "^27.0.6"
-    "@jest/test-result" "^27.2.0"
-    "@jest/transform" "^27.2.0"
-    "@jest/types" "^27.1.1"
-    "@types/yargs" "^16.0.0"
-    chalk "^4.0.0"
-    cjs-module-lexer "^1.0.0"
-    collect-v8-coverage "^1.0.0"
-    execa "^5.0.0"
-    exit "^0.1.2"
-    glob "^7.1.3"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^27.2.0"
-    jest-message-util "^27.2.0"
-    jest-mock "^27.1.1"
-    jest-regex-util "^27.0.6"
-    jest-resolve "^27.2.0"
-    jest-snapshot "^27.2.0"
-    jest-util "^27.2.0"
-    jest-validate "^27.2.0"
-    slash "^3.0.0"
-    strip-bom "^4.0.0"
-    yargs "^16.0.3"
 
-jest-serializer@^27.0.6:
-  version "27.0.6"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.6.tgz#93a6c74e0132b81a2d54623251c46c498bb5bec1"
-  integrity sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA==
-  dependencies:
-    "@types/node" "*"
-    graceful-fs "^4.2.4"
+jest-regex-util@^28.0.2:
+  version "28.0.2"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-28.0.2.tgz#afdc377a3b25fb6e80825adcf76c854e5bf47ead"
+  integrity sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==
 
-jest-snapshot@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.2.0.tgz#7961e7107ac666a46fbb23e7bb48ce0b8c6a9285"
-  integrity sha512-MukJvy3KEqemCT2FoT3Gum37CQqso/62PKTfIzWmZVTsLsuyxQmJd2PI5KPcBYFqLlA8LgZLHM8ZlazkVt8LsQ==
+jest-snapshot@^28.1.0:
+  version "28.1.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-28.1.0.tgz#4b74fa8816707dd10fe9d551c2c258e5a67b53b6"
+  integrity sha512-ex49M2ZrZsUyQLpLGxQtDbahvgBjlLPgklkqGM0hq/F7W/f8DyqZxVHjdy19QKBm4O93eDp+H5S23EiTbbUmHw==
   dependencies:
-    "@babel/core" "^7.7.2"
+    "@babel/core" "^7.11.6"
     "@babel/generator" "^7.7.2"
-    "@babel/parser" "^7.7.2"
     "@babel/plugin-syntax-typescript" "^7.7.2"
     "@babel/traverse" "^7.7.2"
-    "@babel/types" "^7.0.0"
-    "@jest/transform" "^27.2.0"
-    "@jest/types" "^27.1.1"
-    "@types/babel__traverse" "^7.0.4"
+    "@babel/types" "^7.3.3"
+    "@jest/expect-utils" "^28.1.0"
+    "@jest/transform" "^28.1.0"
+    "@jest/types" "^28.1.0"
+    "@types/babel__traverse" "^7.0.6"
     "@types/prettier" "^2.1.5"
     babel-preset-current-node-syntax "^1.0.0"
     chalk "^4.0.0"
-    expect "^27.2.0"
-    graceful-fs "^4.2.4"
-    jest-diff "^27.2.0"
-    jest-get-type "^27.0.6"
-    jest-haste-map "^27.2.0"
-    jest-matcher-utils "^27.2.0"
-    jest-message-util "^27.2.0"
-    jest-resolve "^27.2.0"
-    jest-util "^27.2.0"
+    expect "^28.1.0"
+    graceful-fs "^4.2.9"
+    jest-diff "^28.1.0"
+    jest-get-type "^28.0.2"
+    jest-haste-map "^28.1.0"
+    jest-matcher-utils "^28.1.0"
+    jest-message-util "^28.1.0"
+    jest-util "^28.1.0"
     natural-compare "^1.4.0"
-    pretty-format "^27.2.0"
-    semver "^7.3.2"
-
-jest-util@^27.0.0:
-  version "27.0.6"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.6.tgz#e8e04eec159de2f4d5f57f795df9cdc091e50297"
-  integrity sha512-1JjlaIh+C65H/F7D11GNkGDDZtDfMEM8EBXsvd+l/cxtgQ6QhxuloOaiayt89DxUvDarbVhqI98HhgrM1yliFQ==
-  dependencies:
-    "@jest/types" "^27.0.6"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    is-ci "^3.0.0"
-    picomatch "^2.2.3"
+    pretty-format "^28.1.0"
+    semver "^7.3.5"
 
-jest-util@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.2.0.tgz#bfccb85cfafae752257319e825a5b8d4ada470dc"
-  integrity sha512-T5ZJCNeFpqcLBpx+Hl9r9KoxBCUqeWlJ1Htli+vryigZVJ1vuLB9j35grEBASp4R13KFkV7jM52bBGnArpJN6A==
+jest-util@^28.1.0:
+  version "28.1.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.1.0.tgz#d54eb83ad77e1dd441408738c5a5043642823be5"
+  integrity sha512-qYdCKD77k4Hwkose2YBEqQk7PzUf/NSE+rutzceduFveQREeH6b+89Dc9+wjX9dAwHcgdx4yedGA3FQlU/qCTA==
   dependencies:
-    "@jest/types" "^27.1.1"
+    "@jest/types" "^28.1.0"
     "@types/node" "*"
     chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    is-ci "^3.0.0"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
-jest-validate@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.2.0.tgz#b7535f12d95dd3b4382831f4047384ca098642ab"
-  integrity sha512-uIEZGkFKk3+4liA81Xu0maG5aGDyPLdp+4ed244c+Ql0k3aLWQYcMbaMLXOIFcb83LPHzYzqQ8hwNnIxTqfAGQ==
-  dependencies:
-    "@jest/types" "^27.1.1"
-    camelcase "^6.2.0"
-    chalk "^4.0.0"
-    jest-get-type "^27.0.6"
-    leven "^3.1.0"
-    pretty-format "^27.2.0"
-
-jest-watcher@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.2.0.tgz#dc2eef4c13c6d41cebf3f1fc5f900a54b51c2ea0"
-  integrity sha512-SjRWhnr+qO8aBsrcnYIyF+qRxNZk6MZH8TIDgvi+VlsyrvOyqg0d+Rm/v9KHiTtC9mGGeFi9BFqgavyWib6xLg==
-  dependencies:
-    "@jest/test-result" "^27.2.0"
-    "@jest/types" "^27.1.1"
-    "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    jest-util "^27.2.0"
-    string-length "^4.0.1"
-
 jest-worker@^26.2.1:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
@@ -5345,24 +4853,15 @@ jest-worker@^26.2.1:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest-worker@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.2.0.tgz#11eef39f1c88f41384ca235c2f48fe50bc229bc0"
-  integrity sha512-laB0ZVIBz+voh/QQy9dmUuuDsadixeerrKqyVpgPz+CCWiOYjOBabUXHIXZhsdvkWbLqSHbgkAHWl5cg24Q6RA==
+jest-worker@^28.1.0:
+  version "28.1.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.0.tgz#ced54757a035e87591e1208253a6e3aac1a855e5"
+  integrity sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==
   dependencies:
     "@types/node" "*"
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest@27.1.1:
-  version "27.1.1"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-27.1.1.tgz#49f0497fa0fb07dc78898318cc1b737b5fbf72d8"
-  integrity sha512-LFTEZOhoZNR/2DQM3OCaK5xC6c55c1OWhYh0njRsoHX0qd6x4nkcgenkSH0JKjsAGMTmmJAoL7/oqYHMfwhruA==
-  dependencies:
-    "@jest/core" "^27.1.1"
-    import-local "^3.0.2"
-    jest-cli "^27.1.1"
-
 jpeg-js@*, jpeg-js@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.3.tgz#6158e09f1983ad773813704be80680550eff977b"
@@ -5383,6 +4882,13 @@ js-tokens@^4.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
+js-yaml@4.1.0, js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 js-yaml@^3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
@@ -5391,13 +4897,6 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
 jsbn@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.0.tgz#650987da0dd74f4ebf5a11377a2aa2d273e97dfd"
@@ -5434,39 +4933,6 @@ jsdom@^12.2.0:
     ws "^6.1.0"
     xml-name-validator "^3.0.0"
 
-jsdom@^16.6.0:
-  version "16.6.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz#f79b3786682065492a3da6a60a4695da983805ac"
-  integrity sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg==
-  dependencies:
-    abab "^2.0.5"
-    acorn "^8.2.4"
-    acorn-globals "^6.0.0"
-    cssom "^0.4.4"
-    cssstyle "^2.3.0"
-    data-urls "^2.0.0"
-    decimal.js "^10.2.1"
-    domexception "^2.0.1"
-    escodegen "^2.0.0"
-    form-data "^3.0.0"
-    html-encoding-sniffer "^2.0.1"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
-    is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.0"
-    parse5 "6.0.1"
-    saxes "^5.0.1"
-    symbol-tree "^3.2.4"
-    tough-cookie "^4.0.0"
-    w3c-hr-time "^1.0.2"
-    w3c-xmlserializer "^2.0.0"
-    webidl-conversions "^6.1.0"
-    whatwg-encoding "^1.0.5"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.5.0"
-    ws "^7.4.5"
-    xml-name-validator "^3.0.0"
-
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -5502,13 +4968,6 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@2.x, json5@^2.1.2:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
-  dependencies:
-    minimist "^1.2.5"
-
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -5516,6 +4975,11 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
+json5@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
+  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -5596,11 +5060,6 @@ kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-kleur@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.2.tgz#83c7ec858a41098b613d5998a7b653962b504f68"
-  integrity sha512-3h7B2WRT5LNXOtQiAaWonilegHcPSf9nLVXlSTci8lu1dZUuui61+EsPEZqSVxY7rXYmB2DVKMQILxaO5WL61Q==
-
 ky-universal@^0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/ky-universal/-/ky-universal-0.8.2.tgz#edc398d54cf495d7d6830aa1ab69559a3cc7f824"
@@ -5621,11 +5080,6 @@ lazystream@^1.0.0:
   dependencies:
     readable-stream "^2.0.5"
 
-leven@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
-  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
-
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -5764,11 +5218,19 @@ lodash.union@^4.6.0:
   resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
   integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=
 
-lodash@4.x, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.7.0:
+lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.3:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
+log-symbols@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
+  dependencies:
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
+
 long@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
@@ -5810,11 +5272,6 @@ make-dir@^3.0.0:
   dependencies:
     semver "^6.0.0"
 
-make-error@1.x:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
-  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-
 makeerror@1.0.x:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
@@ -5920,16 +5377,18 @@ mime-types@^2.1.12, mime-types@^2.1.30, mime-types@~2.1.19:
   dependencies:
     mime-db "1.47.0"
 
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
 min-indent@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
+minimatch@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b"
+  integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -5964,10 +5423,33 @@ mkdirp-classic@^0.5.2:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-mkdirp@1.x:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+mocha@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.0.0.tgz#205447d8993ec755335c4b13deba3d3a13c4def9"
+  integrity sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA==
+  dependencies:
+    "@ungap/promise-all-settled" "1.1.2"
+    ansi-colors "4.1.1"
+    browser-stdout "1.3.1"
+    chokidar "3.5.3"
+    debug "4.3.4"
+    diff "5.0.0"
+    escape-string-regexp "4.0.0"
+    find-up "5.0.0"
+    glob "7.2.0"
+    he "1.2.0"
+    js-yaml "4.1.0"
+    log-symbols "4.1.0"
+    minimatch "5.0.1"
+    ms "2.1.3"
+    nanoid "3.3.3"
+    serialize-javascript "6.0.0"
+    strip-json-comments "3.1.1"
+    supports-color "8.1.1"
+    workerpool "6.2.1"
+    yargs "16.2.0"
+    yargs-parser "20.2.4"
+    yargs-unparser "2.0.0"
 
 modify-values@^1.0.0:
   version "1.0.1"
@@ -5984,7 +5466,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.1.1:
+ms@2.1.3, ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -5994,6 +5476,11 @@ nan@^2.14.0:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
   integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
 
+nanoid@3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
+  integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
+
 nanomatch@^1.2.9:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
@@ -6052,15 +5539,10 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
-node-modules-regexp@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
-  integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
-
-node-releases@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
-  integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
+node-releases@^2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666"
+  integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
@@ -6089,7 +5571,7 @@ normalize-path@^2.0.0:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-path@^3.0.0:
+normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@@ -6104,13 +5586,6 @@ normalize-url@^1.0.0:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
-npm-run-path@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
-  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
-  dependencies:
-    path-key "^3.0.0"
-
 npm-run-posix-or-windows@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-posix-or-windows/-/npm-run-posix-or-windows-2.0.2.tgz#74e894702ae34ea338502d04b500c1dec836736e"
@@ -6121,11 +5596,6 @@ nwsapi@^2.0.9:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.9.tgz#77ac0cdfdcad52b6a1151a84e73254edc33ed016"
   integrity sha512-nlWFSCTYQcHk/6A9FFnfhKc14c3aFhfdNBXgo8Qgi9QTBu/qg3Ww+Uiz9wMzXd1T8GFxPc2QIHB6Qtf2XFryFQ==
 
-nwsapi@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
-  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
-
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -6200,13 +5670,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  dependencies:
-    mimic-fn "^2.1.0"
-
 open@^8.4.0:
   version "8.4.0"
   resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
@@ -6247,11 +5710,6 @@ p-all@^2.1.0:
   dependencies:
     p-map "^2.0.0"
 
-p-each-series@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"
-  integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==
-
 p-event@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/p-event/-/p-event-4.2.0.tgz#af4b049c8acd91ae81083ebd1e6f5cae2044c1b5"
@@ -6387,11 +5845,6 @@ parse5@5.1.0:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
   integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==
 
-parse5@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
-  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
-
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -6417,7 +5870,7 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-key@^3.0.0, path-key@^3.1.0:
+path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
@@ -6464,6 +5917,11 @@ picomatch@^2.0.4:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
 
+picomatch@^2.2.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+
 picomatch@^2.2.2:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
@@ -6501,14 +5959,12 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pirates@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
-  integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
-  dependencies:
-    node-modules-regexp "^1.0.0"
+pirates@^4.0.4:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
+  integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
 
-pkg-dir@4.2.0, pkg-dir@^4.2.0:
+pkg-dir@4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
@@ -6532,10 +5988,10 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
-preact@^10.5.14:
-  version "10.5.14"
-  resolved "https://registry.yarnpkg.com/preact/-/preact-10.5.14.tgz#0b14a2eefba3c10a57116b90d1a65f5f00cd2701"
-  integrity sha512-KojoltCrshZ099ksUZ2OQKfbH66uquFoxHSbnwKbTJHeQNvx42EmC7wQVWNuDt6vC5s3nudRHFtKbpY4ijKlaQ==
+preact@^10.7.2:
+  version "10.7.2"
+  resolved "https://registry.yarnpkg.com/preact/-/preact-10.7.2.tgz#5c632ba194b87345dcaee6598b3b6529b58e6a12"
+  integrity sha512-GLjn0I3r6ka+NvxJUppsVFqb4V0qDTEHT/QxHlidPuClGaxF/4AI2Qti4a0cv3XMh5n1+D3hLScW10LRIm5msQ==
 
 prelude-ls@^1.2.1:
   version "1.2.1"
@@ -6552,25 +6008,24 @@ prepend-http@^1.0.0:
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
   integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
-pretty-format@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
-  integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
+pretty-format@^27.0.2:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
+  integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==
   dependencies:
-    "@jest/types" "^26.6.2"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
+    ansi-regex "^5.0.1"
+    ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
-pretty-format@^27.0.0, pretty-format@^27.2.0, pretty-format@^27.4.2:
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.4.2.tgz#e4ce92ad66c3888423d332b40477c87d1dac1fb8"
-  integrity sha512-p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw==
+pretty-format@^28.1.0:
+  version "28.1.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-28.1.0.tgz#8f5836c6a0dfdb834730577ec18029052191af55"
+  integrity sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==
   dependencies:
-    "@jest/types" "^27.4.2"
+    "@jest/schemas" "^28.0.2"
     ansi-regex "^5.0.1"
     ansi-styles "^5.0.0"
-    react-is "^17.0.1"
+    react-is "^18.0.0"
 
 pretty-json-stringify@^0.0.2:
   version "0.0.2"
@@ -6592,14 +6047,6 @@ promise-polyfill@8.1.3:
   resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.1.3.tgz#8c99b3cf53f3a91c68226ffde7bde81d7f904116"
   integrity sha512-MG5r82wBzh7pSKDRa9y+vllNHz3e3d4CNj1PQE4BQYxLme0gKYYBm9YENq+UkEikyZ0XbiGWxYlVw3Rl9O/U8g==
 
-prompts@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.0.3.tgz#c5ccb324010b2e8f74752aadceeb57134c1d2522"
-  integrity sha512-H8oWEoRZpybm6NV4to9/1limhttEo13xK62pNvn2JzY0MA03p7s0OjtmhXyon3uJmxiJJVSuUwEJFFssI3eBiQ==
-  dependencies:
-    kleur "^3.0.2"
-    sisteransi "^1.0.0"
-
 protobufjs@^6.10.0:
   version "6.11.2"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b"
@@ -6629,7 +6076,7 @@ ps-list@^8.0.0:
   resolved "https://registry.yarnpkg.com/ps-list/-/ps-list-8.0.0.tgz#ee622c04a16ac0b29be65d7d920c1fb36c8383d4"
   integrity sha512-rBBL6jp5Ccc5fy7p1Os5wDkXlJm5PeLCP2mVz1wLqEtKGo+d19oDApqVbePJoOxNlWeaxJxe28qahc3KWj9ePg==
 
-psl@^1.1.28, psl@^1.1.33:
+psl@^1.1.28:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
@@ -6701,6 +6148,14 @@ query-string@^4.1.0:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
+quibble@^0.6.7:
+  version "0.6.9"
+  resolved "https://registry.yarnpkg.com/quibble/-/quibble-0.6.9.tgz#1e7b24a72b59bdb6cc272318448cd6b7eb61fbe8"
+  integrity sha512-EotkZs/lqgDdGsKzdmZuqu2ATgupQzhByUZ8oL3ElzCKDhXmgVLrX+WDe/StvrfB80h4EPOTElXuQifcfJwwFw==
+  dependencies:
+    lodash "^4.17.21"
+    resolve "^1.20.0"
+
 quick-lru@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
@@ -6725,6 +6180,11 @@ react-is@^17.0.1:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
+react-is@^18.0.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.1.0.tgz#61aaed3096d30eacf2a2127118b5b41387d32a67"
+  integrity sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==
+
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -6783,6 +6243,13 @@ readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.3.0, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+  dependencies:
+    picomatch "^2.2.1"
+
 redent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
@@ -6876,13 +6343,6 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-resolve-cwd@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
-  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
-  dependencies:
-    resolve-from "^5.0.0"
-
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -7043,13 +6503,6 @@ saxes@^3.1.3:
   dependencies:
     xmlchars "^1.3.1"
 
-saxes@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
-  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
-  dependencies:
-    xmlchars "^2.2.0"
-
 segfault-handler@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/segfault-handler/-/segfault-handler-1.3.0.tgz#054bc847832fa14f218ba6a79e42877501c8870e"
@@ -7083,17 +6536,31 @@ selenium-webdriver@^4.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@7.x, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.7:
+semver@^6.0.0, semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
+semver@^7.2.1, semver@^7.3.4, semver@^7.3.7:
   version "7.3.7"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
   integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^6.0.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+semver@^7.3.5:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
+serialize-javascript@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
+  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
+  dependencies:
+    randombytes "^2.1.0"
 
 serialize-javascript@^4.0.0:
   version "4.0.0"
@@ -7153,15 +6620,10 @@ signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-signal-exit@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
-  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
-
-sisteransi@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz#77d9622ff909080f1c19e5f4a1df0c1b0a27b88c"
-  integrity sha512-N+z4pHB4AmUv0SjveWRd6q1Nj5w62m5jodv+GD8lvmbY/83T/rpbJGZOnK5T149OldDj4Db07BSv9xY4K6NTPQ==
+signal-exit@^3.0.7:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
 slash@^2.0.0:
   version "2.0.0"
@@ -7221,14 +6683,6 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.6:
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
-  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
 source-map-support@~0.5.19:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
@@ -7252,7 +6706,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3, source-map@~0.7.2:
+source-map@~0.7.2:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -7368,14 +6822,6 @@ strict-uri-encode@^1.0.0:
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
   integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
-string-length@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
-  integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
-  dependencies:
-    char-regex "^1.0.2"
-    strip-ansi "^6.0.0"
-
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -7415,6 +6861,14 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-object-es5@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/stringify-object-es5/-/stringify-object-es5-2.5.0.tgz#057c3c9a90a127339bb9d1704a290bb7bd0a1ec5"
+  integrity sha1-BXw8mpChJzObudFwSikLt70KHsU=
+  dependencies:
+    is-plain-obj "^1.0.0"
+    is-regexp "^1.0.0"
+
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -7435,16 +6889,6 @@ strip-bom@^3.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
-strip-bom@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
-  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
-
-strip-final-newline@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
-  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-
 strip-indent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
@@ -7452,7 +6896,7 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -7469,6 +6913,13 @@ strip-url-auth@^1.0.0:
   resolved "https://registry.yarnpkg.com/strip-url-auth/-/strip-url-auth-1.0.1.tgz#22b0fa3a41385b33be3f331551bbb837fa0cd7ae"
   integrity sha1-IrD6OkE4WzO+PzMVUbu4N/oM164=
 
+supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+  dependencies:
+    has-flag "^4.0.0"
+
 supports-color@^5.3.0:
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
@@ -7483,22 +6934,7 @@ supports-color@^7.0.0, supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^8.0.0, supports-color@^8.1.0:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
-  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-hyperlinks@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb"
-  integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==
-  dependencies:
-    has-flag "^4.0.0"
-    supports-color "^7.0.0"
-
-symbol-tree@^3.2.2, symbol-tree@^3.2.4:
+symbol-tree@^3.2.2:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
@@ -7555,14 +6991,6 @@ tempfile@^3.0.0:
     temp-dir "^2.0.0"
     uuid "^3.3.2"
 
-terminal-link@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
-  integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    supports-hyperlinks "^2.0.0"
-
 terser@^5.0.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz#a761eeec206bc87b605ab13029876ead938ae693"
@@ -7590,6 +7018,16 @@ test-exclude@^6.0.0:
     glob "^7.1.4"
     minimatch "^3.0.4"
 
+testdouble@^3.16.5:
+  version "3.16.5"
+  resolved "https://registry.yarnpkg.com/testdouble/-/testdouble-3.16.5.tgz#4e51407b56f542b8cb57c485fff87248eb24d66d"
+  integrity sha512-2/0vR503/X/6LuZzQObpcBtu+KycyEnw7AdX/NPboR7sam1NTuYc128UMW8n7tBDpOPGAKqCUtKVBzvgV6C3bA==
+  dependencies:
+    lodash "^4.17.15"
+    quibble "^0.6.7"
+    stringify-object-es5 "^2.5.0"
+    theredoc "^1.0.0"
+
 text-extensions@^1.0.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
@@ -7600,16 +7038,16 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
+theredoc@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/theredoc/-/theredoc-1.0.0.tgz#bcace376af6feb1873efbdd0f91ed026570ff062"
+  integrity sha512-KU3SA3TjRRM932jpNfD3u4Ec3bSvedyo5ITPI7zgWYnKep7BwQQaxlhI9qbO+lKJoRnoAbEVfMcAHRuKVYikDA==
+
 third-party-web@^0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/third-party-web/-/third-party-web-0.17.1.tgz#22e03f1ff519a6380bae4594b704b9bb28e15158"
   integrity sha512-X9Mha8cVeBwakunlZXkXL6xRzw8VCcDGWqT59EzeTYAJIi8ien3CuufnEGEx4ZUFahumNQdoOwf4H2T9Ca6lBg==
 
-throat@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375"
-  integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==
-
 through2@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
@@ -7692,15 +7130,6 @@ tough-cookie@^2.3.3, tough-cookie@^2.4.3, tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tough-cookie@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
-  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
-  dependencies:
-    psl "^1.1.33"
-    punycode "^2.1.1"
-    universalify "^0.1.2"
-
 tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
@@ -7708,13 +7137,6 @@ tr46@^1.0.1:
   dependencies:
     punycode "^2.1.0"
 
-tr46@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
-  integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
-  dependencies:
-    punycode "^2.1.1"
-
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
@@ -7737,22 +7159,6 @@ trim-repeated@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
-ts-jest@^27.0.4:
-  version "27.0.4"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.0.4.tgz#df49683535831560ccb58f94c023d831b1b80df0"
-  integrity sha512-c4E1ECy9Xz2WGfTMyHbSaArlIva7Wi2p43QOMmCqjSSjHP06KXv+aT+eSY+yZMuqsMi3k7pyGsGj2q5oSl5WfQ==
-  dependencies:
-    bs-logger "0.x"
-    buffer-from "1.x"
-    fast-json-stable-stringify "2.x"
-    jest-util "^27.0.0"
-    json5 "2.x"
-    lodash "4.x"
-    make-error "1.x"
-    mkdirp "1.x"
-    semver "7.x"
-    yargs-parser "20.x"
-
 tsconfig-paths@^3.11.0:
   version "3.11.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36"
@@ -7821,11 +7227,6 @@ type-detect@4.0.8:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
-type-fest@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
-  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
-
 type-fest@^0.18.0:
   version "0.18.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
@@ -7908,7 +7309,7 @@ unique-string@^2.0.0:
   dependencies:
     crypto-random-string "^2.0.0"
 
-universalify@^0.1.0, universalify@^0.1.2:
+universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
@@ -7955,15 +7356,6 @@ v8-compile-cache@^2.0.3:
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
-v8-to-istanbul@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz#4229f2a99e367f3f018fa1d5c2b8ec684667c69c"
-  integrity sha512-LkmXi8UUNxnCC+JlH7/fsfsKr5AU110l+SYGJimWNkWhxbN5EyeOtm1MJ0hhvqMMOhGwBj1Fp70Yv9i+hX0QAg==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.1"
-    convert-source-map "^1.6.0"
-    source-map "^0.7.3"
-
 v8-to-istanbul@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.0.tgz#be0dae58719fc53cb97e5c7ac1d7e6d4f5b19511"
@@ -7990,20 +7382,13 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-w3c-hr-time@^1.0.1, w3c-hr-time@^1.0.2:
+w3c-hr-time@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
   integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
   dependencies:
     browser-process-hrtime "^1.0.0"
 
-w3c-xmlserializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
-  integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
-  dependencies:
-    xml-name-validator "^3.0.0"
-
 wait-for-expect@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-3.0.2.tgz#d2f14b2f7b778c9b82144109c8fa89ceaadaa463"
@@ -8026,16 +7411,6 @@ webidl-conversions@^4.0.2:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
   integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
-webidl-conversions@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
-  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
-
-webidl-conversions@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
-  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
-
 websocket-driver@>=0.5.1:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
@@ -8069,7 +7444,7 @@ whatwg-fetch@2.0.4:
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
   integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
 
-whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0:
+whatwg-mimetype@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
@@ -8091,15 +7466,6 @@ whatwg-url@^7.0.0:
     tr46 "^1.0.1"
     webidl-conversions "^4.0.2"
 
-whatwg-url@^8.0.0, whatwg-url@^8.5.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz#7752b8464fc0903fec89aa9846fc9efe07351fd3"
-  integrity sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg==
-  dependencies:
-    lodash "^4.7.0"
-    tr46 "^2.0.2"
-    webidl-conversions "^6.1.0"
-
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
@@ -8133,6 +7499,11 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
+workerpool@6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
+  integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
+
 wrap-ansi@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
@@ -8166,12 +7537,20 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
+write-file-atomic@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f"
+  integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.7"
+
 ws@8.5.0:
   version "8.5.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
   integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
 
-ws@>=7.4.6, ws@^7.0.0, ws@^7.3.1, ws@^7.4.5:
+ws@>=7.4.6, ws@^7.0.0, ws@^7.3.1:
   version "7.4.6"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
   integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
@@ -8198,11 +7577,6 @@ xmlchars@^1.3.1:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-1.3.1.tgz#1dda035f833dbb4f86a0c28eaa6ca769214793cf"
   integrity sha512-tGkGJkN8XqCod7OT+EvGYK5Z4SfDQGD30zAa58OcnAa0RRWgzUEK72tkXhsX1FZd+rgnhRxFtmO+ihkp8LHSkw==
 
-xmlchars@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
-  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
-
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
@@ -8223,10 +7597,10 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yargs-parser@20.x, yargs-parser@^20.2.3, yargs-parser@^20.2.9:
-  version "20.2.9"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
-  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+yargs-parser@20.2.4, yargs-parser@^20.2.2:
+  version "20.2.4"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
+  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
 yargs-parser@^18.1.2:
   version "18.1.3"
@@ -8236,16 +7610,39 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^20.2.2:
-  version "20.2.4"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
-  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
+yargs-parser@^20.2.3, yargs-parser@^20.2.9:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
 yargs-parser@^21.0.0:
   version "21.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55"
   integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==
 
+yargs-unparser@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb"
+  integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==
+  dependencies:
+    camelcase "^6.0.0"
+    decamelize "^4.0.0"
+    flat "^5.0.2"
+    is-plain-obj "^2.1.0"
+
+yargs@16.2.0, yargs@^16.1.1, yargs@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 yargs@^15.0.0:
   version "15.4.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
@@ -8263,19 +7660,6 @@ yargs@^15.0.0:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
-yargs@^16.0.3, yargs@^16.1.1, yargs@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
-  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
-  dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
-
 yargs@^17.3.1:
   version "17.3.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz#da56b28f32e2fd45aefb402ed9c26f42be4c07b9"

From e286fbb1a669067ad0c6849b4b41c7c2f25d236e Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Tue, 28 Jun 2022 17:57:18 -0700
Subject: [PATCH 65/96] maybe this

---
 .github/workflows/ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 40acc9eaa768..4dace5b85b9f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,9 @@ jobs:
     - name: git clone
       uses: actions/checkout@v2
       with:
-        fetch-depth: 100
+        # Just bumped b/c https://github.com/GoogleChrome/lighthouse/pull/14167 is yuuuuuuuge.
+        # Don't forget to drop back to 100.
+        fetch-depth: 200 
     - run: bash lighthouse-core/scripts/github-actions-commit-range.sh
       env:
         GITHUB_CONTEXT_PR_BASE_SHA: ${{ github.event.pull_request.base.sha }}

From 60ff6ab7d6f2d1f216a85456fb173bcb16416dad Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Tue, 28 Jun 2022 18:07:49 -0700
Subject: [PATCH 66/96] fix

---
 lighthouse-cli/test/cli/bin-test.js       | 6 ++++--
 lighthouse-core/test/scripts/run-tests.js | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lighthouse-cli/test/cli/bin-test.js b/lighthouse-cli/test/cli/bin-test.js
index bcc329e58e60..17f2c2f53f6c 100644
--- a/lighthouse-cli/test/cli/bin-test.js
+++ b/lighthouse-cli/test/cli/bin-test.js
@@ -29,8 +29,10 @@ before(async () => {
   td.replaceEsm('../../sentry-prompt.js', {
     askPermission: mockAskPermission,
   });
-  td.replace('../../../lighthouse-core/lib/sentry.js', {
-    init: mockSentryInit,
+  td.replaceEsm('../../../lighthouse-core/lib/sentry.js', {
+    Sentry: {
+      init: mockSentryInit,
+    },
   });
   td.replaceEsm('lighthouse-logger', undefined, {setLevel: mockLoggerSetLevel});
   bin = await import('../../bin.js');
diff --git a/lighthouse-core/test/scripts/run-tests.js b/lighthouse-core/test/scripts/run-tests.js
index 859f48dc1dcb..e329cb9b8977 100644
--- a/lighthouse-core/test/scripts/run-tests.js
+++ b/lighthouse-core/test/scripts/run-tests.js
@@ -101,6 +101,7 @@ const testsToIsolate = new Set([
   'report/test/clients/bundle-test.js',
   'report/test/clients/bundle-test.js',
   'shared/test/localization/format-test.js',
+  'lighthouse-cli/test/cli/run-test.js',
 ]);
 
 const y = yargs(yargsHelpers.hideBin(process.argv));

From ce71def3c1c9be86fc19c7f857b091270941c1b2 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Wed, 29 Jun 2022 16:48:32 -0700
Subject: [PATCH 67/96] update

---
 clients/extension/scripts/package.json                     | 4 ++++
 clients/test/extension/settings-controller-test.js         | 2 +-
 lighthouse-core/audits/network-requests.js                 | 1 +
 report/test/generator/report-generator-test.js             | 7 ++++---
 .../chromium-synchronization/installability-errors-test.js | 2 --
 5 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 clients/extension/scripts/package.json

diff --git a/clients/extension/scripts/package.json b/clients/extension/scripts/package.json
new file mode 100644
index 000000000000..8d10bc1dfd36
--- /dev/null
+++ b/clients/extension/scripts/package.json
@@ -0,0 +1,4 @@
+{
+  "type": "commonjs",
+  "//": "Preserve commonjs in this directory. Temporary file until converted to type: module"
+}
diff --git a/clients/test/extension/settings-controller-test.js b/clients/test/extension/settings-controller-test.js
index c74e0423a6d1..7cf61f96f4ba 100644
--- a/clients/test/extension/settings-controller-test.js
+++ b/clients/test/extension/settings-controller-test.js
@@ -12,7 +12,7 @@ const format = require('../../../shared/localization/format.js');
 // TODO(esmodules): remove when shared/ is esm
 let defaultConfig;
 before(async () => {
-  defaultConfig = await import('../../../lighthouse-core/config/default-config.js');
+  defaultConfig = (await import('../../../lighthouse-core/config/default-config.js')).default;
 });
 
 describe('Lighthouse chrome extension SettingsController', () => {
diff --git a/lighthouse-core/audits/network-requests.js b/lighthouse-core/audits/network-requests.js
index 19165f1bef4b..7074e4cc87e6 100644
--- a/lighthouse-core/audits/network-requests.js
+++ b/lighthouse-core/audits/network-requests.js
@@ -8,6 +8,7 @@
 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';
 
 class NetworkRequests extends Audit {
   /**
diff --git a/report/test/generator/report-generator-test.js b/report/test/generator/report-generator-test.js
index ced8ebf93d95..a3d6f0b1e3ca 100644
--- a/report/test/generator/report-generator-test.js
+++ b/report/test/generator/report-generator-test.js
@@ -13,9 +13,10 @@ const fs = require('fs');
 const csvValidator = require('csv-validator');
 
 const ReportGenerator = require('../../generator/report-generator.js');
-const {readJson} = require('../../../root.js');
-
-const sampleResults = readJson('lighthouse-core/test/results/sample_v2.json');
+// const {readJson} = require('../../../root.js');
+// TODO(esmodules): remove when this folder is esm
+// const sampleResults = readJson('lighthouse-core/test/results/sample_v2.json');
+const sampleResults = require('../../../lighthouse-core/test/results/sample_v2.json');
 
 describe('ReportGenerator', () => {
   describe('#replaceStrings', () => {
diff --git a/third-party/chromium-synchronization/installability-errors-test.js b/third-party/chromium-synchronization/installability-errors-test.js
index 29e00351511b..664aeb366cc2 100644
--- a/third-party/chromium-synchronization/installability-errors-test.js
+++ b/third-party/chromium-synchronization/installability-errors-test.js
@@ -5,8 +5,6 @@
  */
 'use strict';
 
-import {jest} from '@jest/globals';
-
 import fetch from 'node-fetch';
 
 import {UIStrings} from '../../lighthouse-core/audits/installable-manifest.js';

From 20268fd8482b64a8d49d2dbc75d3746824db352d Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Wed, 29 Jun 2022 16:55:28 -0700
Subject: [PATCH 68/96] rm

---
 jest.config.cjs | 30 ------------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 jest.config.cjs

diff --git a/jest.config.cjs b/jest.config.cjs
deleted file mode 100644
index a37e41992c7c..000000000000
--- a/jest.config.cjs
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @license Copyright 2018 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';
-
-module.exports = {
-  setupFilesAfterEnv: ['./lighthouse-core/test/jest-setup/setup.js'],
-  testEnvironment: 'node',
-  testMatch: [
-    '**/lighthouse-core/**/*-test.js',
-    '**/lighthouse-cli/**/*-test.js',
-    '**/report/**/*-test.js',
-    '**/lighthouse-core/test/fraggle-rock/**/*-test-pptr.js',
-    '**/treemap/**/*-test.js',
-    '**/viewer/**/*-test.js',
-    '**/third-party/**/*-test.js',
-    '**/clients/test/**/*-test.js',
-    '**/shared/**/*-test.js',
-    '**/build/**/*-test.js',
-  ],
-  modulePathIgnorePatterns: ['<rootDir>/.tmp'],
-  transform: {},
-  prettierPath: null,
-  projects: [
-    '<rootDir>',
-    '<rootDir>/flow-report',
-  ],
-};

From 94c8347b45182050d44ff8bfdb321a1441828399 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Wed, 29 Jun 2022 17:35:47 -0700
Subject: [PATCH 69/96] fix build

---
 build/build-bundle.js | 5 +++++
 esm-utils.mjs         | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/build/build-bundle.js b/build/build-bundle.js
index b6781e62d723..a78113509dbc 100644
--- a/build/build-bundle.js
+++ b/build/build-bundle.js
@@ -178,6 +178,11 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
           export const fileURLToPath = url => url;
           export default {URL, fileURLToPath};
         `,
+        'module': `
+          export const createRequire = () => {
+            throw new Error('createRequire is not supported in bundled Lighthouse');
+          };
+        `,
       }),
       rollupPlugins.json(),
       rollupPlugins.inlineFs({verbose: false}),
diff --git a/esm-utils.mjs b/esm-utils.mjs
index 0b8ce070d341..71f7acad5ebb 100644
--- a/esm-utils.mjs
+++ b/esm-utils.mjs
@@ -6,7 +6,7 @@
 'use strict';
 // TODO(esmodules): rename to .js when root is type: module
 
-import module from 'module';
+import {createRequire} from 'module';
 import url from 'url';
 import path from 'path';
 
@@ -15,7 +15,7 @@ import path from 'path';
  * @param {string} packageName
  */
 function resolveModulePath(packageName) {
-  const require = module.createRequire(import.meta.url);
+  const require = createRequire(import.meta.url);
   return require.resolve(packageName);
 }
 

From dfc5f52b9d2e7bdb35b84a2c14cc09a657660053 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Wed, 29 Jun 2022 17:53:08 -0700
Subject: [PATCH 70/96] fix root.js read json

---
 root.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/root.js b/root.js
index 25183e9bdfe9..5336e1ae356e 100644
--- a/root.js
+++ b/root.js
@@ -9,9 +9,8 @@ import fs from 'fs';
 import path from 'path';
 import {getModuleDirectory} from './esm-utils.mjs';
 
-const pkg = JSON.parse(fs.readFileSync('./package.json', 'utf-8'));
-
 const LH_ROOT = getModuleDirectory(import.meta);
+const pkg = readJson('package.json');
 const lighthouseVersion = pkg.version;
 
 /**

From 03baee45f01cf0012711795bc4f4f8d13bf0e13e Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Wed, 29 Jun 2022 17:59:09 -0700
Subject: [PATCH 71/96] update

---
 root.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root.js b/root.js
index 5336e1ae356e..c387e2b17cda 100644
--- a/root.js
+++ b/root.js
@@ -10,7 +10,7 @@ import path from 'path';
 import {getModuleDirectory} from './esm-utils.mjs';
 
 const LH_ROOT = getModuleDirectory(import.meta);
-const pkg = readJson('package.json');
+const pkg = JSON.parse(fs.readFileSync(`${LH_ROOT}/package.json`, 'utf-8'));
 const lighthouseVersion = pkg.version;
 
 /**

From 67db1078a66131589f8d9f01aad597d9c84d2228 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 30 Jun 2022 13:23:36 -0700
Subject: [PATCH 72/96] fix coverage maybe

---
 .github/workflows/ci.yml   | 2 +-
 .github/workflows/unit.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 537280bb52f8..40acc9eaa768 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
     - name: git clone
       uses: actions/checkout@v2
       with:
-        fetch-depth: 100 
+        fetch-depth: 100
     - run: bash lighthouse-core/scripts/github-actions-commit-range.sh
       env:
         GITHUB_CONTEXT_PR_BASE_SHA: ${{ github.event.pull_request.base.sha }}
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
index ab7c0129f548..c7039d6236f7 100644
--- a/.github/workflows/unit.yml
+++ b/.github/workflows/unit.yml
@@ -60,7 +60,7 @@ jobs:
     - run: sudo apt-get install xvfb
 
     # TODO undo
-    - name: yarn unit-core
+    - name: yarn unit
       if: ${{ matrix.node != env.LATEST_NODE }}
       run: xvfb-run --auto-servernum yarn unit:ci
 
@@ -68,7 +68,7 @@ jobs:
     - name: yarn unit:cicoverage
       if: ${{ matrix.node == env.LATEST_NODE }}
       run: |
-        xvfb-run --auto-servernum yarn unit-core
+        xvfb-run --auto-servernum yarn unit:cicoverage
         yarn c8 report --reporter text-lcov > unit-coverage.lcov
     - name: Upload test coverage to Codecov
       if: ${{ matrix.node == env.LATEST_NODE }}

From c14a91da25524a6a353aa89cc55f9b8c4bb1ac7c Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 30 Jun 2022 15:14:18 -0700
Subject: [PATCH 73/96] disable pubads smoke, fix smokehouse bundle build

---
 build/build-smokehouse-bundle.js             | 5 +++++
 lighthouse-cli/test/smokehouse/core-tests.js | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/build/build-smokehouse-bundle.js b/build/build-smokehouse-bundle.js
index 28cf6e30bc03..2a9bdcc86186 100644
--- a/build/build-smokehouse-bundle.js
+++ b/build/build-smokehouse-bundle.js
@@ -22,6 +22,11 @@ async function main() {
       rollupPlugins.shim({
         [smokehouseCliFilename]:
           'export function runLighthouse() { throw new Error("not supported"); }',
+        'module': `
+          export const createRequire = () => {
+            throw new Error('createRequire is not supported in bundled Lighthouse');
+          };
+        `,
       }),
       rollupPlugins.inlineFs({verbose: Boolean(process.env.DEBUG)}),
       rollupPlugins.commonjs(),
diff --git a/lighthouse-cli/test/smokehouse/core-tests.js b/lighthouse-cli/test/smokehouse/core-tests.js
index da4efe426450..275bac1ca028 100644
--- a/lighthouse-cli/test/smokehouse/core-tests.js
+++ b/lighthouse-cli/test/smokehouse/core-tests.js
@@ -103,7 +103,8 @@ const smokeTests = [
   perfFrameMetrics,
   perfPreload,
   perfTraceElements,
-  pubads,
+  // TODO(esmodules): enable when pubads is bundled again
+  // pubads,
   pwaAirhorner,
   pwaChromestatus,
   pwaSvgomg,

From 60f534d77f2591e82997db28cabc43852aae6361 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 30 Jun 2022 15:23:05 -0700
Subject: [PATCH 74/96] fix test-clients

---
 clients/test/extension/popup-test-pptr.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/clients/test/extension/popup-test-pptr.js b/clients/test/extension/popup-test-pptr.js
index 3dd3892cbc5c..c541e60d7ec8 100644
--- a/clients/test/extension/popup-test-pptr.js
+++ b/clients/test/extension/popup-test-pptr.js
@@ -10,7 +10,9 @@ const puppeteer = require('puppeteer-core');
 const {getChromePath} = require('chrome-launcher');
 const {DEFAULT_CATEGORIES, STORAGE_KEYS} =
   require('../../extension/scripts/settings-controller.js');
-const {LH_ROOT} = require('../../../root.js');
+// const {LH_ROOT} = require('../../../root.js');
+// TODO(esmodules): remove when shared/ is esm
+const LH_ROOT = __dirname + '/../../..';
 
 const lighthouseExtensionPath = path.resolve(LH_ROOT, 'dist/extension-chrome');
 

From 1c9b9414a2e2507729ebff425d624e4eca29da56 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 30 Jun 2022 16:33:07 -0700
Subject: [PATCH 75/96] fix test-docs, add exports field and index.cjs

---
 .../custom-gatherer-puppeteer/custom-audit.js |  4 ++--
 .../custom-config.js                          |  2 +-
 .../custom-gatherer.js                        |  8 +++----
 .../custom-gatherer-puppeteer/package.json    |  1 +
 lighthouse-core/index.cjs                     | 21 +++++++++++++++++++
 package.json                                  |  5 +++++
 tsconfig.json                                 |  1 +
 7 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 lighthouse-core/index.cjs

diff --git a/docs/recipes/custom-gatherer-puppeteer/custom-audit.js b/docs/recipes/custom-gatherer-puppeteer/custom-audit.js
index aacb7ba29eae..bbd3ab18aecc 100644
--- a/docs/recipes/custom-gatherer-puppeteer/custom-audit.js
+++ b/docs/recipes/custom-gatherer-puppeteer/custom-audit.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const Audit = require('lighthouse').Audit;
+import {Audit} from 'lighthouse';
 
 class CustomAudit extends Audit {
   static get meta() {
@@ -31,4 +31,4 @@ class CustomAudit extends Audit {
   }
 }
 
-module.exports = CustomAudit;
+export default CustomAudit;
diff --git a/docs/recipes/custom-gatherer-puppeteer/custom-config.js b/docs/recipes/custom-gatherer-puppeteer/custom-config.js
index 87ac5112967d..5258d7684fff 100644
--- a/docs/recipes/custom-gatherer-puppeteer/custom-config.js
+++ b/docs/recipes/custom-gatherer-puppeteer/custom-config.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-module.exports = {
+export default {
   passes: [{
     passName: 'defaultPass',
     gatherers: [
diff --git a/docs/recipes/custom-gatherer-puppeteer/custom-gatherer.js b/docs/recipes/custom-gatherer-puppeteer/custom-gatherer.js
index 2d405b2813dc..672fbd7b44b7 100644
--- a/docs/recipes/custom-gatherer-puppeteer/custom-gatherer.js
+++ b/docs/recipes/custom-gatherer-puppeteer/custom-gatherer.js
@@ -7,11 +7,11 @@
 
 /* global document */
 
-const Gatherer = require('lighthouse').Gatherer;
-const Puppeteer = require('puppeteer');
+import {Gatherer} from 'lighthouse';
+import puppeteer from 'puppeteer';
 
 async function connect(driver) {
-  const browser = await Puppeteer.connect({
+  const browser = await puppeteer.connect({
     browserWSEndpoint: await driver.wsEndpoint(),
     defaultViewport: null,
   });
@@ -48,4 +48,4 @@ class CustomGatherer extends Gatherer {
   }
 }
 
-module.exports = CustomGatherer;
+export default CustomGatherer;
diff --git a/docs/recipes/custom-gatherer-puppeteer/package.json b/docs/recipes/custom-gatherer-puppeteer/package.json
index 3975aaa3ee55..aed8e948a8b9 100644
--- a/docs/recipes/custom-gatherer-puppeteer/package.json
+++ b/docs/recipes/custom-gatherer-puppeteer/package.json
@@ -1,6 +1,7 @@
 {
   "name": "custom-lighthouse-pptr-recipe",
   "private": true,
+  "type": "module",
   "scripts": {
     "test": "sh test.sh"
   },
diff --git a/lighthouse-core/index.cjs b/lighthouse-core/index.cjs
new file mode 100644
index 000000000000..33fa7357601a
--- /dev/null
+++ b/lighthouse-core/index.cjs
@@ -0,0 +1,21 @@
+/**
+ * @license Copyright 2022 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';
+
+/** @type {import('./index.js')['default']} */
+const lighthouse = async function lighthouse(...args) {
+  const {default: lighthouse} = await import('./index.js');
+  return lighthouse(...args);
+};
+
+/** @type {import('./index.js')['legacyNavigation']} */
+const legacyNavigation = async function legacyNavigation(...args) {
+  const {legacyNavigation} = await import('./index.js');
+  return legacyNavigation(...args);
+};
+
+module.exports = lighthouse;
+module.exports.legacyNavigation = legacyNavigation;
diff --git a/package.json b/package.json
index 0d80fbde06bb..6010e2c486c1 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,11 @@
   "version": "9.5.0",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./lighthouse-core/index.js",
+  "exports": {
+    "import": "./lighthouse-core/index.js",
+    "require": "./lighthouse-core/index.cjs",
+    "*": "./*"
+  },
   "bin": {
     "lighthouse": "./lighthouse-cli/index.js",
     "chrome-debug": "./lighthouse-core/scripts/manual-chrome-launcher.js",
diff --git a/tsconfig.json b/tsconfig.json
index cf016d58cd14..dbf449283edb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,6 +15,7 @@
     "root.js",
     "lighthouse-cli/**/*.js",
     "lighthouse-core/**/*.js",
+    "lighthouse-core/index.cjs",
     "lighthouse-core/util-commonjs.cjs",
     "clients/**/*.js",
     "build/**/*.js",

From c5146c47418237dbd1248cec59394bbf5c63af67 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 30 Jun 2022 16:47:43 -0700
Subject: [PATCH 76/96] fix merge

---
 lighthouse-core/fraggle-rock/gather/session.js | 6 +++---
 lighthouse-core/gather/driver.js               | 7 +++----
 lighthouse-core/lib/navigation-error.js        | 5 ++---
 lighthouse-core/test/lib/asset-saver-test.js   | 5 ++---
 lighthouse-core/test/runner-test.js            | 5 ++---
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/lighthouse-core/fraggle-rock/gather/session.js b/lighthouse-core/fraggle-rock/gather/session.js
index 4e982592f1bb..79dd3e46916c 100644
--- a/lighthouse-core/fraggle-rock/gather/session.js
+++ b/lighthouse-core/fraggle-rock/gather/session.js
@@ -87,10 +87,10 @@ class ProtocolSession extends CrdpEventEmitter {
     const timeoutPromise = new Promise((resolve, reject) => {
       if (timeoutMs === Infinity) return;
 
-      const error = new LighthouseError(LighthouseError.errors.PROTOCOL_TIMEOUT, {
+      // eslint-disable-next-line max-len
+      timeout = setTimeout(reject, timeoutMs, new LighthouseError(LighthouseError.errors.PROTOCOL_TIMEOUT, {
         protocolMethod: method,
-      });
-      timeout = setTimeout(reject, timeoutMs, error);
+      }));
     });
 
     const resultPromise = this._cdpSession.send(method, ...params);
diff --git a/lighthouse-core/gather/driver.js b/lighthouse-core/gather/driver.js
index fdb1684214aa..c2d6b9e7ad97 100644
--- a/lighthouse-core/gather/driver.js
+++ b/lighthouse-core/gather/driver.js
@@ -338,11 +338,10 @@ class Driver {
     let asyncTimeout;
     const timeoutPromise = new Promise((resolve, reject) => {
       if (timeout === Infinity) return;
-
-      const error = new LighthouseError(LighthouseError.errors.PROTOCOL_TIMEOUT, {
+      // eslint-disable-next-line max-len
+      asyncTimeout = setTimeout(reject, timeout, new LighthouseError(LighthouseError.errors.PROTOCOL_TIMEOUT, {
         protocolMethod: method,
-      });
-      asyncTimeout = setTimeout(reject, timeout, error);
+      }));
     });
 
     return Promise.race([
diff --git a/lighthouse-core/lib/navigation-error.js b/lighthouse-core/lib/navigation-error.js
index dbf0189d1a8b..c7217007c6bb 100644
--- a/lighthouse-core/lib/navigation-error.js
+++ b/lighthouse-core/lib/navigation-error.js
@@ -44,9 +44,8 @@ function getNetworkError(mainRecord) {
     ) {
       return new LighthouseError(LighthouseError.errors.DNS_FAILURE);
     } else {
-      return new LighthouseError(LighthouseError.errors.FAILED_DOCUMENT_REQUEST, {
-        errorDetails: netErr,
-      });
+      return new LighthouseError(
+        LighthouseError.errors.FAILED_DOCUMENT_REQUEST, {errorDetails: netErr});
     }
   } else if (mainRecord.hasErrorStatusCode()) {
     return new LighthouseError(LighthouseError.errors.ERRORED_DOCUMENT_REQUEST, {
diff --git a/lighthouse-core/test/lib/asset-saver-test.js b/lighthouse-core/test/lib/asset-saver-test.js
index a45acb4e1b72..453965c7167d 100644
--- a/lighthouse-core/test/lib/asset-saver-test.js
+++ b/lighthouse-core/test/lib/asset-saver-test.js
@@ -294,9 +294,8 @@ describe('asset-saver helper', () => {
     it('round trips artifacts with an LighthouseError member', async () => {
       // Use an LighthouseError that has an ICU replacement.
       const protocolMethod = 'Page.getFastness';
-      const lhError = new LighthouseError(LighthouseError.errors.PROTOCOL_TIMEOUT, {
-        protocolMethod,
-      });
+      const lhError = new LighthouseError(
+        LighthouseError.errors.PROTOCOL_TIMEOUT, {protocolMethod});
 
       const artifacts = {
         traces: {},
diff --git a/lighthouse-core/test/runner-test.js b/lighthouse-core/test/runner-test.js
index b4ae2027e7b1..878372850ac5 100644
--- a/lighthouse-core/test/runner-test.js
+++ b/lighthouse-core/test/runner-test.js
@@ -208,9 +208,8 @@ describe('Runner', () => {
         afterPass(passContext) {
           const warning = str_(i18n.UIStrings.displayValueByteSavings, {wastedBytes: 2222});
           passContext.LighthouseRunWarnings.push(warning);
-          throw new LighthouseError(LighthouseError.errors.UNSUPPORTED_OLD_CHROME, {
-            featureName: 'VRML',
-          });
+          throw new LighthouseError(
+            LighthouseError.errors.UNSUPPORTED_OLD_CHROME, {featureName: 'VRML'});
         }
       }
       const gatherConfig = await Config.fromJson({

From 6edab301d0baca9cad22f8411eafd3569b2506de Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 30 Jun 2022 16:59:25 -0700
Subject: [PATCH 77/96] rm tmp code

---
 .github/workflows/ci.yml       | 2 +-
 .github/workflows/devtools.yml | 2 +-
 .github/workflows/smoke.yml    | 2 +-
 .github/workflows/unit.yml     | 5 +----
 build/build-bundle.js          | 2 --
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 40acc9eaa768..f728479853ba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    # branches: [master]
+    branches: [master]
   pull_request: # run on all PRs, not just PRs to a particular branch
 
 jobs:
diff --git a/.github/workflows/devtools.yml b/.github/workflows/devtools.yml
index c3cd45d9ab2d..4fae5b028e9f 100644
--- a/.github/workflows/devtools.yml
+++ b/.github/workflows/devtools.yml
@@ -2,7 +2,7 @@ name: DevTools
 
 on:
   push:
-    # branches: [master]
+    branches: [master]
   pull_request: # run on all PRs, not just PRs to a particular branch
 
 env:
diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
index 008d2fcb79d4..555cb528c9d5 100644
--- a/.github/workflows/smoke.yml
+++ b/.github/workflows/smoke.yml
@@ -2,7 +2,7 @@ name: smoke
 
 on:
   push:
-    # branches: [master]
+    branches: [master]
   pull_request: # run on all PRs, not just PRs to a particular branch
 
 jobs:
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
index c7039d6236f7..1299e407d86a 100644
--- a/.github/workflows/unit.yml
+++ b/.github/workflows/unit.yml
@@ -2,7 +2,7 @@ name: unit
 
 on:
   push:
-    # branches: [master]
+    branches: [master]
   pull_request: # run on all PRs, not just PRs to a particular branch
 
 jobs:
@@ -11,8 +11,6 @@ jobs:
     strategy:
       matrix:
         node: ['14', '16', '17']
-      # TODO remove
-      fail-fast: false
     runs-on: ubuntu-latest
     name: node ${{ matrix.node }}
     env:
@@ -59,7 +57,6 @@ jobs:
 
     - run: sudo apt-get install xvfb
 
-    # TODO undo
     - name: yarn unit
       if: ${{ matrix.node != env.LATEST_NODE }}
       run: xvfb-run --auto-servernum yarn unit:ci
diff --git a/build/build-bundle.js b/build/build-bundle.js
index cd7b56e112de..f7ed4e717840 100644
--- a/build/build-bundle.js
+++ b/build/build-bundle.js
@@ -157,8 +157,6 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
           // and uses the output name as the url. Instead, do a simpler conversion and use the
           // module path.
           'import.meta': (id) => `{url: '${path.relative(LH_ROOT, id)}'}`,
-          // See esm-utils.js
-          'isBundled = false': 'isBundled = true',
         },
       }),
       rollupPlugins.alias({

From bf8d816949bf839fbb2962b9cd04c2fb44adcfe2 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 30 Jun 2022 17:24:16 -0700
Subject: [PATCH 78/96] fix bundled lh

---
 build/build-bundle.js            | 6 +++++-
 build/build-smokehouse-bundle.js | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/build/build-bundle.js b/build/build-bundle.js
index f7ed4e717840..8398b63e7b1a 100644
--- a/build/build-bundle.js
+++ b/build/build-bundle.js
@@ -179,7 +179,11 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
         `,
         'module': `
           export const createRequire = () => {
-            throw new Error('createRequire is not supported in bundled Lighthouse');
+            return {
+              resolve() {
+                throw new Error('createRequire.resolve is not supported in bundled Lighthouse');
+              },
+            };
           };
         `,
       }),
diff --git a/build/build-smokehouse-bundle.js b/build/build-smokehouse-bundle.js
index 2a9bdcc86186..68fa8515a945 100644
--- a/build/build-smokehouse-bundle.js
+++ b/build/build-smokehouse-bundle.js
@@ -24,7 +24,11 @@ async function main() {
           'export function runLighthouse() { throw new Error("not supported"); }',
         'module': `
           export const createRequire = () => {
-            throw new Error('createRequire is not supported in bundled Lighthouse');
+            return {
+              resolve() {
+                throw new Error('createRequire.resolve is not supported in bundled Lighthouse');
+              },
+            };
           };
         `,
       }),

From c0a4bdb47aab36080d3d51cd675d112c02f25232 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 30 Jun 2022 17:24:24 -0700
Subject: [PATCH 79/96] revert unneeded change

---
 lighthouse-core/config/config.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lighthouse-core/config/config.js b/lighthouse-core/config/config.js
index 743b8caebf2d..bd4369bd9489 100644
--- a/lighthouse-core/config/config.js
+++ b/lighthouse-core/config/config.js
@@ -540,13 +540,11 @@ class Config {
     log.time(status, 'verbose');
 
     const coreList = Runner.getGathererList();
-
-    const fullPasses = [];
-    for (const pass of passes) {
-      const gathererDefns = [];
-      for (const gatherer of pass.gatherers) {
-        gathererDefns.push(await resolveGathererToDefn(gatherer, coreList, configDir));
-      }
+    const fullPassesPromises = passes.map(async (pass) => {
+      const gathererDefns = await Promise.all(
+        pass.gatherers
+          .map(gatherer => resolveGathererToDefn(gatherer, coreList, configDir))
+      );
 
       // De-dupe gatherers by artifact name because artifact IDs must be unique at runtime.
       const uniqueDefns = Array.from(
@@ -554,8 +552,9 @@ class Config {
       );
       uniqueDefns.forEach(gatherer => assertValidGatherer(gatherer.instance, gatherer.path));
 
-      fullPasses.push(Object.assign(pass, {gatherers: uniqueDefns}));
-    }
+      return Object.assign(pass, {gatherers: uniqueDefns});
+    });
+    const fullPasses = await Promise.all(fullPassesPromises);
 
     log.timeEnd(status);
     return fullPasses;

From 8140ad030eab2681f278057cced63f880e8e924f Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Thu, 30 Jun 2022 17:42:20 -0700
Subject: [PATCH 80/96] undo change

---
 lighthouse-core/config/config-helpers.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lighthouse-core/config/config-helpers.js b/lighthouse-core/config/config-helpers.js
index 0a71ee956341..4630a99a80e7 100644
--- a/lighthouse-core/config/config-helpers.js
+++ b/lighthouse-core/config/config-helpers.js
@@ -428,8 +428,7 @@ async function resolveAuditsToDefns(audits, configDir) {
   }
 
   const coreList = Runner.getAuditList();
-  const auditDefns = [];
-  for (const auditJson of audits) {
+  const auditDefnsPromises = audits.map(async (auditJson) => {
     const auditDefn = expandAuditShorthand(auditJson);
     let implementation;
     if ('implementation' in auditDefn) {
@@ -438,12 +437,13 @@ async function resolveAuditsToDefns(audits, configDir) {
       implementation = await requireAudit(auditDefn.path, coreList, configDir);
     }
 
-    auditDefns.push({
+    return {
       implementation,
       path: auditDefn.path,
       options: auditDefn.options || {},
-    });
-  }
+    };
+  });
+  const auditDefns = await Promise.all(auditDefnsPromises);
 
   const mergedAuditDefns = mergeOptionsOfItems(auditDefns);
   mergedAuditDefns.forEach(audit => validation.assertValidAudit(audit));
@@ -506,7 +506,7 @@ function resolveModulePath(moduleIdentifier, configDir, category) {
 
   const errorString = 'Unable to locate ' + (category ? `${category}: ` : '') +
     `\`${moduleIdentifier}\`.
-     Tried to require() from these locations:
+     Tried to resolve the module from these locations:
        ${getModuleDirectory(import.meta)}
        ${cwdPath}`;
 

From d1568eac8a25977b00f1e62e50ca8310a5019608 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 1 Jul 2022 16:10:35 -0700
Subject: [PATCH 81/96] remove pkg.exports and update recipes

---
 docs/recipes/auth/example-lh-auth.js          | 17 ++++++------
 docs/recipes/auth/package.json                |  2 ++
 docs/recipes/auth/server/server.js            | 26 ++++++++++++-------
 docs/recipes/custom-audit/custom-config.js    |  2 +-
 docs/recipes/custom-audit/package.json        |  1 +
 docs/recipes/custom-audit/searchable-audit.js |  4 +--
 .../custom-audit/searchable-gatherer.js       |  4 +--
 docs/recipes/gulp/gulpfile.js                 | 10 ++++---
 docs/recipes/gulp/package.json                |  3 ++-
 .../integration-test/example-lh-auth.test.js  | 12 +++++----
 docs/recipes/integration-test/package.json    |  1 +
 .../audits/preload-as.js                      |  4 +--
 .../lighthouse-plugin-example/package.json    |  1 +
 .../lighthouse-plugin-example/plugin.js       |  2 +-
 package.json                                  |  5 ----
 15 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/docs/recipes/auth/example-lh-auth.js b/docs/recipes/auth/example-lh-auth.js
index 7f892b70fde6..4b0c66ed69e1 100644
--- a/docs/recipes/auth/example-lh-auth.js
+++ b/docs/recipes/auth/example-lh-auth.js
@@ -10,8 +10,9 @@
  * See docs/recipes/auth/README.md for more.
  */
 
-const puppeteer = require('puppeteer');
-const lighthouse = require('lighthouse');
+import puppeteer from 'puppeteer';
+import lighthouse from 'lighthouse';
+import esMain from 'es-main';
 
 // This port will be used by Lighthouse later. The specific port is arbitrary.
 const PORT = 8041;
@@ -71,11 +72,11 @@ async function main() {
   console.log(JSON.stringify(result.lhr, null, 2));
 }
 
-if (require.main === module) {
+if (esMain(import.meta)) {
   main();
-} else {
-  module.exports = {
-    login,
-    logout,
-  };
 }
+
+export {
+  login,
+  logout,
+};
diff --git a/docs/recipes/auth/package.json b/docs/recipes/auth/package.json
index 74fd7c3cf90e..f06949f688f0 100644
--- a/docs/recipes/auth/package.json
+++ b/docs/recipes/auth/package.json
@@ -1,9 +1,11 @@
 {
   "private": true,
+  "type": "module",
   "scripts": {
     "start": "node server/server.js"
   },
   "dependencies": {
+    "es-main": "^1.2.0",
     "express": "^4.17.1",
     "express-session": "^1.16.2",
     "lighthouse": "file:../../../dist/lighthouse.tgz",
diff --git a/docs/recipes/auth/server/server.js b/docs/recipes/auth/server/server.js
index 77553b47f81c..9d7cd516f3c9 100644
--- a/docs/recipes/auth/server/server.js
+++ b/docs/recipes/auth/server/server.js
@@ -10,13 +10,18 @@
  * page. See docs/recipes/auth/README.md for more.
  */
 
-const createError = require('http-errors');
-const express = require('express');
-const morgan = require('morgan');
-const session = require('express-session');
-const http = require('http');
-const path = require('path');
-const PUBLIC_DIR = path.join(__dirname, 'public');
+import createError from 'http-errors';
+
+import express from 'express';
+import morgan from 'morgan';
+import session from 'express-session';
+import http from 'http';
+import path from 'path';
+import url from 'url';
+import esMain from 'es-main';
+
+const moduleDir = path.dirname(url.fileURLToPath(import.meta.url));
+const PUBLIC_DIR = path.join(moduleDir, 'public');
 
 const app = express();
 
@@ -78,8 +83,9 @@ app.use(function(err, req, res, next) {
 });
 
 const server = http.createServer(app);
-if (require.main === module) {
+
+if (esMain(import.meta)) {
   server.listen(10632);
-} else {
-  module.exports = server;
 }
+
+export default server;
diff --git a/docs/recipes/custom-audit/custom-config.js b/docs/recipes/custom-audit/custom-config.js
index 226ca7184480..f588f6c3085b 100644
--- a/docs/recipes/custom-audit/custom-config.js
+++ b/docs/recipes/custom-audit/custom-config.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-module.exports = {
+export default {
   // 1. Run your custom tests along with all the default Lighthouse tests.
   extends: 'lighthouse:default',
 
diff --git a/docs/recipes/custom-audit/package.json b/docs/recipes/custom-audit/package.json
index 49de8347d904..0e8af2e02951 100644
--- a/docs/recipes/custom-audit/package.json
+++ b/docs/recipes/custom-audit/package.json
@@ -1,6 +1,7 @@
 {
   "name": "custom-lighthouse-recipe",
   "private": true,
+  "type": "module",
   "scripts": {},
   "devDependencies": {
     "lighthouse": "^9.5.0"
diff --git a/docs/recipes/custom-audit/searchable-audit.js b/docs/recipes/custom-audit/searchable-audit.js
index 31809b43da51..0636d67a853d 100644
--- a/docs/recipes/custom-audit/searchable-audit.js
+++ b/docs/recipes/custom-audit/searchable-audit.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const Audit = require('lighthouse').Audit;
+import {Audit} from 'lighthouse';
 
 const MAX_SEARCHABLE_TIME = 4000;
 
@@ -43,4 +43,4 @@ class LoadAudit extends Audit {
   }
 }
 
-module.exports = LoadAudit;
+export default LoadAudit;
diff --git a/docs/recipes/custom-audit/searchable-gatherer.js b/docs/recipes/custom-audit/searchable-gatherer.js
index ed6470c3f562..e20718d4c73d 100644
--- a/docs/recipes/custom-audit/searchable-gatherer.js
+++ b/docs/recipes/custom-audit/searchable-gatherer.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const Gatherer = require('lighthouse').Gatherer;
+import {Gatherer} from 'lighthouse';
 
 /**
  * @fileoverview Extracts `window.myLoadMetrics` from the test page.
@@ -29,4 +29,4 @@ class TimeToSearchable extends Gatherer {
   }
 }
 
-module.exports = TimeToSearchable;
+export default TimeToSearchable;
diff --git a/docs/recipes/gulp/gulpfile.js b/docs/recipes/gulp/gulpfile.js
index e16e9ce653bd..0d95ea457897 100644
--- a/docs/recipes/gulp/gulpfile.js
+++ b/docs/recipes/gulp/gulpfile.js
@@ -6,10 +6,12 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 
-const gulp = require('gulp');
-const connect = require('gulp-connect');
-const lighthouse = require('lighthouse');
-const chromeLauncher = require('chrome-launcher');
+import gulp from 'gulp';
+
+import connect from 'gulp-connect';
+import lighthouse from 'lighthouse';
+import chromeLauncher from 'chrome-launcher';
+
 const PORT = 8080;
 
 /**
diff --git a/docs/recipes/gulp/package.json b/docs/recipes/gulp/package.json
index d8e6455220ff..68e5e7415c0b 100644
--- a/docs/recipes/gulp/package.json
+++ b/docs/recipes/gulp/package.json
@@ -1,12 +1,13 @@
 {
   "name": "gulp-lighthouse-recipe",
   "private": true,
+  "type": "module",
   "scripts": {
     "start": "gulp"
   },
   "devDependencies": {
     "gulp": "^3.9.1",
     "gulp-connect": "^5.0.0",
-    "lighthouse": "^9.5.0"
+    "lighthouse": "file:../../../dist/lighthouse.tgz"
   }
 }
diff --git a/docs/recipes/integration-test/example-lh-auth.test.js b/docs/recipes/integration-test/example-lh-auth.test.js
index 029ba62607cd..44fddf939305 100644
--- a/docs/recipes/integration-test/example-lh-auth.test.js
+++ b/docs/recipes/integration-test/example-lh-auth.test.js
@@ -4,6 +4,7 @@
  * 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';
+
 /* eslint-disable new-cap */
 
 /**
@@ -13,11 +14,12 @@
 
 /** @typedef {import('lighthouse/types/lhr')} LH */
 
-const puppeteer = require('puppeteer');
-const lighthouse = require('lighthouse');
-const {expect} = require('expect');
-const server = require('../auth/server/server.js');
-const {login, logout} = require('../auth/example-lh-auth.js');
+import puppeteer from 'puppeteer';
+
+import lighthouse from 'lighthouse';
+import {expect} from 'expect';
+import server from '../auth/server/server.js';
+import {login, logout} from '../auth/example-lh-auth.js';
 
 const CHROME_DEBUG_PORT = 8042;
 const SERVER_PORT = 10632;
diff --git a/docs/recipes/integration-test/package.json b/docs/recipes/integration-test/package.json
index 2fe386a94acf..e91cef0837bc 100644
--- a/docs/recipes/integration-test/package.json
+++ b/docs/recipes/integration-test/package.json
@@ -1,5 +1,6 @@
 {
   "private": true,
+  "type": "module",
   "scripts": {
     "test": "mocha --timeout 30000 example-lh-auth.test.js"
   },
diff --git a/docs/recipes/lighthouse-plugin-example/audits/preload-as.js b/docs/recipes/lighthouse-plugin-example/audits/preload-as.js
index 83bdf59f88d4..9fad62553921 100644
--- a/docs/recipes/lighthouse-plugin-example/audits/preload-as.js
+++ b/docs/recipes/lighthouse-plugin-example/audits/preload-as.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const Audit = require('lighthouse').Audit;
+import {Audit} from 'lighthouse';
 
 /**
  * @fileoverview A fake additional check of the robots.txt file.
@@ -43,4 +43,4 @@ class PreloadAsAudit extends Audit {
   }
 }
 
-module.exports = PreloadAsAudit;
+export default PreloadAsAudit;
diff --git a/docs/recipes/lighthouse-plugin-example/package.json b/docs/recipes/lighthouse-plugin-example/package.json
index 68ee2cf7a274..3bc28f364858 100644
--- a/docs/recipes/lighthouse-plugin-example/package.json
+++ b/docs/recipes/lighthouse-plugin-example/package.json
@@ -1,6 +1,7 @@
 {
   "name": "lighthouse-plugin-example",
   "private": true,
+  "type": "module",
   "main": "./plugin.js",
   "peerDependencies": {
     "lighthouse": "^9.5.0"
diff --git a/docs/recipes/lighthouse-plugin-example/plugin.js b/docs/recipes/lighthouse-plugin-example/plugin.js
index 8169004b6186..478f39b0d16e 100644
--- a/docs/recipes/lighthouse-plugin-example/plugin.js
+++ b/docs/recipes/lighthouse-plugin-example/plugin.js
@@ -6,7 +6,7 @@
 'use strict';
 
 /** @type {LH.Config.Plugin} */
-module.exports = {
+export default {
   // Additional audit to run on information Lighthouse gathered.
   audits: [{
     path: 'lighthouse-plugin-example/audits/preload-as.js',
diff --git a/package.json b/package.json
index 6010e2c486c1..0d80fbde06bb 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,6 @@
   "version": "9.5.0",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./lighthouse-core/index.js",
-  "exports": {
-    "import": "./lighthouse-core/index.js",
-    "require": "./lighthouse-core/index.cjs",
-    "*": "./*"
-  },
   "bin": {
     "lighthouse": "./lighthouse-cli/index.js",
     "chrome-debug": "./lighthouse-core/scripts/manual-chrome-launcher.js",

From b7fe3ee0a122775697a0b5c035c35506b38d983c Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 1 Jul 2022 16:16:16 -0700
Subject: [PATCH 82/96] util.cjs

---
 lighthouse-core/audits/audit.js               |   2 +-
 lighthouse-core/computed/resource-summary.js  |   2 +-
 lighthouse-core/lib/url-shim.js               |   2 +-
 lighthouse-core/scripts/copy-util-commonjs.sh |   2 +-
 .../scripts/i18n/collect-strings.js           |   2 +-
 lighthouse-core/util-commonjs.cjs             | 710 ------------------
 .../{util-commonjs.js => util.cjs}            |   0
 tsconfig.json                                 |   2 +-
 8 files changed, 6 insertions(+), 716 deletions(-)
 delete mode 100644 lighthouse-core/util-commonjs.cjs
 rename lighthouse-core/{util-commonjs.js => util.cjs} (100%)

diff --git a/lighthouse-core/audits/audit.js b/lighthouse-core/audits/audit.js
index 54eb68597d6d..9fe32cf46230 100644
--- a/lighthouse-core/audits/audit.js
+++ b/lighthouse-core/audits/audit.js
@@ -7,7 +7,7 @@
 
 import {isUnderTest} from '../lib/lh-env.js';
 import * as statistics from '../lib/statistics.js';
-import {Util} from '../util-commonjs.cjs';
+import {Util} from '../util.cjs';
 
 const DEFAULT_PASS = 'defaultPass';
 
diff --git a/lighthouse-core/computed/resource-summary.js b/lighthouse-core/computed/resource-summary.js
index 105921671fcd..61e905d322a6 100644
--- a/lighthouse-core/computed/resource-summary.js
+++ b/lighthouse-core/computed/resource-summary.js
@@ -10,7 +10,7 @@ import NetworkRecords from './network-records.js';
 import URL from '../lib/url-shim.js';
 import {NetworkRequest} from '../lib/network-request.js';
 import {Budget} from '../config/budget.js';
-import {Util} from '../util-commonjs.cjs';
+import {Util} from '../util.cjs';
 
 /** @typedef {{count: number, resourceSize: number, transferSize: number}} ResourceEntry */
 
diff --git a/lighthouse-core/lib/url-shim.js b/lighthouse-core/lib/url-shim.js
index ce1715db00e6..38edb18b6907 100644
--- a/lighthouse-core/lib/url-shim.js
+++ b/lighthouse-core/lib/url-shim.js
@@ -9,7 +9,7 @@
  * URL shim so we keep our code DRY
  */
 
-import {Util} from '../util-commonjs.cjs';
+import {Util} from '../util.cjs';
 
 import {LighthouseError} from '../lib/lh-error.js';
 
diff --git a/lighthouse-core/scripts/copy-util-commonjs.sh b/lighthouse-core/scripts/copy-util-commonjs.sh
index c57b9e06d23a..5ee4f5d720c6 100644
--- a/lighthouse-core/scripts/copy-util-commonjs.sh
+++ b/lighthouse-core/scripts/copy-util-commonjs.sh
@@ -11,7 +11,7 @@
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 LH_ROOT_DIR="$SCRIPT_DIR/../.."
 
-OUT_FILE="$LH_ROOT_DIR"/lighthouse-core/util-commonjs.js
+OUT_FILE="$LH_ROOT_DIR"/lighthouse-core/util.cjs
 
 echo '// @ts-nocheck' > "$OUT_FILE"
 echo '// Auto-generated by lighthouse-core/scripts/copy-util-commonjs.sh' >> "$OUT_FILE"
diff --git a/lighthouse-core/scripts/i18n/collect-strings.js b/lighthouse-core/scripts/i18n/collect-strings.js
index 7e2b63f521de..91b280048120 100644
--- a/lighthouse-core/scripts/i18n/collect-strings.js
+++ b/lighthouse-core/scripts/i18n/collect-strings.js
@@ -16,7 +16,7 @@ import tsc from 'typescript';
 import MessageParser from 'intl-messageformat-parser';
 import esMain from 'es-main';
 
-import {Util} from '../../util-commonjs.cjs';
+import {Util} from '../../util.cjs';
 import {collectAndBakeCtcStrings} from './bake-ctc-to-lhl.js';
 import {pruneObsoleteLhlMessages} from './prune-obsolete-lhl-messages.js';
 import {countTranslatedMessages} from './count-translated.js';
diff --git a/lighthouse-core/util-commonjs.cjs b/lighthouse-core/util-commonjs.cjs
deleted file mode 100644
index 22d49d53585f..000000000000
--- a/lighthouse-core/util-commonjs.cjs
+++ /dev/null
@@ -1,710 +0,0 @@
-// @ts-nocheck
-// Auto-generated by lighthouse-core/scripts/copy-util-commonjs.sh
-// Temporary solution until all our code uses esmodules
-'use strict';
-/**
- * @license
- * Copyright 2017 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.
- */
-
-/** @template T @typedef {import('./i18n').I18n<T>} I18n */
-
-const ELLIPSIS = '\u2026';
-const NBSP = '\xa0';
-const PASS_THRESHOLD = 0.9;
-const SCREENSHOT_PREFIX = 'data:image/jpeg;base64,';
-
-const RATINGS = {
-  PASS: {label: 'pass', minScore: PASS_THRESHOLD},
-  AVERAGE: {label: 'average', minScore: 0.5},
-  FAIL: {label: 'fail'},
-  ERROR: {label: 'error'},
-};
-
-// 25 most used tld plus one domains (aka public suffixes) from http archive.
-// @see https://github.com/GoogleChrome/lighthouse/pull/5065#discussion_r191926212
-// The canonical list is https://publicsuffix.org/learn/ but we're only using subset to conserve bytes
-const listOfTlds = [
-  'com', 'co', 'gov', 'edu', 'ac', 'org', 'go', 'gob', 'or', 'net', 'in', 'ne', 'nic', 'gouv',
-  'web', 'spb', 'blog', 'jus', 'kiev', 'mil', 'wi', 'qc', 'ca', 'bel', 'on',
-];
-
-class Util {
-  /** @type {I18n<typeof UIStrings>} */
-  // @ts-expect-error: Is set in report renderer.
-  static i18n = null;
-
-  static get PASS_THRESHOLD() {
-    return PASS_THRESHOLD;
-  }
-
-  static get MS_DISPLAY_VALUE() {
-    return `%10d${NBSP}ms`;
-  }
-
-  /**
-   * Returns a new LHR that's reshaped for slightly better ergonomics within the report rendereer.
-   * Also, sets up the localized UI strings used within renderer and makes changes to old LHRs to be
-   * compatible with current renderer.
-   * The LHR passed in is not mutated.
-   * TODO(team): we all agree the LHR shape change is technical debt we should fix
-   * @param {LH.Result} result
-   * @return {LH.ReportResult}
-   */
-  static prepareReportResult(result) {
-    // If any mutations happen to the report within the renderers, we want the original object untouched
-    const clone = /** @type {LH.ReportResult} */ (JSON.parse(JSON.stringify(result)));
-
-    // If LHR is older (≤3.0.3), it has no locale setting. Set default.
-    if (!clone.configSettings.locale) {
-      clone.configSettings.locale = 'en';
-    }
-    if (!clone.configSettings.formFactor) {
-      // @ts-expect-error fallback handling for emulatedFormFactor
-      clone.configSettings.formFactor = clone.configSettings.emulatedFormFactor;
-    }
-
-    for (const audit of Object.values(clone.audits)) {
-      // Turn 'not-applicable' (LHR <4.0) and 'not_applicable' (older proto versions)
-      // into 'notApplicable' (LHR ≥4.0).
-      // @ts-expect-error tsc rightly flags that these values shouldn't occur.
-      // eslint-disable-next-line max-len
-      if (audit.scoreDisplayMode === 'not_applicable' || audit.scoreDisplayMode === 'not-applicable') {
-        audit.scoreDisplayMode = 'notApplicable';
-      }
-
-      if (audit.details) {
-        // Turn `auditDetails.type` of undefined (LHR <4.2) and 'diagnostic' (LHR <5.0)
-        // into 'debugdata' (LHR ≥5.0).
-        // @ts-expect-error tsc rightly flags that these values shouldn't occur.
-        if (audit.details.type === undefined || audit.details.type === 'diagnostic') {
-          // @ts-expect-error details is of type never.
-          audit.details.type = 'debugdata';
-        }
-
-        // Add the jpg data URL prefix to filmstrip screenshots without them (LHR <5.0).
-        if (audit.details.type === 'filmstrip') {
-          for (const screenshot of audit.details.items) {
-            if (!screenshot.data.startsWith(SCREENSHOT_PREFIX)) {
-              screenshot.data = SCREENSHOT_PREFIX + screenshot.data;
-            }
-          }
-        }
-      }
-    }
-
-    // For convenience, smoosh all AuditResults into their auditRef (which has just weight & group)
-    if (typeof clone.categories !== 'object') throw new Error('No categories provided.');
-
-    /** @type {Map<string, Array<LH.ReportResult.AuditRef>>} */
-    const relevantAuditToMetricsMap = new Map();
-
-    // This backcompat converts old LHRs (<9.0.0) to use the new "hidden" group.
-    // Old LHRs used "no group" to identify audits that should be hidden in performance instead of the "hidden" group.
-    // Newer LHRs use "no group" to identify opportunities and diagnostics whose groups are assigned by details type.
-    const [majorVersion] = clone.lighthouseVersion.split('.').map(Number);
-    const perfCategory = clone.categories['performance'];
-    if (majorVersion < 9 && perfCategory) {
-      if (!clone.categoryGroups) clone.categoryGroups = {};
-      clone.categoryGroups['hidden'] = {title: ''};
-      for (const auditRef of perfCategory.auditRefs) {
-        if (!auditRef.group) {
-          auditRef.group = 'hidden';
-        } else if (['load-opportunities', 'diagnostics'].includes(auditRef.group)) {
-          delete auditRef.group;
-        }
-      }
-    }
-
-    for (const category of Object.values(clone.categories)) {
-      // Make basic lookup table for relevantAudits
-      category.auditRefs.forEach(metricRef => {
-        if (!metricRef.relevantAudits) return;
-        metricRef.relevantAudits.forEach(auditId => {
-          const arr = relevantAuditToMetricsMap.get(auditId) || [];
-          arr.push(metricRef);
-          relevantAuditToMetricsMap.set(auditId, arr);
-        });
-      });
-
-      category.auditRefs.forEach(auditRef => {
-        const result = clone.audits[auditRef.id];
-        auditRef.result = result;
-
-        // Attach any relevantMetric auditRefs
-        if (relevantAuditToMetricsMap.has(auditRef.id)) {
-          auditRef.relevantMetrics = relevantAuditToMetricsMap.get(auditRef.id);
-        }
-
-        // attach the stackpacks to the auditRef object
-        if (clone.stackPacks) {
-          clone.stackPacks.forEach(pack => {
-            if (pack.descriptions[auditRef.id]) {
-              auditRef.stackPacks = auditRef.stackPacks || [];
-              auditRef.stackPacks.push({
-                title: pack.title,
-                iconDataURL: pack.iconDataURL,
-                description: pack.descriptions[auditRef.id],
-              });
-            }
-          });
-        }
-      });
-    }
-
-    return clone;
-  }
-
-  /**
-   * Used to determine if the "passed" for the purposes of showing up in the "failed" or "passed"
-   * sections of the report.
-   *
-   * @param {{score: (number|null), scoreDisplayMode: string}} audit
-   * @return {boolean}
-   */
-  static showAsPassed(audit) {
-    switch (audit.scoreDisplayMode) {
-      case 'manual':
-      case 'notApplicable':
-        return true;
-      case 'error':
-      case 'informative':
-        return false;
-      case 'numeric':
-      case 'binary':
-      default:
-        return Number(audit.score) >= RATINGS.PASS.minScore;
-    }
-  }
-
-  /**
-   * Convert a score to a rating label.
-   * TODO: Return `'error'` for `score === null && !scoreDisplayMode`.
-   *
-   * @param {number|null} score
-   * @param {string=} scoreDisplayMode
-   * @return {string}
-   */
-  static calculateRating(score, scoreDisplayMode) {
-    // Handle edge cases first, manual and not applicable receive 'pass', errored audits receive 'error'
-    if (scoreDisplayMode === 'manual' || scoreDisplayMode === 'notApplicable') {
-      return RATINGS.PASS.label;
-    } else if (scoreDisplayMode === 'error') {
-      return RATINGS.ERROR.label;
-    } else if (score === null) {
-      return RATINGS.FAIL.label;
-    }
-
-    // At this point, we're rating a standard binary/numeric audit
-    let rating = RATINGS.FAIL.label;
-    if (score >= RATINGS.PASS.minScore) {
-      rating = RATINGS.PASS.label;
-    } else if (score >= RATINGS.AVERAGE.minScore) {
-      rating = RATINGS.AVERAGE.label;
-    }
-    return rating;
-  }
-
-  /**
-   * Split a string by markdown code spans (enclosed in `backticks`), splitting
-   * into segments that were enclosed in backticks (marked as `isCode === true`)
-   * and those that outside the backticks (`isCode === false`).
-   * @param {string} text
-   * @return {Array<{isCode: true, text: string}|{isCode: false, text: string}>}
-   */
-  static splitMarkdownCodeSpans(text) {
-    /** @type {Array<{isCode: true, text: string}|{isCode: false, text: string}>} */
-    const segments = [];
-
-    // Split on backticked code spans.
-    const parts = text.split(/`(.*?)`/g);
-    for (let i = 0; i < parts.length; i ++) {
-      const text = parts[i];
-
-      // Empty strings are an artifact of splitting, not meaningful.
-      if (!text) continue;
-
-      // Alternates between plain text and code segments.
-      const isCode = i % 2 !== 0;
-      segments.push({
-        isCode,
-        text,
-      });
-    }
-
-    return segments;
-  }
-
-  /**
-   * Split a string on markdown links (e.g. [some link](https://...)) into
-   * segments of plain text that weren't part of a link (marked as
-   * `isLink === false`), and segments with text content and a URL that did make
-   * up a link (marked as `isLink === true`).
-   * @param {string} text
-   * @return {Array<{isLink: true, text: string, linkHref: string}|{isLink: false, text: string}>}
-   */
-  static splitMarkdownLink(text) {
-    /** @type {Array<{isLink: true, text: string, linkHref: string}|{isLink: false, text: string}>} */
-    const segments = [];
-
-    const parts = text.split(/\[([^\]]+?)\]\((https?:\/\/.*?)\)/g);
-    while (parts.length) {
-      // Shift off the same number of elements as the pre-split and capture groups.
-      const [preambleText, linkText, linkHref] = parts.splice(0, 3);
-
-      if (preambleText) { // Skip empty text as it's an artifact of splitting, not meaningful.
-        segments.push({
-          isLink: false,
-          text: preambleText,
-        });
-      }
-
-      // Append link if there are any.
-      if (linkText && linkHref) {
-        segments.push({
-          isLink: true,
-          text: linkText,
-          linkHref,
-        });
-      }
-    }
-
-    return segments;
-  }
-
-  /**
-   * @param {URL} parsedUrl
-   * @param {{numPathParts?: number, preserveQuery?: boolean, preserveHost?: boolean}=} options
-   * @return {string}
-   */
-  static getURLDisplayName(parsedUrl, options) {
-    // Closure optional properties aren't optional in tsc, so fallback needs undefined  values.
-    options = options || {numPathParts: undefined, preserveQuery: undefined,
-      preserveHost: undefined};
-    const numPathParts = options.numPathParts !== undefined ? options.numPathParts : 2;
-    const preserveQuery = options.preserveQuery !== undefined ? options.preserveQuery : true;
-    const preserveHost = options.preserveHost || false;
-
-    let name;
-
-    if (parsedUrl.protocol === 'about:' || parsedUrl.protocol === 'data:') {
-      // Handle 'about:*' and 'data:*' URLs specially since they have no path.
-      name = parsedUrl.href;
-    } else {
-      name = parsedUrl.pathname;
-      const parts = name.split('/').filter(part => part.length);
-      if (numPathParts && parts.length > numPathParts) {
-        name = ELLIPSIS + parts.slice(-1 * numPathParts).join('/');
-      }
-
-      if (preserveHost) {
-        name = `${parsedUrl.host}/${name.replace(/^\//, '')}`;
-      }
-      if (preserveQuery) {
-        name = `${name}${parsedUrl.search}`;
-      }
-    }
-
-    const MAX_LENGTH = 64;
-    if (parsedUrl.protocol !== 'data:') {
-      // Always elide hexadecimal hash
-      name = name.replace(/([a-f0-9]{7})[a-f0-9]{13}[a-f0-9]*/g, `$1${ELLIPSIS}`);
-      // Also elide other hash-like mixed-case strings
-      name = name.replace(/([a-zA-Z0-9-_]{9})(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])[a-zA-Z0-9-_]{10,}/g,
-        `$1${ELLIPSIS}`);
-      // Also elide long number sequences
-      name = name.replace(/(\d{3})\d{6,}/g, `$1${ELLIPSIS}`);
-      // Merge any adjacent ellipses
-      name = name.replace(/\u2026+/g, ELLIPSIS);
-
-      // Elide query params first
-      if (name.length > MAX_LENGTH && name.includes('?')) {
-        // Try to leave the first query parameter intact
-        name = name.replace(/\?([^=]*)(=)?.*/, `?$1$2${ELLIPSIS}`);
-
-        // Remove it all if it's still too long
-        if (name.length > MAX_LENGTH) {
-          name = name.replace(/\?.*/, `?${ELLIPSIS}`);
-        }
-      }
-    }
-
-    // Elide too long names next
-    if (name.length > MAX_LENGTH) {
-      const dotIndex = name.lastIndexOf('.');
-      if (dotIndex >= 0) {
-        name = name.slice(0, MAX_LENGTH - 1 - (name.length - dotIndex)) +
-          // Show file extension
-          `${ELLIPSIS}${name.slice(dotIndex)}`;
-      } else {
-        name = name.slice(0, MAX_LENGTH - 1) + ELLIPSIS;
-      }
-    }
-
-    return name;
-  }
-
-  /**
-   * Split a URL into a file, hostname and origin for easy display.
-   * @param {string} url
-   * @return {{file: string, hostname: string, origin: string}}
-   */
-  static parseURL(url) {
-    const parsedUrl = new URL(url);
-    return {
-      file: Util.getURLDisplayName(parsedUrl),
-      hostname: parsedUrl.hostname,
-      origin: parsedUrl.origin,
-    };
-  }
-
-  /**
-   * @param {string|URL} value
-   * @return {!URL}
-   */
-  static createOrReturnURL(value) {
-    if (value instanceof URL) {
-      return value;
-    }
-
-    return new URL(value);
-  }
-
-  /**
-   * Gets the tld of a domain
-   *
-   * @param {string} hostname
-   * @return {string} tld
-   */
-  static getTld(hostname) {
-    const tlds = hostname.split('.').slice(-2);
-
-    if (!listOfTlds.includes(tlds[0])) {
-      return `.${tlds[tlds.length - 1]}`;
-    }
-
-    return `.${tlds.join('.')}`;
-  }
-
-  /**
-   * Returns a primary domain for provided hostname (e.g. www.example.com -> example.com).
-   * @param {string|URL} url hostname or URL object
-   * @return {string}
-   */
-  static getRootDomain(url) {
-    const hostname = Util.createOrReturnURL(url).hostname;
-    const tld = Util.getTld(hostname);
-
-    // tld is .com or .co.uk which means we means that length is 1 to big
-    // .com => 2 & .co.uk => 3
-    const splitTld = tld.split('.');
-
-    // get TLD + root domain
-    return hostname.split('.').slice(-splitTld.length).join('.');
-  }
-
-
-  /**
-   * @param {LH.Result['configSettings']} settings
-   * @return {!{deviceEmulation: string, networkThrottling: string, cpuThrottling: string, summary: string}}
-   */
-  static getEmulationDescriptions(settings) {
-    let cpuThrottling;
-    let networkThrottling;
-    let summary;
-
-    const throttling = settings.throttling;
-
-    switch (settings.throttlingMethod) {
-      case 'provided':
-        summary = networkThrottling = cpuThrottling = Util.i18n.strings.throttlingProvided;
-        break;
-      case 'devtools': {
-        const {cpuSlowdownMultiplier, requestLatencyMs} = throttling;
-        // eslint-disable-next-line max-len
-        cpuThrottling = `${Util.i18n.formatNumber(cpuSlowdownMultiplier)}x slowdown (DevTools)`;
-        networkThrottling = `${Util.i18n.formatMilliseconds(requestLatencyMs)} HTTP RTT, ` +
-          `${Util.i18n.formatKbps(throttling.downloadThroughputKbps)} down, ` +
-          `${Util.i18n.formatKbps(throttling.uploadThroughputKbps)} up (DevTools)`;
-
-        const isSlow4G = () => {
-          return requestLatencyMs === 150 * 3.75 &&
-            throttling.downloadThroughputKbps === 1.6 * 1024 * 0.9 &&
-            throttling.uploadThroughputKbps === 750 * 0.9;
-        };
-        summary = isSlow4G() ? Util.i18n.strings.runtimeSlow4g : Util.i18n.strings.runtimeCustom;
-        break;
-      }
-      case 'simulate': {
-        const {cpuSlowdownMultiplier, rttMs, throughputKbps} = throttling;
-        // eslint-disable-next-line max-len
-        cpuThrottling = `${Util.i18n.formatNumber(cpuSlowdownMultiplier)}x slowdown (Simulated)`;
-        networkThrottling = `${Util.i18n.formatMilliseconds(rttMs)} TCP RTT, ` +
-          `${Util.i18n.formatKbps(throughputKbps)} throughput (Simulated)`;
-
-        const isSlow4G = () => {
-          return rttMs === 150 && throughputKbps === 1.6 * 1024;
-        };
-        summary = isSlow4G() ? Util.i18n.strings.runtimeSlow4g : Util.i18n.strings.runtimeCustom;
-        break;
-      }
-      default:
-        summary = cpuThrottling = networkThrottling = Util.i18n.strings.runtimeUnknown;
-    }
-
-    // TODO(paulirish): revise Runtime Settings strings: https://github.com/GoogleChrome/lighthouse/pull/11796
-    const deviceEmulation = {
-      mobile: Util.i18n.strings.runtimeMobileEmulation,
-      desktop: Util.i18n.strings.runtimeDesktopEmulation,
-    }[settings.formFactor] || Util.i18n.strings.runtimeNoEmulation;
-
-    return {
-      deviceEmulation,
-      cpuThrottling,
-      networkThrottling,
-      summary,
-    };
-  }
-
-  /**
-   * Returns only lines that are near a message, or the first few lines if there are
-   * no line messages.
-   * @param {LH.Audit.Details.SnippetValue['lines']} lines
-   * @param {LH.Audit.Details.SnippetValue['lineMessages']} lineMessages
-   * @param {number} surroundingLineCount Number of lines to include before and after
-   * the message. If this is e.g. 2 this function might return 5 lines.
-   */
-  static filterRelevantLines(lines, lineMessages, surroundingLineCount) {
-    if (lineMessages.length === 0) {
-      // no lines with messages, just return the first bunch of lines
-      return lines.slice(0, surroundingLineCount * 2 + 1);
-    }
-
-    const minGapSize = 3;
-    const lineNumbersToKeep = new Set();
-    // Sort messages so we can check lineNumbersToKeep to see how big the gap to
-    // the previous line is.
-    lineMessages = lineMessages.sort((a, b) => (a.lineNumber || 0) - (b.lineNumber || 0));
-    lineMessages.forEach(({lineNumber}) => {
-      let firstSurroundingLineNumber = lineNumber - surroundingLineCount;
-      let lastSurroundingLineNumber = lineNumber + surroundingLineCount;
-
-      while (firstSurroundingLineNumber < 1) {
-        // make sure we still show (surroundingLineCount * 2 + 1) lines in total
-        firstSurroundingLineNumber++;
-        lastSurroundingLineNumber++;
-      }
-      // If only a few lines would be omitted normally then we prefer to include
-      // extra lines to avoid the tiny gap
-      if (lineNumbersToKeep.has(firstSurroundingLineNumber - minGapSize - 1)) {
-        firstSurroundingLineNumber -= minGapSize;
-      }
-      for (let i = firstSurroundingLineNumber; i <= lastSurroundingLineNumber; i++) {
-        const surroundingLineNumber = i;
-        lineNumbersToKeep.add(surroundingLineNumber);
-      }
-    });
-
-    return lines.filter(line => lineNumbersToKeep.has(line.lineNumber));
-  }
-
-  /**
-   * @param {string} categoryId
-   */
-  static isPluginCategory(categoryId) {
-    return categoryId.startsWith('lighthouse-plugin-');
-  }
-
-  /**
-   * @param {LH.Result.GatherMode} gatherMode
-   */
-  static shouldDisplayAsFraction(gatherMode) {
-    return gatherMode === 'timespan' || gatherMode === 'snapshot';
-  }
-
-  /**
-   * @param {LH.ReportResult.Category} category
-   */
-  static calculateCategoryFraction(category) {
-    let numPassableAudits = 0;
-    let numPassed = 0;
-    let numInformative = 0;
-    let totalWeight = 0;
-    for (const auditRef of category.auditRefs) {
-      const auditPassed = Util.showAsPassed(auditRef.result);
-
-      // Don't count the audit if it's manual, N/A, or isn't displayed.
-      if (auditRef.group === 'hidden' ||
-          auditRef.result.scoreDisplayMode === 'manual' ||
-          auditRef.result.scoreDisplayMode === 'notApplicable') {
-        continue;
-      } else if (auditRef.result.scoreDisplayMode === 'informative') {
-        if (!auditPassed) {
-          ++numInformative;
-        }
-        continue;
-      }
-
-      ++numPassableAudits;
-      totalWeight += auditRef.weight;
-      if (auditPassed) numPassed++;
-    }
-    return {numPassed, numPassableAudits, numInformative, totalWeight};
-  }
-}
-
-/**
- * Some parts of the report renderer require data found on the LHR. Instead of wiring it
- * through, we have this global.
- * @type {LH.ReportResult | null}
- */
-Util.reportJson = null;
-
-/**
- * An always-increasing counter for making unique SVG ID suffixes.
- */
-Util.getUniqueSuffix = (() => {
-  let svgSuffix = 0;
-  return function() {
-    return svgSuffix++;
-  };
-})();
-
-/**
- * Report-renderer-specific strings.
- */
-const UIStrings = {
-  /** Disclaimer shown to users below the metric values (First Contentful Paint, Time to Interactive, etc) to warn them that the numbers they see will likely change slightly the next time they run Lighthouse. */
-  varianceDisclaimer: 'Values are estimated and may vary. The [performance score is calculated](https://web.dev/performance-scoring/) directly from these metrics.',
-  /** Text link pointing to an interactive calculator that explains Lighthouse scoring. The link text should be fairly short. */
-  calculatorLink: 'See calculator.',
-  /** Label preceding a radio control for filtering the list of audits. The radio choices are various performance metrics (FCP, LCP, TBT), and if chosen, the audits in the report are hidden if they are not relevant to the selected metric. */
-  showRelevantAudits: 'Show audits relevant to:',
-  /** Column heading label for the listing of opportunity audits. Each audit title represents an opportunity. There are only 2 columns, so no strict character limit.  */
-  opportunityResourceColumnLabel: 'Opportunity',
-  /** Column heading label for the estimated page load savings of opportunity audits. Estimated Savings is the total amount of time (in seconds) that Lighthouse computed could be reduced from the total page load time, if the suggested action is taken. There are only 2 columns, so no strict character limit. */
-  opportunitySavingsColumnLabel: 'Estimated Savings',
-
-  /** An error string displayed next to a particular audit when it has errored, but not provided any specific error message. */
-  errorMissingAuditInfo: 'Report error: no audit information',
-  /** A label, shown next to an audit title or metric title, indicating that there was an error computing it. The user can hover on the label to reveal a tooltip with the extended error message. Translation should be short (< 20 characters). */
-  errorLabel: 'Error!',
-  /** This label is shown above a bulleted list of warnings. It is shown directly below an audit that produced warnings. Warnings describe situations the user should be aware of, as Lighthouse was unable to complete all the work required on this audit. For example, The 'Unable to decode image (biglogo.jpg)' warning may show up below an image encoding audit. */
-  warningHeader: 'Warnings: ',
-  /** Section heading shown above a list of passed audits that contain warnings. Audits under this section do not negatively impact the score, but Lighthouse has generated some potentially actionable suggestions that should be reviewed. This section is expanded by default and displays after the failing audits. */
-  warningAuditsGroupTitle: 'Passed audits but with warnings',
-  /** Section heading shown above a list of audits that are passing. 'Passed' here refers to a passing grade. This section is collapsed by default, as the user should be focusing on the failed audits instead. Users can click this heading to reveal the list. */
-  passedAuditsGroupTitle: 'Passed audits',
-  /** Section heading shown above a list of audits that do not apply to the page. For example, if an audit is 'Are images optimized?', but the page has no images on it, the audit will be marked as not applicable. This is neither passing or failing. This section is collapsed by default, as the user should be focusing on the failed audits instead. Users can click this heading to reveal the list. */
-  notApplicableAuditsGroupTitle: 'Not applicable',
-  /** Section heading shown above a list of audits that were not computed by Lighthouse. They serve as a list of suggestions for the user to go and manually check. For example, Lighthouse can't automate testing cross-browser compatibility, so that is listed within this section, so the user is reminded to test it themselves. This section is collapsed by default, as the user should be focusing on the failed audits instead. Users can click this heading to reveal the list. */
-  manualAuditsGroupTitle: 'Additional items to manually check',
-
-  /** Label shown preceding any important warnings that may have invalidated the entire report. For example, if the user has Chrome extensions installed, they may add enough performance overhead that Lighthouse's performance metrics are unreliable. If shown, this will be displayed at the top of the report UI. */
-  toplevelWarningsMessage: 'There were issues affecting this run of Lighthouse:',
-
-  /** String of text shown in a graphical representation of the flow of network requests for the web page. This label represents the initial network request that fetches an HTML page. This navigation may be redirected (eg. Initial navigation to http://example.com redirects to https://www.example.com). */
-  crcInitialNavigation: 'Initial Navigation',
-  /** Label of value shown in the summary of critical request chains. Refers to the total amount of time (milliseconds) of the longest critical path chain/sequence of network requests. Example value: 2310 ms */
-  crcLongestDurationLabel: 'Maximum critical path latency:',
-
-  /** Label for button that shows all lines of the snippet when clicked */
-  snippetExpandButtonLabel: 'Expand snippet',
-  /** Label for button that only shows a few lines of the snippet when clicked */
-  snippetCollapseButtonLabel: 'Collapse snippet',
-
-  /** Explanation shown to users below performance results to inform them that the test was done with a 4G network connection and to warn them that the numbers they see will likely change slightly the next time they run Lighthouse. 'Lighthouse' becomes link text to additional documentation. */
-  lsPerformanceCategoryDescription: '[Lighthouse](https://developers.google.com/web/tools/lighthouse/) analysis of the current page on an emulated mobile network. Values are estimated and may vary.',
-  /** Title of the lab data section of the Performance category. Within this section are various speed metrics which quantify the pageload performance into values presented in seconds and milliseconds. "Lab" is an abbreviated form of "laboratory", and refers to the fact that the data is from a controlled test of a website, not measurements from real users visiting that site.  */
-  labDataTitle: 'Lab Data',
-
-  /** This label is for a checkbox above a table of items loaded by a web page. The checkbox is used to show or hide third-party (or "3rd-party") resources in the table, where "third-party resources" refers to items loaded by a web page from URLs that aren't controlled by the owner of the web page. */
-  thirdPartyResourcesLabel: 'Show 3rd-party resources',
-  /** This label is for a button that opens a new tab to a webapp called "Treemap", which is a nested visual representation of a heierarchy of data related to the reports (script bytes and coverage, resource breakdown, etc.) */
-  viewTreemapLabel: 'View Treemap',
-  /** This label is for a button that will show the user a trace of the page. */
-  viewTraceLabel: 'View Trace',
-  /** This label is for a button that will show the user a trace of the page. */
-  viewOriginalTraceLabel: 'View Original Trace',
-
-  /** Option in a dropdown menu that opens a small, summary report in a print dialog.  */
-  dropdownPrintSummary: 'Print Summary',
-  /** Option in a dropdown menu that opens a full Lighthouse report in a print dialog.  */
-  dropdownPrintExpanded: 'Print Expanded',
-  /** Option in a dropdown menu that copies the Lighthouse JSON object to the system clipboard. */
-  dropdownCopyJSON: 'Copy JSON',
-  /** Option in a dropdown menu that saves the Lighthouse report HTML locally to the system as a '.html' file. */
-  dropdownSaveHTML: 'Save as HTML',
-  /** Option in a dropdown menu that saves the Lighthouse JSON object to the local system as a '.json' file. */
-  dropdownSaveJSON: 'Save as JSON',
-  /** Option in a dropdown menu that opens the current report in the Lighthouse Viewer Application. */
-  dropdownViewer: 'Open in Viewer',
-  /** Option in a dropdown menu that saves the current report as a new GitHub Gist. */
-  dropdownSaveGist: 'Save as Gist',
-  /** Option in a dropdown menu that toggles the themeing of the report between Light(default) and Dark themes. */
-  dropdownDarkTheme: 'Toggle Dark Theme',
-
-  /** Label for a row in a table that describes the kind of device that was emulated for the Lighthouse run.  Example values for row elements: 'No Emulation', 'Emulated Desktop', etc. */
-  runtimeSettingsDevice: 'Device',
-  /** Label for a row in a table that describes the network throttling conditions that were used during a Lighthouse run, if any. */
-  runtimeSettingsNetworkThrottling: 'Network throttling',
-  /** Label for a row in a table that describes the CPU throttling conditions that were used during a Lighthouse run, if any.*/
-  runtimeSettingsCPUThrottling: 'CPU throttling',
-  /** Label for a row in a table that shows the User Agent that was used to send out all network requests during the Lighthouse run. */
-  runtimeSettingsUANetwork: 'User agent (network)',
-  /** Label for a row in a table that shows the estimated CPU power of the machine running Lighthouse. Example row values: 532, 1492, 783. */
-  runtimeSettingsBenchmark: 'CPU/Memory Power',
-  /** Label for a row in a table that shows the version of the Axe library used. Example row values: 2.1.0, 3.2.3 */
-  runtimeSettingsAxeVersion: 'Axe version',
-
-  /** Label for button to create an issue against the Lighthouse GitHub project. */
-  footerIssue: 'File an issue',
-
-  /** Descriptive explanation for emulation setting when no device emulation is set. */
-  runtimeNoEmulation: 'No emulation',
-  /** Descriptive explanation for emulation setting when emulating a Moto G4 mobile device. */
-  runtimeMobileEmulation: 'Emulated Moto G4',
-  /** Descriptive explanation for emulation setting when emulating a generic desktop form factor, as opposed to a mobile-device like form factor. */
-  runtimeDesktopEmulation: 'Emulated Desktop',
-  /** Descriptive explanation for a runtime setting that is set to an unknown value. */
-  runtimeUnknown: 'Unknown',
-  /** Descriptive label that this analysis run was from a single pageload of a browser (not a summary of hundreds of loads) */
-  runtimeSingleLoad: 'Single page load',
-  /** Descriptive label that this analysis only considers the initial load of the page, and no interaction beyond when the page had "fully loaded" */
-  runtimeAnalysisWindow: 'Initial page load',
-  /** Descriptive explanation that this analysis run was from a single pageload of a browser, whereas field data often summarizes hundreds+ of page loads */
-  runtimeSingleLoadTooltip: 'This data is taken from a single page load, as opposed to field data summarizing many sessions.', // eslint-disable-line max-len
-
-  /** Descriptive explanation for environment throttling that was provided by the runtime environment instead of provided by Lighthouse throttling. */
-  throttlingProvided: 'Provided by environment',
-  /** Label for an interactive control that will reveal or hide a group of content. This control toggles between the text 'Show' and 'Hide'. */
-  show: 'Show',
-  /** Label for an interactive control that will reveal or hide a group of content. This control toggles between the text 'Show' and 'Hide'. */
-  hide: 'Hide',
-  /** Label for an interactive control that will reveal or hide a group of content. This control toggles between the text 'Expand view' and 'Collapse view'. */
-  expandView: 'Expand view',
-  /** Label for an interactive control that will reveal or hide a group of content. This control toggles between the text 'Expand view' and 'Collapse view'. */
-  collapseView: 'Collapse view',
-  /** Label indicating that Lighthouse throttled the page to emulate a slow 4G network connection. */
-  runtimeSlow4g: 'Slow 4G throttling',
-  /** Label indicating that Lighthouse throttled the page using custom throttling settings. */
-  runtimeCustom: 'Custom throttling',
-};
-Util.UIStrings = UIStrings;
-
-module.exports = {
-  Util,
-  UIStrings,
-};
diff --git a/lighthouse-core/util-commonjs.js b/lighthouse-core/util.cjs
similarity index 100%
rename from lighthouse-core/util-commonjs.js
rename to lighthouse-core/util.cjs
diff --git a/tsconfig.json b/tsconfig.json
index dbf449283edb..d6c0a18605ac 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,7 +16,7 @@
     "lighthouse-cli/**/*.js",
     "lighthouse-core/**/*.js",
     "lighthouse-core/index.cjs",
-    "lighthouse-core/util-commonjs.cjs",
+    "lighthouse-core/util.cjs",
     "clients/**/*.js",
     "build/**/*.js",
     "./types/**/*.d.ts",

From 29a12bb07b830f5561f53ca8837be772b0a4b31d Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 1 Jul 2022 16:22:37 -0700
Subject: [PATCH 83/96] pr

---
 .eslintrc.cjs                                                | 2 +-
 lighthouse-core/audits/seo/font-size.js                      | 1 +
 lighthouse-core/audits/seo/http-status-code.js               | 5 +++--
 lighthouse-core/audits/seo/is-crawlable.js                   | 4 ++--
 lighthouse-core/audits/seo/link-text.js                      | 3 ++-
 lighthouse-core/audits/work-during-interaction.js            | 3 +--
 .../audits/byte-efficiency/byte-efficiency-audit-test.js     | 3 +--
 lighthouse-core/test/config/config-helpers-test.js           | 2 +-
 lighthouse-core/test/create-test-trace.js                    | 2 +-
 9 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index c1b27434b08d..6f9fed97b4ab 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -36,7 +36,7 @@ module.exports = {
     }],
     'no-floating-decimal': 2,
     'max-len': [2, 100, {
-      ignorePattern: 'readJson\\(',
+      ignorePattern: 'readJson\\(|^import ',
       ignoreComments: true,
       ignoreUrls: true,
       tabWidth: 2,
diff --git a/lighthouse-core/audits/seo/font-size.js b/lighthouse-core/audits/seo/font-size.js
index dc28d01d225c..0a4f01d3965a 100644
--- a/lighthouse-core/audits/seo/font-size.js
+++ b/lighthouse-core/audits/seo/font-size.js
@@ -11,6 +11,7 @@ import * as i18n from '../../lib/i18n/i18n.js';
 
 import {Audit} from '../audit.js';
 import ComputedViewportMeta from '../../computed/viewport-meta.js';
+
 const MINIMAL_PERCENTAGE_OF_LEGIBLE_TEXT = 60;
 
 const UIStrings = {
diff --git a/lighthouse-core/audits/seo/http-status-code.js b/lighthouse-core/audits/seo/http-status-code.js
index b67dee493079..f5cef37fc10a 100644
--- a/lighthouse-core/audits/seo/http-status-code.js
+++ b/lighthouse-core/audits/seo/http-status-code.js
@@ -6,11 +6,12 @@
 'use strict';
 
 import {Audit} from '../audit.js';
-const HTTP_UNSUCCESSFUL_CODE_LOW = 400;
-const HTTP_UNSUCCESSFUL_CODE_HIGH = 599;
 import * as i18n from '../../lib/i18n/i18n.js';
 import MainResource from '../../computed/main-resource.js';
 
+const HTTP_UNSUCCESSFUL_CODE_LOW = 400;
+const HTTP_UNSUCCESSFUL_CODE_HIGH = 599;
+
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the HTTP status code a page responds with. This descriptive title is shown when the page has responded with a valid HTTP status code. */
   title: 'Page has successful HTTP status code',
diff --git a/lighthouse-core/audits/seo/is-crawlable.js b/lighthouse-core/audits/seo/is-crawlable.js
index 25f5a4d50200..4c6beea06abd 100644
--- a/lighthouse-core/audits/seo/is-crawlable.js
+++ b/lighthouse-core/audits/seo/is-crawlable.js
@@ -7,18 +7,18 @@
 
 import {Audit} from '../audit.js';
 
-// TODO(esmodules): cast can be removed when this switches to import.
 import robotsParser from 'robots-parser'; // eslint-disable-line max-len
 
 import URL from '../../lib/url-shim.js';
 import MainResource from '../../computed/main-resource.js';
+import * as i18n from '../../lib/i18n/i18n.js';
+
 const BLOCKLIST = new Set([
   'noindex',
   'none',
 ]);
 const ROBOTS_HEADER = 'x-robots-tag';
 const UNAVAILABLE_AFTER = 'unavailable_after';
-import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on if search-engine crawlers are blocked from indexing the page. This title is shown when the page is not blocked from indexing and can be crawled. */
diff --git a/lighthouse-core/audits/seo/link-text.js b/lighthouse-core/audits/seo/link-text.js
index fea6335d1293..6bb0fe544578 100644
--- a/lighthouse-core/audits/seo/link-text.js
+++ b/lighthouse-core/audits/seo/link-text.js
@@ -7,6 +7,8 @@
 
 import {Audit} from '../audit.js';
 import URL from '../../lib/url-shim.js';
+import * as i18n from '../../lib/i18n/i18n.js';
+
 const BLOCKLIST = new Set([
   // English
   'click here',
@@ -74,7 +76,6 @@ const BLOCKLIST = new Set([
   'mer info',
   'mer information',
 ]);
-import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /** Title of a Lighthouse audit that tests if each link on a page contains a sufficient description of what a user will find when they click it. Generic, non-descriptive text like "click here" doesn't give an indication of what the link leads to. This descriptive title is shown when all links on the page have sufficient textual descriptions. */
diff --git a/lighthouse-core/audits/work-during-interaction.js b/lighthouse-core/audits/work-during-interaction.js
index bff06312274f..44807db99b1b 100644
--- a/lighthouse-core/audits/work-during-interaction.js
+++ b/lighthouse-core/audits/work-during-interaction.js
@@ -14,8 +14,7 @@ import {MainThreadTasks} from '../lib/tracehouse/main-thread-tasks.js';
 import {taskGroups} from '../lib/tracehouse/task-groups.js';
 import {TraceProcessor} from '../lib/tracehouse/trace-processor.js';
 import {getExecutionTimingsByURL} from '../lib/tracehouse/task-summary.js';
-import ExperimentalInteractionToNextPaint
-  from './metrics/experimental-interaction-to-next-paint.js';
+import ExperimentalInteractionToNextPaint from './metrics/experimental-interaction-to-next-paint.js';
 import {LighthouseError} from '../lib/lh-error.js';
 
 /** @typedef {import('../computed/metrics/responsiveness.js').EventTimingEvent} EventTimingEvent */
diff --git a/lighthouse-core/test/audits/byte-efficiency/byte-efficiency-audit-test.js b/lighthouse-core/test/audits/byte-efficiency/byte-efficiency-audit-test.js
index c232c1687448..7965ebcb5233 100644
--- a/lighthouse-core/test/audits/byte-efficiency/byte-efficiency-audit-test.js
+++ b/lighthouse-core/test/audits/byte-efficiency/byte-efficiency-audit-test.js
@@ -6,8 +6,7 @@
 
 import {strict as assert} from 'assert';
 
-import {ByteEfficiencyAudit as ByteEfficiencyAudit_}
-  from '../../../audits/byte-efficiency/byte-efficiency-audit.js';
+import {ByteEfficiencyAudit as ByteEfficiencyAudit_} from '../../../audits/byte-efficiency/byte-efficiency-audit.js';
 import {NetworkNode} from '../../../lib/dependency-graph/network-node.js';
 import {CPUNode} from '../../../lib/dependency-graph/cpu-node.js';
 import {Simulator} from '../../../lib/dependency-graph/simulator/simulator.js';
diff --git a/lighthouse-core/test/config/config-helpers-test.js b/lighthouse-core/test/config/config-helpers-test.js
index 271a7f50e375..bb64ded0ee99 100644
--- a/lighthouse-core/test/config/config-helpers-test.js
+++ b/lighthouse-core/test/config/config-helpers-test.js
@@ -337,7 +337,7 @@ describe('.resolveSettings', () => {
   });
 });
 
-describe('.await resolveGathererToDefn', () => {
+describe('.resolveGathererToDefn', () => {
   const coreList = Runner.getGathererList();
 
   it('should expand gatherer path short-hand', async () => {
diff --git a/lighthouse-core/test/create-test-trace.js b/lighthouse-core/test/create-test-trace.js
index cfaf56dc58aa..a808d8a2e4ed 100644
--- a/lighthouse-core/test/create-test-trace.js
+++ b/lighthouse-core/test/create-test-trace.js
@@ -199,5 +199,5 @@ function createTestTrace(options) {
   return {traceEvents};
 }
 
-// TODO(esmodules)
+// TODO(esmodules): named export
 export default createTestTrace;

From 541a9c790a066916d52f10077d5569747a7fc99d Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 1 Jul 2022 16:24:35 -0700
Subject: [PATCH 84/96] createTestTrace named export

---
 .../test/audits/byte-efficiency/offscreen-images-test.js       | 2 +-
 lighthouse-core/test/audits/critical-request-chains-test.js    | 2 +-
 lighthouse-core/test/audits/long-tasks-test.js                 | 2 +-
 lighthouse-core/test/audits/preload-lcp-image-test.js          | 2 +-
 lighthouse-core/test/audits/redirects-test.js                  | 2 +-
 lighthouse-core/test/audits/third-party-facades-test.js        | 2 +-
 lighthouse-core/test/audits/uses-rel-preconnect-test.js        | 2 +-
 lighthouse-core/test/audits/uses-rel-preload-test.js           | 2 +-
 lighthouse-core/test/computed/critical-request-chains-test.js  | 2 +-
 .../test/computed/metrics/cumulative-layout-shift-test.js      | 2 +-
 .../computed/metrics/lantern-first-contentful-paint-test.js    | 2 +-
 lighthouse-core/test/computed/metrics/responsiveness-test.js   | 2 +-
 lighthouse-core/test/create-test-trace.js                      | 3 +--
 lighthouse-core/test/gather/gatherers/trace-elements-test.js   | 2 +-
 lighthouse-core/test/lib/tracehouse/trace-processor-test.js    | 2 +-
 15 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/lighthouse-core/test/audits/byte-efficiency/offscreen-images-test.js b/lighthouse-core/test/audits/byte-efficiency/offscreen-images-test.js
index 8bb3c7548da3..fdcbe74cb487 100644
--- a/lighthouse-core/test/audits/byte-efficiency/offscreen-images-test.js
+++ b/lighthouse-core/test/audits/byte-efficiency/offscreen-images-test.js
@@ -7,7 +7,7 @@
 import {strict as assert} from 'assert';
 
 import UnusedImages from '../../../audits/byte-efficiency/offscreen-images.js';
-import createTestTrace from '../../create-test-trace.js';
+import {createTestTrace} from '../../create-test-trace.js';
 import {networkRecordsToDevtoolsLog} from '../../network-records-to-devtools-log.js';
 
 function generateRecord({
diff --git a/lighthouse-core/test/audits/critical-request-chains-test.js b/lighthouse-core/test/audits/critical-request-chains-test.js
index fe63d8966e06..e8ecaead1d2b 100644
--- a/lighthouse-core/test/audits/critical-request-chains-test.js
+++ b/lighthouse-core/test/audits/critical-request-chains-test.js
@@ -7,7 +7,7 @@
 import {strict as assert} from 'assert';
 
 import CriticalRequestChains from '../../audits/critical-request-chains.js';
-import createTestTrace from '../create-test-trace.js';
+import {createTestTrace} from '../create-test-trace.js';
 import {networkRecordsToDevtoolsLog} from '../network-records-to-devtools-log.js';
 import {readJson} from '../test-utils.js';
 
diff --git a/lighthouse-core/test/audits/long-tasks-test.js b/lighthouse-core/test/audits/long-tasks-test.js
index 444ffcf9dfee..f4288294ad0a 100644
--- a/lighthouse-core/test/audits/long-tasks-test.js
+++ b/lighthouse-core/test/audits/long-tasks-test.js
@@ -5,7 +5,7 @@
  */
 
 import LongTasks from '../../audits/long-tasks.js';
-import createTestTrace from '../create-test-trace.js';
+import {createTestTrace} from '../create-test-trace.js';
 import {networkRecordsToDevtoolsLog} from '../network-records-to-devtools-log.js';
 
 const BASE_TS = 12345e3;
diff --git a/lighthouse-core/test/audits/preload-lcp-image-test.js b/lighthouse-core/test/audits/preload-lcp-image-test.js
index 03fd08e48ab3..34f68a80682f 100644
--- a/lighthouse-core/test/audits/preload-lcp-image-test.js
+++ b/lighthouse-core/test/audits/preload-lcp-image-test.js
@@ -6,7 +6,7 @@
 
 import PreloadLCPImage from '../../audits/preload-lcp-image.js';
 import {networkRecordsToDevtoolsLog} from '../network-records-to-devtools-log.js';
-import createTestTrace from '../create-test-trace.js';
+import {createTestTrace} from '../create-test-trace.js';
 
 const rootNodeUrl = 'http://example.com:3000';
 const mainDocumentNodeUrl = 'http://www.example.com:3000';
diff --git a/lighthouse-core/test/audits/redirects-test.js b/lighthouse-core/test/audits/redirects-test.js
index c737a4690efd..8806b711b6d1 100644
--- a/lighthouse-core/test/audits/redirects-test.js
+++ b/lighthouse-core/test/audits/redirects-test.js
@@ -8,7 +8,7 @@ import {strict as assert} from 'assert';
 
 import RedirectsAudit from '../../audits/redirects.js';
 import {networkRecordsToDevtoolsLog} from '../network-records-to-devtools-log.js';
-import createTestTrace from '../create-test-trace.js';
+import {createTestTrace} from '../create-test-trace.js';
 
 const FAILING_THREE_REDIRECTS = [{
   requestId: '1',
diff --git a/lighthouse-core/test/audits/third-party-facades-test.js b/lighthouse-core/test/audits/third-party-facades-test.js
index a8377889dbe7..4b5c36df37ce 100644
--- a/lighthouse-core/test/audits/third-party-facades-test.js
+++ b/lighthouse-core/test/audits/third-party-facades-test.js
@@ -6,7 +6,7 @@
 
 import ThirdPartyFacades from '../../audits/third-party-facades.js';
 import {networkRecordsToDevtoolsLog} from '../network-records-to-devtools-log.js';
-import createTestTrace from '../create-test-trace.js';
+import {createTestTrace} from '../create-test-trace.js';
 import {getURLArtifactFromDevtoolsLog, readJson} from '../test-utils.js';
 
 const pwaTrace = readJson('../fixtures/traces/progressive-app-m60.json', import.meta);
diff --git a/lighthouse-core/test/audits/uses-rel-preconnect-test.js b/lighthouse-core/test/audits/uses-rel-preconnect-test.js
index f906cdc15b9d..fc462086d3bb 100644
--- a/lighthouse-core/test/audits/uses-rel-preconnect-test.js
+++ b/lighthouse-core/test/audits/uses-rel-preconnect-test.js
@@ -8,7 +8,7 @@ import {strict as assert} from 'assert';
 
 import UsesRelPreconnect from '../../audits/uses-rel-preconnect.js';
 import {networkRecordsToDevtoolsLog} from '../network-records-to-devtools-log.js';
-import createTestTrace from '../create-test-trace.js';
+import {createTestTrace} from '../create-test-trace.js';
 
 const mainResource = {
   url: 'https://www.example.com/',
diff --git a/lighthouse-core/test/audits/uses-rel-preload-test.js b/lighthouse-core/test/audits/uses-rel-preload-test.js
index 16d18b39674d..6e4093290b21 100644
--- a/lighthouse-core/test/audits/uses-rel-preload-test.js
+++ b/lighthouse-core/test/audits/uses-rel-preload-test.js
@@ -8,7 +8,7 @@ import {strict as assert} from 'assert';
 
 import UsesRelPreload from '../../audits/uses-rel-preload.js';
 import {networkRecordsToDevtoolsLog} from '../network-records-to-devtools-log.js';
-import createTestTrace from '../create-test-trace.js';
+import {createTestTrace} from '../create-test-trace.js';
 import {getURLArtifactFromDevtoolsLog, readJson} from '../test-utils.js';
 
 const pwaTrace = readJson('../fixtures/traces/progressive-app-m60.json', import.meta);
diff --git a/lighthouse-core/test/computed/critical-request-chains-test.js b/lighthouse-core/test/computed/critical-request-chains-test.js
index 391719b5c77b..155e61982ea2 100644
--- a/lighthouse-core/test/computed/critical-request-chains-test.js
+++ b/lighthouse-core/test/computed/critical-request-chains-test.js
@@ -8,7 +8,7 @@ import {strict as assert} from 'assert';
 
 import CriticalRequestChains from '../../computed/critical-request-chains.js';
 import {NetworkRequest} from '../../lib/network-request.js';
-import createTestTrace from '../create-test-trace.js';
+import {createTestTrace} from '../create-test-trace.js';
 import {networkRecordsToDevtoolsLog} from '../network-records-to-devtools-log.js';
 import {getURLArtifactFromDevtoolsLog, readJson} from '../test-utils.js';
 
diff --git a/lighthouse-core/test/computed/metrics/cumulative-layout-shift-test.js b/lighthouse-core/test/computed/metrics/cumulative-layout-shift-test.js
index df7d83420efa..8a4ba82a0555 100644
--- a/lighthouse-core/test/computed/metrics/cumulative-layout-shift-test.js
+++ b/lighthouse-core/test/computed/metrics/cumulative-layout-shift-test.js
@@ -5,7 +5,7 @@
  */
 
 import CumulativeLayoutShift from '../../../computed/metrics/cumulative-layout-shift.js';
-import createTestTrace from '../../create-test-trace.js';
+import {createTestTrace} from '../../create-test-trace.js';
 import {readJson} from '../../test-utils.js';
 
 const jumpyClsTrace = readJson('../../fixtures/traces/jumpy-cls-m90.json', import.meta);
diff --git a/lighthouse-core/test/computed/metrics/lantern-first-contentful-paint-test.js b/lighthouse-core/test/computed/metrics/lantern-first-contentful-paint-test.js
index 06080b34a516..a3eb237d6434 100644
--- a/lighthouse-core/test/computed/metrics/lantern-first-contentful-paint-test.js
+++ b/lighthouse-core/test/computed/metrics/lantern-first-contentful-paint-test.js
@@ -9,7 +9,7 @@ import {strict as assert} from 'assert';
 import LanternFirstContentfulPaint from '../../../computed/metrics/lantern-first-contentful-paint.js'; // eslint-disable-line max-len
 import {getURLArtifactFromDevtoolsLog, readJson} from '../../test-utils.js';
 import {networkRecordsToDevtoolsLog} from '../../network-records-to-devtools-log.js';
-import createTestTrace from '../../create-test-trace.js';
+import {createTestTrace} from '../../create-test-trace.js';
 
 const trace = readJson('../../fixtures/traces/progressive-app-m60.json', import.meta);
 const devtoolsLog = readJson('../../fixtures/traces/progressive-app-m60.devtools.log.json', import.meta);
diff --git a/lighthouse-core/test/computed/metrics/responsiveness-test.js b/lighthouse-core/test/computed/metrics/responsiveness-test.js
index 31638ca3e047..82795db99745 100644
--- a/lighthouse-core/test/computed/metrics/responsiveness-test.js
+++ b/lighthouse-core/test/computed/metrics/responsiveness-test.js
@@ -7,7 +7,7 @@
 import {strict as assert} from 'assert';
 
 import Responsiveness from '../../../computed/metrics/responsiveness.js';
-import createTestTrace from '../../create-test-trace.js';
+import {createTestTrace} from '../../create-test-trace.js';
 import {readJson} from '../../test-utils.js';
 
 const interactionTrace = readJson('../../fixtures/traces/timespan-responsiveness-m103.trace.json', import.meta);
diff --git a/lighthouse-core/test/create-test-trace.js b/lighthouse-core/test/create-test-trace.js
index a808d8a2e4ed..881afb72528d 100644
--- a/lighthouse-core/test/create-test-trace.js
+++ b/lighthouse-core/test/create-test-trace.js
@@ -199,5 +199,4 @@ function createTestTrace(options) {
   return {traceEvents};
 }
 
-// TODO(esmodules): named export
-export default createTestTrace;
+export {createTestTrace};
diff --git a/lighthouse-core/test/gather/gatherers/trace-elements-test.js b/lighthouse-core/test/gather/gatherers/trace-elements-test.js
index 1d217f79a9ab..22e40c1c5824 100644
--- a/lighthouse-core/test/gather/gatherers/trace-elements-test.js
+++ b/lighthouse-core/test/gather/gatherers/trace-elements-test.js
@@ -7,7 +7,7 @@
 import TraceElementsGatherer from '../../../gather/gatherers/trace-elements.js';
 import {Driver} from '../../../gather/driver.js';
 import {Connection} from '../../../gather/connections/connection.js';
-import createTestTrace from '../../create-test-trace.js';
+import {createTestTrace} from '../../create-test-trace.js';
 import {createMockSendCommandFn, createMockOnFn} from '../mock-commands.js';
 import {flushAllTimersAndMicrotasks, fnAny, readJson, timers} from '../../test-utils.js';
 
diff --git a/lighthouse-core/test/lib/tracehouse/trace-processor-test.js b/lighthouse-core/test/lib/tracehouse/trace-processor-test.js
index e316abc32e16..cc2877ceadd8 100644
--- a/lighthouse-core/test/lib/tracehouse/trace-processor-test.js
+++ b/lighthouse-core/test/lib/tracehouse/trace-processor-test.js
@@ -7,7 +7,7 @@
 import {strict as assert} from 'assert';
 
 import {TraceProcessor} from '../../../lib/tracehouse/trace-processor.js';
-import createTestTrace from '../../create-test-trace.js';
+import {createTestTrace} from '../../create-test-trace.js';
 import {readJson} from '../../test-utils.js';
 
 const pwaTrace = readJson('../../fixtures/traces/progressive-app.json', import.meta);

From fe39155d6a90e26d2578bf3d97a99f95c090a9d3 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 1 Jul 2022 16:37:03 -0700
Subject: [PATCH 85/96] nit

---
 lighthouse-core/test/create-test-trace.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lighthouse-core/test/create-test-trace.js b/lighthouse-core/test/create-test-trace.js
index 881afb72528d..d91b01bf7490 100644
--- a/lighthouse-core/test/create-test-trace.js
+++ b/lighthouse-core/test/create-test-trace.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.
  */
 
-
 const pid = 1111;
 const tid = 222;
 const browserPid = 13725;

From 5e21f8763f0fbd932fab9de8bd316777e0162067 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Fri, 1 Jul 2022 17:01:15 -0700
Subject: [PATCH 86/96] rename

---
 esm-utils.mjs => esm-utils.js                      | 0
 flow-report/tsconfig.json                          | 2 +-
 lighthouse-core/config/config-helpers.js           | 2 +-
 lighthouse-core/config/config.js                   | 2 +-
 lighthouse-core/fraggle-rock/config/config.js      | 2 +-
 lighthouse-core/lib/i18n/i18n.js                   | 2 +-
 lighthouse-core/runner.js                          | 2 +-
 lighthouse-core/scripts/cleanup-vuln-snapshot.js   | 2 +-
 lighthouse-core/scripts/i18n/collect-strings.js    | 2 +-
 lighthouse-core/test/config/config-helpers-test.js | 2 +-
 lighthouse-core/test/config/config-test.js         | 2 +-
 lighthouse-core/test/lib/asset-saver-test.js       | 2 +-
 lighthouse-core/test/lib/i18n/i18n-test.js         | 2 +-
 lighthouse-core/test/runner-test.js                | 2 +-
 lighthouse-core/test/test-utils.js                 | 2 +-
 root.js                                            | 2 +-
 tsconfig.json                                      | 2 +-
 17 files changed, 16 insertions(+), 16 deletions(-)
 rename esm-utils.mjs => esm-utils.js (100%)

diff --git a/esm-utils.mjs b/esm-utils.js
similarity index 100%
rename from esm-utils.mjs
rename to esm-utils.js
diff --git a/flow-report/tsconfig.json b/flow-report/tsconfig.json
index 93ea7365f160..2c313f236ad7 100644
--- a/flow-report/tsconfig.json
+++ b/flow-report/tsconfig.json
@@ -21,7 +21,7 @@
     "./types",
     "../types/test.d.ts",
     "../root.js",
-    "../esm-utils.mjs",
+    "../esm-utils.js",
     "../lighthouse-core/test/test-env/fake-timers.js",
   ],
 }
diff --git a/lighthouse-core/config/config-helpers.js b/lighthouse-core/config/config-helpers.js
index 4630a99a80e7..d4c2d280014c 100644
--- a/lighthouse-core/config/config-helpers.js
+++ b/lighthouse-core/config/config-helpers.js
@@ -14,7 +14,7 @@ import ConfigPlugin from './config-plugin.js';
 import {Runner} from '../runner.js';
 import * as i18n from '../lib/i18n/i18n.js';
 import * as validation from '../fraggle-rock/config/validation.js';
-import {getModuleDirectory} from '../../esm-utils.mjs';
+import {getModuleDirectory} from '../../esm-utils.js';
 
 const require = createRequire(import.meta.url);
 
diff --git a/lighthouse-core/config/config.js b/lighthouse-core/config/config.js
index bd4369bd9489..41477e3e3456 100644
--- a/lighthouse-core/config/config.js
+++ b/lighthouse-core/config/config.js
@@ -22,7 +22,7 @@ import {
   deepClone,
   deepCloneConfigJson,
 } from './config-helpers.js';
-import {getModuleDirectory} from '../../esm-utils.mjs';
+import {getModuleDirectory} from '../../esm-utils.js';
 
 const defaultConfigPath = './default-config.js';
 
diff --git a/lighthouse-core/fraggle-rock/config/config.js b/lighthouse-core/fraggle-rock/config/config.js
index 0561173888bd..f51547d62fd0 100644
--- a/lighthouse-core/fraggle-rock/config/config.js
+++ b/lighthouse-core/fraggle-rock/config/config.js
@@ -32,7 +32,7 @@ import {
   mergeConfigFragmentArrayByKey,
 } from '../../config/config-helpers.js';
 
-import {getModuleDirectory} from '../../../esm-utils.mjs';
+import {getModuleDirectory} from '../../../esm-utils.js';
 import * as format from '../../../shared/localization/format.js';
 
 const defaultConfigPath = path.join(getModuleDirectory(import.meta), './default-config.js');
diff --git a/lighthouse-core/lib/i18n/i18n.js b/lighthouse-core/lib/i18n/i18n.js
index 80e6c0314253..743af1a6f227 100644
--- a/lighthouse-core/lib/i18n/i18n.js
+++ b/lighthouse-core/lib/i18n/i18n.js
@@ -14,7 +14,7 @@ import {getAvailableLocales} from '../../../shared/localization/format.js';
 import log from 'lighthouse-logger';
 import {LH_ROOT} from '../../../root.js';
 import {isIcuMessage, formatMessage, DEFAULT_LOCALE} from '../../../shared/localization/format.js';
-import {getModulePath} from '../../../esm-utils.mjs';
+import {getModulePath} from '../../../esm-utils.js';
 
 const UIStrings = {
   /** Used to show the duration in milliseconds that something lasted. The `{timeInMs}` placeholder will be replaced with the time duration, shown in milliseconds (e.g. 63 ms) */
diff --git a/lighthouse-core/runner.js b/lighthouse-core/runner.js
index 7e892d2eac2c..d4e3a0e0b2ac 100644
--- a/lighthouse-core/runner.js
+++ b/lighthouse-core/runner.js
@@ -20,7 +20,7 @@ import {Sentry} from './lib/sentry.js';
 import ReportGenerator from '../report/generator/report-generator.js';
 import {LighthouseError} from './lib/lh-error.js';
 import {lighthouseVersion} from '../root.js';
-import {getModuleDirectory} from '../esm-utils.mjs';
+import {getModuleDirectory} from '../esm-utils.js';
 
 const moduleDir = getModuleDirectory(import.meta);
 
diff --git a/lighthouse-core/scripts/cleanup-vuln-snapshot.js b/lighthouse-core/scripts/cleanup-vuln-snapshot.js
index 0edcef4b7e72..9100ac9c6153 100755
--- a/lighthouse-core/scripts/cleanup-vuln-snapshot.js
+++ b/lighthouse-core/scripts/cleanup-vuln-snapshot.js
@@ -12,7 +12,7 @@ import {readFileSync, writeFileSync} from 'fs';
 
 import prettyJSONStringify from 'pretty-json-stringify';
 
-import {resolveModulePath} from '../../esm-utils.mjs';
+import {resolveModulePath} from '../../esm-utils.js';
 
 const libDetectorSource = readFileSync(
   resolveModulePath('js-library-detector/library/libraries.js'),
diff --git a/lighthouse-core/scripts/i18n/collect-strings.js b/lighthouse-core/scripts/i18n/collect-strings.js
index 91b280048120..875bdd8d5ee6 100644
--- a/lighthouse-core/scripts/i18n/collect-strings.js
+++ b/lighthouse-core/scripts/i18n/collect-strings.js
@@ -21,7 +21,7 @@ import {collectAndBakeCtcStrings} from './bake-ctc-to-lhl.js';
 import {pruneObsoleteLhlMessages} from './prune-obsolete-lhl-messages.js';
 import {countTranslatedMessages} from './count-translated.js';
 import {LH_ROOT} from '../../../root.js';
-import {resolveModulePath} from '../../../esm-utils.mjs';
+import {resolveModulePath} from '../../../esm-utils.js';
 
 // Match declarations of UIStrings, terminating in either a `};\n` (very likely to always be right)
 // or `}\n\n` (allowing semicolon to be optional, but insisting on a double newline so that an
diff --git a/lighthouse-core/test/config/config-helpers-test.js b/lighthouse-core/test/config/config-helpers-test.js
index bb64ded0ee99..9f24d9c6c995 100644
--- a/lighthouse-core/test/config/config-helpers-test.js
+++ b/lighthouse-core/test/config/config-helpers-test.js
@@ -25,7 +25,7 @@ import {Gatherer} from '../../gather/gatherers/gatherer.js';
 import ImageElementsGatherer from '../../gather/gatherers/image-elements.js';
 import UserTimingsAudit from '../../audits/user-timings.js';
 import {LH_ROOT} from '../../../root.js';
-import {getModuleDirectory} from '../../../esm-utils.mjs';
+import {getModuleDirectory} from '../../../esm-utils.js';
 
 const require = createRequire(import.meta.url);
 const moduleDir = getModuleDirectory(import.meta);
diff --git a/lighthouse-core/test/config/config-test.js b/lighthouse-core/test/config/config-test.js
index dde8530bff60..93e1f1a4ad01 100644
--- a/lighthouse-core/test/config/config-test.js
+++ b/lighthouse-core/test/config/config-test.js
@@ -17,7 +17,7 @@ import {Gatherer} from '../../gather/gatherers/gatherer.js';
 import {Audit} from '../../audits/audit.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 import format from '../../../shared/localization/format.js';
-import {getModuleDirectory, getModulePath} from '../../../esm-utils.mjs';
+import {getModuleDirectory, getModulePath} from '../../../esm-utils.js';
 
 const require = createRequire(import.meta.url);
 const moduleDir = getModuleDirectory(import.meta);
diff --git a/lighthouse-core/test/lib/asset-saver-test.js b/lighthouse-core/test/lib/asset-saver-test.js
index 453965c7167d..b98f4cab9a48 100644
--- a/lighthouse-core/test/lib/asset-saver-test.js
+++ b/lighthouse-core/test/lib/asset-saver-test.js
@@ -12,7 +12,7 @@ import {Metrics} from '../../lib/traces/pwmetrics-events.js';
 import {LighthouseError} from '../../lib/lh-error.js';
 import {Audit} from '../../audits/audit.js';
 import {LH_ROOT} from '../../../root.js';
-import {getModuleDirectory} from '../../../esm-utils.mjs';
+import {getModuleDirectory} from '../../../esm-utils.js';
 import {readJson} from '../test-utils.js';
 
 const traceEvents = readJson('../fixtures/traces/progressive-app.json', import.meta);
diff --git a/lighthouse-core/test/lib/i18n/i18n-test.js b/lighthouse-core/test/lib/i18n/i18n-test.js
index 9a2c7520dcb5..607fb10c1d71 100644
--- a/lighthouse-core/test/lib/i18n/i18n-test.js
+++ b/lighthouse-core/test/lib/i18n/i18n-test.js
@@ -10,7 +10,7 @@ import log from 'lighthouse-logger';
 import jestMock from 'jest-mock';
 
 import * as i18n from '../../../lib/i18n/i18n.js';
-import {getModuleDirectory} from '../../../../esm-utils.mjs';
+import {getModuleDirectory} from '../../../../esm-utils.js';
 
 const moduleDir = getModuleDirectory(import.meta);
 
diff --git a/lighthouse-core/test/runner-test.js b/lighthouse-core/test/runner-test.js
index 878372850ac5..b911875c17fb 100644
--- a/lighthouse-core/test/runner-test.js
+++ b/lighthouse-core/test/runner-test.js
@@ -21,7 +21,7 @@ import * as assetSaver from '../lib/asset-saver.js';
 import {LighthouseError} from '../lib/lh-error.js';
 import * as i18n from '../lib/i18n/i18n.js';
 import {importMock, makeMocksForGatherRunner} from './test-utils.js';
-import {getModuleDirectory} from '../../esm-utils.mjs';
+import {getModuleDirectory} from '../../esm-utils.js';
 
 const moduleDir = getModuleDirectory(import.meta);
 
diff --git a/lighthouse-core/test/test-utils.js b/lighthouse-core/test/test-utils.js
index 4bb917eab06d..819135e5c18c 100644
--- a/lighthouse-core/test/test-utils.js
+++ b/lighthouse-core/test/test-utils.js
@@ -16,7 +16,7 @@ import {LH_ROOT} from '../../root.js';
 import * as mockCommands from './gather/mock-commands.js';
 import {NetworkRecorder} from '../lib/network-recorder.js';
 import {timers} from './test-env/fake-timers.js';
-import {getModuleDirectory} from '../../esm-utils.mjs';
+import {getModuleDirectory} from '../../esm-utils.js';
 
 const require = createRequire(import.meta.url);
 
diff --git a/root.js b/root.js
index 5afac11a1688..949d9b677764 100644
--- a/root.js
+++ b/root.js
@@ -6,7 +6,7 @@
 'use strict';
 
 import fs from 'fs';
-import {getModuleDirectory} from './esm-utils.mjs';
+import {getModuleDirectory} from './esm-utils.js';
 
 const LH_ROOT = getModuleDirectory(import.meta);
 const pkg = JSON.parse(fs.readFileSync(`${LH_ROOT}/package.json`, 'utf-8'));
diff --git a/tsconfig.json b/tsconfig.json
index d6c0a18605ac..c3bdf54acfea 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -13,6 +13,7 @@
   ],
   "include": [
     "root.js",
+    "esm-utils.js",
     "lighthouse-cli/**/*.js",
     "lighthouse-core/**/*.js",
     "lighthouse-core/index.cjs",
@@ -32,7 +33,6 @@
     "third-party/snyk/snapshot.json",
     "lighthouse-core/audits/byte-efficiency/polyfill-graph-data.json",
     "shared/localization/locales/en-US.json",
-    "esm-utils.mjs",
   ],
   "exclude": [
     "lighthouse-core/test/audits/**/*.js",

From fc5e40250febeebef9a8eb43afe8da8f5fb1d301 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@gmail.com>
Date: Fri, 8 Jul 2022 12:10:29 -0700
Subject: [PATCH 87/96] i18n: fix collect-strings on windows with pathToFileURL

---
 lighthouse-core/scripts/i18n/collect-strings.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lighthouse-core/scripts/i18n/collect-strings.js b/lighthouse-core/scripts/i18n/collect-strings.js
index 875bdd8d5ee6..9fe3866adaef 100644
--- a/lighthouse-core/scripts/i18n/collect-strings.js
+++ b/lighthouse-core/scripts/i18n/collect-strings.js
@@ -9,6 +9,7 @@
 
 import fs from 'fs';
 import path from 'path';
+import {pathToFileURL} from 'url';
 
 import glob from 'glob';
 import {expect} from 'expect';
@@ -37,7 +38,7 @@ const foldersWithStrings = [
   `${LH_ROOT}/report/renderer`,
   `${LH_ROOT}/treemap`,
   `${LH_ROOT}/flow-report`,
-  path.dirname(resolveModulePath('lighthouse-stack-packs')) + '/packs',
+  path.join(path.dirname(resolveModulePath('lighthouse-stack-packs')), 'packs'),
 ];
 
 const ignoredPathComponents = [
@@ -552,7 +553,7 @@ async function collectAllStringsInDir(dir) {
     if (!process.env.CI) console.log('Collecting from', relativeToRootPath);
 
     const content = fs.readFileSync(absolutePath, 'utf8');
-    const exportVars = await import(absolutePath);
+    const exportVars = await import(pathToFileURL(absolutePath).href);
     const regexMatch = content.match(UISTRINGS_REGEX);
     const exportedUIStrings = exportVars.UIStrings || exportVars.default?.UIStrings;
 

From 6508c2916e279fe8a70bd5c859d89bbec4d7c055 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@gmail.com>
Date: Fri, 8 Jul 2022 14:53:40 -0700
Subject: [PATCH 88/96] tweak

---
 lighthouse-core/scripts/i18n/collect-strings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lighthouse-core/scripts/i18n/collect-strings.js b/lighthouse-core/scripts/i18n/collect-strings.js
index 9fe3866adaef..144c66ba2281 100644
--- a/lighthouse-core/scripts/i18n/collect-strings.js
+++ b/lighthouse-core/scripts/i18n/collect-strings.js
@@ -38,7 +38,7 @@ const foldersWithStrings = [
   `${LH_ROOT}/report/renderer`,
   `${LH_ROOT}/treemap`,
   `${LH_ROOT}/flow-report`,
-  path.join(path.dirname(resolveModulePath('lighthouse-stack-packs')), 'packs'),
+  path.dirname(resolveModulePath('lighthouse-stack-packs')) + '/packs',
 ];
 
 const ignoredPathComponents = [

From 7707693521c2262dbe8cc3ca53572c6abfe8f90b Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Mon, 11 Jul 2022 11:30:44 -0700
Subject: [PATCH 89/96] update

---
 lighthouse-core/audits/seo/is-crawlable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lighthouse-core/audits/seo/is-crawlable.js b/lighthouse-core/audits/seo/is-crawlable.js
index 4c6beea06abd..071611871a8a 100644
--- a/lighthouse-core/audits/seo/is-crawlable.js
+++ b/lighthouse-core/audits/seo/is-crawlable.js
@@ -7,7 +7,7 @@
 
 import {Audit} from '../audit.js';
 
-import robotsParser from 'robots-parser'; // eslint-disable-line max-len
+import robotsParser from 'robots-parser';
 
 import URL from '../../lib/url-shim.js';
 import MainResource from '../../computed/main-resource.js';

From 32c35ea31307b86e024acf796f0a59f62e6da320 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Mon, 11 Jul 2022 13:20:21 -0700
Subject: [PATCH 90/96] pr

---
 build/build-bundle.js          | 12 +++--
 docs/recipes/gulp/gulpfile.js  | 81 ----------------------------------
 docs/recipes/gulp/package.json | 13 ------
 3 files changed, 5 insertions(+), 101 deletions(-)
 delete mode 100644 docs/recipes/gulp/gulpfile.js
 delete mode 100644 docs/recipes/gulp/package.json

diff --git a/build/build-bundle.js b/build/build-bundle.js
index 8398b63e7b1a..e3e6fbe0f298 100644
--- a/build/build-bundle.js
+++ b/build/build-bundle.js
@@ -97,7 +97,11 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
   }).join(',\n');
 
   /** @type {Record<string, string>} */
-  const shimsObj = {};
+  const shimsObj = {
+    [require.resolve('../lighthouse-core/gather/connections/cri.js')]:
+      'export const CriConnection = {}',
+    [require.resolve('../package.json')]: `export const version = '${pkg.version}';`,
+  };
 
   const modulesToIgnore = [
     'puppeteer-core',
@@ -109,9 +113,6 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
     'ws',
   ];
 
-  shimsObj[require.resolve('../lighthouse-core/gather/connections/cri.js')] =
-    'export const CriConnection = {}';
-
   // Don't include the stringified report in DevTools - see devtools-report-assets.js
   // Don't include in Lightrider - HTML generation isn't supported, so report assets aren't needed.
   if (isDevtools(entryPath) || isLightrider(entryPath)) {
@@ -127,9 +128,6 @@ async function buildBundle(entryPath, distPath, opts = {minify: true}) {
     shimsObj[modulePath] = 'export default {}';
   }
 
-  shimsObj[require.resolve('../package.json')] =
-    `export const version = '${pkg.version}';`;
-
   const bundle = await rollup({
     input: entryPath,
     context: 'globalThis',
diff --git a/docs/recipes/gulp/gulpfile.js b/docs/recipes/gulp/gulpfile.js
deleted file mode 100644
index 0d95ea457897..000000000000
--- a/docs/recipes/gulp/gulpfile.js
+++ /dev/null
@@ -1,81 +0,0 @@
-'use strict';
-
-/**
- * @license Copyright 2017 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.
- */
-
-import gulp from 'gulp';
-
-import connect from 'gulp-connect';
-import lighthouse from 'lighthouse';
-import chromeLauncher from 'chrome-launcher';
-
-const PORT = 8080;
-
-/**
- * Start server
- */
-const startServer = function() {
-  return connect.server({
-    root: './public',
-    port: PORT,
-  });
-};
-
-/**
- * Stop server
- */
-const stopServer = function() {
-  connect.serverClose();
-};
-
-/**
- * Run lighthouse
- */
-function launchChromeAndRunLighthouse(url, flags, config = null) {
-  return chromeLauncher.launch().then(chrome => {
-    flags.port = chrome.port;
-    return lighthouse(url, flags, config).then(results =>
-      chrome.kill().then(() => results)
-    );
-  });
-}
-
-/**
- * Handle ok result
- * @param {Object} results - Lighthouse results
- */
-const handleOk = function(results) {
-  stopServer();
-  console.log(results); // eslint-disable-line no-console
-  // TODO: use lighthouse results for checking your performance expectations.
-  // e.g. process.exit(1) or throw Error if score falls below a certain threshold.
-  // if (results.audits['first-meaningful-paint'].numericValue > 3000) {
-  //   console.log(`Warning: Time to first meaningful paint ${results.audits['first-meaningful-paint'].displayValue}`);
-  //   process.exit(1);
-  // }
-  return results;
-};
-
-/**
- * Handle error
- */
-const handleError = function(e) {
-  stopServer();
-  console.error(e); // eslint-disable-line no-console
-  throw e; // Throw to exit process with status 1.
-};
-
-const flags = {}; // available options - https://github.com/GoogleChrome/lighthouse/#cli-options
-
-gulp.task('lighthouse', function() {
-  startServer();
-  const config = {settings: {onlyCategories: ['performance']}};
-  return launchChromeAndRunLighthouse(`http://localhost:${PORT}/index.html`, flags, config)
-    .then(handleOk)
-    .catch(handleError);
-});
-
-gulp.task('default', ['lighthouse']);
diff --git a/docs/recipes/gulp/package.json b/docs/recipes/gulp/package.json
deleted file mode 100644
index 68e5e7415c0b..000000000000
--- a/docs/recipes/gulp/package.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "gulp-lighthouse-recipe",
-  "private": true,
-  "type": "module",
-  "scripts": {
-    "start": "gulp"
-  },
-  "devDependencies": {
-    "gulp": "^3.9.1",
-    "gulp-connect": "^5.0.0",
-    "lighthouse": "file:../../../dist/lighthouse.tgz"
-  }
-}

From b717a4494e3e7c28afd324e5bc1d23fd64a7c73a Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Wed, 13 Jul 2022 12:30:30 -0700
Subject: [PATCH 91/96] tests passing

---
 lighthouse-core/fraggle-rock/gather/navigation-runner.js | 6 ++----
 lighthouse-core/runner.js                                | 5 +----
 package.json                                             | 3 ++-
 yarn.lock                                                | 5 ++---
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/lighthouse-core/fraggle-rock/gather/navigation-runner.js b/lighthouse-core/fraggle-rock/gather/navigation-runner.js
index a950ba3d6e6d..2792f4300392 100644
--- a/lighthouse-core/fraggle-rock/gather/navigation-runner.js
+++ b/lighthouse-core/fraggle-rock/gather/navigation-runner.js
@@ -18,6 +18,7 @@ import {defaultNavigationConfig} from '../../config/constants.js';
 import {initializeConfig} from '../config/config.js';
 import {getBaseArtifacts, finalizeArtifacts} from './base-artifacts.js';
 import format from '../../../shared/localization/format.js';
+import {LighthouseError} from '../../lib/lh-error.js';
 import URL from '../../lib/url-shim.js';
 import {getPageLoadError} from '../../lib/navigation-error.js';
 import Trace from '../../gather/gatherers/trace.js';
@@ -103,10 +104,7 @@ async function _navigate(navigationContext) {
     });
     return {requestedUrl, mainDocumentUrl, navigationError: undefined, warnings};
   } catch (err) {
-    // TODO: for some reason, when under test LighthouseError !== the LighthouseError from the test file.
-    // yarn mocha navigation-runner-test -t 'should retain PageLoadError'
-    // if (!(err instanceof LighthouseError)) throw err;
-    if (err.name !== 'LighthouseError') throw err;
+    if (!(err instanceof LighthouseError)) throw err;
     if (err.code !== 'NO_FCP' && err.code !== 'PAGE_HUNG') throw err;
     if (typeof requestor !== 'string') throw err;
 
diff --git a/lighthouse-core/runner.js b/lighthouse-core/runner.js
index d4e3a0e0b2ac..659e3f19b67e 100644
--- a/lighthouse-core/runner.js
+++ b/lighthouse-core/runner.js
@@ -439,10 +439,7 @@ class Runner {
     ];
 
     for (const possibleErrorArtifact of possibleErrorArtifacts) {
-      // TODO: for some reason, when under test LighthouseError !== the LighthouseError from the test file.
-      // yarn mocha navigation-runner-test -t 'includes a top-level runtimeError when a gatherer throws one'
-      // const isError = possibleErrorArtifact instanceof LighthouseError;
-      const isError = possibleErrorArtifact?.name === 'LighthouseError';
+      const isError = possibleErrorArtifact instanceof LighthouseError;
 
       // eslint-disable-next-line max-len
       if (isError && possibleErrorArtifact.lhrRuntimeError) {
diff --git a/package.json b/package.json
index 4fc49050eb8e..951e26342ac7 100644
--- a/package.json
+++ b/package.json
@@ -215,7 +215,8 @@
   },
   "resolutions": {
     "puppeteer/**/devtools-protocol": "0.0.995287",
-    "puppeteer-core/**/devtools-protocol": "0.0.995287"
+    "puppeteer-core/**/devtools-protocol": "0.0.995287",
+    "testdouble/**/quibble": "connorjclark/quibble#mod-cache"
   },
   "repository": "GoogleChrome/lighthouse",
   "keywords": [
diff --git a/yarn.lock b/yarn.lock
index dd54c4b1f089..20f411f15e7a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6131,10 +6131,9 @@ query-string@^4.1.0:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
-quibble@^0.6.7:
+quibble@^0.6.7, quibble@connorjclark/quibble#mod-cache:
   version "0.6.9"
-  resolved "https://registry.yarnpkg.com/quibble/-/quibble-0.6.9.tgz#1e7b24a72b59bdb6cc272318448cd6b7eb61fbe8"
-  integrity sha512-EotkZs/lqgDdGsKzdmZuqu2ATgupQzhByUZ8oL3ElzCKDhXmgVLrX+WDe/StvrfB80h4EPOTElXuQifcfJwwFw==
+  resolved "https://codeload.github.com/connorjclark/quibble/tar.gz/b228a4ddbbad5061d36b465db2f364bb7c3291d3"
   dependencies:
     lodash "^4.17.21"
     resolve "^1.20.0"

From 50d08844492a394ee30cbb916e9dfff077a6424b Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Wed, 13 Jul 2022 12:40:52 -0700
Subject: [PATCH 92/96] unskip

---
 .../test/fraggle-rock/gather/navigation-runner-test.js         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js b/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
index 3d5922782c5b..c69fd67e4a64 100644
--- a/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
+++ b/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
@@ -421,8 +421,7 @@ describe('NavigationRunner', () => {
       expect(artifacts).toEqual({});
     });
 
-    // TODO(esmodules): unclear why this fails now.
-    it.skip('finds page load errors in network records when available', async () => {
+    it('finds page load errors in network records when available', async () => {
       const {navigation, gatherers} = createNavigation();
       mocks.navigationMock.gotoURL.mockResolvedValue({mainDocumentUrl: requestedUrl, warnings: []});
       const devtoolsLog = networkRecordsToDevtoolsLog([{url: requestedUrl, failed: true}]);

From afc5e653d65e5f76569bedeadbd3417b7092e0c7 Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Wed, 13 Jul 2022 15:15:25 -0700
Subject: [PATCH 93/96] await all the things

---
 lighthouse-cli/test/cli/bin-test.js            | 10 +++++-----
 .../test/fraggle-rock/gather/mock-driver.js    | 16 ++++++++--------
 .../gather/navigation-runner-test.js           |  4 ++--
 .../gather/snapshot-runner-test.js             |  2 +-
 .../gather/timespan-runner-test.js             |  6 +++---
 .../test/fraggle-rock/user-flow-test.js        |  8 ++++----
 .../test/gather/driver/prepare-test.js         |  2 +-
 .../test/gather/gather-runner-test.js          |  2 +-
 .../dobetterweb/response-compression-test.js   |  2 +-
 .../gather/gatherers/link-elements-test.js     |  2 +-
 .../gather/gatherers/script-elements-test.js   |  2 +-
 .../gather/gatherers/service-worker-test.js    |  2 +-
 lighthouse-core/test/lib/sentry-test.js        |  4 ++--
 lighthouse-core/test/runner-test.js            |  6 +++---
 lighthouse-core/test/test-utils.js             | 18 +++++++++---------
 15 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/lighthouse-cli/test/cli/bin-test.js b/lighthouse-cli/test/cli/bin-test.js
index d14487bcc251..2a872bac960c 100644
--- a/lighthouse-cli/test/cli/bin-test.js
+++ b/lighthouse-cli/test/cli/bin-test.js
@@ -21,21 +21,21 @@ const mockLoggerSetLevel = jestMock.fn();
 /** @type {import('../../bin.js')} */
 let bin;
 before(async () => {
-  td.replaceEsm('../../run.js', {
+  await td.replaceEsm('../../run.js', {
     runLighthouse: mockRunLighthouse,
   });
-  td.replaceEsm('../../cli-flags.js', {
+  await td.replaceEsm('../../cli-flags.js', {
     getFlags: mockGetFlags,
   });
-  td.replaceEsm('../../sentry-prompt.js', {
+  await td.replaceEsm('../../sentry-prompt.js', {
     askPermission: mockAskPermission,
   });
-  td.replaceEsm('../../../lighthouse-core/lib/sentry.js', {
+  await td.replaceEsm('../../../lighthouse-core/lib/sentry.js', {
     Sentry: {
       init: mockSentryInit,
     },
   });
-  td.replaceEsm('lighthouse-logger', undefined, {setLevel: mockLoggerSetLevel});
+  await td.replaceEsm('lighthouse-logger', undefined, {setLevel: mockLoggerSetLevel});
   bin = await import('../../bin.js');
 });
 
diff --git a/lighthouse-core/test/fraggle-rock/gather/mock-driver.js b/lighthouse-core/test/fraggle-rock/gather/mock-driver.js
index b23f8f4bd071..d209475d9a57 100644
--- a/lighthouse-core/test/fraggle-rock/gather/mock-driver.js
+++ b/lighthouse-core/test/fraggle-rock/gather/mock-driver.js
@@ -186,8 +186,8 @@ const runnerMock = {
     runnerMock.gather.mockReset();
   },
 };
-function mockRunnerModule() {
-  td.replaceEsm(`${LH_ROOT}/lighthouse-core/runner.js`, {Runner: runnerMock});
+async function mockRunnerModule() {
+  await td.replaceEsm(`${LH_ROOT}/lighthouse-core/runner.js`, {Runner: runnerMock});
   return runnerMock;
 }
 
@@ -249,7 +249,7 @@ function createMockContext() {
   };
 }
 
-function mockDriverSubmodules() {
+async function mockDriverSubmodules() {
   const navigationMock = {gotoURL: fnAny()};
   const prepareMock = {
     prepareThrottlingAndNetwork: fnAny(),
@@ -290,11 +290,11 @@ function mockDriverSubmodules() {
     return (...args) => target[name](...args);
   };
 
-  td.replaceEsm('../../../gather/driver/navigation.js', new Proxy(navigationMock, {get}));
-  td.replaceEsm('../../../gather/driver/prepare.js', new Proxy(prepareMock, {get}));
-  td.replaceEsm('../../../gather/driver/storage.js', new Proxy(storageMock, {get}));
-  td.replaceEsm('../../../gather/driver/network.js', new Proxy(networkMock, {get}));
-  td.replaceEsm('../../../lib/emulation.js', new Proxy(emulationMock, {get}));
+  await td.replaceEsm('../../../gather/driver/navigation.js', new Proxy(navigationMock, {get}));
+  await td.replaceEsm('../../../gather/driver/prepare.js', new Proxy(prepareMock, {get}));
+  await td.replaceEsm('../../../gather/driver/storage.js', new Proxy(storageMock, {get}));
+  await td.replaceEsm('../../../gather/driver/network.js', new Proxy(networkMock, {get}));
+  await td.replaceEsm('../../../lib/emulation.js', new Proxy(emulationMock, {get}));
 
   reset();
 
diff --git a/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js b/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
index c69fd67e4a64..c424c44db538 100644
--- a/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
+++ b/lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js
@@ -27,8 +27,8 @@ import {Runner as runnerActual} from '../../../runner.js';
 /** @type {import('../../../fraggle-rock/gather/navigation-runner.js')} */
 let runner;
 
-const mocks = mockDriverSubmodules();
-const mockRunner = mockRunnerModule();
+const mocks = await mockDriverSubmodules();
+const mockRunner = await mockRunnerModule();
 beforeEach(async () => {
   mockRunner.reset();
   mockRunner.getGathererList.mockImplementation(runnerActual.getGathererList);
diff --git a/lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js b/lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js
index a2ab0b8095e9..9e7647002dbd 100644
--- a/lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js
+++ b/lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js
@@ -31,7 +31,7 @@ const mockRunner = mockRunnerModule();
 /** @type {ReturnType<typeof createMockDriver>} */
 let mockDriver;
 
-td.replaceEsm('../../../fraggle-rock/gather/driver.js',
+await td.replaceEsm('../../../fraggle-rock/gather/driver.js',
   mockDriverModule(() => mockDriver.asDriver()));
 
 describe('Snapshot Runner', () => {
diff --git a/lighthouse-core/test/fraggle-rock/gather/timespan-runner-test.js b/lighthouse-core/test/fraggle-rock/gather/timespan-runner-test.js
index da6b32131edb..57dfd89e506c 100644
--- a/lighthouse-core/test/fraggle-rock/gather/timespan-runner-test.js
+++ b/lighthouse-core/test/fraggle-rock/gather/timespan-runner-test.js
@@ -27,13 +27,13 @@ before(async () => {
     (await import('../../../fraggle-rock/gather/timespan-runner.js')).startTimespanGather;
 });
 
-const mockSubmodules = mockDriverSubmodules();
-const mockRunner = mockRunnerModule();
+const mockSubmodules = await mockDriverSubmodules();
+const mockRunner = await mockRunnerModule();
 
 // Establish the mocks before we import the file under test.
 /** @type {ReturnType<typeof createMockDriver>} */
 let mockDriver;
-td.replaceEsm('../../../fraggle-rock/gather/driver.js',
+await td.replaceEsm('../../../fraggle-rock/gather/driver.js',
   mockDriverModule(() => mockDriver.asDriver()));
 
 describe('Timespan Runner', () => {
diff --git a/lighthouse-core/test/fraggle-rock/user-flow-test.js b/lighthouse-core/test/fraggle-rock/user-flow-test.js
index c05590c54e69..03d0b7b35a7e 100644
--- a/lighthouse-core/test/fraggle-rock/user-flow-test.js
+++ b/lighthouse-core/test/fraggle-rock/user-flow-test.js
@@ -24,13 +24,13 @@ before(async () => {
 });
 
 const snapshotModule = {snapshotGather: jestMock.fn()};
-td.replaceEsm('../../fraggle-rock/gather/snapshot-runner.js', snapshotModule);
+await td.replaceEsm('../../fraggle-rock/gather/snapshot-runner.js', snapshotModule);
 const navigationModule = {navigationGather: jestMock.fn()};
-td.replaceEsm('../../fraggle-rock/gather/navigation-runner.js', navigationModule);
+await td.replaceEsm('../../fraggle-rock/gather/navigation-runner.js', navigationModule);
 const timespanModule = {startTimespanGather: jestMock.fn()};
-td.replaceEsm('../../fraggle-rock/gather/timespan-runner.js', timespanModule);
+await td.replaceEsm('../../fraggle-rock/gather/timespan-runner.js', timespanModule);
 
-const mockRunner = mockRunnerModule();
+const mockRunner = await mockRunnerModule();
 
 describe('UserFlow', () => {
   let mockPage = createMockPage();
diff --git a/lighthouse-core/test/gather/driver/prepare-test.js b/lighthouse-core/test/gather/driver/prepare-test.js
index b00380415590..a83e59e025bd 100644
--- a/lighthouse-core/test/gather/driver/prepare-test.js
+++ b/lighthouse-core/test/gather/driver/prepare-test.js
@@ -26,7 +26,7 @@ const storageMock = {
   clearBrowserCaches: fnAny(),
   getImportantStorageWarning: fnAny(),
 };
-td.replaceEsm('../../../gather/driver/storage.js', storageMock);
+await td.replaceEsm('../../../gather/driver/storage.js', storageMock);
 
 const url = 'https://example.com';
 let sessionMock = createMockSession();
diff --git a/lighthouse-core/test/gather/gather-runner-test.js b/lighthouse-core/test/gather/gather-runner-test.js
index 9962ffcd933a..0b66db432be7 100644
--- a/lighthouse-core/test/gather/gather-runner-test.js
+++ b/lighthouse-core/test/gather/gather-runner-test.js
@@ -30,7 +30,7 @@ import {fakeDriver} from './fake-driver.js';
 
 const unresolvedPerfLog = readJson('./../fixtures/unresolved-perflog.json', import.meta);
 
-makeMocksForGatherRunner();
+await makeMocksForGatherRunner();
 
 /** @type {jestMock.SpyInstance<Promise<void>, [session: any, pageUrl: string]>} */
 let assertNoSameOriginServiceWorkerClientsMock;
diff --git a/lighthouse-core/test/gather/gatherers/dobetterweb/response-compression-test.js b/lighthouse-core/test/gather/gatherers/dobetterweb/response-compression-test.js
index fcefe4a77827..b36b8a2f2c85 100644
--- a/lighthouse-core/test/gather/gatherers/dobetterweb/response-compression-test.js
+++ b/lighthouse-core/test/gather/gatherers/dobetterweb/response-compression-test.js
@@ -19,7 +19,7 @@ before(async () => {
     (await import('../../../../gather/gatherers/dobetterweb/response-compression.js')).default;
 });
 
-const mocks = mockDriverSubmodules();
+const mocks = await mockDriverSubmodules();
 
 const networkRecords = [
   {
diff --git a/lighthouse-core/test/gather/gatherers/link-elements-test.js b/lighthouse-core/test/gather/gatherers/link-elements-test.js
index 308cc89c15c4..737ddb23ad74 100644
--- a/lighthouse-core/test/gather/gatherers/link-elements-test.js
+++ b/lighthouse-core/test/gather/gatherers/link-elements-test.js
@@ -19,7 +19,7 @@ before(async () => {
 });
 
 const mockMainResource = jestMock.fn();
-td.replaceEsm('../../../computed/main-resource.js', undefined, {request: mockMainResource});
+await td.replaceEsm('../../../computed/main-resource.js', undefined, {request: mockMainResource});
 
 beforeEach(() => {
   mockMainResource.mockReset();
diff --git a/lighthouse-core/test/gather/gatherers/script-elements-test.js b/lighthouse-core/test/gather/gatherers/script-elements-test.js
index 17665bf7578c..324b51f6f23a 100644
--- a/lighthouse-core/test/gather/gatherers/script-elements-test.js
+++ b/lighthouse-core/test/gather/gatherers/script-elements-test.js
@@ -19,7 +19,7 @@ before(async () => {
   ScriptElements = (await import('../../../gather/gatherers/script-elements.js')).default;
 });
 
-const mocks = mockDriverSubmodules();
+const mocks = await mockDriverSubmodules();
 
 /**
  * @param {Partial<LH.Artifacts.NetworkRequest>=} partial
diff --git a/lighthouse-core/test/gather/gatherers/service-worker-test.js b/lighthouse-core/test/gather/gatherers/service-worker-test.js
index 0598f937286a..ac465a29308e 100644
--- a/lighthouse-core/test/gather/gatherers/service-worker-test.js
+++ b/lighthouse-core/test/gather/gatherers/service-worker-test.js
@@ -25,7 +25,7 @@ before(async () => {
 const getServiceWorkerVersions = fnAny();
 const getServiceWorkerRegistrations = fnAny();
 
-td.replaceEsm('../../../gather/driver/service-workers.js', {
+await td.replaceEsm('../../../gather/driver/service-workers.js', {
   getServiceWorkerVersions,
   getServiceWorkerRegistrations,
 });
diff --git a/lighthouse-core/test/lib/sentry-test.js b/lighthouse-core/test/lib/sentry-test.js
index 0bca03175e03..5c04288072e4 100644
--- a/lighthouse-core/test/lib/sentry-test.js
+++ b/lighthouse-core/test/lib/sentry-test.js
@@ -14,8 +14,8 @@ describe('Sentry', () => {
   let configPayload;
   let originalSentry;
 
-  beforeEach(() => {
-    td.replaceEsm('@sentry/node', (sentryNodeMock = {
+  beforeEach(async () => {
+    await td.replaceEsm('@sentry/node', (sentryNodeMock = {
       init: jestMock.fn().mockReturnValue({install: jestMock.fn()}),
       setExtras: jestMock.fn(),
       captureException: jestMock.fn(),
diff --git a/lighthouse-core/test/runner-test.js b/lighthouse-core/test/runner-test.js
index b911875c17fb..4048b93ee139 100644
--- a/lighthouse-core/test/runner-test.js
+++ b/lighthouse-core/test/runner-test.js
@@ -25,7 +25,7 @@ import {getModuleDirectory} from '../../esm-utils.js';
 
 const moduleDir = getModuleDirectory(import.meta);
 
-makeMocksForGatherRunner();
+await makeMocksForGatherRunner();
 
 // Some imports needs to be done dynamically, so that their dependencies will be mocked.
 // See: https://jestjs.io/docs/ecmascript-modules#differences-between-esm-and-commonjs
@@ -48,13 +48,13 @@ let gatherRunnerRunSpy;
 /** @type {jestMock.Mock} */
 let runAuditSpy;
 
-td.replaceEsm('../lib/asset-saver.js', {
+await td.replaceEsm('../lib/asset-saver.js', {
   saveArtifacts: saveArtifactsSpy = jestMock.fn(assetSaver.saveArtifacts),
   saveLhr: saveLhrSpy = jestMock.fn(),
   loadArtifacts: loadArtifactsSpy = jestMock.fn(assetSaver.loadArtifacts),
 });
 
-td.replaceEsm('../gather/driver/service-workers.js', {
+await td.replaceEsm('../gather/driver/service-workers.js', {
   getServiceWorkerVersions: jestMock.fn().mockResolvedValue({versions: []}),
   getServiceWorkerRegistrations: jestMock.fn().mockResolvedValue({registrations: []}),
 });
diff --git a/lighthouse-core/test/test-utils.js b/lighthouse-core/test/test-utils.js
index 819135e5c18c..f424adc92708 100644
--- a/lighthouse-core/test/test-utils.js
+++ b/lighthouse-core/test/test-utils.js
@@ -181,36 +181,36 @@ async function flushAllTimersAndMicrotasks(ms = 1000) {
  * Mocks gatherers for BaseArtifacts that tests for components using GatherRunner
  * shouldn't concern themselves about.
  */
-function makeMocksForGatherRunner() {
-  td.replaceEsm(require.resolve('../gather/driver/environment.js'), {
+async function makeMocksForGatherRunner() {
+  await td.replaceEsm(require.resolve('../gather/driver/environment.js'), {
     getBenchmarkIndex: () => Promise.resolve(150),
     getBrowserVersion: async () => ({userAgent: 'Chrome', milestone: 80}),
     getEnvironmentWarnings: () => [],
   });
-  td.replaceEsm(require.resolve('../gather/gatherers/stacks.js'), undefined, {
+  await td.replaceEsm(require.resolve('../gather/gatherers/stacks.js'), undefined, {
     collectStacks: () => Promise.resolve([]),
   });
-  td.replaceEsm(require.resolve('../gather/gatherers/installability-errors.js'), undefined, {
+  await td.replaceEsm(require.resolve('../gather/gatherers/installability-errors.js'), undefined, {
     getInstallabilityErrors: async () => ({errors: []}),
   });
-  td.replaceEsm(require.resolve('../gather/gatherers/web-app-manifest.js'), undefined, {
+  await td.replaceEsm(require.resolve('../gather/gatherers/web-app-manifest.js'), undefined, {
     getWebAppManifest: async () => null,
   });
-  td.replaceEsm(require.resolve('../lib/emulation.js'), {
+  await td.replaceEsm(require.resolve('../lib/emulation.js'), {
     emulate: jestMock.fn(),
     throttle: jestMock.fn(),
     clearThrottling: jestMock.fn(),
   });
-  td.replaceEsm(require.resolve('../gather/driver/prepare.js'), {
+  await td.replaceEsm(require.resolve('../gather/driver/prepare.js'), {
     prepareTargetForNavigationMode: jestMock.fn(),
     prepareTargetForIndividualNavigation: jestMock.fn().mockResolvedValue({warnings: []}),
   });
-  td.replaceEsm(require.resolve('../gather/driver/storage.js'), {
+  await td.replaceEsm(require.resolve('../gather/driver/storage.js'), {
     clearDataForOrigin: jestMock.fn(),
     cleanBrowserCaches: jestMock.fn(),
     getImportantStorageWarning: jestMock.fn(),
   });
-  td.replaceEsm(require.resolve('../gather/driver/navigation.js'), {
+  await td.replaceEsm(require.resolve('../gather/driver/navigation.js'), {
     gotoURL: jestMock.fn().mockResolvedValue({
       mainDocumentUrl: 'http://example.com',
       warnings: [],

From 7888d97cf2ad8a54eef2e524f3e1ba5742bcd41e Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Wed, 13 Jul 2022 15:25:51 -0700
Subject: [PATCH 94/96] fail fast units

---
 .github/workflows/unit.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
index 1299e407d86a..7c92a4228b49 100644
--- a/.github/workflows/unit.yml
+++ b/.github/workflows/unit.yml
@@ -11,6 +11,7 @@ jobs:
     strategy:
       matrix:
         node: ['14', '16', '17']
+      fail-fast: false
     runs-on: ubuntu-latest
     name: node ${{ matrix.node }}
     env:

From b1f39d3ab0a35e5ec6fa1ff9af2ecdcd644c056a Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Wed, 13 Jul 2022 15:40:41 -0700
Subject: [PATCH 95/96] missed one

---
 .../test/fraggle-rock/gather/snapshot-runner-test.js            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js b/lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js
index 9e7647002dbd..753cf0baa983 100644
--- a/lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js
+++ b/lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js
@@ -25,7 +25,7 @@ before(async () => {
   snapshotGather = (await import('../../../fraggle-rock/gather/snapshot-runner.js')).snapshotGather;
 });
 
-const mockRunner = mockRunnerModule();
+const mockRunner = await mockRunnerModule();
 
 // Establish the mocks before we import the file under test.
 /** @type {ReturnType<typeof createMockDriver>} */

From 42bd6bad8b7ec2b3faf2fb5c8c0d48d5e6f0383e Mon Sep 17 00:00:00 2001
From: Connor Clark <cjamcl@google.com>
Date: Wed, 13 Jul 2022 15:55:47 -0700
Subject: [PATCH 96/96] isolate bin-test

---
 lighthouse-core/test/scripts/run-mocha-tests.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lighthouse-core/test/scripts/run-mocha-tests.js b/lighthouse-core/test/scripts/run-mocha-tests.js
index 1d9d2807b0bc..4d037e390780 100644
--- a/lighthouse-core/test/scripts/run-mocha-tests.js
+++ b/lighthouse-core/test/scripts/run-mocha-tests.js
@@ -47,9 +47,10 @@ function getFailedTests() {
 //    yarn mocha --no-isolation --no-parallel lighthouse-core/test
 //
 // Because mocha workers can divide up test files that mess with global scope in a way that
-// _just happens_ to not cause anything to fail, use this command works to verify that
+// _just happens_ to not cause anything to fail, use this command to verify that
 // all necessary tests are isolated:
-//    yarn mocha --no-parallel lighthouse-core/test
+//    yarn mocha --no-parallel
+// (also, just comment out the `testsToRunIsolated` below, as they won't impact this verification)
 const testsToIsolate = new Set([
   // grep -lRE '^timers\.useFakeTimers' --include='*-test.*' --exclude-dir=node_modules
   'flow-report/test/common-test.tsx',
@@ -67,14 +68,12 @@ const testsToIsolate = new Set([
   'lighthouse-core/test/gather/gatherers/trace-test.js',
 
   // grep -lRE '^td\.replace' --include='*-test.*' --exclude-dir=node_modules
-  'lighthouse-core/test/fraggle-rock/gather/navigation-runner-test.js',
   'lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js',
   'lighthouse-core/test/fraggle-rock/gather/timespan-runner-test.js',
   'lighthouse-core/test/fraggle-rock/user-flow-test.js',
   'lighthouse-core/test/gather/driver/prepare-test.js',
   'lighthouse-core/test/gather/gatherers/link-elements-test.js',
   'lighthouse-core/test/gather/gatherers/service-worker-test.js',
-  'lighthouse-core/test/lib/sentry-test.js',
   'lighthouse-core/test/runner-test.js',
 
   // grep -lRE --include='-test.js' 'mockDriverSubmodules|mockRunnerModule|mockDriverModule|mockDriverSubmodules|makeMocksForGatherRunner' --include='*-test.*' --exclude-dir=node_modules
@@ -95,6 +94,7 @@ const testsToIsolate = new Set([
   // ?
   'clients/test/lightrider/lightrider-entry-test.js', // Runner overrides.
   'flow-report/test/flow-report-pptr-test.ts',
+  'lighthouse-cli/test/cli/bin-test.js',
   'lighthouse-cli/test/cli/run-test.js',
   'lighthouse-core/test/config/config-test.js',
   'lighthouse-core/test/fraggle-rock/config/config-test.js',