lighthouse 9.5.0-dev.20220607 → 9.6.2

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

@@ -3,6 +3,7 @@
  * 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 {strict as assert} from 'assert';
 
@@ -16,33 +17,14 @@ 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});
     assert.strictEqual(i18n.formatNumber(10), '10');
-    assert.strictEqual(i18n.formatNumber(100.01), '100.01');
-    assert.strictEqual(i18n.formatNumber(13000.456), '13,000.456');
-    assert.strictEqual(i18n.formatNumber(13000.456444), '13,000.456');
-
-    assert.strictEqual(i18n.formatNumber(10, 0.1), '10.0');
-    assert.strictEqual(i18n.formatNumber(100.01, 0.1), '100.0');
-    assert.strictEqual(i18n.formatNumber(13000.456, 0.1), '13,000.5');
-
-    assert.strictEqual(i18n.formatNumber(0), '0');
-    assert.strictEqual(i18n.formatNumber(-0), '0');
-    assert.strictEqual(i18n.formatNumber(-0, 0.1), '0.0');
-    assert.strictEqual(i18n.formatNumber(0.000001), '0');
-    assert.strictEqual(i18n.formatNumber(-0.000001), '0');
-    assert.strictEqual(i18n.formatNumber(0.000001, 0.1), '0.0');
-    assert.strictEqual(i18n.formatNumber(-0.000001, 0.1), '0.0');
-
-    assert.strictEqual(i18n.formatNumber(10), '10');
-    assert.strictEqual(i18n.formatNumber(100.01), '100.01');
-    assert.strictEqual(i18n.formatNumber(13000.456, 0.1), '13,000.5');
-
-    assert.strictEqual(i18n.formatInteger(10), '10');
-    assert.strictEqual(i18n.formatInteger(100.01), '100');
-    assert.strictEqual(i18n.formatInteger(13000.6), '13,001');
+    assert.strictEqual(i18n.formatNumber(100.01), '100');
+    assert.strictEqual(i18n.formatNumber(13000.456), '13,000.5');
   });
 
   it('formats a date', () => {
@@ -57,10 +39,9 @@ describe('util helpers', () => {
 
   it('formats bytes', () => {
     const i18n = new I18n('en', {...Util.UIStrings});
-    assert.equal(i18n.formatBytesToKiB(100), `0.098${NBSP}KiB`);
-    assert.equal(i18n.formatBytesToKiB(100, 0.1), `0.1${NBSP}KiB`);
-    assert.equal(i18n.formatBytesToKiB(2000, 0.1), `2.0${NBSP}KiB`);
-    assert.equal(i18n.formatBytesToKiB(1014 * 1024, 0.1), `1,014.0${NBSP}KiB`);
+    assert.equal(i18n.formatBytesToKiB(100), `0.1${NBSP}KiB`);
+    assert.equal(i18n.formatBytesToKiB(2000), `2.0${NBSP}KiB`);
+    assert.equal(i18n.formatBytesToKiB(1014 * 1024), `1,014.0${NBSP}KiB`);
   });
 
   it('formats bytes with different granularities', () => {
@@ -76,6 +57,11 @@ describe('util helpers', () => {
     assert.strictEqual(i18n.formatBytes(15.12345, granularity), `15${NBSP}bytes`);
     assert.strictEqual(i18n.formatBytes(15.54321, granularity), `16${NBSP}bytes`);
 
+    granularity = 0.5;
+    assert.strictEqual(i18n.formatBytes(15.0, granularity), `15.0${NBSP}bytes`);
+    assert.strictEqual(i18n.formatBytes(15.12345, granularity), `15.0${NBSP}bytes`);
+    assert.strictEqual(i18n.formatBytes(15.54321, granularity), `15.5${NBSP}bytes`);
+
     granularity = 0.1;
     assert.strictEqual(i18n.formatBytes(15.0, granularity), `15.0${NBSP}bytes`);
     assert.strictEqual(i18n.formatBytes(15.12345, granularity), `15.1${NBSP}bytes`);
@@ -87,21 +73,6 @@ describe('util helpers', () => {
     assert.strictEqual(i18n.formatBytes(15.19999, granularity), `15.20${NBSP}bytes`);
   });
 
-  it('formats bytes with invalid granularity', () => {
-    const i18n = new I18n('en', {...Util.UIStrings});
-    const granularity = 0.5;
-    const originalWarn = console.warn;
-
-    try {
-      console.warn = () => {};
-      assert.strictEqual(i18n.formatBytes(15.0, granularity), `15${NBSP}bytes`);
-      assert.strictEqual(i18n.formatBytes(15.12345, granularity), `15${NBSP}bytes`);
-      assert.strictEqual(i18n.formatBytes(15.54321, granularity), `16${NBSP}bytes`);
-    } finally {
-      console.warn = originalWarn;
-    }
-  });
-
   it('formats kibibytes with different granularities', () => {
     const i18n = new I18n('en', {...Util.UIStrings});
 
@@ -122,7 +93,7 @@ describe('util helpers', () => {
 
   it('formats ms', () => {
     const i18n = new I18n('en', {...Util.UIStrings});
-    assert.equal(i18n.formatMilliseconds(123, 10), `120${NBSP}ms`);
+    assert.equal(i18n.formatMilliseconds(123), `120${NBSP}ms`);
     assert.equal(i18n.formatMilliseconds(2456.5, 0.1), `2,456.5${NBSP}ms`);
     assert.equal(i18n.formatMilliseconds(0.000001), `0${NBSP}ms`);
     assert.equal(i18n.formatMilliseconds(-0.000001), `0${NBSP}ms`);
@@ -130,25 +101,9 @@ describe('util helpers', () => {
 
   it('formats a duration', () => {
     const i18n = new I18n('en', {...Util.UIStrings});
-    assert.equal(i18n.formatDuration(60 * 1000), '1m');
-    assert.equal(i18n.formatDuration(60 * 60 * 1000 + 5000), '1h 5s');
-    assert.equal(i18n.formatDuration(28 * 60 * 60 * 1000 + 5000), '1d 4h 5s');
-  });
-
-  it('formats a duration based on locale', () => {
-    let i18n = new I18n('de', {...Util.UIStrings});
-    assert.equal(i18n.formatDuration(60 * 1000), `1${NBSP}Min.`);
-    assert.equal(i18n.formatDuration(60 * 60 * 1000 + 5000), `1${NBSP}Std. 5${NBSP}Sek.`);
-    assert.equal(
-      i18n.formatDuration(28 * 60 * 60 * 1000 + 5000), `1${NBSP}T 4${NBSP}Std. 5${NBSP}Sek.`);
-
-    // Yes, this is actually backwards (s h d).
-    i18n = new I18n('ar', {...Util.UIStrings});
-    /* eslint-disable no-irregular-whitespace */
-    assert.equal(i18n.formatDuration(60 * 1000), `١${NBSP}د`);
-    assert.equal(i18n.formatDuration(60 * 60 * 1000 + 5000), `١${NBSP}س ٥${NBSP}ث`);
-    assert.equal(i18n.formatDuration(28 * 60 * 60 * 1000 + 5000), `١ ي ٤ س ٥ ث`);
-    /* eslint-enable no-irregular-whitespace */
+    assert.equal(i18n.formatDuration(60 * 1000), `1${NBSP}m`);
+    assert.equal(i18n.formatDuration(60 * 60 * 1000 + 5000), `1${NBSP}h 5${NBSP}s`);
+    assert.equal(i18n.formatDuration(28 * 60 * 60 * 1000 + 5000), `1${NBSP}d 4${NBSP}h 5${NBSP}s`);
   });
 
   it('formats numbers based on locale', () => {
@@ -156,10 +111,10 @@ describe('util helpers', () => {
     const number = 12346.858558;
 
     const i18n = new I18n('de', {...Util.UIStrings});
-    assert.strictEqual(i18n.formatNumber(number), '12.346,859');
-    assert.strictEqual(i18n.formatBytesToKiB(number, 0.1), `12,1${NBSP}KiB`);
-    assert.strictEqual(i18n.formatMilliseconds(number, 10), `12.350${NBSP}ms`);
-    assert.strictEqual(i18n.formatSeconds(number), `12,347${NBSP}Sek.`);
+    assert.strictEqual(i18n.formatNumber(number), '12.346,9');
+    assert.strictEqual(i18n.formatBytesToKiB(number), `12,1${NBSP}KiB`);
+    assert.strictEqual(i18n.formatMilliseconds(number), `12.350${NBSP}ms`);
+    assert.strictEqual(i18n.formatSeconds(number), `12,3${NBSP}s`);
   });
 
   it('uses decimal comma with en-XA test locale', () => {
@@ -167,10 +122,10 @@ describe('util helpers', () => {
     const number = 12346.858558;
 
     const i18n = new I18n('en-XA', {...Util.UIStrings});
-    assert.strictEqual(i18n.formatNumber(number), '12.346,859');
-    assert.strictEqual(i18n.formatBytesToKiB(number, 0.1), `12,1${NBSP}KiB`);
-    assert.strictEqual(i18n.formatMilliseconds(number, 100), `12.300${NBSP}ms`);
-    assert.strictEqual(i18n.formatSeconds(number, 1), `12${NBSP}Sek.`);
+    assert.strictEqual(i18n.formatNumber(number), '12.346,9');
+    assert.strictEqual(i18n.formatBytesToKiB(number), `12,1${NBSP}KiB`);
+    assert.strictEqual(i18n.formatMilliseconds(number), `12.350${NBSP}ms`);
+    assert.strictEqual(i18n.formatSeconds(number), `12,3${NBSP}s`);
   });
 
   it('should not crash on unknown locales', () => {

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

@@ -3,6 +3,9 @@
  * 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';
+
+/* eslint-env jest */
 
 import {strict as assert} from 'assert';
 
@@ -14,9 +17,7 @@ import URL from '../../../lighthouse-core/lib/url-shim.js';
 import {DOM} from '../../renderer/dom.js';
 import {DetailsRenderer} from '../../renderer/details-renderer.js';
 import {PerformanceCategoryRenderer} from '../../renderer/performance-category-renderer.js';
-import {readJson} from '../../../root.js';
-
-const sampleResultsOrig = readJson('../../../lighthouse-core/test/results/sample_v2.json', import.meta);
+import sampleResultsOrig from '../../../lighthouse-core/test/results/sample_v2.json';
 
 describe('PerfCategoryRenderer', () => {
   let category;
@@ -359,7 +360,7 @@ Array [
       }
     });
 
-    it('uses null if the metric\'s value is undefined', () => {
+    it('uses null if the metric is missing its value', () => {
       const categoryClone = JSON.parse(JSON.stringify(category));
       const lcp = categoryClone.auditRefs.find(audit => audit.id === 'largest-contentful-paint');
       lcp.result.numericValue = undefined;
@@ -367,16 +368,6 @@ Array [
       const href = renderer._getScoringCalculatorHref(categoryClone.auditRefs);
       expect(href).toContain('LCP=null');
     });
-
-    it('uses null if the metric\'s value is null (LR)', () => {
-      const categoryClone = JSON.parse(JSON.stringify(category));
-      const lcp = categoryClone.auditRefs.find(audit => audit.id === 'largest-contentful-paint');
-      // In LR, we think there might be some case where undefined becomes null, but we can't prove it.
-      lcp.result.numericValue = null;
-      lcp.result.score = null;
-      const href = renderer._getScoringCalculatorHref(categoryClone.auditRefs);
-      expect(href).toContain('LCP=null');
-    });
   });
 
   // This is done all in CSS, but tested here.

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

@@ -3,6 +3,9 @@
  * 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';
+
+/* eslint-env jest */
 
 import {strict as assert} from 'assert';
 
@@ -13,9 +16,7 @@ import {I18n} from '../../renderer/i18n.js';
 import {DOM} from '../../renderer/dom.js';
 import {DetailsRenderer} from '../../renderer/details-renderer.js';
 import {PwaCategoryRenderer} from '../../renderer/pwa-category-renderer.js';
-import {readJson} from '../../../root.js';
-
-const sampleResultsOrig = readJson('../../../lighthouse-core/test/results/sample_v2.json', import.meta);
+import sampleResultsOrig from '../../../lighthouse-core/test/results/sample_v2.json';
 
 describe('PwaCategoryRenderer', () => {
   let category;

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

@@ -3,14 +3,15 @@
  * 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';
+
+/* eslint-env jest */
 
 import puppeteer from 'puppeteer';
 
+import sampleResults from '../../../lighthouse-core/test/results/sample_v2.json';
 import reportGenerator from '../../generator/report-generator.js';
 import axeLib from '../../../lighthouse-core/lib/axe.js';
-import {readJson} from '../../../root.js';
-
-const sampleResults = readJson('../../../lighthouse-core/test/results/sample_v2.json', import.meta);
 
 describe('ReportRendererAxe', () => {
   describe('with aXe', () => {

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

@@ -3,6 +3,9 @@
  * 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';
+
+/* eslint-env jest */
 
 import {strict as assert} from 'assert';
 
@@ -15,9 +18,7 @@ import {DOM} from '../../renderer/dom.js';
 import {DetailsRenderer} from '../../renderer/details-renderer.js';
 import {CategoryRenderer} from '../../renderer/category-renderer.js';
 import {ReportRenderer} from '../../renderer/report-renderer.js';
-import {readJson} from '../../../root.js';
-
-const sampleResultsOrig = readJson('../../../lighthouse-core/test/results/sample_v2.json', import.meta);
+import sampleResultsOrig from '../../../lighthouse-core/test/results/sample_v2.json';
 
 const TIMESTAMP_REGEX = /\d+, \d{4}.*\d+:\d+/;
 

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

@@ -3,6 +3,9 @@
  * 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';
+
+/* eslint-env jest */
 
 import {strict as assert} from 'assert';
 
@@ -16,9 +19,7 @@ import {DetailsRenderer} from '../../renderer/details-renderer.js';
 import {ReportUIFeatures} from '../../renderer/report-ui-features.js';
 import {CategoryRenderer} from '../../renderer/category-renderer.js';
 import {ReportRenderer} from '../../renderer/report-renderer.js';
-import {readJson} from '../../../root.js';
-
-const sampleResultsOrig = readJson('../../../lighthouse-core/test/results/sample_v2.json', import.meta);
+import sampleResultsOrig from '../../../lighthouse-core/test/results/sample_v2.json';
 
 describe('ReportUIFeatures', () => {
   let sampleResults;

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

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

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

@@ -3,6 +3,7 @@
  * 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 fs from 'fs';
 
@@ -11,6 +12,8 @@ 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

@@ -3,14 +3,15 @@
  * 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 {strict as assert} from 'assert';
 
 import {Util} from '../../renderer/util.js';
 import {I18n} from '../../renderer/i18n.js';
-import {readJson} from '../../../root.js';
+import sampleResult from '../../../lighthouse-core/test/results/sample_v2.json';
 
-const sampleResult = readJson('../../../lighthouse-core/test/results/sample_v2.json', import.meta);
+/* eslint-env jest */
 
 describe('util helpers', () => {
   beforeEach(() => {
@@ -56,7 +57,7 @@ describe('util helpers', () => {
     });
 
     // eslint-disable-next-line max-len
-    assert.equal(descriptions.networkThrottling, '565\xa0ms HTTP RTT, 1,400\xa0kb/s down, 600\xa0kb/s up (DevTools)');
+    assert.equal(descriptions.networkThrottling, '565\xa0ms HTTP RTT, 1,400\xa0Kbps down, 600\xa0Kbps up (DevTools)');
     assert.equal(descriptions.cpuThrottling, '4.5x slowdown (DevTools)');
   });
 
@@ -71,7 +72,7 @@ describe('util helpers', () => {
     });
 
     // eslint-disable-next-line max-len
-    assert.equal(descriptions.networkThrottling, '150\xa0ms TCP RTT, 1,600\xa0kb/s throughput (Simulated)');
+    assert.equal(descriptions.networkThrottling, '150\xa0ms TCP RTT, 1,600\xa0Kbps throughput (Simulated)');
     assert.equal(descriptions.cpuThrottling, '2x slowdown (Simulated)');
   });
 

package/report/test-assets/faux-psi.js

@@ -3,6 +3,7 @@
  * 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 file exercises two LH reports within the same DOM. */
 
@@ -65,8 +66,6 @@ async function renderLHReport() {
           metaItemsEl,
           reportRootEl.querySelector('.lh-buttons')
         );
-        reportRootEl.querySelector('.lh-metrics-container')?.closest('.lh-category')?.classList
-            .add('lh--hoisted-meta');
       }
 
       container.append(reportRootEl);

package/shared/localization/format.js

@@ -100,7 +100,7 @@ function collectAllCustomElementsFromICU(icuElements, seenElementsById = new Map
  * @param {string} lhlMessage Used for clear error logging.
  * @return {Record<string, string | number>}
  */
-function _preformatValues(messageFormatter, values = {}, lhlMessage) {
+function _preformatValues(messageFormatter, values, lhlMessage) {
   const elementMap = collectAllCustomElementsFromICU(messageFormatter.getAst().elements);
   const argumentElements = [...elementMap.values()];
 
@@ -165,15 +165,11 @@ function _preformatValues(messageFormatter, values = {}, lhlMessage) {
  * is assumed to already be in the given locale.
  * If you need to localize a messagem `getFormatted` is probably what you want.
  * @param {string} message
- * @param {Record<string, string | number>|undefined} values
+ * @param {Record<string, string | number>} values
  * @param {LH.Locale} locale
  * @return {string}
  */
-function formatMessage(message, values, locale) {
-  // Parsing and formatting can be slow. Don't attempt if the string can't
-  // contain ICU placeholders, in which case formatting is already complete.
-  if (!message.includes('{') && values === undefined) return message;
-
+function formatMessage(message, values = {}, locale) {
   // When using accented english, force the use of a different locale for number formatting.
   const localeForMessageFormat = (locale === 'en-XA' || locale === 'en-XL') ? 'de-DE' : locale;