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

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

@@ -5,22 +5,24 @@
  */
 'use strict';
 
-const path = require('path');
-const log = require('lighthouse-logger');
-const Runner = require('../../runner.js');
-const format = require('../../../shared/localization/format.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,
@@ -28,8 +30,12 @@ const {
   mergePlugins,
   mergeConfigFragment,
   mergeConfigFragmentArrayByKey,
-} = require('../../config/config-helpers.js');
-const defaultConfigPath = path.join(__dirname, './default-config.js');
+} from '../../config/config-helpers.js';
+
+import {getModuleDirectory} from '../../../esm-utils.js';
+import * as format from '../../../shared/localization/format.js';
+
+const defaultConfigPath = path.join(getModuleDirectory(import.meta), './default-config.js');
 
 /** @typedef {LH.Config.FRContext & {gatherMode: LH.Gatherer.GatherMode}} ConfigContext */
 
@@ -134,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;
@@ -155,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;
@@ -323,4 +329,8 @@ function getConfigDisplayString(config) {
   return JSON.stringify(jsonConfig, null, 2);
 }
 
-module.exports = {resolveWorkingCopy, initializeConfig, getConfigDisplayString};
+export {
+  resolveWorkingCopy,
+  initializeConfig,
+  getConfigDisplayString,
+};

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

@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const legacyDefaultConfig = require('../../config/default-config.js');
-const m2a = require('../../config/metrics-to-audits.js');
-const {deepClone} = require('../../config/config-helpers.js');
+import legacyDefaultConfig from '../../config/default-config.js';
+import {deepClone} from '../../config/config-helpers.js';
+import {metricsToAudits} from '../../config/metrics-to-audits.js';
 
 /** @type {LH.Config.AuditJson[]} */
 const frAudits = [
@@ -21,7 +21,7 @@ const frCategoryAuditRefExtensions = {
   'performance': [
     {id: 'uses-responsive-images-snapshot', weight: 0},
     {id: 'experimental-interaction-to-next-paint', weight: 0, group: 'metrics', acronym: 'INP',
-      relevantAudits: m2a.inpRelevantAudits},
+      relevantAudits: metricsToAudits.inpRelevantAudits},
     {id: 'work-during-interaction', weight: 0},
   ],
 };
@@ -205,4 +205,4 @@ const defaultConfig = {
   groups: legacyDefaultConfig.groups,
 };
 
-module.exports = defaultConfig;
+export default defaultConfig;

package/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 = {
@@ -324,7 +323,7 @@ function filterConfigByExplicitFilters(config, filters) {
   };
 }
 
-module.exports = {
+export {
   filterConfigByGatherMode,
   filterConfigByExplicitFilters,
   filterArtifactsByGatherMode,

package/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 * as 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,

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

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

@@ -104,4 +104,5 @@ class FRGatherer {
   }
 }
 
-module.exports = FRGatherer;
+// TODO(esmodules): do not use default export
+export default FRGatherer;

package/lighthouse-core/fraggle-rock/gather/driver.js

@@ -5,10 +5,10 @@
  */
 'use strict';
 
-const log = require('lighthouse-logger');
-const ExecutionContext = require('../../gather/driver/execution-context.js');
-const Fetcher = require('../../gather/fetcher.js');
-const TargetManager = require('../../gather/driver/target-manager.js');
+import log from 'lighthouse-logger';
+import {ExecutionContext} from '../../gather/driver/execution-context.js';
+import {TargetManager} from '../../gather/driver/target-manager.js';
+import {Fetcher} from '../../gather/fetcher.js';
 
 /** @return {*} */
 const throwNotConnectedFn = () => {
@@ -89,4 +89,4 @@ class Driver {
   }
 }
 
-module.exports = Driver;
+export {Driver};

package/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 * as prepare from '../../gather/driver/prepare.js';
+import {gotoURL} from '../../gather/driver/navigation.js';
+import * as storage from '../../gather/driver/storage.js';
+import * as 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};
 }
@@ -356,7 +352,7 @@ async function navigationGather(requestor, options) {
   return {artifacts, runnerOptions};
 }
 
