lighthouse 9.2.0 → 9.3.0

package/lighthouse-core/gather/gatherers/trace-elements.js

@@ -60,42 +60,6 @@ class TraceElements extends FRGatherer {
     if (name) this.animationIdToName.set(id, name);
   }
 
-  /**
-   * @param {LH.TraceEvent | undefined} event
-   * @return {number | undefined}
-   */
-  static getNodeIDFromTraceEvent(event) {
-    return event && event.args &&
-      event.args.data && event.args.data.nodeId;
-  }
-
-  /**
-   * @param {LH.TraceEvent | undefined} event
-   * @return {string | undefined}
-   */
-  static getAnimationIDFromTraceEvent(event) {
-    return event && event.args &&
-      event.args.data && event.args.data.id;
-  }
-
-  /**
-   * @param {LH.TraceEvent | undefined} event
-   * @return {number | undefined}
-   */
-  static getFailureReasonsFromTraceEvent(event) {
-    return event && event.args &&
-      event.args.data && event.args.data.compositeFailed;
-  }
-
-  /**
-   * @param {LH.TraceEvent | undefined} event
-   * @return {string[] | undefined}
-   */
-  static getUnsupportedPropertiesFromTraceEvent(event) {
-    return event && event.args &&
-      event.args.data && event.args.data.unsupportedProperties;
-  }
-
   /**
    * @param {Array<number>} rect
    * @return {LH.Artifacts.Rect}
@@ -124,7 +88,7 @@ class TraceElements extends FRGatherer {
     const clsPerNode = new Map();
     const shiftEvents = mainThreadEvents
       .filter(e => e.name === 'LayoutShift')
-      .map(e => e.args && e.args.data);
+      .map(e => e.args?.data);
     const indexFirstEventWithoutInput =
       shiftEvents.findIndex(event => event && !event.had_recent_input);
 
@@ -207,11 +171,12 @@ class TraceElements extends FRGatherer {
     /** @type {Map<number, Set<{animationId: string, failureReasonsMask?: number, unsupportedProperties?: string[]}>>} */
     const elementAnimations = new Map();
     for (const {begin, status} of animationPairs.values()) {
-      const nodeId = TraceElements.getNodeIDFromTraceEvent(begin);
-      const animationId = TraceElements.getAnimationIDFromTraceEvent(begin);
-      const failureReasonsMask = TraceElements.getFailureReasonsFromTraceEvent(status);
-      const unsupportedProperties = TraceElements.getUnsupportedPropertiesFromTraceEvent(status);
+      const nodeId = begin?.args?.data?.nodeId;
+      const animationId = begin?.args?.data?.id;
+      const failureReasonsMask = status?.args?.data?.compositeFailed;
+      const unsupportedProperties = status?.args?.data?.unsupportedProperties;
       if (!nodeId || !animationId) continue;
+
       const animationIds = elementAnimations.get(nodeId) || new Set();
       animationIds.add({animationId, failureReasonsMask, unsupportedProperties});
       elementAnimations.set(nodeId, animationIds);
@@ -270,7 +235,7 @@ class TraceElements extends FRGatherer {
       });
     const {mainThreadEvents} = processedTrace;
 
-    const lcpNodeId = TraceElements.getNodeIDFromTraceEvent(largestContentfulPaintEvt);
+    const lcpNodeId = largestContentfulPaintEvt?.args?.data?.nodeId;
     const clsNodeData = TraceElements.getTopLayoutShiftElements(mainThreadEvents);
     const animatedElementData =
       await this.getAnimatedElements(mainThreadEvents);
@@ -308,7 +273,7 @@ class TraceElements extends FRGatherer {
           continue;
         }
 
