lighthouse 9.5.0-dev.20220505 → 9.5.0-dev.20220506

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

@@ -6,8 +6,6 @@
 
 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);

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/long-tasks.js

@@ -9,9 +9,9 @@ const Audit = require('./audit.js');
 const NetworkRecords = require('../computed/network-records.js');
 const i18n = require('../lib/i18n/i18n.js');
 const MainThreadTasks = require('../computed/main-thread-tasks.js');
-const BootupTime = require('./bootup-time.js');
 const PageDependencyGraph = require('../computed/page-dependency-graph.js');
 const LoadSimulator = require('../computed/load-simulator.js');
+const {getJavaScriptURLs, getAttributableURLForTask} = require('../lib/tracehouse/task-summary.js');
 
 /** We don't always have timing data for short tasks, if we're missing timing data. Treat it as though it were 0ms. */
 const DEFAULT_TIMING = {startTime: 0, endTime: 0, duration: 0};
@@ -78,7 +78,7 @@ class LongTasks extends Audit {
       }
     }
 
-    const jsURLs = BootupTime.getJavaScriptURLs(networkRecords);
+    const jsURLs = getJavaScriptURLs(networkRecords);
     // Only consider up to 20 long, top-level (no parent) tasks that have an explicit endTime
     const longtasks = tasks
       .map(t => {
@@ -91,7 +91,7 @@ class LongTasks extends Audit {
 
     // TODO(beytoven): Add start time that matches with the simulated throttling
     const results = longtasks.map(task => ({
-      url: BootupTime.getAttributableURLForTask(task, jsURLs),
+      url: getAttributableURLForTask(task, jsURLs),
       duration: task.duration,
       startTime: task.startTime,
     }));

package/lighthouse-core/audits/metrics/experimental-interaction-to-next-paint.js

@@ -63,19 +63,21 @@ class ExperimentalInteractionToNextPaint extends Audit {
 
     const trace = artifacts.traces[Audit.DEFAULT_PASS];
     const metricData = {trace, settings};
-    const metricResult = await ComputedResponsivenes.request(metricData, context);
+    const responsivenessEvent = await ComputedResponsivenes.request(metricData, context);
 
     // TODO: include the no-interaction state in the report instead of using n/a.
-    if (metricResult === null) {
+    if (responsivenessEvent === null) {
       return {score: null, notApplicable: true};
     }
 
+    const timing = responsivenessEvent.args.data.maxDuration;
+
     return {
       score: Audit.computeLogNormalScore({p10: context.options.p10, median: context.options.median},
-        metricResult.timing),
-      numericValue: metricResult.timing,
+        timing),
+      numericValue: timing,
       numericUnit: 'millisecond',
-      displayValue: str_(i18n.UIStrings.ms, {timeInMs: metricResult.timing}),
+      displayValue: str_(i18n.UIStrings.ms, {timeInMs: timing}),
     };
   }
 }

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

@@ -6,11 +6,11 @@
 'use strict';
 
 const Audit = require('./audit.js');
-const BootupTime = require('./bootup-time.js');
 const i18n = require('../lib/i18n/i18n.js');
 const thirdPartyWeb = require('../lib/third-party-web.js');
 const NetworkRecords = require('../computed/network-records.js');
 const MainThreadTasks = require('../computed/main-thread-tasks.js');
+const {getJavaScriptURLs, getAttributableURLForTask} = require('../lib/tracehouse/task-summary.js');
 
 const UIStrings = {
   /** Title of a diagnostic audit that provides details about the code on a web page that the user doesn't control (referred to as "third-party code"). This descriptive title is shown to users when the amount is acceptable and no user action is required. */
@@ -98,10 +98,10 @@ class ThirdPartySummary extends Audit {
       byURL.set(request.url, urlSummary);
     }
 
-    const jsURLs = BootupTime.getJavaScriptURLs(networkRecords);
+    const jsURLs = getJavaScriptURLs(networkRecords);
 
     for (const task of mainThreadTasks) {
-      const attributableURL = BootupTime.getAttributableURLForTask(task, jsURLs);
+      const attributableURL = getAttributableURLForTask(task, jsURLs);
 
       const urlSummary = byURL.get(attributableURL) || {...defaultSummary};
       const taskDuration = task.selfTime * cpuMultiplier;

package/lighthouse-core/computed/metrics/responsiveness.js

@@ -11,24 +11,25 @@
  * user input in the provided trace).
  */
 
+/** @typedef {LH.Trace.CompleteEvent & {name: 'Responsiveness.Renderer.UserInteraction', args: {frame: string, data: {interactionType: 'drag'|'keyboard'|'tapOrClick', maxDuration: number}}}} ResponsivenessEvent */
+
 const makeComputedArtifact = require('../computed-artifact.js');
 const ProcessedTrace = require('../processed-trace.js');
 
 class Responsiveness {
   /**
    * @param {LH.Artifacts.ProcessedTrace} processedTrace
-   * @return {{timing: number}|null}
+   * @return {ResponsivenessEvent|null}
    */
   static getHighPercentileResponsiveness(processedTrace) {
-    const durations = processedTrace.frameTreeEvents
+    const responsivenessEvents = processedTrace.frameTreeEvents
       // https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/core/timing/responsiveness_metrics.cc;l=146-150;drc=a1a2302f30b0a58f7669a41c80acdf1fa11958dd
-      .filter(e => e.name === 'Responsiveness.Renderer.UserInteraction')
-      .map(evt => evt.args.data?.maxDuration)
-      .filter(/** @return {duration is number} */duration => duration !== undefined)
-      .sort((a, b) => b - a);
+      .filter(/** @return {e is ResponsivenessEvent} */ e => {
+        return e.name === 'Responsiveness.Renderer.UserInteraction';
+      }).sort((a, b) => b.args.data.maxDuration - a.args.data.maxDuration);
 
     // If there were no interactions with the page, the metric is N/A.
-    if (durations.length === 0) {
+    if (responsivenessEvents.length === 0) {
       return null;
     }
 
@@ -36,17 +37,15 @@ class Responsiveness {
     // keeps the 10 worst events around, so it can never be more than the 10th from
     // last array element. To keep things simpler, sort desc and pick from front.
     // See https://source.chromium.org/chromium/chromium/src/+/main:components/page_load_metrics/browser/responsiveness_metrics_normalization.cc;l=45-59;drc=cb0f9c8b559d9c7c3cb4ca94fc1118cc015d38ad
-    const index = Math.min(9, Math.floor(durations.length / 50));
+    const index = Math.min(9, Math.floor(responsivenessEvents.length / 50));
 
-    return {
-      timing: durations[index],
-    };
+    return responsivenessEvents[index];
   }
 
   /**
    * @param {{trace: LH.Trace, settings: Immutable<LH.Config.Settings>}} data
    * @param {LH.Artifacts.ComputedContext} context
-   * @return {Promise<LH.Artifacts.Metric|null>}
+   * @return {Promise<ResponsivenessEvent|null>}
    */
   static async compute_(data, context) {
     if (data.settings.throttlingMethod === 'simulate') {
@@ -54,7 +53,9 @@ class Responsiveness {
     }
 
     const processedTrace = await ProcessedTrace.request(data.trace, context);
-    return Responsiveness.getHighPercentileResponsiveness(processedTrace);
+    const event = Responsiveness.getHighPercentileResponsiveness(processedTrace);
+
+    return JSON.parse(JSON.stringify(event));
   }
 }
 

package/lighthouse-core/lib/cdt/generated/SourceMap.js

@@ -149,7 +149,7 @@ class TextSourceMap {
         }
         return mappings.slice(startIndex, endIndex);
     }
-    /** @return {Array<{lineNumber: number, columnNumber: number, sourceURL?: string, sourceLineNumber, sourceColumnNumber: number, name?: string, lastColumnNumber?: number}>} */
+    /** @return {Array<{lineNumber: number, columnNumber: number, sourceURL?: string, sourceLineNumber: number, sourceColumnNumber: number, name?: string, lastColumnNumber?: number}>} */
 mappings() {
         if (this.mappingsInternal === null) {
             this.mappingsInternal = [];

package/lighthouse-core/lib/tracehouse/task-summary.js

@@ -0,0 +1,87 @@
+/**
+ * @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 Utility functions for grouping and summarizing tasks.
+ */
+
+const NetworkRequest = require('../network-request.js');
+
+// 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',
+]);
+
+/**
+ * @param {LH.Artifacts.NetworkRequest[]} records
+ */
+function 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}
+ */
+function 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 {Array<LH.Artifacts.NetworkRequest>} networkRecords
+ * @return {Map<string, Record<string, number>>}
+ */
+function getExecutionTimingsByURL(tasks, networkRecords) {
+  const jsURLs = getJavaScriptURLs(networkRecords);
+
+  /** @type {Map<string, Record<string, number>>} */
+  const result = new Map();
+
+  for (const task of tasks) {
+    const attributableURL = 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;
+}
+
+module.exports = {
+  getJavaScriptURLs,
+  getAttributableURLForTask,
+  getExecutionTimingsByURL,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lighthouse",
-  "version": "9.5.0-dev.20220505",
+  "version": "9.5.0-dev.20220506",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./lighthouse-core/index.js",
   "bin": {
@@ -68,13 +68,13 @@
     "vercel-build": "yarn build-sample-reports && yarn build-viewer && yarn build-treemap",
     "dogfood-lhci": "./lighthouse-core/scripts/dogfood-lhci.sh",
     "timing-trace": "node lighthouse-core/scripts/generate-timing-trace.js",
-    "changelog": "conventional-changelog --config ./build/changelog-generator/index.js --infile changelog.md --same-file",
+    "changelog": "conventional-changelog --config ./build/changelog-generator/index.cjs --infile changelog.md --same-file",
     "type-check": "tsc --build ./tsconfig-all.json",
     "i18n:checks": "./lighthouse-core/scripts/i18n/assert-strings-collected.sh",
     "i18n:collect-strings": "node lighthouse-core/scripts/i18n/collect-strings.js",
     "update:lantern-baseline": "node lighthouse-core/scripts/lantern/update-baseline-lantern-values.js",
     "update:sample-artifacts": "node lighthouse-core/scripts/update-report-fixtures.js",
-    "update:sample-json": "yarn i18n:collect-strings && node ./lighthouse-cli -A=./lighthouse-core/test/results/artifacts --config-path=./lighthouse-core/test/results/sample-config.js --output=json --output-path=./lighthouse-core/test/results/sample_v2.json && node lighthouse-core/scripts/cleanup-LHR-for-diff.js ./lighthouse-core/test/results/sample_v2.json --only-remove-timing",
+    "update:sample-json": "yarn i18n:collect-strings && node ./lighthouse-cli -A=./lighthouse-core/test/results/artifacts --config-path=./lighthouse-core/test/results/sample-config.js --output=json --output-path=./lighthouse-core/test/results/sample_v2.json && node lighthouse-core/scripts/cleanup-LHR-for-diff.js ./lighthouse-core/test/results/sample_v2.json --only-remove-timing && node ./lighthouse-core/scripts/update-flow-fixtures.js",
     "update:flow-sample-json": "yarn i18n:collect-strings && node ./lighthouse-core/scripts/update-flow-fixtures.js",
     "update:test-devtools": "bash lighthouse-core/test/chromium-web-tests/test-locally.sh --reset-results",
     "test-devtools": "bash lighthouse-core/test/chromium-web-tests/test-locally.sh",

package/report/test/.eslintrc.cjs

@@ -0,0 +1,11 @@
+/**
+ * @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.
+ */
+
+module.exports = {
+  env: {
+    jest: true,
+  },
+};

package/report/test/clients/bundle-test.js

@@ -16,9 +16,6 @@ import {LH_ROOT} from '../../../root.js';
 const sampleResultsStr =
   fs.readFileSync(LH_ROOT + '/lighthouse-core/test/results/sample_v2.json', 'utf-8');
 
-
-/* eslint-env jest */
-
 describe('lighthouseRenderer bundle', () => {
   let document;
   beforeAll(() => {

package/report/test/generator/file-namer-test.js

@@ -9,7 +9,6 @@ const assert = require('assert').strict;
 
 const getLhrFilenamePrefix = require('../../generator/file-namer.js').getLhrFilenamePrefix;
 
-/* eslint-env jest */
 describe('file-namer helper', () => {
   it('generates filename prefixes', () => {
     const results = {

package/report/test/generator/report-generator-test.js

@@ -15,8 +15,6 @@ const csvValidator = require('csv-validator');
 const ReportGenerator = require('../../generator/report-generator.js');
 const sampleResults = require('../../../lighthouse-core/test/results/sample_v2.json');
 
-/* eslint-env jest */
-
 describe('ReportGenerator', () => {
   describe('#replaceStrings', () => {
     it('should replace all occurrences', () => {

package/report/test/renderer/category-renderer-test.js

@@ -4,8 +4,6 @@
  * 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.
  */
 
-/* eslint-env jest */
-
 import {strict as assert} from 'assert';
 
 import jsdom from 'jsdom';

package/report/test/renderer/components-test.js

@@ -4,8 +4,6 @@
  * 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.
  */
 
-/* eslint-env jest */
-
 import fs from 'fs';
 
 import jsdom from 'jsdom';

package/report/test/renderer/crc-details-renderer-test.js

@@ -4,8 +4,6 @@
  * 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.
  */
 
-/* eslint-env jest */
-
 import {strict as assert} from 'assert';
 
 import jsdom from 'jsdom';

package/report/test/renderer/details-renderer-test.js

@@ -13,8 +13,6 @@ import {Util} from '../../renderer/util.js';
 import {I18n} from '../../renderer/i18n.js';
 import {DetailsRenderer} from '../../renderer/details-renderer.js';
 
-/* eslint-env jest */
-
 describe('DetailsRenderer', () => {
   let renderer;
 

package/report/test/renderer/dom-test.js

@@ -13,8 +13,6 @@ import {DOM} from '../../renderer/dom.js';
 import {Util} from '../../renderer/util.js';
 import {I18n} from '../../renderer/i18n.js';
 
-/* eslint-env jest */
-
 describe('DOM', () => {
   /** @type {DOM} */
   let dom;

package/report/test/renderer/element-screenshot-renderer-test.js

@@ -4,8 +4,6 @@
  * 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.
  */
 
-/* eslint-env jest */
-
 import jsdom from 'jsdom';
 
 import {ElementScreenshotRenderer} from '../../renderer/element-screenshot-renderer.js';

package/report/test/renderer/i18n-test.js

@@ -16,8 +16,6 @@ import '../../../lighthouse-core/lib/i18n/i18n.js';
 
 const NBSP = '\xa0';
 
-/* eslint-env jest */
-
 describe('util helpers', () => {
   it('formats a number', () => {
     const i18n = new I18n('en', {...Util.UIStrings});

package/report/test/renderer/performance-category-renderer-test.js

@@ -4,8 +4,6 @@
  * 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.
  */
 
-/* eslint-env jest */
-
 import {strict as assert} from 'assert';
 
 import jsdom from 'jsdom';

package/report/test/renderer/pwa-category-renderer-test.js

@@ -4,8 +4,6 @@
  * 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.
  */
 
-/* eslint-env jest */
-
 import {strict as assert} from 'assert';
 
 import jsdom from 'jsdom';

package/report/test/renderer/report-renderer-axe-test.js

@@ -4,8 +4,6 @@
  * 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.
  */
 
-/* eslint-env jest */
-
 import puppeteer from 'puppeteer';
 
 import sampleResults from '../../../lighthouse-core/test/results/sample_v2.json';

package/report/test/renderer/report-renderer-test.js

@@ -4,8 +4,6 @@
  * 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.
  */
 
-/* eslint-env jest */
-
 import {strict as assert} from 'assert';
 
 import jsdom from 'jsdom';

package/report/test/renderer/report-ui-features-test.js

@@ -4,8 +4,6 @@
  * 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.
  */
 
-/* eslint-env jest */
-
 import {strict as assert} from 'assert';
 
 import jsdom from 'jsdom';

package/report/test/renderer/snippet-renderer-test.js

@@ -4,8 +4,6 @@
  * 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.
  */
 
-/* eslint-env jest */
-
 import {strict as assert} from 'assert';
 
 import jsdom from 'jsdom';

package/report/test/renderer/text-encoding-test.js

@@ -11,8 +11,6 @@ import pako from 'pako';
 import {TextEncoding} from '../../renderer/text-encoding.js';
 import {LH_ROOT} from '../../../root.js';
 
-/* eslint-env jest */
-
 describe('TextEncoding', () => {
   beforeAll(() => {
     global.window = {pako};

package/report/test/renderer/util-test.js

@@ -10,8 +10,6 @@ import {Util} from '../../renderer/util.js';
 import {I18n} from '../../renderer/i18n.js';
 import sampleResult from '../../../lighthouse-core/test/results/sample_v2.json';
 
-/* eslint-env jest */
-
 describe('util helpers', () => {
   beforeEach(() => {
     Util.i18n = new I18n('en', {...Util.UIStrings});

package/shared/test/localization/.eslintrc.cjs

@@ -0,0 +1,11 @@
+/**
+ * @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.
+ */
+
+module.exports = {
+  env: {
+    jest: true,
+  },
+};

package/shared/test/localization/format-test.js

@@ -12,8 +12,6 @@ const i18n = require('../../../lighthouse-core/lib/i18n/i18n.js');
 const constants = require('../../../lighthouse-core/config/constants.js');
 const locales = require('../../localization/locales.js');
 
-/* eslint-env jest */
-
 describe('format', () => {
   describe('DEFAULT_LOCALE', () => {
     it('is the same as the default config locale', () => {

package/shared/test/localization/locales-test.js

@@ -8,8 +8,6 @@
 const locales = require('../../localization/locales.js');
 const assert = require('assert').strict;
 
-/* eslint-env jest */
-
 describe('locales', () => {
   it('has only canonical (or expected-deprecated) language tags', () => {
     // Map of deprecated codes to their canonical version. Depending on the ICU

package/shared/test/localization/swap-locale-test.js

@@ -8,8 +8,6 @@
 const swapLocale = require('../../localization/swap-locale.js');
 
 const lhr = require('../../../lighthouse-core/test/results/sample_v2.json');
-
-/* eslint-env jest */
 describe('swap-locale', () => {
   it('does not mutate the original lhr', () => {
     /** @type {LH.Result} */

package/third-party/chromium-synchronization/inspector-issueAdded-types-test.js

@@ -13,8 +13,6 @@ const inspectorIssuesGathererPath = LH_ROOT +
   '/lighthouse-core/gather/gatherers/inspector-issues.js';
 const inspectorIssuesGathererSource = fs.readFileSync(inspectorIssuesGathererPath, 'utf-8');
 
-/* eslint-env jest */
-
 describe('issueAdded types', () => {
   /** @type {Array<LH.Crdp.Audits.InspectorIssueDetails>} */
   let inspectorIssueDetailsTypes;

package/third-party/chromium-synchronization/installability-errors-test.js

@@ -9,8 +9,6 @@ const fetch = require('node-fetch');
 
 const InstallableManifestAudit = require('../../lighthouse-core/audits/installable-manifest.js');
 
-/* eslint-env jest */
-
 jest.setTimeout(20_000);
 
 describe('installabilityErrors', () => {

package/tsconfig.json

@@ -11,6 +11,7 @@
     {"path": "./report/"},
     {"path": "./report/generator/"},
     {"path": "./shared/"},
+    {"path": "./treemap/"},
   ],
   "include": [
     "root.js",
@@ -99,6 +100,7 @@
     "lighthouse-core/test/lib/timing-trace-saver-test.js",
     "lighthouse-core/test/lib/tracehouse/cpu-profile-model-test.js",
     "lighthouse-core/test/lib/tracehouse/main-thread-tasks-test.js",
+    "lighthouse-core/test/lib/tracehouse/task-summary-test.js",
     "lighthouse-core/test/lib/tracehouse/trace-processor-test.js",
     "lighthouse-core/test/lib/traces/pwmetrics-events-test.js",
     "lighthouse-core/test/lib/url-shim-test.js",

package/types/artifacts.d.ts

@@ -1020,6 +1020,23 @@ export interface TraceEvent {
   };
 }
 
+declare module Trace {
+  /**
+   * Base event of a `ph: 'X'` 'complete' event. Extend with `name` and `args` as
+   * needed.
+   */
+  interface CompleteEvent {
+    ph: 'X';
+    cat: string;
+    pid: number;
+    tid: number;
+    dur: number;
+    ts: number;
+    tdur: number;
+    tts: number;
+  }
+}
+
 /**
  * A record of DevTools Debugging Protocol events.
  */