lighthouse 9.5.0-dev.20220711 → 9.5.0-dev.20220714

package/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 * as 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. */
@@ -90,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 = {
@@ -165,7 +163,7 @@ function evaluateRawCspsForXss(rawCsps) {
   return {bypasses, warnings, syntax};
 }
 
-module.exports = {
+export {
   getTranslatedDescription,
   evaluateRawCspsForXss,
   parseCsp,

package/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};

package/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};

package/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};

package/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 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);
   }
-};
+}

package/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 {DNSCache};

package/lighthouse-core/lib/dependency-graph/simulator/network-analyzer.js

@@ -5,8 +5,9 @@
  */
 'use strict';
 
+import URL from '../../url-shim.js';
+
 const INITIAL_CWD = 14 * 1024;
-const URL = require('../../url-shim.js');
 
 // 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 {
   }
 }
 
-module.exports = NetworkAnalyzer;
+export {NetworkAnalyzer};
 
 /**
- * @typedef NetworkAnalyzer.Summary
+ * @typedef Summary
  * @property {number} min
  * @property {number} max
  * @property {number} avg
@@ -468,7 +469,7 @@ module.exports = 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.

package/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 {SimulatorTimingMap};

package/lighthouse-core/lib/dependency-graph/simulator/simulator.js

@@ -5,16 +5,18 @@
  */
 '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');
-const mobileSlow4G = require('../../../config/constants.js').throttling.mobileSlow4G;
-const SimulatorTimingMap = require('./simulator-timing-map.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';
+import {SimulatorTimingMap} from './simulator-timing-map.js';
+import * as constants from '../../../config/constants.js';
 
-/** @typedef {BaseNode.Node} Node */
-/** @typedef {import('../network-node')} NetworkNode */
-/** @typedef {import('../cpu-node')} CpuNode */
+const mobileSlow4G = constants.throttling.mobileSlow4G;
+
+/** @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 +522,4 @@ class Simulator {
   }
 }
 
-module.exports = Simulator;
+export {Simulator};

package/lighthouse-core/lib/dependency-graph/simulator/tcp-connection.js

@@ -187,7 +187,7 @@ class TcpConnection {
   }
 }
 
-module.exports = TcpConnection;
+export {TcpConnection};
 
 /**
  * @typedef DownloadOptions

package/lighthouse-core/lib/emulation.js

@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const {version: lighthouseVersion} = require('../../package.json');
+import {lighthouseVersion} from '../../root.js';
 
 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 {
   emulate,
   throttle,
   clearThrottling,

package/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});

package/lighthouse-core/lib/i18n/i18n.js

@@ -7,16 +7,14 @@
 
 /** @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';
+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) */
@@ -172,6 +170,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>}
@@ -188,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 : __filename;
+    const filenameToLookup = keyname in fileStrings ? filename : getModulePath(import.meta);
     const unixStyleFilename = path.relative(LH_ROOT, filenameToLookup).replace(/\\/g, '/');
     const i18nId = `${unixStyleFilename} | ${keyname}`;
 
@@ -211,11 +211,11 @@ function isStringOrIcuMessage(value) {
   return typeof value === 'string' || isIcuMessage(value);
 }
 
