lighthouse 12.0.0 → 12.1.0

package/cli/run.js

@@ -9,7 +9,6 @@
 import path from 'path';
 import os from 'os';
 
-import psList from 'ps-list';
 import * as ChromeLauncher from 'chrome-launcher';
 import yargsParser from 'yargs-parser';
 import log from 'lighthouse-logger';
@@ -176,36 +175,6 @@ async function saveResults(runnerResult, flags) {
   }
 }
 
-/**
- * Attempt to kill the launched Chrome, if defined.
- * @param {ChromeLauncher.LaunchedChrome=} launchedChrome
- * @return {Promise<void>}
- */
-async function potentiallyKillChrome(launchedChrome) {
-  if (!launchedChrome) return;
-
-  /** @type {NodeJS.Timeout} */
-  let timeout;
-  const timeoutPromise = new Promise((_, reject) => {
-    timeout = setTimeout(reject, 5000, new Error('Timed out waiting to kill Chrome'));
-  });
-
-  return Promise.race([
-    launchedChrome.kill(),
-    timeoutPromise,
-  ]).catch(async err => {
-    const runningProcesses = await psList();
-    if (!runningProcesses.some(proc => proc.pid === launchedChrome.pid)) {
-      log.warn('CLI', 'Warning: Chrome process could not be killed because it already exited.');
-      return;
-    }
-
-    throw new Error(`Couldn't quit Chrome process. ${err}`);
-  }).finally(() => {
-    clearTimeout(timeout);
-  });
-}
-
 /**
  * @param {string} url
  * @param {LH.CliFlags} flags
@@ -214,12 +183,10 @@ async function potentiallyKillChrome(launchedChrome) {
  */
 async function runLighthouse(url, flags, config) {
   /** @param {any} reason */
-  async function handleTheUnhandled(reason) {
+  function handleTheUnhandled(reason) {
     process.stderr.write(`Unhandled Rejection. Reason: ${reason}\n`);
-    await potentiallyKillChrome(launchedChrome).catch(() => {});
-    setTimeout(_ => {
-      process.exit(1);
-    }, 100);
+    launchedChrome?.kill();
+    process.exit(1);
   }
   process.on('unhandledRejection', handleTheUnhandled);
 
@@ -247,7 +214,7 @@ async function runLighthouse(url, flags, config) {
       await saveResults(runnerResult, flags);
     }
 
-    await potentiallyKillChrome(launchedChrome);
+    launchedChrome?.kill();
     process.removeListener('unhandledRejection', handleTheUnhandled);
 
     // Runtime errors indicate something was *very* wrong with the page result.
@@ -265,7 +232,7 @@ async function runLighthouse(url, flags, config) {
 
     return runnerResult;
   } catch (err) {
-    await potentiallyKillChrome(launchedChrome).catch(() => {});
+    launchedChrome?.kill();
     return printErrorAndExit(err);
   }
 }

package/cli/test/smokehouse/lighthouse-runners/bundle.js

@@ -97,7 +97,7 @@ async function runBundledLighthouse(url, config, testRunnerOptions) {
     };
   } finally {
     // Clean up and return results.
-    await launchedChrome.kill();
+    launchedChrome.kill();
   }
 }
 

package/cli/test/smokehouse/smokehouse.js