-        if (response && response.result && response.result.value) {
+        if (response?.result?.value) {
           traceElements.push({
             traceEventType,
             ...response.result.value,

package/lighthouse-core/index.js

@@ -9,6 +9,7 @@ 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');
 
 /** @typedef {import('./gather/connections/connection.js')} Connection */
 
@@ -42,12 +43,12 @@ async function lighthouse(url, flags = {}, configJSON, userConnection) {
 
   const config = generateConfig(configJSON, flags);
   const computedCache = new Map();
-  const options = {url, config, computedCache};
+  const options = {config, computedCache};
   const connection = userConnection || new ChromeProtocol(flags.port, flags.hostname);
 
   // kick off a lighthouse run
-  /** @param {{requestedUrl: string}} runnerData */
-  const gatherFn = ({requestedUrl}) => {
+  const gatherFn = () => {
+    const requestedUrl = URL.normalizeUrl(url);
     return Runner._gatherArtifactsFromBrowser(requestedUrl, options, connection);
   };
   return Runner.run(gatherFn, options);

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

@@ -40,7 +40,7 @@ class ArbitraryEqualityMap {
    */
   get(key) {
     const entry = this._entries[this._findIndexOf(key)];
-    return entry && entry.value;
+    return entry?.value;
   }
 
   /**

package/lighthouse-core/lib/asset-saver.js

@@ -19,6 +19,8 @@ const LHError = require('../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.
+// TODO: Can remove promisify(pipeline) in Node 15.
+// https://nodejs.org/api/stream.html#streams-promises-api
 const pipeline = promisify && promisify(stream.pipeline);
 
 const artifactsFilename = 'artifacts.json';
@@ -238,8 +240,6 @@ async function saveTrace(traceData, traceFilename) {
   const traceIter = traceJsonGenerator(traceData);
   const writeStream = fs.createWriteStream(traceFilename);
 
-  // TODO: Can remove promisify(pipeline) in Node 15.
-  // https://nodejs.org/api/stream.html#stream_stream_pipeline_streams_callback
   return pipeline(traceIter, writeStream);
 }
 
@@ -250,10 +250,12 @@ async function saveTrace(traceData, traceFilename) {
  * @return {Promise<void>}
  */
 function saveDevtoolsLog(devtoolsLog, devtoolLogFilename) {
-  const logIter = arrayOfObjectsJsonGenerator(devtoolsLog);
   const writeStream = fs.createWriteStream(devtoolLogFilename);
 
-  return pipeline(logIter, writeStream);
+  return pipeline(function* () {
+    yield* arrayOfObjectsJsonGenerator(devtoolsLog);
+    yield '\n';
+  }, writeStream);
 }
 
 /**

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

@@ -109,7 +109,7 @@ module.exports = class ConnectionPool {
       }
 
       // This connection is a match and is available! Update our max if it has a larger congestionWindow
-      const currentMax = (maxConnection && maxConnection.congestionWindow) || -Infinity;
+      const currentMax = (maxConnection?.congestionWindow) || -Infinity;
       if (connection.congestionWindow > currentMax) maxConnection = connection;
     }
 

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

@@ -390,7 +390,7 @@ class NetworkAnalyzer {
     // downloading those bytes. We slice up all the network records into start/end boundaries, so
     // it's easier to deal with the gaps in downloading.
     const timeBoundaries = networkRecords.reduce((boundaries, record) => {
-      const scheme = record.parsedURL && record.parsedURL.scheme;
+      const scheme = record.parsedURL?.scheme;
       // Requests whose bodies didn't come over the network or didn't completely finish will mess
       // with the computation, just skip over them.
       if (scheme === 'data' || record.failed || !record.finished ||

package/lighthouse-core/lib/emulation.js

@@ -25,7 +25,7 @@ const NO_CPU_THROTTLE_METRICS = {
  */
 function parseUseragentIntoMetadata(userAgent, formFactor) {
   const match = userAgent.match(/Chrome\/([\d.]+)/); // eg 'Chrome/(71.0.3577.0)'
-  const fullVersion = (match && match[1]) || '99.0.1234.0';
+  const fullVersion = match?.[1] || '99.0.1234.0';
   const [version] = fullVersion.split('.', 1);
   const brands = [
     {brand: 'Chromium', version},

package/lighthouse-core/lib/icons.js

@@ -73,8 +73,7 @@ function pngSizedAtLeast(sizeRequirement, manifest) {
 function containsMaskableIcon(manifest) {
   const iconValues = manifest.icons.value;
   return iconValues.some(icon => {
-    return icon.value.purpose &&
-      icon.value.purpose.value &&
+    return icon.value.purpose?.value &&
       icon.value.purpose.value.includes('maskable');
   });
 }

package/lighthouse-core/lib/median-run.js

@@ -6,8 +6,7 @@
 'use strict';
 
 /** @param {LH.Result} lhr @param {string} auditName */
-const getNumericValue = (lhr, auditName) =>
-  (lhr.audits[auditName] && lhr.audits[auditName].numericValue) || NaN;
+const getNumericValue = (lhr, auditName) => lhr.audits[auditName]?.numericValue || NaN;
 
 /**
  * @param {Array<number>} numbers

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

@@ -251,8 +251,8 @@ class NetworkRecorder extends EventEmitter {
     if (record.redirectSource) {
       return record.redirectSource;
     }
-    const stackFrames = (record.initiator.stack && record.initiator.stack.callFrames) || [];
-    const initiatorURL = record.initiator.url || (stackFrames[0] && stackFrames[0].url);
+    const stackFrames = record.initiator.stack?.callFrames || [];
+    const initiatorURL = record.initiator.url || stackFrames[0]?.url;
 
     let candidates = recordsByURL.get(initiatorURL) || [];
     // The initiator must come before the initiated request.

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

@@ -510,7 +510,7 @@ class NetworkRequest {
 
     const reasonHeader = record.responseHeaders
       .find(header => header.name === 'Non-Authoritative-Reason');
-    const reason = reasonHeader && reasonHeader.value;
+    const reason = reasonHeader?.value;
     return reason === 'HSTS' && NetworkRequest.isSecureRequest(destination);
   }
 

package/lighthouse-core/lib/stack-packs.js

@@ -19,6 +19,11 @@ const stackPacksToInclude = [
     packId: 'wordpress',
     requiredStacks: ['js:wordpress'],
   },
+  // waiting for https://github.com/johnmichel/Library-Detector-for-Chrome/pull/193
+  // {
+  //   packId: 'ezoic',
+  //   requiredStacks: ['js:ezoic'],
+  // },
   {
     packId: 'drupal',
     requiredStacks: ['js:drupal'],

package/lighthouse-core/lib/tracehouse/cpu-profile-model.js

@@ -184,8 +184,7 @@ class CpuProfilerModel {
     if (!event) return false;
     return Boolean(
       event.name === SAMPLER_TRACE_EVENT_NAME &&
-      event.args.data &&
-      event.args.data._syntheticProfilerRange
+      event.args.data?._syntheticProfilerRange
     );
   }
 
@@ -562,9 +561,8 @@ class CpuProfilerModel {
 
       // `Profile` or `ProfileChunk` can partially define these across multiple events.
       // We'll fallback to empty values and worry about validation in the `synthesizeTraceEvents` phase.
-      const cpuProfileArg = (event.args.data && event.args.data.cpuProfile) || {};
-      const timeDeltas =
-        (event.args.data && event.args.data.timeDeltas) || cpuProfileArg.timeDeltas;
+      const cpuProfileArg = event.args.data?.cpuProfile || {};
+      const timeDeltas = event.args.data?.timeDeltas || cpuProfileArg.timeDeltas;
       let profile = profiles.get(event.id);
 
       if (event.name === 'Profile') {
@@ -572,7 +570,7 @@ class CpuProfilerModel {
           id: event.id,
           pid: event.pid,
           tid: event.tid,
-          startTime: (event.args.data && event.args.data.startTime) || event.ts,
+          startTime: event.args.data?.startTime || event.ts,
           nodes: cpuProfileArg.nodes || [],
           samples: cpuProfileArg.samples || [],
           timeDeltas: timeDeltas || [],

package/lighthouse-core/lib/tracehouse/main-thread-tasks.js

@@ -234,7 +234,7 @@ class MainThreadTasks {
       // Do bookkeeping on XHR requester data.
       if (nextTask.event.name === 'XHRReadyStateChange') {
         const data = nextTask.event.args.data;
-        const url = data && data.url;
+        const url = data?.url;
         if (data && url && data.readyState === 1) priorTaskData.xhrs.set(url, nextTask);
       }
 

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

@@ -425,15 +425,14 @@ class TraceProcessor {
   static findMainFrameIds(events) {
     // Prefer the newer TracingStartedInBrowser event first, if it exists
     const startedInBrowserEvt = events.find(e => e.name === 'TracingStartedInBrowser');
-    if (startedInBrowserEvt && startedInBrowserEvt.args.data &&
-        startedInBrowserEvt.args.data.frames) {
+    if (startedInBrowserEvt?.args.data?.frames) {
       const mainFrame = startedInBrowserEvt.args.data.frames.find(frame => !frame.parent);
-      const frameId = mainFrame && mainFrame.frame;
-      const pid = mainFrame && mainFrame.processId;
+      const frameId = mainFrame?.frame;
+      const pid = mainFrame?.processId;
 
       const threadNameEvt = events.find(e => e.pid === pid && e.ph === 'M' &&
         e.cat === '__metadata' && e.name === 'thread_name' && e.args.name === 'CrRendererMain');
-      const tid = threadNameEvt && threadNameEvt.tid;
+      const tid = threadNameEvt?.tid;
 
       if (pid && tid && frameId) {
         return {
@@ -448,7 +447,7 @@ class TraceProcessor {
     // The first TracingStartedInPage in the trace is definitely our renderer thread of interest
     // Beware: the tracingStartedInPage event can appear slightly after a navigationStart
     const startedInPageEvt = events.find(e => e.name === 'TracingStartedInPage');
-    if (startedInPageEvt && startedInPageEvt.args && startedInPageEvt.args.data) {
+    if (startedInPageEvt?.args?.data) {
       const frameId = startedInPageEvt.args.data.page;
       if (frameId) {
         return {
@@ -463,12 +462,12 @@ class TraceProcessor {
     // If we can't find either TracingStarted event, then we'll fallback to the first navStart that
     // looks like it was loading the main frame with a real URL. Because the schema for this event
     // has changed across Chrome versions, we'll be extra defensive about finding this case.
-    const navStartEvt = events.find(e => Boolean(e.name === 'navigationStart' && e.args &&
-      e.args.data && e.args.data.isLoadingMainFrame && e.args.data.documentLoaderURL));
+    const navStartEvt = events.find(e => Boolean(e.name === 'navigationStart' &&
+      e.args?.data?.isLoadingMainFrame && e.args.data.documentLoaderURL));
     // Find the first resource that was requested and make sure it agrees on the id.
     const firstResourceSendEvt = events.find(e => e.name === 'ResourceSendRequest');
     // We know that these properties exist if we found the events, but TSC doesn't.
-    if (navStartEvt && navStartEvt.args && navStartEvt.args.data &&
+    if (navStartEvt?.args?.data &&
         firstResourceSendEvt &&
         firstResourceSendEvt.pid === navStartEvt.pid &&
         firstResourceSendEvt.tid === navStartEvt.tid) {
@@ -503,7 +502,7 @@ class TraceProcessor {
   static isLCPEvent(evt) {
     if (evt.name !== 'largestContentfulPaint::Invalidate' &&
         evt.name !== 'largestContentfulPaint::Candidate') return false;
-    return Boolean(evt.args && evt.args.frame);
+    return Boolean(evt.args?.frame);
   }
 
   /**
@@ -513,8 +512,7 @@ class TraceProcessor {
   static isLCPCandidateEvent(evt) {
     return Boolean(
       evt.name === 'largestContentfulPaint::Candidate' &&
-      evt.args &&
-      evt.args.frame &&
+      evt.args?.frame &&
       evt.args.data &&
       evt.args.data.size !== undefined
     );
@@ -613,8 +611,7 @@ class TraceProcessor {
       .filter(/** @return {evt is FrameCommittedEvent} */ evt => {
         return Boolean(
           evt.name === 'FrameCommittedInBrowser' &&
-          evt.args.data &&
-          evt.args.data.frame &&
+          evt.args.data?.frame &&
           evt.args.data.url
         );
       })
@@ -723,7 +720,7 @@ class TraceProcessor {
         firstContentfulPaintAllFrames: getTiming(fcpAllFramesEvt.ts),
         firstMeaningfulPaint: frameTimings.timings.firstMeaningfulPaint,
         largestContentfulPaint: frameTimings.timings.largestContentfulPaint,
-        largestContentfulPaintAllFrames: maybeGetTiming(lcpAllFramesEvt && lcpAllFramesEvt.ts),
+        largestContentfulPaintAllFrames: maybeGetTiming(lcpAllFramesEvt?.ts),
         load: frameTimings.timings.load,
         domContentLoaded: frameTimings.timings.domContentLoaded,
         traceEnd: timings.traceEnd,
@@ -735,7 +732,7 @@ class TraceProcessor {
         firstContentfulPaintAllFrames: fcpAllFramesEvt.ts,
         firstMeaningfulPaint: frameTimings.timestamps.firstMeaningfulPaint,
         largestContentfulPaint: frameTimings.timestamps.largestContentfulPaint,
-        largestContentfulPaintAllFrames: lcpAllFramesEvt && lcpAllFramesEvt.ts,
+        largestContentfulPaintAllFrames: lcpAllFramesEvt?.ts,
         load: frameTimings.timestamps.load,
         domContentLoaded: frameTimings.timestamps.domContentLoaded,
         traceEnd: timestamps.traceEnd,
@@ -886,7 +883,7 @@ class TraceProcessor {
     );
 
     /** @param {{ts: number}=} event */
-    const getTimestamp = (event) => event && event.ts;
+    const getTimestamp = (event) => event?.ts;
     /** @type {TraceNavigationTimesForFrame} */
     const timestamps = {
       timeOrigin: timeOriginEvt.ts,

package/lighthouse-core/lib/url-shim.js

@@ -10,6 +10,7 @@
  */
 
 const {Util} = require('../util-commonjs.js');
+const LHError = require('../lib/lh-error.js');
 
 /** @typedef {import('./network-request.js')} NetworkRequest */
 
@@ -248,6 +249,20 @@ class URLShim extends URL {
     if (ext === 'jpg') return 'image/jpeg';
     return `image/${ext}`;
   }
+
+  /**
+   * @param {string|undefined} url
+   * @return {string}
+   */
+  static normalizeUrl(url) {
+    // Verify the url is valid and that protocol is allowed
+    if (url && this.isValid(url) && this.isProtocolAllowed(url)) {
+      // Use canonicalized URL (with trailing slashes and such)
+      return new URL(url).href;
+    } else {
+      throw new LHError(LHError.errors.INVALID_URL);
+    }
+  }
 }
 
 URLShim.URL = URL;

package/lighthouse-core/runner.js

@@ -16,7 +16,6 @@ const stackPacks = require('./lib/stack-packs.js');
 const assetSaver = require('./lib/asset-saver.js');
 const fs = require('fs');
 const path = require('path');
-const URL = require('./lib/url-shim.js');
 const Sentry = require('./lib/sentry.js');
 const generateReport = require('../report/generator/report-generator.js').generateReport;
 const LHError = require('./lib/lh-error.js');
@@ -29,8 +28,8 @@ const {version: lighthouseVersion} = require('../package.json');
 class Runner {
   /**
    * @template {LH.Config.Config | LH.Config.FRConfig} TConfig
-   * @param {(runnerData: {requestedUrl: string, config: TConfig, driverMock?: Driver}) => Promise<LH.Artifacts>} gatherFn
-   * @param {{config: TConfig, computedCache: Map<string, ArbitraryEqualityMap>, url?: string, driverMock?: Driver}} runOpts
+   * @param {(runnerData: {config: TConfig, driverMock?: Driver}) => Promise<LH.Artifacts>} gatherFn
+   * @param {{config: TConfig, computedCache: Map<string, ArbitraryEqualityMap>, driverMock?: Driver}} runOpts
    * @return {Promise<LH.RunnerResult|undefined>}
    */
   static async run(gatherFn, runOpts) {
@@ -49,50 +48,10 @@ class Runner {
       Sentry.captureBreadcrumb({
         message: 'Run started',
         category: 'lifecycle',
-        data: sentryContext && sentryContext.extra,
+        data: sentryContext?.extra,
       });
 
-      // User can run -G solo, -A solo, or -GA together
-      // -G and -A will run partial lighthouse pipelines,
-      // and -GA will run everything plus save artifacts and lhr to disk.
-
-      // Gather phase
-      // Either load saved artifacts off disk or from the browser
-      let artifacts;
-      let requestedUrl;
-      if (settings.auditMode && !settings.gatherMode) {
-        // No browser required, just load the artifacts from disk.
-        const path = Runner._getDataSavePath(settings);
-        artifacts = assetSaver.loadArtifacts(path);
-        requestedUrl = artifacts.URL.requestedUrl;
-
-        if (!requestedUrl) {
-          throw new Error('Cannot run audit mode on empty URL');
-        }
-        if (runOpts.url && !URL.equalWithExcludedFragments(runOpts.url, requestedUrl)) {
-          throw new Error('Cannot run audit mode on different URL');
-        }
-      } else {
-        // verify the url is valid and that protocol is allowed
-        if (runOpts.url && URL.isValid(runOpts.url) && URL.isProtocolAllowed(runOpts.url)) {
-          // Use canonicalized URL (with trailing slashes and such)
-          requestedUrl = new URL(runOpts.url).href;
-        } else {
-          throw new LHError(LHError.errors.INVALID_URL);
-        }
-
-        artifacts = await gatherFn({
-          requestedUrl,
-          config: runOpts.config,
-          driverMock: runOpts.driverMock,
-        });
-
-        // -G means save these to ./latest-run, etc.
-        if (settings.gatherMode) {
-          const path = Runner._getDataSavePath(settings);
-          await assetSaver.saveArtifacts(artifacts, path);
-        }
-      }
+      const artifacts = await this.gatherAndManageArtifacts(gatherFn, runOpts);
 
       // Potentially quit early
       if (settings.gatherMode && !settings.auditMode) return;
@@ -116,7 +75,7 @@ class Runner {
 
       // Use version from gathering stage.
       // If accessibility gatherer didn't run or errored, it won't be in credits.
-      const axeVersion = artifacts.Accessibility && artifacts.Accessibility.version;
+      const axeVersion = artifacts.Accessibility?.version;
       const credits = {
         'axe-core': axeVersion,
       };
@@ -133,7 +92,7 @@ class Runner {
       /** @type {LH.RawIcu<LH.Result>} */
       const i18nLhr = {
         lighthouseVersion,
-        requestedUrl,
+        requestedUrl: artifacts.URL.requestedUrl,
         finalUrl: artifacts.URL.finalUrl,
         fetchTime: artifacts.fetchTime,
         gatherMode: artifacts.GatherContext.gatherMode,
@@ -184,6 +143,47 @@ class Runner {
     }
   }
 
+  /**
+   * User can run -G solo, -A solo, or -GA together
+   * -G and -A will run partial lighthouse pipelines,
+   * and -GA will run everything plus save artifacts and lhr to disk.
+   *
+   * @template {LH.Config.Config | LH.Config.FRConfig} TConfig
+   * @param {(runnerData: {config: TConfig, driverMock?: Driver}) => Promise<LH.Artifacts>} gatherFn
+   * @param {{config: TConfig, driverMock?: Driver}} options
+   * @return {Promise<LH.Artifacts>}
+   */
+  static async gatherAndManageArtifacts(gatherFn, options) {
+    const settings = options.config.settings;
+
+    // Gather phase
+    // Either load saved artifacts from disk or from the browser.
+    let artifacts;
+    if (settings.auditMode && !settings.gatherMode) {
+      // No browser required, just load the artifacts from disk.
+      const path = this._getDataSavePath(settings);
+      artifacts = assetSaver.loadArtifacts(path);
+      const requestedUrl = artifacts.URL.requestedUrl;
+
+      if (!requestedUrl) {
+        throw new Error('Cannot run audit mode on empty URL');
+      }
+    } else {
+      artifacts = await gatherFn({
+        config: options.config,
+        driverMock: options.driverMock,
+      });
+
+      // -G means save these to disk (e.g. ./latest-run).
+      if (settings.gatherMode) {
+        const path = this._getDataSavePath(settings);
+        await assetSaver.saveArtifacts(artifacts, path);
+      }
+    }
+
+    return artifacts;
+  }
+
   /**
    * This handles both the auditMode case where gatherer entries need to be merged in and
    * the gather/audit case where timingEntriesFromRunner contains all entries from this run,
@@ -213,7 +213,7 @@ class Runner {
       };
     }).sort((a, b) => a.startTime - b.startTime);
     const runnerEntry = timingEntries.find(e => e.name === 'lh:runner:run');
-    return {entries: timingEntries, total: runnerEntry && runnerEntry.duration || 0};
+    return {entries: timingEntries, total: runnerEntry?.duration || 0};
   }
 
   /**
@@ -263,6 +263,19 @@ class Runner {
       const normalizedGatherSettings = Object.assign({}, artifacts.settings, overrides);
       const normalizedAuditSettings = Object.assign({}, settings, overrides);
 
+      // First, try each key individually so we can print which key differed.
+      const keys = new Set([
+        ...Object.keys(normalizedGatherSettings),
+        ...Object.keys(normalizedAuditSettings),
+      ]);
+      for (const k of keys) {
+        if (!isDeepEqual(normalizedGatherSettings[k], normalizedAuditSettings[k])) {
+          throw new Error(
+            `Cannot change settings between gathering and auditing. Difference found at: ${k}`);
+        }
+      }
+
+      // Call `isDeepEqual` on the entire thing, just in case something was missed.
       if (!isDeepEqual(normalizedGatherSettings, normalizedAuditSettings)) {
         throw new Error('Cannot change settings between gathering and auditing');
       }
@@ -367,7 +380,7 @@ class Runner {
           return narrowedArtifacts;
         }, /** @type {LH.Artifacts} */ ({}));
       const product = await audit.audit(narrowedArtifacts, auditContext);
-      runWarnings.push(...product.runWarnings || []);
+      runWarnings.push(...(product.runWarnings || []));
 
       auditResult = Audit.generateAuditResult(audit, product);
     } catch (err) {

package/lighthouse-core/scripts/download-chrome.sh

@@ -10,10 +10,23 @@
 
 set -euo pipefail
 
-if [ "$OSTYPE" == "msys" ]; then
+unameOut="$(uname -s)"
+case "${unameOut}" in
+  Linux*)     machine=Linux;;
+  Darwin*)    machine=Mac;;
+  MINGW*)     machine=MinGw;;
+  *)          machine="UNKNOWN:${unameOut}"
+esac
+
+if [ "$machine" == "MinGw" ]; then
   url="https://download-chromium.appspot.com/dl/Win?type=snapshots"
-else
+elif [ "$machine" == "Linux" ]; then
   url="https://download-chromium.appspot.com/dl/Linux_x64?type=snapshots"
+elif [ "$machine" == "Mac" ]; then
+  url="https://download-chromium.appspot.com/dl/Mac?type=snapshots"
+else
+  echo "unsupported platform"
+  exit 1
 fi
 
 if [ -e "$CHROME_PATH" ]; then