-module.exports = {
+export {
   UIStrings,
   lookupLocale,
   createIcuMessageFn,
   isStringOrIcuMessage,
   // TODO: exported for backwards compatibility. Consider removing on future breaking change.
-  createMessageInstanceIdFn: createIcuMessageFn,
+  createIcuMessageFn as createMessageInstanceIdFn,
 };

package/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 {
   doExist,
   pngSizedAtLeast,
   containsMaskableIcon,

package/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

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

@@ -5,10 +5,12 @@
  */
 'use strict';
 
-const process = require('process');
+import process from 'process';
 
-module.exports = {
-  // 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
-  isUnderTest: !!process.env.CI || process.env.NODE_ENV === 'test',
+// 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';
+
+export {
+  isUnderTest,
 };

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

@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const i18n = require('./i18n/i18n.js');
+import * as i18n from './i18n/i18n.js';
 
 /* eslint-disable max-len */
 const UIStrings = {
@@ -89,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);
 
 
 /**
@@ -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};

package/lighthouse-core/lib/lh-trace-processor.js

@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const LighthouseError = require('../lib/lh-error.js');
-const TraceProcessor = require('../lib/tracehouse/trace-processor.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 LighthouseError
 // objects to be thrown instead.
@@ -43,4 +43,4 @@ class LHTraceProcessor extends TraceProcessor {
   }
 }
 
-module.exports = LHTraceProcessor;
+export default LHTraceProcessor;

package/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.js';
 
 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};

package/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 {computeMedianRun, filterToValidRuns};

package/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 {computeJSTokenLength, computeCSSTokenLength};

package/lighthouse-core/lib/minify-devtoolslog.js

@@ -84,4 +84,4 @@ function minifyDevtoolsLog(log) {
   });
 }
 
-module.exports = {minifyDevtoolsLog};
+export {minifyDevtoolsLog};

package/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 {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;
@@ -170,4 +170,4 @@ function minifyTrace(inputTrace) {
   return {traceEvents: filterTraceEvents(inputTrace.traceEvents)};
 }
 
-module.exports = {minifyTrace};
+export {minifyTrace};

package/lighthouse-core/lib/navigation-error.js

@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const LighthouseError = require('./lh-error.js');
-const NetworkAnalyzer = require('./dependency-graph/simulator/network-analyzer.js');
-const NetworkRequest = require('./network-request.js');
-const i18n = require('./i18n/i18n.js');
+import {LighthouseError} from './lh-error.js';
+import {NetworkAnalyzer} from './dependency-graph/simulator/network-analyzer.js';
+import {NetworkRequest} from './network-request.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 const UIStrings = {
   /**
@@ -19,7 +19,7 @@ const UIStrings = {
     'The page MIME type is XHTML: Lighthouse does not explicitly support this document type',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
+const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
 
 // MIME types are case-insensitive but Chrome normalizes MIME types to be lowercase.
 const HTML_MIME_TYPE = 'text/html';
@@ -165,7 +165,7 @@ function getPageLoadError(navigationError, context) {
   return navigationError;
 }
 
-module.exports = {
+export {
   getNetworkError,
   getInterstitialError,
   getPageLoadError,

package/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 {{
@@ -325,4 +325,4 @@ class NetworkRecorder extends RequestEventEmitter {
   }
 }
 
-module.exports = NetworkRecorder;
+export {NetworkRecorder};

package/lighthouse-core/lib/network-request.js

@@ -11,8 +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.
 // See: _updateTransferSizeForLightrider and _updateTimingsForLightrider.
@@ -537,4 +536,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};

package/lighthouse-core/lib/page-functions.js

@@ -537,7 +537,8 @@ const getNodeDetailsString = `function getNodeDetails(element) {
   return (${getNodeDetails.toString()})(element);
 }`;
 
-module.exports = {
+// TODO(esmodules): should this be refactored to export each function individually?
+export const pageFunctions = {
   wrapRuntimeEvalErrorInBrowserString: wrapRuntimeEvalErrorInBrowser.toString(),
   wrapRuntimeEvalErrorInBrowser,
   getElementsInDocument,

package/lighthouse-core/lib/proto-preprocessor.js

@@ -6,7 +6,8 @@
 
 'use strict';
 
-const fs = require('fs');
+import fs from 'fs';
+import esMain from 'es-main';
 
 /**
  * @fileoverview Helper functions to transform an LHR into a proto-ready LHR.
@@ -108,7 +109,7 @@ function processForProto(lhr) {
 }
 
 // Test if called from the CLI or as a module.
-if (require.main === module) {
+if (esMain(import.meta)) {
   // read in the argv for the input & output
   const args = process.argv.slice(2);
   let input;
@@ -126,8 +127,8 @@ if (require.main === module) {
     // write to output from argv
     fs.writeFileSync(output, JSON.stringify(report), 'utf-8');
   }
-} else {
-  module.exports = {
-    processForProto,
-  };
 }
+
+export {
+  processForProto,
+};

package/lighthouse-core/lib/rect-helpers.js

@@ -233,7 +233,7 @@ function allRectsContainedWithinEachOther(rectListA, rectListB) {
   return true;
 }
 
-module.exports = {
+export {
   rectContainsPoint,
   rectContains,
   addRectWidthAndHeight,