@@ -163,8 +163,18 @@ async function runSmokeTest(smokeTestDefn, testOptions) {
 
     // Run Lighthouse.
     try {
+      // Each individual runner has internal timeouts, but we've had bugs where
+      // that didn't cover some edge case. So to be safe give a (long) timeout here.
+      const timeoutPromise = new Promise((_, reject) => {
+        setTimeout(() =>
+          reject(new Error('Timed out waiting for provided lighthouseRunner')), 1000 * 120);
+      });
+      const timedResult = await Promise.race([
+        lighthouseRunner(requestedUrl, config, testRunnerOptions),
+        timeoutPromise,
+      ]);
       result = {
-        ...await lighthouseRunner(requestedUrl, config, testRunnerOptions),
+        ...timedResult,
         networkRequests: takeNetworkRequestUrls ? takeNetworkRequestUrls() : undefined,
       };
 

package/core/audits/accessibility/aria-allowed-role.js

@@ -13,16 +13,14 @@ import AxeAudit from './axe-audit.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 
 const UIStrings = {
-  /** Title of an accesibility audit that evaluates if the ARIA role attributes are valid for the HTML element. This title is descriptive of the successful state and is shown to users when no user action is required. */
-  title: 'Values assigned to `role=""` are valid ARIA roles.',
-  /** Title of an accesibility audit that evaluates if the ARIA role attributes are valid for the HTML element. This title is descriptive of the failing state and is shown to users when there is a failure that needs to be addressed. */
-  failureTitle: 'Values assigned to `role=""` are not valid ARIA roles.',
+  /** Title of an accessibility audit that evaluates if the ARIA role attributes are valid for the HTML element. This title is descriptive of the successful state and is shown to users when no user action is required. */
+  title: 'Uses ARIA roles only on compatible elements',
+  /** Title of an accessibility audit that evaluates if the ARIA role attributes are valid for the HTML element. This title is descriptive of the failing state and is shown to users when there is a failure that needs to be addressed. */
+  failureTitle: 'Uses ARIA roles on incompatible elements',
   /** Description of a Lighthouse audit that tells the user *why* they should try to pass. This is displayed after a user expands the section to see more. No character length limits. The last sentence starting with 'Learn' becomes link text to additional documentation. */
-  description: 'ARIA `role`s enable assistive technologies to know the role of each element on ' +
-      'the web page. If the `role` values are misspelled, not existing ARIA `role` values, or ' +
-      'abstract roles, then the purpose of the element will not be communicated to users of ' +
-      'assistive technologies. ' +
-      '[Learn more about ARIA roles](https://dequeuniversity.com/rules/axe/4.9/aria-allowed-role).',
+  description: 'Many HTML elements can only be assigned certain ARIA roles. Using ARIA ' +
+    'roles where they are not allowed can interfere with the accessibility of the web page. ' +
+    '[Learn more about ARIA roles](https://dequeuniversity.com/rules/axe/4.9/aria-allowed-role).',
 };
 
 const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);

package/core/audits/byte-efficiency/byte-efficiency-audit.d.ts

@@ -1,5 +1,5 @@
-export type Simulator = import('../../lib/lantern/simulator/simulator.js').Simulator;
-export type Node = import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
+export type Simulator = import('../../lib/lantern/simulation/Simulator.js').Simulator;
+export type Node = import('../../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>;
 export type ByteEfficiencyProduct = {
     items: Array<LH.Audit.ByteEfficiencyItem>;
     wastedBytesByUrl?: Map<string, number> | undefined;

package/core/audits/byte-efficiency/byte-efficiency-audit.js

@@ -14,8 +14,8 @@ import {LCPImageRecord} from '../../computed/lcp-image-record.js';
 
 const str_ = i18n.createIcuMessageFn(import.meta.url, {});
 
-/** @typedef {import('../../lib/lantern/simulator/simulator.js').Simulator} Simulator */
-/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
+/** @typedef {import('../../lib/lantern/simulation/Simulator.js').Simulator} Simulator */
+/** @typedef {import('../../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>} Node */
 
 // Parameters for log-normal distribution scoring. These values were determined by fitting the
 // log-normal cumulative distribution function curve to the former method of linear interpolation
@@ -120,7 +120,7 @@ class ByteEfficiencyAudit extends Audit {
     const originalTransferSizes = new Map();
     graph.traverse(node => {
       if (node.type !== 'network') return;
-      const wastedBytes = wastedBytesByUrl.get(node.record.url);
+      const wastedBytes = wastedBytesByUrl.get(node.request.url);
       if (!wastedBytes) return;
 
       const original = node.request.transferSize;

package/core/audits/byte-efficiency/offscreen-images.js

@@ -128,7 +128,7 @@ class OffscreenImages extends ByteEfficiencyAudit {
       if (node.type === 'cpu' && timing.duration >= 50) {
         lastLongTaskStartTime = Math.max(lastLongTaskStartTime, timing.startTime);
       } else if (node.type === 'network') {
-        startTimesByURL.set(node.record.url, timing.startTime);
+        startTimesByURL.set(node.request.url, timing.startTime);
       }
     }
 

package/core/audits/byte-efficiency/render-blocking-resources.d.ts

@@ -1,7 +1,7 @@
 export default RenderBlockingResources;
-export type Simulator = import('../../lib/lantern/simulator/simulator.js').Simulator;
-export type Node = import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
-export type NetworkNode = import('../../lib/lantern/network-node.js').NetworkNode<LH.Artifacts.NetworkRequest>;
+export type Simulator = import('../../lib/lantern/simulation/Simulator.js').Simulator;
+export type Node = import('../../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>;
+export type NetworkNode = import('../../lib/lantern/NetworkNode.js').NetworkNode<LH.Artifacts.NetworkRequest>;
 declare class RenderBlockingResources extends Audit {
     /**
      * @param {LH.Artifacts} artifacts

package/core/audits/byte-efficiency/render-blocking-resources.js

@@ -11,7 +11,7 @@
 
 import {Audit} from '../audit.js';
 import * as i18n from '../../lib/i18n/i18n.js';
-import {BaseNode} from '../../lib/lantern/base-node.js';
+import {BaseNode} from '../../lib/lantern/lantern.js';
 import {UnusedCSS} from '../../computed/unused-css.js';
 import {NetworkRequest} from '../../lib/network-request.js';
 import {LoadSimulator} from '../../computed/load-simulator.js';
@@ -20,9 +20,9 @@ import {LCPImageRecord} from '../../computed/lcp-image-record.js';
 import {NavigationInsights} from '../../computed/navigation-insights.js';
 
 
-/** @typedef {import('../../lib/lantern/simulator/simulator.js').Simulator} Simulator */
-/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
-/** @typedef {import('../../lib/lantern/network-node.js').NetworkNode<LH.Artifacts.NetworkRequest>} NetworkNode */
+/** @typedef {import('../../lib/lantern/simulation/Simulator.js').Simulator} Simulator */
+/** @typedef {import('../../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>} Node */
+/** @typedef {import('../../lib/lantern/NetworkNode.js').NetworkNode<LH.Artifacts.NetworkRequest>} NetworkNode */
 
 // Because of the way we detect blocking stylesheets, asynchronously loaded
 // CSS with link[rel=preload] and an onload handler (see https://github.com/filamentgroup/loadCSS)
@@ -53,7 +53,7 @@ function getNodesAndTimingByRequestId(nodeTimings) {
   for (const [node, nodeTiming] of nodeTimings) {
     if (node.type !== 'network') continue;
 
-    requestIdToNode.set(node.record.requestId, {node, nodeTiming});
+    requestIdToNode.set(node.request.requestId, {node, nodeTiming});
   }
 
   return requestIdToNode;
@@ -94,7 +94,7 @@ function computeStackSpecificTiming(node, nodeTiming, Stacks) {
     // https://github.com/ampproject/amphtml/blob/8e03ac2f315774070651584a7e046ff24212c9b1/src/font-stylesheet-timeout.js#L54-L59
     // Any potential savings must only include time spent on AMP stylesheet nodes before 2.1 seconds.
     if (node.type === BaseNode.TYPES.NETWORK &&
-        node.record.resourceType === NetworkRequest.TYPES.Stylesheet &&
+        node.request.resourceType === NetworkRequest.TYPES.Stylesheet &&
         nodeTiming.endTime > 2100) {
       stackSpecificTiming.endTime = Math.max(nodeTiming.startTime, 2100);
       stackSpecificTiming.duration = stackSpecificTiming.endTime - stackSpecificTiming.startTime;
@@ -228,11 +228,11 @@ class RenderBlockingResources extends Audit {
       if (node.type !== BaseNode.TYPES.NETWORK) return !canDeferRequest;
 
       const isStylesheet =
-        node.record.resourceType === NetworkRequest.TYPES.Stylesheet;
+        node.request.resourceType === NetworkRequest.TYPES.Stylesheet;
       if (canDeferRequest && isStylesheet) {
         // We'll inline the used bytes of the stylesheet and assume the rest can be deferred
-        const wastedBytes = wastedCssBytesByUrl.get(node.record.url) || 0;
-        totalChildNetworkBytes += (node.record.transferSize || 0) - wastedBytes;
+        const wastedBytes = wastedCssBytesByUrl.get(node.request.url) || 0;
+        totalChildNetworkBytes += (node.request.transferSize || 0) - wastedBytes;
       }
       return !canDeferRequest;
     });
@@ -247,7 +247,7 @@ class RenderBlockingResources extends Audit {
     ));
 
     // Add the inlined bytes to the HTML response
-    const originalTransferSize = minimalFCPGraph.record.transferSize;
+    const originalTransferSize = minimalFCPGraph.request.transferSize;
     const safeTransferSize = originalTransferSize || 0;
     minimalFCPGraph.request.transferSize = safeTransferSize + totalChildNetworkBytes;
     const estimateAfterInline = simulator.simulate(minimalFCPGraph).timeInMs;

package/core/audits/dobetterweb/uses-http2.d.ts

@@ -1,6 +1,6 @@
 export default UsesHTTP2Audit;
-export type Simulator = import('../../lib/lantern/simulator/simulator.js').Simulator;
-export type Node = import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
+export type Simulator = import('../../lib/lantern/simulation/Simulator.js').Simulator;
+export type Node = import('../../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>;
 declare class UsesHTTP2Audit extends Audit {
     /**
      * Computes the estimated effect of all results being converted to http/2 on the provided graph.

package/core/audits/dobetterweb/uses-http2.js

@@ -9,8 +9,8 @@
  * origin are over the http/2 protocol.
  */
 
-/** @typedef {import('../../lib/lantern/simulator/simulator.js').Simulator} Simulator */
-/** @typedef {import('../../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
+/** @typedef {import('../../lib/lantern/simulation/Simulator.js').Simulator} Simulator */
+/** @typedef {import('../../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>} Node */
 
 import {Audit} from '../audit.js';
 import {EntityClassification} from '../../computed/entity-classification.js';
@@ -87,9 +87,9 @@ class UsesHTTP2Audit extends Audit {
     const originalProtocols = new Map();
     graph.traverse(node => {
       if (node.type !== 'network') return;
-      if (!urlsToChange.has(node.record.url)) return;
+      if (!urlsToChange.has(node.request.url)) return;
 
-      originalProtocols.set(node.record.requestId, node.record.protocol);
+      originalProtocols.set(node.request.requestId, node.request.protocol);
       node.request.protocol = 'h2';
     });
 
@@ -98,7 +98,7 @@ class UsesHTTP2Audit extends Audit {
     // Restore the original protocol after we've done our simulation
     graph.traverse(node => {
       if (node.type !== 'network') return;
-      const originalProtocol = originalProtocols.get(node.record.requestId);
+      const originalProtocol = originalProtocols.get(node.request.requestId);
       if (originalProtocol === undefined) return;
       node.request.protocol = originalProtocol;
     });

package/core/audits/long-tasks.d.ts

@@ -25,11 +25,11 @@ declare class LongTasks extends Audit {
      * most time will be attributed to 'other' (the category of the top-level
      * RunTask). See pruning in `PageDependencyGraph.linkCPUNodes`.
      * @param {LH.Artifacts.TaskNode} task
-     * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+     * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
      * @param {Map<TaskGroupIds, number>} [timeByTaskGroup]
      * @return {{startTime: number, duration: number, timeByTaskGroup: Map<TaskGroupIds, number>}}
      */
-    static getTimingBreakdown(task: LH.Artifacts.TaskNode, taskTimingsByEvent: Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined, timeByTaskGroup?: Map<import("../lib/tracehouse/task-groups.js").TaskGroupIds, number> | undefined): {
+    static getTimingBreakdown(task: LH.Artifacts.TaskNode, taskTimingsByEvent: Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined, timeByTaskGroup?: Map<import("../lib/tracehouse/task-groups.js").TaskGroupIds, number> | undefined): {
         startTime: number;
         duration: number;
         timeByTaskGroup: Map<TaskGroupIds, number>;
@@ -37,17 +37,17 @@ declare class LongTasks extends Audit {
     /**
      * @param {Array<LH.Artifacts.TaskNode>} longTasks
      * @param {Set<string>} jsUrls
-     * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+     * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
      * @return {LH.Audit.Details.DebugData}
      */
-    static makeDebugData(longTasks: Array<LH.Artifacts.TaskNode>, jsUrls: Set<string>, taskTimingsByEvent: Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined): LH.Audit.Details.DebugData;
+    static makeDebugData(longTasks: Array<LH.Artifacts.TaskNode>, jsUrls: Set<string>, taskTimingsByEvent: Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined): LH.Audit.Details.DebugData;
     /**
      * Get timing from task, overridden by taskTimingsByEvent if provided.
      * @param {LH.Artifacts.TaskNode} task
-     * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+     * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
      * @return {Timing}
      */
-    static getTiming(task: LH.Artifacts.TaskNode, taskTimingsByEvent: Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined): Timing;
+    static getTiming(task: LH.Artifacts.TaskNode, taskTimingsByEvent: Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined): Timing;
     /**
      * @param {LH.Artifacts} artifacts
      * @param {LH.Audit.Context} context
@@ -61,4 +61,5 @@ export namespace UIStrings {
     const displayValue: string;
 }
 import { Audit } from './audit.js';
+import * as Lantern from '../lib/lantern/lantern.js';
 //# sourceMappingURL=long-tasks.d.ts.map

package/core/audits/long-tasks.js

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as Lantern from '../lib/lantern/lantern.js';
 import {Audit} from './audit.js';
 import {NetworkRecords} from '../computed/network-records.js';
 import * as i18n from '../lib/i18n/i18n.js';
@@ -85,7 +86,7 @@ class LongTasks extends Audit {
    * most time will be attributed to 'other' (the category of the top-level
    * RunTask). See pruning in `PageDependencyGraph.linkCPUNodes`.
    * @param {LH.Artifacts.TaskNode} task
-   * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+   * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
    * @param {Map<TaskGroupIds, number>} [timeByTaskGroup]
    * @return {{startTime: number, duration: number, timeByTaskGroup: Map<TaskGroupIds, number>}}
    */
@@ -116,7 +117,7 @@ class LongTasks extends Audit {
   /**
    * @param {Array<LH.Artifacts.TaskNode>} longTasks
    * @param {Set<string>} jsUrls
-   * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+   * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
    * @return {LH.Audit.Details.DebugData}
    */
   static makeDebugData(longTasks, jsUrls, taskTimingsByEvent) {
@@ -154,7 +155,7 @@ class LongTasks extends Audit {
   /**
    * Get timing from task, overridden by taskTimingsByEvent if provided.
    * @param {LH.Artifacts.TaskNode} task
-   * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+   * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
    * @return {Timing}
    */
   static getTiming(task, taskTimingsByEvent) {
@@ -184,7 +185,7 @@ class LongTasks extends Audit {
     const metricComputationData = Audit.makeMetricComputationDataInput(artifacts, context);
     const tbtResult = await TotalBlockingTime.request(metricComputationData, context);
 
-    /** @type {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} */
+    /** @type {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} */
     let taskTimingsByEvent;
 
     if (settings.throttlingMethod === 'simulate') {

package/core/audits/metrics/first-meaningful-paint.d.ts

@@ -1,25 +1,9 @@
 export default FirstMeaningfulPaint;
 declare class FirstMeaningfulPaint extends Audit {
     /**
-     * @return {{mobile: {scoring: LH.Audit.ScoreOptions}, desktop: {scoring: LH.Audit.ScoreOptions}}}
-     */
-    static get defaultOptions(): {
-        mobile: {
-            scoring: LH.Audit.ScoreOptions;
-        };
-        desktop: {
-            scoring: LH.Audit.ScoreOptions;
-        };
-    };
-    /**
-     * Audits the page to give a score for First Meaningful Paint.
-     * @see https://github.com/GoogleChrome/lighthouse/issues/26
-     * @see https://docs.google.com/document/d/1BR94tJdZLsin5poeet0XoTW60M0SjvOJQttKT-JK8HI/view
-     * @param {LH.Artifacts} artifacts The artifacts from the gather phase.
-     * @param {LH.Audit.Context} context
      * @return {Promise<LH.Audit.Product>}
      */
-    static audit(artifacts: LH.Artifacts, context: LH.Audit.Context): Promise<LH.Audit.Product>;
+    static audit(): Promise<LH.Audit.Product>;
 }
 export namespace UIStrings {
     const description: string;

package/core/audits/metrics/first-meaningful-paint.js

@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+// TODO(COMPAT): This is just a shell. Remove in future breaking release.
+
 import {Audit} from '../audit.js';
 import * as i18n from '../../lib/i18n/i18n.js';
-import {FirstMeaningfulPaint as 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. The last sentence starting with 'Learn' becomes link text to additional documentation. */
@@ -32,55 +33,12 @@ class FirstMeaningfulPaint extends Audit {
   }
 
   /**
-   * @return {{mobile: {scoring: LH.Audit.ScoreOptions}, desktop: {scoring: LH.Audit.ScoreOptions}}}
-   */
-  static get defaultOptions() {
-    return {
-      mobile: {
-        // 25th and 5th percentiles HTTPArchive -> median and PODR, then p10 derived from them.
-        // https://bigquery.cloud.google.com/table/httparchive:lighthouse.2018_04_01_mobile?pli=1
-        // see https://www.desmos.com/calculator/i4znkdccut
-        scoring: {
-          p10: 2336,
-          median: 4000,
-        },
-      },
-      desktop: {
-        // SELECT QUANTILES(renderStart, 21) FROM [httparchive:summary_pages.2018_12_15_desktop] LIMIT 1000
-        scoring: {
-          p10: 934,
-          median: 1600,
-        },
-      },
-    };
-  }
-
-  /**
-   * Audits the page to give a score for First Meaningful Paint.
-   * @see https://github.com/GoogleChrome/lighthouse/issues/26
-   * @see https://docs.google.com/document/d/1BR94tJdZLsin5poeet0XoTW60M0SjvOJQttKT-JK8HI/view
-   * @param {LH.Artifacts} artifacts The artifacts from the gather phase.
-   * @param {LH.Audit.Context} context
    * @return {Promise<LH.Audit.Product>}
    */
-  static async audit(artifacts, context) {
-    const trace = artifacts.traces[Audit.DEFAULT_PASS];
-    const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
-    const gatherContext = artifacts.GatherContext;
-    const metricComputationData = {trace, devtoolsLog, gatherContext,
-      settings: context.settings, URL: artifacts.URL};
-    const metricResult = await ComputedFmp.request(metricComputationData, context);
-    const options = context.options[context.settings.formFactor];
-
-
+  static async audit() {
     return {
-      score: Audit.computeLogNormalScore(
-        options.scoring,
-        metricResult.timing
-      ),
-      numericValue: metricResult.timing,
-      numericUnit: 'millisecond',
-      displayValue: str_(i18n.UIStrings.seconds, {timeInMs: metricResult.timing}),
+      score: null,
+      notApplicable: true,
     };
   }
 }

package/core/audits/metrics/interactive.d.ts

@@ -1,7 +1,7 @@
 export default InteractiveMetric;
 /**
  * @fileoverview This audit identifies the time the page is "consistently interactive".
- * Looks for the first period of at least 5 seconds after FMP where both CPU and network were quiet,
+ * Looks for the first period of at least 5 seconds after FCP where both CPU and network were quiet,
  * and returns the timestamp of the beginning of the CPU quiet period.
  * @see https://docs.google.com/document/d/1GGiI9-7KeY3TPqS3YT271upUVimo-XiL5mwWorDUD4c/edit#
  */

package/core/audits/metrics/interactive.js

@@ -18,7 +18,7 @@ const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview This audit identifies the time the page is "consistently interactive".
- * Looks for the first period of at least 5 seconds after FMP where both CPU and network were quiet,
+ * Looks for the first period of at least 5 seconds after FCP where both CPU and network were quiet,
  * and returns the timestamp of the beginning of the CPU quiet period.
  * @see https://docs.google.com/document/d/1GGiI9-7KeY3TPqS3YT271upUVimo-XiL5mwWorDUD4c/edit#
  */

package/core/audits/predictive-perf.js

@@ -7,7 +7,6 @@
 import {Audit} from './audit.js';
 import * as i18n from '../lib/i18n/i18n.js';
 import {LanternFirstContentfulPaint} from '../computed/metrics/lantern-first-contentful-paint.js';
-import {LanternFirstMeaningfulPaint} 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 {LanternLargestContentfulPaint} from '../computed/metrics/lantern-largest-contentful-paint.js';
@@ -52,7 +51,6 @@ class PredictivePerf extends Audit {
     const settings = JSON.parse(JSON.stringify(defaultSettings)); // Use default settings.
     const computationData = {trace, devtoolsLog, gatherContext, settings, URL};
     const fcp = await LanternFirstContentfulPaint.request(computationData, context);
-    const fmp = await LanternFirstMeaningfulPaint.request(computationData, context);
     const tti = await LanternInteractive.request(computationData, context);
     const si = await LanternSpeedIndex.request(computationData, context);
     const lcp = await LanternLargestContentfulPaint.request(computationData, context);
@@ -64,10 +62,6 @@ class PredictivePerf extends Audit {
       optimisticFCP: fcp.optimisticEstimate.timeInMs,
       pessimisticFCP: fcp.pessimisticEstimate.timeInMs,
 
-      roughEstimateOfFMP: fmp.timing,
-      optimisticFMP: fmp.optimisticEstimate.timeInMs,
-      pessimisticFMP: fmp.pessimisticEstimate.timeInMs,
-
       roughEstimateOfTTI: tti.timing,
       optimisticTTI: tti.optimisticEstimate.timeInMs,
       pessimisticTTI: tti.pessimisticEstimate.timeInMs,

package/core/audits/prioritize-lcp-image.d.ts

@@ -39,7 +39,7 @@ declare class PrioritizeLcpImage extends Audit {
      * @return {{lcpNodeToPreload?: LH.Gatherer.Simulation.GraphNetworkNode, initiatorPath?: InitiatorPath}}
      */
     static getLCPNodeToPreload(mainResource: LH.Artifacts.NetworkRequest, graph: LH.Gatherer.Simulation.GraphNode, lcpRecord: NetworkRequest | undefined): {
-        lcpNodeToPreload?: import("../lib/lantern/network-node.js").NetworkNode<NetworkRequest> | undefined;
+        lcpNodeToPreload?: import("../lib/lantern/NetworkNode.js").NetworkNode<NetworkRequest> | undefined;
         initiatorPath?: InitiatorPath | undefined;
     };
     /**

package/core/audits/prioritize-lcp-image.js

@@ -69,7 +69,7 @@ class PrioritizeLcpImage extends Audit {
   static findLCPNode(graph, lcpRecord) {
     for (const {node} of graph.traverseGenerator()) {
       if (node.type !== 'network') continue;
-      if (node.record.requestId === lcpRecord.requestId) {
+      if (node.request.requestId === lcpRecord.requestId) {
         return node;
       }
     }
@@ -222,7 +222,7 @@ class PrioritizeLcpImage extends Audit {
       wastedMs,
       results: [{
         node: Audit.makeNodeItem(lcpElement.node),
-        url: lcpNode.record.url,
+        url: lcpNode.request.url,
         wastedMs,
       }],
     };

package/core/audits/redirects.js

@@ -90,6 +90,7 @@ class Redirects extends Audit {
 
     const processedTrace = await ProcessedTrace.request(trace, context);
     const networkRecords = await NetworkRecords.request(devtoolsLog, context);
+    const documentRequests = Redirects.getDocumentRequestChain(networkRecords, processedTrace);
 
     const metricComputationData = {trace, devtoolsLog, gatherContext, settings, URL: artifacts.URL};
     const metricResult = await LanternInteractive.request(metricComputationData, context);
@@ -98,12 +99,10 @@ class Redirects extends Audit {
     const nodeTimingsById = new Map();
     for (const [node, timing] of metricResult.pessimisticEstimate.nodeTimings.entries()) {
       if (node.type === 'network') {
-        nodeTimingsById.set(node.record.requestId, timing);
+        nodeTimingsById.set(node.request.requestId, timing);
       }
     }
 
-    const documentRequests = Redirects.getDocumentRequestChain(networkRecords, processedTrace);
-
     let totalWastedMs = 0;
     const tableRows = [];
 

package/core/audits/third-party-facades.js

@@ -225,7 +225,7 @@ class ThirdPartyFacades extends Audit {
         itemCount: results.length,
       }),
       details: Audit.makeTableDetails(headings, results),
-      metricSavings: {TBT: tbtImpact},
+      metricSavings: {TBT: Math.round(tbtImpact)},
     };
   }
 }

package/core/audits/third-party-summary.js

@@ -223,7 +223,7 @@ class ThirdPartySummary extends Audit {
       }),
       details,
       metricSavings: {
-        TBT: overallSummary.tbtImpact,
+        TBT: Math.round(overallSummary.tbtImpact),
       },
     };
   }

package/core/audits/uses-rel-preconnect.js

@@ -146,14 +146,14 @@ class UsesRelPreconnectAudit extends Audit {
     /** @type {Set<string>} */
     const lcpGraphURLs = new Set();
     lcpGraph.traverse(node => {
-      if (node.type === 'network') lcpGraphURLs.add(node.record.url);
+      if (node.type === 'network') lcpGraphURLs.add(node.request.url);
     });
 
     const fcpGraph =
       await LanternFirstContentfulPaint.getPessimisticGraph(pageGraph, processedNavigation);
     const fcpGraphURLs = new Set();
     fcpGraph.traverse(node => {
-      if (node.type === 'network') fcpGraphURLs.add(node.record.url);
+      if (node.type === 'network') fcpGraphURLs.add(node.request.url);
     });
 
     /** @type {Map<string, LH.Artifacts.NetworkRequest[]>}  */