-module.exports = {
+export {
   navigationGather,
   _setup,
   _setupNavigation,

package/lighthouse-core/fraggle-rock/gather/runner-helpers.js

@@ -7,7 +7,7 @@
 
 /**
  * @typedef CollectPhaseArtifactOptions
- * @property {import('./driver.js')} driver
+ * @property {import('./driver.js').Driver} driver
  * @property {Array<LH.Config.AnyArtifactDefn>} artifactDefinitions
  * @property {ArtifactState} artifactState
  * @property {LH.FRBaseArtifacts} baseArtifacts
@@ -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 {
   getEmptyArtifactState,
   awaitArtifacts,
   collectPhaseArtifacts,

package/lighthouse-core/fraggle-rock/gather/session.js

@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const EventEmitter = require('events').EventEmitter;
-const LighthouseError = require('../../lib/lh-error.js');
+import EventEmitter from 'events';
+import {LighthouseError} from '../../lib/lh-error.js';
 
 // Controls how long to wait for a response after sending a DevTools protocol command.
 const DEFAULT_PROTOCOL_TIMEOUT = 30000;
@@ -111,4 +111,4 @@ class ProtocolSession extends CrdpEventEmitter {
   }
 }
 
-module.exports = ProtocolSession;
+export {ProtocolSession};

package/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
@@ -65,6 +61,6 @@ async function snapshotGather(options) {
   return {artifacts, runnerOptions};
 }
 
-module.exports = {
+export {
   snapshotGather,
 };

package/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
@@ -78,6 +74,6 @@ async function startTimespanGather(options) {
   };
 }
 
-module.exports = {
+export {
   startTimespanGather,
 };

package/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 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';
+import {Runner} from '../runner.js';
+import {initializeConfig} from './config/config.js';
 
 /** @typedef {Parameters<snapshotGather>[0]} FrOptions */
 /** @typedef {Omit<FrOptions, 'page'> & {name?: string}} UserFlowOptions */
@@ -220,7 +220,7 @@ class UserFlow {
    */
   async generateReport() {
     const flowResult = await this.createFlowResult();
-    return generateFlowReportHtml(flowResult);
+    return ReportGenerator.generateFlowReportHtml(flowResult);
   }
 
   /**
@@ -273,7 +273,7 @@ async function auditGatherSteps(gatherSteps, options) {
 }
 
 
-module.exports = {
+export {
   UserFlow,
   auditGatherSteps,
 };

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

@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const EventEmitter = require('events').EventEmitter;
-const log = require('lighthouse-logger');
-const LighthouseError = require('../../lib/lh-error.js');
+import {EventEmitter} from 'events';
+import log from 'lighthouse-logger';
+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.
@@ -176,4 +176,4 @@ class Connection {
   }
 }
 
-module.exports = Connection;
+export {Connection};

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

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

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

@@ -55,4 +55,4 @@ async function resolveDevtoolsNodePathToObjectId(session, path) {
   }
 }
 
-module.exports = {resolveNodeIdToObjectId, resolveDevtoolsNodePathToObjectId};
+export {resolveNodeIdToObjectId, resolveDevtoolsNodePathToObjectId};

package/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 * as constants from '../../config/constants.js';
+import {pageFunctions} from '../../lib/page-functions.js';
+import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
   /**
@@ -27,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
@@ -96,7 +96,7 @@ function getEnvironmentWarnings(context) {
   ].filter(/** @return {s is LH.IcuMessage} */ s => !!s);
 }
 
-module.exports = {
+export {
   UIStrings,
   getBrowserVersion,
   getBenchmarkIndex,

package/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 */
@@ -249,4 +249,4 @@ class ExecutionContext {
   }
 }
 
-module.exports = ExecutionContext;
+export {ExecutionContext};

package/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 * as constants from '../../config/constants.js';
+import * as i18n from '../../lib/i18n/i18n.js';
+import URL from '../../lib/url-shim.js';
 
 const UIStrings = {
   /**
@@ -28,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
@@ -179,4 +179,4 @@ function getNavigationWarnings(navigation) {
   return warnings;
 }
 
-module.exports = {gotoURL, getNavigationWarnings, UIStrings};
+export {gotoURL, getNavigationWarnings, UIStrings};

package/lighthouse-core/gather/driver/network-monitor.js

@@ -10,11 +10,12 @@
  * 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');
+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';
 
 /** @typedef {import('../../lib/network-recorder.js').NetworkRecorderEventMap} NetworkRecorderEventMap */
 /** @typedef {'network-2-idle'|'network-critical-idle'|'networkidle'|'networkbusy'|'network-critical-busy'|'network-2-busy'} NetworkMonitorEvent_ */
@@ -256,4 +257,4 @@ class NetworkMonitor extends NetworkMonitorEventEmitter {
   }
 }
 
-module.exports = NetworkMonitor;
+export {NetworkMonitor};

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