lighthouse 12.2.1 → 12.2.2

package/cli/printer.js

@@ -5,6 +5,7 @@
  */
 
 import fs from 'fs';
+import path from 'path';
 
 import log from 'lighthouse-logger';
 
@@ -58,13 +59,17 @@ function writeToStdout(output) {
  */
 function writeFile(filePath, output, outputMode) {
   return new Promise((resolve, reject) => {
-    // TODO: make this mkdir to the filePath.
-    fs.writeFile(filePath, output, (err) => {
-      if (err) {
+    fs.mkdir(path.dirname(filePath), {recursive: true}, (err) => {
+      if (err && err.code !== 'EEXIST') {
         return reject(err);
       }
-      log.log('Printer', `${OutputMode[outputMode]} output written to ${filePath}`);
-      resolve();
+      fs.writeFile(filePath, output, (err) => {
+        if (err) {
+          return reject(err);
+        }
+        log.log('Printer', `${OutputMode[outputMode]} output written to ${filePath}`);
+        resolve();
+      });
     });
   });
 }

package/cli/test/smokehouse/frontends/lib.js

@@ -12,7 +12,7 @@
 
 /* eslint-disable no-console */
 
-import cloneDeep from 'lodash/cloneDeep.js';
+import {cloneDeep} from 'lodash-es';
 
 import smokeTests from '../core-tests.js';
 import {runSmokehouse, getShardedDefinitions} from '../smokehouse.js';

package/cli/test/smokehouse/frontends/smokehouse-bin.js

@@ -16,7 +16,7 @@ import path from 'path';
 import fs from 'fs';
 import url from 'url';
 
-import cloneDeep from 'lodash/cloneDeep.js';
+import {cloneDeep} from 'lodash-es';
 import yargs from 'yargs';
 import * as yargsHelpers from 'yargs/helpers';
 import log from 'lighthouse-logger';

package/cli/test/smokehouse/report-assert.js

@@ -9,7 +9,7 @@
  * against the results actually collected from Lighthouse.
  */
 
-import cloneDeep from 'lodash/cloneDeep.js';
+import {cloneDeep} from 'lodash-es';
 import log from 'lighthouse-logger';
 
 import {LocalConsole} from './lib/local-console.js';

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

@@ -38,10 +38,10 @@ const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 /**
  * Given a simulation's nodeTimings, return an object with the nodes/timing keyed by network URL
  * @param {LH.Gatherer.Simulation.Result['nodeTimings']} nodeTimings
- * @return {Map<string, {node: LH.Gatherer.Simulation.GraphNode, nodeTiming: LH.Gatherer.Simulation.NodeTiming}>}
+ * @return {Map<string, {node: LH.Gatherer.Simulation.GraphNetworkNode, nodeTiming: LH.Gatherer.Simulation.NodeTiming}>}
  */
 function getNodesAndTimingByRequestId(nodeTimings) {
-  /** @type {Map<string, {node: LH.Gatherer.Simulation.GraphNode, nodeTiming: LH.Gatherer.Simulation.NodeTiming}>} */
+  /** @type {Map<string, {node: LH.Gatherer.Simulation.GraphNetworkNode, nodeTiming: LH.Gatherer.Simulation.NodeTiming}>} */
   const requestIdToNode = new Map();
 
   for (const [node, nodeTiming] of nodeTimings) {
@@ -169,7 +169,7 @@ class RenderBlockingResources extends Audit {
 
       results.push({
         url: resource.args.data.url,
-        totalBytes: resource.args.data.encodedDataLength,
+        totalBytes: node.request.transferSize,
         wastedMs,
       });
     }

package/core/config/config-helpers.js

@@ -8,7 +8,7 @@ import path from 'path';
 import {createRequire} from 'module';
 import url from 'url';
 
-import isDeepEqual from 'lodash/isEqual.js';
+import {isEqual} from 'lodash-es';
 
 import * as constants from './constants.js';
 import ConfigPlugin from './config-plugin.js';
@@ -69,7 +69,7 @@ const mergeOptionsOfItems = function(items) {
  *    - `null` is treated similarly to `undefined` for whether a value should be overridden.
  *    - `overwriteArrays` controls array extension behavior:
  *        - true: Arrays are overwritten without any merging or concatenation.
- *        - false: Arrays are concatenated and de-duped by isDeepEqual.
+ *        - false: Arrays are concatenated and de-duped by isEqual.
  *    - Objects are recursively merged.
  *    - If the `settings` key is encountered while traversing an object, its arrays are *always*
  *      overridden, not concatenated. (`overwriteArrays` is flipped to `true`)
@@ -90,7 +90,7 @@ function _mergeConfigFragment(base, extension, overwriteArrays = false) {
     if (!Array.isArray(base)) throw new TypeError(`Expected array but got ${typeof base}`);
     const merged = base.slice();
     extension.forEach(item => {
-      if (!merged.some(candidate => isDeepEqual(candidate, item))) merged.push(item);
+      if (!merged.some(candidate => isEqual(candidate, item))) merged.push(item);
     });
 
     return merged;

package/core/config/lr-mobile-config.js

@@ -10,6 +10,11 @@ const config = {
   settings: {
     maxWaitForFcp: 15 * 1000,
     maxWaitForLoad: 35 * 1000,
+    throttling: {
+      // Determined using PSI CPU benchmark median and
+      // https://lighthouse-cpu-throttling-calculator.vercel.app/
+      cpuSlowdownMultiplier: 1.5,
+    },
     skipAudits: [
       // Skip the h2 audit so it doesn't lie to us. See https://github.com/GoogleChrome/lighthouse/issues/6539
       'uses-http2',

package/core/gather/base-artifacts.js

@@ -5,7 +5,7 @@
  */
 
 import log from 'lighthouse-logger';
-import isDeepEqual from 'lodash/isEqual.js';
+import {isEqual} from 'lodash-es';
 
 import {
   getBrowserVersion, getBenchmarkIndex, getEnvironmentWarnings,
@@ -52,7 +52,7 @@ function deduplicateWarnings(warnings) {
   const unique = [];
 
   for (const warning of warnings) {
-    if (unique.some(existing => isDeepEqual(warning, existing))) continue;
+    if (unique.some(existing => isEqual(warning, existing))) continue;
     unique.push(warning);
   }
 

package/core/gather/driver/network-monitor.d.ts

@@ -71,7 +71,7 @@ export class NetworkMonitor extends NetworkMonitor_base {
      * @param {(request: NetworkRequest) => boolean} [requestFilter]
      * @return {boolean}
      */
-    _isActiveIdlePeriod(allowedRequests: number, requestFilter?: ((request: NetworkRequest) => boolean) | undefined): boolean;
+    _isIdlePeriod(allowedRequests: number, requestFilter?: ((request: NetworkRequest) => boolean) | undefined): boolean;
     /**
      * Emits the appropriate network status event.
      */

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

@@ -129,7 +129,7 @@ class NetworkMonitor extends NetworkMonitorEventEmitter {
    * Returns whether the network is completely idle (i.e. there are 0 inflight network requests).
    */
   isIdle() {
-    return this._isActiveIdlePeriod(0);
+    return this._isIdlePeriod(0);
   }
 
   /**
@@ -144,10 +144,13 @@ class NetworkMonitor extends NetworkMonitorEventEmitter {
     const rootFrameRequest = requests.find(r => r.resourceType === 'Document');
     const rootFrameId = rootFrameRequest?.frameId;
 
-    return this._isActiveIdlePeriod(
+    return this._isIdlePeriod(
       0,
+      // Return true if it should be a candidate for critical.
       request =>
         request.frameId === rootFrameId &&
+        // WebSocket and Server-sent Events are typically long-lived and shouldn't be considered critical.
+        request.resourceType !== 'WebSocket' && request.resourceType !== 'EventSource' &&
         (request.priority === 'VeryHigh' || request.priority === 'High')
     );
   }
@@ -156,7 +159,7 @@ class NetworkMonitor extends NetworkMonitorEventEmitter {
    * Returns whether the network is semi-idle (i.e. there are 2 or fewer inflight network requests).
    */
   is2Idle() {
-    return this._isActiveIdlePeriod(2);
+    return this._isIdlePeriod(2);
   }
 
   /**
@@ -166,7 +169,7 @@ class NetworkMonitor extends NetworkMonitorEventEmitter {
    * @param {(request: NetworkRequest) => boolean} [requestFilter]
    * @return {boolean}
    */
-  _isActiveIdlePeriod(allowedRequests, requestFilter) {
+  _isIdlePeriod(allowedRequests, requestFilter) {
     if (!this._networkRecorder) return false;
     const requests = this._networkRecorder.getRawRecords();
     let inflightRequests = 0;
@@ -174,7 +177,7 @@ class NetworkMonitor extends NetworkMonitorEventEmitter {
     for (let i = 0; i < requests.length; i++) {
       const request = requests[i];
       if (request.finished) continue;
-      if (requestFilter && !requestFilter(request)) continue;
+      if (requestFilter?.(request) === false) continue;
       if (NetworkRequest.isNonNetworkRequest(request)) continue;
       inflightRequests++;
     }

package/core/gather/driver/target-manager.js

@@ -170,6 +170,10 @@ class TargetManager extends ProtocolEventEmitter {
       // Sometimes targets can be closed before we even have a chance to listen to their network activity.
       if (/Target closed/.test(err.message)) return;
 
+      // `Target.getTargetInfo` is not implemented for certain target types.
+      // Lighthouse isn't interested in these targets anyway so we can just ignore them.
+      if (/'Target.getTargetInfo' wasn't found/.test(err)) return;
+
       // Worker targets can be a bit fickle and we only enable them for diagnostic purposes.
       // We shouldn't throw a fatal error if there were issues attaching to them.
       if (targetType === 'worker') {

package/core/lib/arbitrary-equality-map.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import isDeepEqual from 'lodash/isEqual.js';
+import {isEqual} from 'lodash-es';
 
 /**
  * @fileoverview This class is designed to allow maps with arbitrary equality functions.
@@ -73,7 +73,7 @@ class ArbitraryEqualityMap {
    * @return {boolean}
    */
   static deepEquals(objA, objB) {
-    return isDeepEqual(objA, objB);
+    return isEqual(objA, objB);
   }
 }
 

package/core/runner.js

@@ -9,7 +9,7 @@ import path from 'path';
 
 
 import log from 'lighthouse-logger';
-import isDeepEqual from 'lodash/isEqual.js';
+import {isEqual} from 'lodash-es';
 
 import {ReportScoring} from './scoring.js';
 import {Audit} from './audits/audit.js';
@@ -308,7 +308,7 @@ class Runner {
         ...Object.keys(normalizedAuditSettings),
       ]);
       for (const k of keys) {
-        if (!isDeepEqual(normalizedGatherSettings[k], normalizedAuditSettings[k])) {
+        if (!isEqual(normalizedGatherSettings[k], normalizedAuditSettings[k])) {
           throw new Error(
             `Cannot change settings between gathering and auditing…
 Difference found at: \`${k}\`
@@ -318,8 +318,8 @@ vs
         }
       }
 
-      // Call `isDeepEqual` on the entire thing, just in case something was missed.
-      if (!isDeepEqual(normalizedGatherSettings, normalizedAuditSettings)) {
+      // Call `isEqual` on the entire thing, just in case something was missed.
+      if (!isEqual(normalizedGatherSettings, normalizedAuditSettings)) {
         throw new Error('Cannot change settings between gathering and auditing');
       }
     }