lighthouse 9.5.0-dev.20230122 → 9.5.0-dev.20230124

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

@@ -8,12 +8,13 @@ import assert from 'assert/strict';
 
 import jsdom from 'jsdom';
 
-import {Util} from '../../renderer/util.js';
-import {I18n} from '../../renderer/i18n.js';
+import {ReportUtils} from '../../renderer/report-utils.js';
+import {I18nFormatter} from '../../renderer/i18n-formatter.js';
 import {DOM} from '../../renderer/dom.js';
 import {DetailsRenderer} from '../../renderer/details-renderer.js';
 import {CategoryRenderer} from '../../renderer/category-renderer.js';
 import {readJson} from '../../../core/test/test-utils.js';
+import {Globals} from '../../renderer/report-globals.js';
 
 const sampleResultsOrig = readJson('../../../core/test/results/sample_v2.json', import.meta);
 
@@ -22,18 +23,22 @@ describe('CategoryRenderer', () => {
   let sampleResults;
 
   before(() => {
-    Util.i18n = new I18n('en', {...Util.UIStrings});
+    Globals.apply({
+      providedStrings: {},
+      i18n: new I18nFormatter('en'),
+      reportJson: null,
+    });
 
     const {document} = new jsdom.JSDOM().window;
     const dom = new DOM(document);
     const detailsRenderer = new DetailsRenderer(dom);
     renderer = new CategoryRenderer(dom, detailsRenderer);
 
-    sampleResults = Util.prepareReportResult(sampleResultsOrig);
+    sampleResults = ReportUtils.prepareReportResult(sampleResultsOrig);
   });
 
   after(() => {
-    Util.i18n = undefined;
+    Globals.i18n = undefined;
   });
 
   it('renders an audit', () => {

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

@@ -8,11 +8,11 @@ import assert from 'assert/strict';
 
 import jsdom from 'jsdom';
 
-import {Util} from '../../renderer/util.js';
-import {I18n} from '../../renderer/i18n.js';
+import {I18nFormatter} from '../../renderer/i18n-formatter.js';
 import {DOM} from '../../renderer/dom.js';
 import {DetailsRenderer} from '../../renderer/details-renderer.js';
 import {CriticalRequestChainRenderer} from '../../renderer/crc-details-renderer.js';
+import {Globals} from '../../renderer/report-globals.js';
 
 const superLongURL =
     'https://example.com/thisIsASuperLongURLThatWillTriggerFilenameTruncationWhichWeWantToTest.js';
@@ -73,7 +73,11 @@ describe('DetailsRenderer', () => {
   let detailsRenderer;
 
   before(() => {
-    Util.i18n = new I18n('en', {...Util.UIStrings});
+    Globals.apply({
+      providedStrings: {},
+      i18n: new I18nFormatter('en'),
+      reportJson: null,
+    });
 
     const {document} = new jsdom.JSDOM().window;
     dom = new DOM(document);
@@ -81,7 +85,7 @@ describe('DetailsRenderer', () => {
   });
 
   after(() => {
-    Util.i18n = undefined;
+    Globals.i18n = undefined;
   });
 
   it('renders tree structure', () => {

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

@@ -9,9 +9,9 @@ import assert from 'assert/strict';
 import jsdom from 'jsdom';
 
 import {DOM} from '../../renderer/dom.js';
-import {Util} from '../../renderer/util.js';
-import {I18n} from '../../renderer/i18n.js';
+import {I18nFormatter} from '../../renderer/i18n-formatter.js';
 import {DetailsRenderer} from '../../renderer/details-renderer.js';
+import {Globals} from '../../renderer/report-globals.js';
 
 describe('DetailsRenderer', () => {
   let renderer;
@@ -23,12 +23,16 @@ describe('DetailsRenderer', () => {
   }
 
   before(() => {
-    Util.i18n = new I18n('en', {...Util.UIStrings});
+    Globals.apply({
+      providedStrings: {},
+      i18n: new I18nFormatter('en'),
+      reportJson: null,
+    });
     createRenderer();
   });
 
   after(() => {
-    Util.i18n = undefined;
+    Globals.i18n = undefined;
   });
 
   describe('render', () => {

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

@@ -10,8 +10,8 @@ import jestMock from 'jest-mock';
 import jsdom from 'jsdom';
 
 import {DOM} from '../../renderer/dom.js';
-import {Util} from '../../renderer/util.js';
-import {I18n} from '../../renderer/i18n.js';
+import {I18nFormatter} from '../../renderer/i18n-formatter.js';
+import {Globals} from '../../renderer/report-globals.js';
 
 describe('DOM', () => {
   /** @type {DOM} */
@@ -20,7 +20,11 @@ describe('DOM', () => {
   let nativeCreateObjectURL;
 
   before(() => {
-    Util.i18n = new I18n('en', {...Util.UIStrings});
+    Globals.apply({
+      providedStrings: {},
+      i18n: new I18nFormatter('en'),
+      reportJson: null,
+    });
     window = new jsdom.JSDOM().window;
 
     // The Node version of URL.createObjectURL isn't compatible with the jsdom blob type,
@@ -33,7 +37,7 @@ describe('DOM', () => {
   });
 
   after(() => {
-    Util.i18n = undefined;
+    Globals.i18n = undefined;
     URL.createObjectURL = nativeCreateObjectURL;
   });
 

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

@@ -7,9 +7,9 @@
 import jsdom from 'jsdom';
 
 import {ElementScreenshotRenderer} from '../../renderer/element-screenshot-renderer.js';
-import {Util} from '../../renderer/util.js';
-import {I18n} from '../../renderer/i18n.js';
+import {I18nFormatter} from '../../renderer/i18n-formatter.js';
 import {DOM} from '../../renderer/dom.js';
+import {Globals} from '../../renderer/report-globals.js';
 
 /**
  * @param {{left: number, top: number, width: number, height:number}} opts
@@ -27,15 +27,19 @@ describe('ElementScreenshotRenderer', () => {
   let dom;
 
   before(() => {
-    Util.i18n = new I18n('en', {...Util.UIStrings});
+    Globals.apply({
+      providedStrings: {},
+      i18n: new I18nFormatter('en'),
+      reportJson: null,
+    });
 
     const {document} = new jsdom.JSDOM().window;
     dom = new DOM(document);
-    Util.resetUniqueSuffix();
+    Globals.resetUniqueSuffix();
   });
 
   after(() => {
-    Util.i18n = undefined;
+    Globals.i18n = undefined;
   });
 
   it('renders screenshot', () => {

package/report/test/renderer/{i18n-test.js → i18n-formatter-test.js}

@@ -6,19 +6,13 @@
 
 import assert from 'assert/strict';
 
-import {Util} from '../../renderer/util.js';
-import {I18n} from '../../renderer/i18n.js';
-
-// Require i18n to make sure Intl is polyfilled in Node without full-icu for testing.
-// When Util is run in a browser, Intl will be supplied natively (IE11+).
-// eslint-disable-next-line no-unused-vars
-import '../../../core/lib/i18n/i18n.js';
+import {I18nFormatter} from '../../renderer/i18n-formatter.js';
 
 const NBSP = '\xa0';
 
-describe('util helpers', () => {
+describe('i18n formatter', () => {
   it('formats a number', () => {
-    const i18n = new I18n('en', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en');
     assert.strictEqual(i18n.formatNumber(10), '10');
     assert.strictEqual(i18n.formatNumber(100.01), '100.01');
     assert.strictEqual(i18n.formatNumber(13000.456), '13,000.456');
@@ -46,7 +40,7 @@ describe('util helpers', () => {
   });
 
   it('formats a date', () => {
-    const i18n = new I18n('en', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en');
     const timestamp = i18n.formatDateTime('2017-04-28T23:07:51.189Z');
     assert.ok(
       timestamp.includes('Apr 27, 2017') ||
@@ -56,7 +50,7 @@ describe('util helpers', () => {
   });
 
   it('formats bytes', () => {
-    const i18n = new I18n('en', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en');
     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`);
@@ -64,7 +58,7 @@ describe('util helpers', () => {
   });
 
   it('formats bytes with different granularities', () => {
-    const i18n = new I18n('en', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en');
 
     let granularity = 10;
     assert.strictEqual(i18n.formatBytes(15.0, granularity), `20${NBSP}bytes`);
@@ -88,7 +82,7 @@ describe('util helpers', () => {
   });
 
   it('formats bytes with invalid granularity', () => {
-    const i18n = new I18n('en', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en');
     const granularity = 0.5;
     const originalWarn = console.warn;
 
@@ -103,7 +97,7 @@ describe('util helpers', () => {
   });
 
   it('formats kibibytes with different granularities', () => {
-    const i18n = new I18n('en', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en');
 
     let granularity = 10;
     assert.strictEqual(i18n.formatBytesToKiB(5 * 1024, granularity), `10${NBSP}KiB`);
@@ -121,7 +115,7 @@ describe('util helpers', () => {
   });
 
   it('formats ms', () => {
-    const i18n = new I18n('en', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en');
     assert.equal(i18n.formatMilliseconds(123, 10), `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`);
@@ -129,21 +123,21 @@ describe('util helpers', () => {
   });
 
   it('formats a duration', () => {
-    const i18n = new I18n('en', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en');
     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});
+    let i18n = new I18nFormatter('de');
     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});
+    i18n = new I18nFormatter('ar');
     /* eslint-disable no-irregular-whitespace */
     assert.equal(i18n.formatDuration(60 * 1000), `١${NBSP}د`);
     assert.equal(i18n.formatDuration(60 * 60 * 1000 + 5000), `١${NBSP}س ٥${NBSP}ث`);
@@ -155,7 +149,7 @@ describe('util helpers', () => {
     // Requires full-icu or Intl polyfill.
     const number = 12346.858558;
 
-    const i18n = new I18n('de', {...Util.UIStrings});
+    const i18n = new I18nFormatter('de');
     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`);
@@ -166,7 +160,7 @@ describe('util helpers', () => {
     // Requires full-icu or Intl polyfill.
     const number = 12346.858558;
 
-    const i18n = new I18n('en-XA', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en-XA');
     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`);
@@ -174,7 +168,7 @@ describe('util helpers', () => {
   });
 
   it('should not crash on unknown locales', () => {
-    const i18n = new I18n('unknown-mystery-locale', {...Util.UIStrings});
+    const i18n = new I18nFormatter('unknown-mystery-locale');
     const timestamp = i18n.formatDateTime('2017-04-28T23:07:51.189Z');
     assert.ok(
       timestamp.includes('Apr 27, 2017') ||

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

@@ -8,12 +8,13 @@ import assert from 'assert/strict';
 
 import jsdom from 'jsdom';
 
-import {Util} from '../../renderer/util.js';
-import {I18n} from '../../renderer/i18n.js';
+import {ReportUtils} from '../../renderer/report-utils.js';
+import {I18nFormatter} from '../../renderer/i18n-formatter.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 '../../../core/test/test-utils.js';
+import {Globals} from '../../renderer/report-globals.js';
 
 const sampleResultsOrig = readJson('../../../core/test/results/sample_v2.json', import.meta);
 
@@ -23,7 +24,11 @@ describe('PerfCategoryRenderer', () => {
   let sampleResults;
 
   before(() => {
-    Util.i18n = new I18n('en', {...Util.UIStrings});
+    Globals.apply({
+      providedStrings: {},
+      i18n: new I18nFormatter('en'),
+      reportJson: null,
+    });
 
     const {document} = new jsdom.JSDOM().window;
     const dom = new DOM(document);
@@ -31,12 +36,12 @@ describe('PerfCategoryRenderer', () => {
     renderer = new PerformanceCategoryRenderer(dom, detailsRenderer);
 
     // TODO: don't call a LH.ReportResult `sampleResults`, which is typically always LH.Result
-    sampleResults = Util.prepareReportResult(sampleResultsOrig);
+    sampleResults = ReportUtils.prepareReportResult(sampleResultsOrig);
     category = sampleResults.categories.performance;
   });
 
   after(() => {
-    Util.i18n = undefined;
+    Globals.i18n = undefined;
   });
 
   it('renders the category header', () => {
@@ -151,7 +156,7 @@ describe('PerfCategoryRenderer', () => {
     const oppAudits = category.auditRefs.filter(audit =>
       audit.result.details &&
       audit.result.details.type === 'opportunity' &&
-      !Util.showAsPassed(audit.result));
+      !ReportUtils.showAsPassed(audit.result));
     const oppElements = [...categoryDOM.querySelectorAll('.lh-audit--load-opportunity')];
     expect(oppElements.map(e => e.id).sort()).toEqual(oppAudits.map(a => a.id).sort());
     expect(oppElements.length).toBeGreaterThan(0);
@@ -220,7 +225,7 @@ describe('PerfCategoryRenderer', () => {
     const diagnosticAuditIds = category.auditRefs.filter(audit => {
       return !audit.group &&
         !(audit.result.details && audit.result.details.type === 'opportunity') &&
-        !Util.showAsPassed(audit.result);
+        !ReportUtils.showAsPassed(audit.result);
     }).map(audit => audit.id).sort();
     assert.ok(diagnosticAuditIds.length > 0);
 
@@ -235,7 +240,7 @@ describe('PerfCategoryRenderer', () => {
 
     const passedAudits = category.auditRefs.filter(audit =>
       !audit.group &&
-      Util.showAsPassed(audit.result));
+      ReportUtils.showAsPassed(audit.result));
     const passedElements = passedSection.querySelectorAll('.lh-audit');
     assert.equal(passedElements.length, passedAudits.length);
   });
@@ -332,7 +337,7 @@ Array [
     });
 
     it('also appends device and version number', () => {
-      Util.reportJson = {
+      Globals.reportJson = {
         configSettings: {formFactor: 'mobile'},
         lighthouseVersion: '6.0.0',
       };
@@ -353,7 +358,7 @@ Array [
 ]
 `);
       } finally {
-        Util.reportJson = null;
+        Globals.reportJson = null;
       }
     });
 

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

@@ -8,12 +8,13 @@ import assert from 'assert/strict';
 
 import jsdom from 'jsdom';
 
-import {Util} from '../../renderer/util.js';
-import {I18n} from '../../renderer/i18n.js';
+import {ReportUtils, UIStrings} from '../../renderer/report-utils.js';
+import {I18nFormatter} from '../../renderer/i18n-formatter.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 '../../../core/test/test-utils.js';
+import {Globals} from '../../renderer/report-globals.js';
 
 const sampleResultsOrig = readJson('../../../core/test/results/sample_v2.json', import.meta);
 
@@ -23,14 +24,18 @@ describe('PwaCategoryRenderer', () => {
   let sampleResults;
 
   before(() => {
-    Util.i18n = new I18n('en', {...Util.UIStrings});
+    Globals.apply({
+      providedStrings: {},
+      i18n: new I18nFormatter('en'),
+      reportJson: null,
+    });
 
     const {document} = new jsdom.JSDOM().window;
     const dom = new DOM(document);
     const detailsRenderer = new DetailsRenderer(dom);
     pwaRenderer = new PwaCategoryRenderer(dom, detailsRenderer);
 
-    sampleResults = Util.prepareReportResult(sampleResultsOrig);
+    sampleResults = ReportUtils.prepareReportResult(sampleResultsOrig);
   });
 
   beforeEach(() => {
@@ -40,7 +45,7 @@ describe('PwaCategoryRenderer', () => {
   });
 
   after(() => {
-    Util.i18n = undefined;
+    Globals.i18n = undefined;
   });
 
   it('renders the regular audits', () => {
@@ -258,7 +263,7 @@ describe('PwaCategoryRenderer', () => {
 
       const percentageElem = badgeGauge.querySelector('.lh-gauge__percentage');
       assert.strictEqual(percentageElem.textContent, '?');
-      assert.strictEqual(percentageElem.title, Util.UIStrings.errorLabel);
+      assert.strictEqual(percentageElem.title, UIStrings.errorLabel);
     });
 
     it('renders score gauges with unique ids for items in <defs>', () => {

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

@@ -9,7 +9,7 @@ import assert from 'assert/strict';
 import jsdom from 'jsdom';
 import jestMock from 'jest-mock';
 
-import {Util} from '../../renderer/util.js';
+import {ReportUtils} from '../../renderer/report-utils.js';
 import {DOM} from '../../renderer/dom.js';
 import {DetailsRenderer} from '../../renderer/details-renderer.js';
 import {CategoryRenderer} from '../../renderer/category-renderer.js';
@@ -41,7 +41,7 @@ describe('ReportRenderer', () => {
     const detailsRenderer = new DetailsRenderer(dom);
     const categoryRenderer = new CategoryRenderer(dom, detailsRenderer);
     renderer = new ReportRenderer(dom, categoryRenderer);
-    sampleResults = Util.prepareReportResult(sampleResultsOrig);
+    sampleResults = ReportUtils.prepareReportResult(sampleResultsOrig);
   });
 
   after(() => {

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

@@ -10,7 +10,7 @@ import jsdom from 'jsdom';
 import jestMock from 'jest-mock';
 
 import {reportAssets} from '../../generator/report-assets.js';
-import {Util} from '../../renderer/util.js';
+import {ReportUtils, UIStrings} from '../../renderer/report-utils.js';
 import {DOM} from '../../renderer/dom.js';
 import {DetailsRenderer} from '../../renderer/details-renderer.js';
 import {ReportUIFeatures} from '../../renderer/report-ui-features.js';
@@ -76,7 +76,7 @@ describe('ReportUIFeatures', () => {
     };
 
     dom = new DOM(document.window.document);
-    sampleResults = Util.prepareReportResult(sampleResultsOrig);
+    sampleResults = ReportUtils.prepareReportResult(sampleResultsOrig);
     render(sampleResults);
   });
 
@@ -550,7 +550,7 @@ describe('ReportUIFeatures', () => {
       const container = render(sampleResults);
       for (const node of dom.findAll('[data-i18n]', container)) {
         const val = node.getAttribute('data-i18n');
-        assert.ok(val in Util.UIStrings, `Invalid data-i18n value of: "${val}" not found.`);
+        assert.ok(val in UIStrings, `Invalid data-i18n value of: "${val}" not found.`);
       }
     });
   });