lighthouse 9.5.0 → 9.6.3

package/lighthouse-cli/test/smokehouse/core-tests.js

@@ -52,6 +52,7 @@ import pwaSvgomg from './test-definitions/pwa-svgomg.js';
 import redirectsClientPaintServer from './test-definitions/redirects-client-paint-server.js';
 import redirectsHistoryPushState from './test-definitions/redirects-history-push-state.js';
 import redirectsMultipleServer from './test-definitions/redirects-multiple-server.js';
+import redirectScripts from './test-definitions/redirects-scripts.js';
 import redirectsSingleClient from './test-definitions/redirects-single-client.js';
 import redirectsSingleServer from './test-definitions/redirects-single-server.js';
 import redirectsSelf from './test-definitions/redirects-self.js';
@@ -112,6 +113,7 @@ const smokeTests = [
   redirectsClientPaintServer,
   redirectsHistoryPushState,
   redirectsMultipleServer,
+  redirectScripts,
   redirectsSingleClient,
   redirectsSingleServer,
   redirectsSelf,

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

@@ -13,13 +13,11 @@
 
 /* eslint-disable no-console */
 
-import _ from 'lodash';
+import cloneDeep from 'lodash/cloneDeep.js';
 
 import smokeTests from '../core-tests.js';
 import {runSmokehouse, getShardedDefinitions} from '../smokehouse.js';
 
-const {cloneDeep} = _;
-
 /**
  * @param {Smokehouse.SmokehouseLibOptions} options
  */

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

@@ -17,7 +17,7 @@ import path from 'path';
 import fs from 'fs';
 import url from 'url';
 
-import _ from 'lodash';
+import cloneDeep from 'lodash/cloneDeep.js';
 import yargs from 'yargs';
 import * as yargsHelpers from 'yargs/helpers';
 import log from 'lighthouse-logger';
@@ -26,8 +26,6 @@ import {runSmokehouse, getShardedDefinitions} from '../smokehouse.js';
 import {updateTestDefnFormat} from './back-compat-util.js';
 import {LH_ROOT} from '../../../../root.js';
 
-const {cloneDeep} = _;
-
 const coreTestDefnsPath =
   path.join(LH_ROOT, 'lighthouse-cli/test/smokehouse/core-tests.js');
 

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

@@ -80,6 +80,7 @@ async function internalRun(url, tmpPath, configJson, options) {
     `-A=${artifactsDirectory}`,
     '--quiet',
     '--port=0',
+    '--quiet',
   ];
 
   if (useFraggleRock) {

package/lighthouse-cli/test/smokehouse/readme.md

@@ -82,7 +82,8 @@ Arrays can be asserted to not match any elements using the special `_excludes` p
 
 ### Special environment checks
 
-If an expectation requires a minimum version of Chromium, use `_minChromiumMilestone: xx` to conditionally ignore that entire object in the expectation.
+If an expectation requires a minimum version of Chromium, use `_minChromiumVersion: xx.x.x.x` to conditionally ignore that entire object in the expectation.
+Can be as specific as you like (`_minChromiumVersion: xx` works too).
 
 **Examples**:
 ```js
@@ -90,7 +91,7 @@ If an expectation requires a minimum version of Chromium, use `_minChromiumMiles
   artifacts: {
     InspectorIssues: {
       // Mixed Content issues weren't added to the protocol until M84.
-      _minChromiumMilestone: 84, // The entire `InspectorIssues` is ignored for older Chrome.
+      _minChromiumVersion: '84', // The entire `InspectorIssues` is ignored for older Chrome.
       mixedContent: [
         {
           resourceType: 'Image',
@@ -111,8 +112,8 @@ If an expectation requires a minimum version of Chromium, use `_minChromiumMiles
 
 All pruning checks:
 
-- `_minChromiumMilestone`
-- `_maxChromiumMilestone`
+- `_minChromiumVersion`
+- `_maxChromiumVersion`
 - `_legacyOnly`
 - `_fraggleRockOnly`
 - `_skipInBundled`

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

@@ -10,12 +10,11 @@
  * against the results actually collected from Lighthouse.
  */
 
-import _ from 'lodash';
+import cloneDeep from 'lodash/cloneDeep.js';
 import log from 'lighthouse-logger';
 
 import {LocalConsole} from './lib/local-console.js';
-
-const {cloneDeep} = _;
+import {chromiumVersionCheck} from './version-check.js';
 
 /**
  * @typedef Difference
@@ -228,22 +227,26 @@ function pruneExpectations(localConsole, lhr, expected, reportOptions) {
 
   /**
    * Lazily compute the Chrome version because some reports are explicitly asserting error conditions.
-   * @returns {number}
+   * @returns {string}
    */
-  function getChromeVersion() {
+  function getChromeVersionString() {
     const userAgent = lhr.environment.hostUserAgent;
-    const userAgentMatch = /Chrome\/(\d+)/.exec(userAgent); // Chrome/85.0.4174.0
+    const userAgentMatch = /Chrome\/([\d.]+)/.exec(userAgent); // Chrome/85.0.4174.0
     if (!userAgentMatch) throw new Error('Could not get chrome version.');
-    return Number(userAgentMatch[1]);
+    const versionString = userAgentMatch[1];
+    if (versionString.split('.').length !== 4) throw new Error(`unexpected ua: ${userAgent}`);
+    return versionString;
   }
 
   /**
    * @param {*} obj
    */
   function failsChromeVersionCheck(obj) {
-    if (obj._minChromiumMilestone && getChromeVersion() < obj._minChromiumMilestone) return true;
-    if (obj._maxChromiumMilestone && getChromeVersion() > obj._maxChromiumMilestone) return true;
-    return false;
+    return !chromiumVersionCheck({
+      version: getChromeVersionString(),
+      min: obj._minChromiumVersion,
+      max: obj._maxChromiumVersion,
+    });
   }
 
   /**
@@ -272,7 +275,7 @@ function pruneExpectations(localConsole, lhr, expected, reportOptions) {
         localConsole.log([
           `[${key}] failed chrome version check, pruning expectation:`,
           JSON.stringify(value, null, 2),
-          `Actual Chromium version: ${getChromeVersion()}`,
+          `Actual Chromium version: ${getChromeVersionString()}`,
         ].join(' '));
         remove(key);
       } else if (value._legacyOnly && isFraggleRock) {
@@ -308,8 +311,8 @@ function pruneExpectations(localConsole, lhr, expected, reportOptions) {
     delete obj._legacyOnly;
     delete obj._fraggleRockOnly;
     delete obj._skipInBundled;
-    delete obj._minChromiumMilestone;
-    delete obj._maxChromiumMilestone;
+    delete obj._minChromiumVersion;
+    delete obj._maxChromiumVersion;
     delete obj._runner;
   }
 

package/lighthouse-cli/test/smokehouse/version-check-test.js

@@ -0,0 +1,46 @@
+/**
+ * @license Copyright 2022 The Lighthouse Authors. All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+'use strict';
+
+import {chromiumVersionCheck, compareVersions} from './version-check.js';
+
+/* eslint-env jest */
+
+describe('version check', () => {
+  it('compareVersions', async () => {
+    expect(compareVersions([100, 0, 0, 0], [100, 0, 0, 0])).toBe(0);
+    expect(compareVersions([101, 0, 0, 0], [100, 0, 0, 0])).toBe(1);
+    expect(compareVersions([99, 0, 0, 0], [100, 0, 0, 0])).toBe(-1);
+
+    expect(compareVersions([100, 0, 10, 0], [100, 0, 10, 0])).toBe(0);
+    expect(compareVersions([100, 0, 11, 0], [100, 0, 10, 0])).toBe(1);
+    expect(compareVersions([100, 0, 9, 0], [100, 0, 10, 0])).toBe(-1);
+
+    expect(compareVersions([100, 0, 0, 0], [100])).toBe(0);
+    expect(compareVersions([100, 0, 0, 1], [100])).toBe(1);
+    expect(compareVersions([99, 0, 0, 0], [100])).toBe(-1);
+  });
+
+  it('chromiumVersionCheck', async () => {
+    expect(chromiumVersionCheck({version: '100'})).toBe(true);
+    expect(chromiumVersionCheck({version: '100', min: '100'})).toBe(true);
+    expect(chromiumVersionCheck({version: '100', max: '100'})).toBe(true);
+    expect(chromiumVersionCheck({version: '100', min: '101'})).toBe(false);
+    expect(chromiumVersionCheck({version: '100', max: '99'})).toBe(false);
+
+    expect(chromiumVersionCheck({version: '100.0.2331.3'})).toBe(true);
+    expect(chromiumVersionCheck({version: '100.0.2331.3', min: '100.0.2331.3'})).toBe(true);
+    expect(chromiumVersionCheck({version: '100.0.2331.3', min: '100.0.0.0'})).toBe(true);
+    expect(chromiumVersionCheck({version: '100.0.2331.3', max: '100.0.3333.3'})).toBe(true);
+    expect(chromiumVersionCheck({version: '100.0.2331.3', min: '100.0.2331.2'})).toBe(true);
+    expect(chromiumVersionCheck({version: '100.0.2331.3', max: '99'})).toBe(false);
+
+    expect(chromiumVersionCheck({
+      version: '100.0.2331.3', min: '100.0.2331.0', max: '100.0.2331.10'})).toBe(true);
+    expect(chromiumVersionCheck({
+      version: '100.3.2331.3', min: '100.0.2331.0', max: '100.0.2331.10'})).toBe(false);
+  });
+});

package/lighthouse-cli/test/smokehouse/version-check.js

@@ -0,0 +1,49 @@
+/**
+ * @license Copyright 2022 The Lighthouse Authors. All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+'use strict';
+
+/**
+ * @fileoverview Compares chromium version strings: 103.0.5017.0
+ */
+
+/**
+ * @param {string} versionString
+ * @return {number[]}
+ */
+function parseVersion(versionString) {
+  const versionParts = versionString.split('.');
+  return versionParts.map(Number);
+}
+
+/**
+ * @param {number[]} versionA
+ * @param {number[]} versionB
+ */
+function compareVersions(versionA, versionB) {
+  for (let i = 0; i < versionA.length; i++) {
+    if ((versionA[i] ?? 0) > (versionB[i] ?? 0)) return 1;
+    if ((versionA[i] ?? 0) < (versionB[i] ?? 0)) return -1;
+  }
+  return 0;
+}
+
+/**
+ * Returns false if fails check.
+ * @param {{version: string, min?: string, max?: string}} opts
+ */
+function chromiumVersionCheck(opts) {
+  const version = parseVersion(opts.version);
+  const min = opts.min && parseVersion(opts.min);
+  const max = opts.max && parseVersion(opts.max);
+  if (min && compareVersions(version, min) === -1) return false;
+  if (max && compareVersions(version, max) === 1) return false;
+  return true;
+}
+
+export {
+  chromiumVersionCheck,
+  compareVersions,
+};

package/lighthouse-core/audits/bootup-time.js

@@ -6,11 +6,11 @@
 'use strict';
 
 const Audit = require('./audit.js');
-const NetworkRequest = require('../lib/network-request.js');
 const {taskGroups} = require('../lib/tracehouse/task-groups.js');
 const i18n = require('../lib/i18n/i18n.js');
 const NetworkRecords = require('../computed/network-records.js');
 const MainThreadTasks = require('../computed/main-thread-tasks.js');
+const {getExecutionTimingsByURL} = require('../lib/tracehouse/task-summary.js');
 
 const UIStrings = {
   /** Title of a diagnostic audit that provides detail on the time spent executing javascript files during the load. This descriptive title is shown to users when the amount is acceptable and no user action is required. */
@@ -34,18 +34,6 @@ const UIStrings = {
 
 const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
 
-// These trace events, when not triggered by a script inside a particular task, are just general Chrome overhead.
-const BROWSER_TASK_NAMES_SET = new Set([
-  'CpuProfiler::StartProfiling',
-]);
-
-// These trace events, when not triggered by a script inside a particular task, are GC Chrome overhead.
-const BROWSER_GC_TASK_NAMES_SET = new Set([
-  'V8.GCCompactor',
-  'MajorGC',
-  'MinorGC',
-]);
-
 class BootupTime extends Audit {
   /**
    * @return {LH.Audit.Meta}
@@ -74,61 +62,6 @@ class BootupTime extends Audit {
     };
   }
 
-  /**
-   * @param {LH.Artifacts.NetworkRequest[]} records
-   */
-  static getJavaScriptURLs(records) {
-    /** @type {Set<string>} */
-    const urls = new Set();
-    for (const record of records) {
-      if (record.resourceType === NetworkRequest.TYPES.Script) {
-        urls.add(record.url);
-      }
-    }
-
-    return urls;
-  }
-
-  /**
-   * @param {LH.Artifacts.TaskNode} task
-   * @param {Set<string>} jsURLs
-   * @return {string}
-   */
-  static getAttributableURLForTask(task, jsURLs) {
-    const jsURL = task.attributableURLs.find(url => jsURLs.has(url));
-    const fallbackURL = task.attributableURLs[0];
-    let attributableURL = jsURL || fallbackURL;
-    // If we can't find what URL was responsible for this execution, attribute it to the root page
-    // or Chrome depending on the type of work.
-    if (!attributableURL || attributableURL === 'about:blank') {
-      if (BROWSER_TASK_NAMES_SET.has(task.event.name)) attributableURL = 'Browser';
-      else if (BROWSER_GC_TASK_NAMES_SET.has(task.event.name)) attributableURL = 'Browser GC';
-      else attributableURL = 'Unattributable';
-    }
-
-    return attributableURL;
-  }
-
-  /**
-   * @param {LH.Artifacts.TaskNode[]} tasks
-   * @param {Set<string>} jsURLs
-   * @return {Map<string, Object<string, number>>}
-   */
-  static getExecutionTimingsByURL(tasks, jsURLs) {
-    /** @type {Map<string, Object<string, number>>} */
-    const result = new Map();
-
-    for (const task of tasks) {
-      const attributableURL = BootupTime.getAttributableURLForTask(task, jsURLs);
-      const timingByGroupId = result.get(attributableURL) || {};
-      const originalTime = timingByGroupId[task.group.id] || 0;
-      timingByGroupId[task.group.id] = originalTime + task.selfTime;
-      result.set(attributableURL, timingByGroupId);
-    }
-
-    return result;
-  }
-
   /**
    * @param {LH.Artifacts} artifacts
    * @param {LH.Audit.Context} context
@@ -143,8 +76,7 @@ class BootupTime extends Audit {
     const multiplier = settings.throttlingMethod === 'simulate' ?
       settings.throttling.cpuSlowdownMultiplier : 1;
 
-    const jsURLs = BootupTime.getJavaScriptURLs(networkRecords);
-    const executionTimings = BootupTime.getExecutionTimingsByURL(tasks, jsURLs);
+    const executionTimings = getExecutionTimingsByURL(tasks, networkRecords);
 
     let hadExcessiveChromeExtension = false;
     let totalBootupTime = 0;

package/lighthouse-core/audits/byte-efficiency/duplicated-javascript.js

@@ -11,8 +11,8 @@
 
 const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
 const ModuleDuplication = require('../../computed/module-duplication.js');
-const NetworkAnalyzer = require('../../lib/dependency-graph/simulator/network-analyzer.js');
 const i18n = require('../../lib/i18n/i18n.js');
+const {getRequestForScript} = require('../../lib/script-helpers.js');
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to remove duplicate JavaScript from their code. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -130,7 +130,6 @@ class DuplicatedJavascript extends ByteEfficiencyAudit {
       context.options?.ignoreThresholdInBytes || IGNORE_THRESHOLD_IN_BYTES;
     const duplication =
       await DuplicatedJavascript._getDuplicationGroupedByNodeModules(artifacts, context);
-    const mainDocumentRecord = NetworkAnalyzer.findOptionalMainDocument(networkRecords);
 
     /** @type {Map<string, number>} */
     const transferRatioByUrl = new Map();
@@ -162,9 +161,8 @@ class DuplicatedJavascript extends ByteEfficiencyAudit {
         /** @type {number|undefined} */
         let transferRatio = transferRatioByUrl.get(url);
         if (transferRatio === undefined) {
-          const networkRecord = url === artifacts.URL.finalUrl ?
-            mainDocumentRecord :
-            networkRecords.find(n => n.url === url);
+          const fakeScript = /** @type {LH.Artifacts.ScriptElement} */ ({src: url});
+          const networkRecord = getRequestForScript(networkRecords, fakeScript);
 
           const script = artifacts.ScriptElements.find(script => script.src === url);
           if (!script || script.content === null) {

package/lighthouse-core/audits/byte-efficiency/legacy-javascript.js

@@ -22,7 +22,7 @@ const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
 const JsBundles = require('../../computed/js-bundles.js');
 const i18n = require('../../lib/i18n/i18n.js');
 const thirdPartyWeb = require('../../lib/third-party-web.js');
-const NetworkAnalyzer = require('../../lib/dependency-graph/simulator/network-analyzer.js');
+const {getRequestForScript} = require('../../lib/script-helpers.js');
 
 const UIStrings = {
   /** Title of a Lighthouse audit that tells the user about legacy polyfills and transforms used on the page. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -373,11 +373,8 @@ class LegacyJavascript extends ByteEfficiencyAudit {
     let transferRatio = transferRatioByUrl.get(url);
     if (transferRatio !== undefined) return transferRatio;
 
-    const mainDocumentRecord = NetworkAnalyzer.findOptionalMainDocument(networkRecords);
-    const networkRecord = url === artifacts.URL.finalUrl ?
-      mainDocumentRecord :
-      networkRecords.find(n => n.url === url);
     const script = artifacts.ScriptElements.find(script => script.src === url);
+    const networkRecord = getRequestForScript(networkRecords, script);
 
     if (!script || script.content === null) {
       // Can't find content, so just use 1.

package/lighthouse-core/audits/byte-efficiency/unminified-javascript.js

@@ -8,6 +8,7 @@
 const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
 const i18n = require('../../lib/i18n/i18n.js');
 const computeTokenLength = require('../../lib/minification-estimator.js').computeJSTokenLength;
+const {getRequestForScript} = require('../../lib/script-helpers.js');
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to minify the page’s JS code to reduce file size. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -78,10 +79,11 @@ class UnminifiedJavaScript extends ByteEfficiencyAudit {
     /** @type {Array<LH.Audit.ByteEfficiencyItem>} */
     const items = [];
     const warnings = [];
-    for (const {requestId, src, content} of artifacts.ScriptElements) {
+    for (const script of artifacts.ScriptElements) {
+      const {src, content} = script;
       if (!content) continue;
 
-      const networkRecord = networkRecords.find(record => record.requestId === requestId);
+      const networkRecord = getRequestForScript(networkRecords, script);
       const displayUrl = !src || !networkRecord ?
         `inline: ${content.substr(0, 40)}...` :
         networkRecord.url;

package/lighthouse-core/audits/byte-efficiency/unused-javascript.js

@@ -9,6 +9,7 @@ const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
 const UnusedJavaScriptSummary = require('../../computed/unused-javascript-summary.js');
 const JsBundles = require('../../computed/js-bundles.js');
 const i18n = require('../../lib/i18n/i18n.js');
+const {getRequestForScript} = require('../../lib/script-helpers.js');
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to reduce JavaScript that is never evaluated during page load. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -87,7 +88,8 @@ class UnusedJavaScript extends ByteEfficiencyAudit {
 
     const items = [];
     for (const [url, scriptCoverages] of Object.entries(artifacts.JsUsage)) {
-      const networkRecord = networkRecords.find(record => record.url === url);
+      const fakeScript = /** @type {LH.Artifacts.ScriptElement} */ ({src: url});
+      const networkRecord = getRequestForScript(networkRecords, fakeScript);
       if (!networkRecord) continue;
       const bundle = bundles.find(b => b.script.src === url);
       const unusedJsSummary =