lighthouse 9.5.0-dev.20220606 → 9.5.0-dev.20220609

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lighthouse",
-  "version": "9.5.0-dev.20220606",
+  "version": "9.5.0-dev.20220609",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./lighthouse-core/index.js",
   "bin": {
@@ -125,8 +125,8 @@
     "@types/ws": "^7.0.0",
     "@types/yargs": "^17.0.8",
     "@types/yargs-parser": "^20.2.1",
-    "@typescript-eslint/eslint-plugin": "^5.6.0",
-    "@typescript-eslint/parser": "^5.6.0",
+    "@typescript-eslint/eslint-plugin": "^5.26.0",
+    "@typescript-eslint/parser": "^5.26.0",
     "acorn": "^8.5.0",
     "angular": "^1.7.4",
     "archiver": "^3.0.0",
@@ -175,7 +175,7 @@
     "terser": "^5.3.8",
     "ts-jest": "^27.0.4",
     "typed-query-selector": "^2.6.1",
-    "typescript": "^4.5.2",
+    "typescript": "^4.7.2",
     "wait-for-expect": "^3.0.2",
     "webtreemap-cdt": "^3.2.1"
   },

package/report/generator/tsconfig.json

@@ -1,8 +1,6 @@
 {
   "extends": "../../tsconfig-base.json",
   "compilerOptions": {
-    "outDir": "../../.tmp/tsbuildinfo/report/generator",
-
     // Limit defs to base JS and DOM (for URL: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/34960).
     "lib": ["es2020", "dom"],
     // Only include `@types/node` from node_modules/.

package/report/renderer/swap-locale-feature.js

@@ -57,8 +57,8 @@ export class SwapLocaleFeature {
         const optionLocaleDisplay = new Intl.DisplayNames([locale], {type: 'language'});
 
         const optionLocaleName = optionLocaleDisplay.of(locale);
-        const currentLocaleName = currentLocaleDisplay.of(locale);
-        if (optionLocaleName !== currentLocaleName) {
+        const currentLocaleName = currentLocaleDisplay.of(locale) || locale;
+        if (optionLocaleName && optionLocaleName !== currentLocaleName) {
           optionEl.textContent = `${optionLocaleName} – ${currentLocaleName}`;
         } else {
           optionEl.textContent = currentLocaleName;

package/report/tsconfig.json

@@ -1,8 +1,6 @@
 {
   "extends": "../tsconfig-base.json",
   "compilerOptions": {
-    "outDir": "../.tmp/tsbuildinfo/report",
-
     // Limit to base JS and DOM defs.
     "lib": ["es2020", "dom", "dom.iterable"],
     // Don't include any types from node_modules/.

package/shared/tsconfig.json

@@ -1,8 +1,6 @@
 {
   "extends": "../tsconfig-base.json",
   "compilerOptions": {
-    "outDir": "../../.tmp/tsbuildinfo/shared/",
-
     // Limit defs to base JS.
     "lib": ["es2020"],
     // Only include `@types/node` from node_modules/.

package/tsconfig-base.json

@@ -3,8 +3,13 @@
 {
   "compilerOptions": {
     "composite": true,
+
+    // Set up incremental builds. All sub-projects emit under outDir, maintaining
+    // directory structure relative to rootDir. No effect on include, exclude, etc.
     "emitDeclarationOnly": true,
     "declarationMap": true,
+    "outDir": ".tmp/tsbuildinfo/",
+    "rootDir": ".",
 
     "target": "es2020",
     "module": "es2020",

package/tsconfig.json

@@ -1,8 +1,6 @@
 {
   "extends": "./tsconfig-base.json",
   "compilerOptions": {
-    "outDir": ".tmp/tsbuildinfo/",
-
     // TODO(esmodules): included to support require('file.json'). Remove on the switch to ES Modules.
     "resolveJsonModule": true,
   },
@@ -32,6 +30,7 @@
     "third-party/snyk/snapshot.json",
     "lighthouse-core/audits/byte-efficiency/polyfill-graph-data.json",
     "shared/localization/locales/en-US.json",
+    "esm-utils.mjs",
   ],
   "exclude": [
     "lighthouse-core/test/audits/**/*.js",
@@ -48,11 +47,11 @@
     "lighthouse-core/test/config/config-test.js",
     "lighthouse-core/test/config/default-config-test.js",
     "lighthouse-core/test/create-test-trace.js",
-    "lighthouse-core/test/gather/devtools-log-test.js",
     "lighthouse-core/test/gather/driver/wait-for-condition-test.js",
     "lighthouse-core/test/gather/gatherers/accessibility-test.js",
     "lighthouse-core/test/gather/gatherers/cache-contents-test.js",
     "lighthouse-core/test/gather/gatherers/console-messages-test.js",
+    "lighthouse-core/test/gather/gatherers/devtools-log-test.js",
     "lighthouse-core/test/gather/gatherers/dobetterweb/optimized-images-test.js",
     "lighthouse-core/test/gather/gatherers/dobetterweb/password-inputs-with-prevented-paste-test.js",
     "lighthouse-core/test/gather/gatherers/dobetterweb/response-compression-test.js",

package/types/artifacts.d.ts

@@ -49,6 +49,8 @@ interface UniversalBaseArtifacts {
   LighthouseRunWarnings: Array<string | IcuMessage>;
   /** The benchmark index that indicates rough device class. */
   BenchmarkIndex: number;
+  /** Many benchmark indexes. Many. */
+  BenchmarkIndexes?: number[];
   /** An object containing information about the testing configuration used by Lighthouse. */
   settings: Config.Settings;
   /** The timing instrumentation of the gather portion of a run. */

package/types/gatherer.d.ts

@@ -30,8 +30,6 @@ declare module Gatherer {
     once<TEvent extends keyof LH.CrdpEvents>(event: TEvent, callback: (...args: LH.CrdpEvents[TEvent]) => void): void;
     addProtocolMessageListener(callback: (payload: Protocol.RawEventMessage) => void): void
     removeProtocolMessageListener(callback: (payload: Protocol.RawEventMessage) => void): void
-    addSessionAttachedListener(callback: (session: FRProtocolSession) => void): void
-    removeSessionAttachedListener(callback: (session: FRProtocolSession) => void): void
     off<TEvent extends keyof LH.CrdpEvents>(event: TEvent, callback: (...args: LH.CrdpEvents[TEvent]) => void): void;
     sendCommand<TMethod extends keyof LH.CrdpCommands>(method: TMethod, ...params: LH.CrdpCommands[TMethod]['paramsType']): Promise<LH.CrdpCommands[TMethod]['returnType']>;
     dispose(): Promise<void>;

package/types/lhr/lhr.d.ts

@@ -59,6 +59,8 @@ declare module Result {
     networkUserAgent: string;
     /** The benchmark index number that indicates rough device class. */
     benchmarkIndex: number;
+    /** Many benchmark indexes. */
+    benchmarkIndexes?: number[];
     /** The version of libraries with which these results were generated. Ex: axe-core. */
     credits?: Record<string, string|undefined>,
   }

package/types/lhr/tsconfig.json

@@ -1,8 +1,6 @@
 {
   "extends": "../../tsconfig-base.json",
   "compilerOptions": {
-    "outDir": "../../.tmp/tsbuildinfo/types/lhr",
-
     // We only need the base JS definitions, no DOM, etc.
     "lib": ["esnext"],
     // Don't include any types from node_modules/.

package/types/lighthouse-logger/index.d.ts

@@ -11,6 +11,7 @@ declare module 'lighthouse-logger' {
     args?: any[];
   }
   export function setLevel(level: string): void;
+  export function isVerbose(): boolean;
   export function formatProtocol(prefix: string, data: Object, level?: string): void;
   export function log(title: string, ...args: any[]): void;
   export function warn(title: string, ...args: any[]): void;

package/lighthouse-core/gather/devtools-log.js

@@ -1,61 +0,0 @@
-/**
- * @license Copyright 2017 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 This class saves all protocol messages whose method match a particular
- *    regex filter. Used when saving assets for later analysis by another tool such as
- *    Webpagetest.
- */
-class DevtoolsLog {
-  /**
-   * @param {RegExp=} regexFilter
-   */
-  constructor(regexFilter) {
-    this._filter = regexFilter;
-
-    /** @type {LH.DevtoolsLog} */
-    this._messages = [];
-    this._isRecording = false;
-  }
-
-  /**
-   * @return {LH.DevtoolsLog}
-   */
-  get messages() {
-    return this._messages;
-  }
-
-  reset() {
-    this._messages = [];
-  }
-
-  beginRecording() {
-    this._isRecording = true;
-  }
-
-  endRecording() {
-    this._isRecording = false;
-  }
-
-  /**
-   * Records a message if method matches filter and recording has been started.
-   * @param {LH.Protocol.RawEventMessage} message
-   */
-  record(message) {
-    // We're not recording, skip the rest of the checks.
-    if (!this._isRecording) return;
-    // The event was likely an internal puppeteer method that uses Symbols.
-    if (typeof message.method !== 'string') return;
-    // The event didn't pass our filter, do not record it.
-    if (this._filter && !this._filter.test(message.method)) return;
-
-    // We passed all the checks, record the message.
-    this._messages.push(message);
-  }
-}
-
-module.exports = DevtoolsLog;