lighthouse 9.6.8 → 10.0.0-dev.20230210

package/report/renderer/i18n-formatter.js

@@ -0,0 +1,263 @@
+/**
+ * @license Copyright 2020 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.
+ */
+
+// Not named `NBSP` because that creates a duplicate identifier (util.js).
+const NBSP2 = '\xa0';
+const KiB = 1024;
+const MiB = KiB * KiB;
+
+export class I18nFormatter {
+  /**
+   * @param {LH.Locale} locale
+   */
+  constructor(locale) {
+    // When testing, use a locale with more exciting numeric formatting.
+    if (locale === 'en-XA') locale = 'de';
+
+    this._locale = locale;
+    this._cachedNumberFormatters = new Map();
+  }
+
+  /**
+   * @param {number} number
+   * @param {number|undefined} granularity
+   * @param {Intl.NumberFormatOptions=} opts
+   * @return {string}
+   */
+  _formatNumberWithGranularity(number, granularity, opts = {}) {
+    if (granularity !== undefined) {
+      const log10 = -Math.log10(granularity);
+      if (!Number.isInteger(log10)) {
+        console.warn(`granularity of ${granularity} is invalid. Using 1 instead`);
+        granularity = 1;
+      }
+
+      if (granularity < 1) {
+        opts = {...opts};
+        opts.minimumFractionDigits = opts.maximumFractionDigits = Math.ceil(log10);
+      }
+
+      number = Math.round(number / granularity) * granularity;
+
+      // Avoid displaying a negative value that rounds to zero as "0".
+      if (Object.is(number, -0)) number = 0;
+    } else if (Math.abs(number) < 0.0005) {
+      // Also avoids "-0".
+      number = 0;
+    }
+
+    let formatter;
+    // eslint-disable-next-line max-len
+    const cacheKey = [
+      opts.minimumFractionDigits,
+      opts.maximumFractionDigits,
+      opts.style,
+      opts.unit,
+      opts.unitDisplay,
+      this._locale,
+    ].join('');
+
+    formatter = this._cachedNumberFormatters.get(cacheKey);
+    if (!formatter) {
+      formatter = new Intl.NumberFormat(this._locale, opts);
+      this._cachedNumberFormatters.set(cacheKey, formatter);
+    }
+
+    return formatter.format(number).replace(' ', NBSP2);
+  }
+
+  /**
+   * Format number.
+   * @param {number} number
+   * @param {number=} granularity Controls how coarse the displayed value is.
+   *                              If undefined, the number will be displayed as described
+   *                              by the Intl defaults: tinyurl.com/7s67w5x7
+   * @return {string}
+   */
+  formatNumber(number, granularity) {
+    return this._formatNumberWithGranularity(number, granularity);
+  }
+
+  /**
+   * Format integer.
+   * Just like {@link formatNumber} but uses a granularity of 1, rounding to the nearest
+   * whole number.
+   * @param {number} number
+   * @return {string}
+   */
+  formatInteger(number) {
+    return this._formatNumberWithGranularity(number, 1);
+  }
+
+  /**
+   * Format percent.
+   * @param {number} number 0–1
+   * @return {string}
+   */
+  formatPercent(number) {
+    return new Intl.NumberFormat(this._locale, {style: 'percent'}).format(number);
+  }
+
+  /**
+   * @param {number} size
+   * @param {number=} granularity Controls how coarse the displayed value is.
+   *                              If undefined, the number will be displayed in full.
+   * @return {string}
+   */
+  formatBytesToKiB(size, granularity = undefined) {
+    return this._formatNumberWithGranularity(size / KiB, granularity) + `${NBSP2}KiB`;
+  }
+
+  /**
+   * @param {number} size
+   * @param {number=} granularity Controls how coarse the displayed value is.
+   *                              If undefined, the number will be displayed in full.
+   * @return {string}
+   */
+  formatBytesToMiB(size, granularity = undefined) {
+    return this._formatNumberWithGranularity(size / MiB, granularity) + `${NBSP2}MiB`;
+  }
+
+  /**
+   * @param {number} size
+   * @param {number=} granularity Controls how coarse the displayed value is.
+   *                              If undefined, the number will be displayed in full.
+   * @return {string}
+   */
+  formatBytes(size, granularity = 1) {
+    return this._formatNumberWithGranularity(size, granularity, {
+      style: 'unit',
+      unit: 'byte',
+      unitDisplay: 'long',
+    });
+  }
+
+  /**
+   * @param {number} size
+   * @param {number=} granularity Controls how coarse the displayed value is.
+   *                              If undefined, the number will be displayed in full.
+   * @return {string}
+   */
+  formatBytesWithBestUnit(size, granularity = undefined) {
+    if (size >= MiB) return this.formatBytesToMiB(size, granularity);
+    if (size >= KiB) return this.formatBytesToKiB(size, granularity);
+    return this._formatNumberWithGranularity(size, granularity, {
+      style: 'unit',
+      unit: 'byte',
+      unitDisplay: 'narrow',
+    });
+  }
+
+  /**
+   * @param {number} size
+   * @param {number=} granularity Controls how coarse the displayed value is.
+   *                              If undefined, the number will be displayed in full.
+   * @return {string}
+   */
+  formatKbps(size, granularity = undefined) {
+    return this._formatNumberWithGranularity(size, granularity, {
+      style: 'unit',
+      unit: 'kilobit-per-second',
+      unitDisplay: 'short',
+    });
+  }
+
+  /**
+   * @param {number} ms
+   * @param {number=} granularity Controls how coarse the displayed value is.
+   *                              If undefined, the number will be displayed in full.
+   * @return {string}
+   */
+  formatMilliseconds(ms, granularity = undefined) {
+    return this._formatNumberWithGranularity(ms, granularity, {
+      style: 'unit',
+      unit: 'millisecond',
+      unitDisplay: 'short',
+    });
+  }
+
+  /**
+   * @param {number} ms
+   * @param {number=} granularity Controls how coarse the displayed value is.
+   *                              If undefined, the number will be displayed in full.
+   * @return {string}
+   */
+  formatSeconds(ms, granularity = undefined) {
+    return this._formatNumberWithGranularity(ms / 1000, granularity, {
+      style: 'unit',
+      unit: 'second',
+      unitDisplay: 'narrow',
+    });
+  }
+
+  /**
+   * Format time.
+   * @param {string} date
+   * @return {string}
+   */
+  formatDateTime(date) {
+    /** @type {Intl.DateTimeFormatOptions} */
+    const options = {
+      month: 'short', day: 'numeric', year: 'numeric',
+      hour: 'numeric', minute: 'numeric', timeZoneName: 'short',
+    };
+
+    // Force UTC if runtime timezone could not be detected.
+    // See https://github.com/GoogleChrome/lighthouse/issues/1056
+    // and https://github.com/GoogleChrome/lighthouse/pull/9822
+    let formatter;
+    try {
+      formatter = new Intl.DateTimeFormat(this._locale, options);
+    } catch (err) {
+      options.timeZone = 'UTC';
+      formatter = new Intl.DateTimeFormat(this._locale, options);
+    }
+
+    return formatter.format(new Date(date));
+  }
+
+  /**
+   * Converts a time in milliseconds into a duration string, i.e. `1d 2h 13m 52s`
+   * @param {number} timeInMilliseconds
+   * @return {string}
+   */
+  formatDuration(timeInMilliseconds) {
+    // There is a proposal for a Intl.DurationFormat.
+    // https://github.com/tc39/proposal-intl-duration-format
+    // Until then, we do things a bit more manually.
+
+    let timeInSeconds = timeInMilliseconds / 1000;
+    if (Math.round(timeInSeconds) === 0) {
+      return 'None';
+    }
+
+    /** @type {Array<string>} */
+    const parts = [];
+    /** @type {Record<string, number>} */
+    const unitToSecondsPer = {
+      day: 60 * 60 * 24,
+      hour: 60 * 60,
+      minute: 60,
+      second: 1,
+    };
+
+    Object.keys(unitToSecondsPer).forEach(unit => {
+      const secondsPerUnit = unitToSecondsPer[unit];
+      const numberOfUnits = Math.floor(timeInSeconds / secondsPerUnit);
+      if (numberOfUnits > 0) {
+        timeInSeconds -= numberOfUnits * secondsPerUnit;
+        const part = this._formatNumberWithGranularity(numberOfUnits, 1, {
+          style: 'unit',
+          unit,
+          unitDisplay: 'narrow',
+        });
+        parts.push(part);
+      }
+    });
+
+    return parts.join(' ');
+  }
+}

package/report/renderer/logger.d.ts

@@ -0,0 +1,47 @@
+/**
+ * @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.
+ */
+/**
+ * Logs messages via a UI butter.
+ */
+export class Logger {
+    /**
+     * @param {HTMLElement} element - expected to have id #lh-log
+     */
+    constructor(element: HTMLElement);
+    el: HTMLElement;
+    _id: number | undefined;
+    /**
+     * Shows a butter bar.
+     * @param {string} msg The message to show.
+     * @param {boolean=} autoHide True to hide the message after a duration.
+     *     Default is true.
+     */
+    log(msg: string, autoHide?: boolean | undefined): void;
+    /**
+     * @param {string} msg
+     */
+    warn(msg: string): void;
+    /**
+     * @param {string} msg
+     */
+    error(msg: string): void;
+    /**
+     * Explicitly hides the butter bar.
+     */
+    hide(): void;
+}
+//# sourceMappingURL=logger.d.ts.map

package/report/renderer/logger.js

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-'use strict';
 
 /**
  * Logs messages via a UI butter.

package/report/renderer/open-tab.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Opens a new tab to the online viewer and sends the local page's JSON results
+ * to the online viewer using URL.fragment
+ * @param {LH.Result} lhr
+ * @protected
+ */
+export function openViewer(lhr: LH.Result): Promise<void>;
+/**
+ * Same as openViewer, but uses postMessage.
+ * @param {LH.Result} lhr
+ * @protected
+ */
+export function openViewerAndSendData(lhr: LH.Result): Promise<void>;
+/**
+ * Opens a new tab to the treemap app and sends the JSON results using URL.fragment
+ * @param {LH.Result} json
+ */
+export function openTreemap(json: LH.Result): void;
+//# sourceMappingURL=open-tab.d.ts.map

package/report/renderer/open-tab.js

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-'use strict';
 
 import {TextEncoding} from './text-encoding.js';
 
@@ -25,7 +24,7 @@ function getAppsOrigin() {
   const isDev = new URLSearchParams(window.location.search).has('dev');
 
   if (isVercel) return `https://${window.location.host}/gh-pages`;
-  if (isDev) return 'http://localhost:8000';
+  if (isDev) return 'http://localhost:7333';
   return 'https://googlechrome.github.io/lighthouse';
 }
 
@@ -38,7 +37,7 @@ function computeWindowNameSuffix(json) {
   // @ts-expect-error - If this is a v2 LHR, use old `generatedTime`.
   const fallbackFetchTime = /** @type {string} */ (json.generatedTime);
   const fetchTime = json.fetchTime || fallbackFetchTime;
-  return `${json.lighthouseVersion}-${json.requestedUrl}-${fetchTime}`;
+  return `${json.lighthouseVersion}-${json.finalDisplayedUrl}-${fetchTime}`;
 }
 
 /**
@@ -120,8 +119,9 @@ function openTreemap(json) {
   /** @type {LH.Treemap.Options} */
   const treemapOptions = {
     lhr: {
-      requestedUrl: json.requestedUrl,
+      mainDocumentUrl: json.mainDocumentUrl,
       finalUrl: json.finalUrl,
+      finalDisplayedUrl: json.finalDisplayedUrl,
       audits: {
         'script-treemap-data': json.audits['script-treemap-data'],
       },

package/report/renderer/performance-category-renderer.d.ts

@@ -0,0 +1,56 @@
+export class PerformanceCategoryRenderer extends CategoryRenderer {
+    /**
+     * @param {LH.ReportResult.AuditRef} audit
+     * @return {!Element}
+     */
+    _renderMetric(audit: LH.ReportResult.AuditRef): Element;
+    /**
+     * @param {LH.ReportResult.AuditRef} audit
+     * @param {number} scale
+     * @return {!Element}
+     */
+    _renderOpportunity(audit: LH.ReportResult.AuditRef, scale: number): Element;
+    /**
+     * Get an audit's wastedMs to sort the opportunity by, and scale the sparkline width
+     * Opportunities with an error won't have a details object, so MIN_VALUE is returned to keep any
+     * erroring opportunities last in sort order.
+     * @param {LH.ReportResult.AuditRef} audit
+     * @return {number}
+     */
+    _getWastedMs(audit: LH.ReportResult.AuditRef): number;
+    /**
+     * Get a link to the interactive scoring calculator with the metric values.
+     * @param {LH.ReportResult.AuditRef[]} auditRefs
+     * @return {string}
+     */
+    _getScoringCalculatorHref(auditRefs: LH.ReportResult.AuditRef[]): string;
+    /**
+     * For performance, audits with no group should be a diagnostic or opportunity.
+     * The audit details type will determine which of the two groups an audit is in.
+     *
+     * @param {LH.ReportResult.AuditRef} audit
+     * @return {'load-opportunity'|'diagnostic'|null}
+     */
+    _classifyPerformanceAudit(audit: LH.ReportResult.AuditRef): 'load-opportunity' | 'diagnostic' | null;
+    /**
+     * @param {LH.ReportResult.Category} category
+     * @param {Object<string, LH.Result.ReportGroup>} groups
+     * @param {{gatherMode: LH.Result.GatherMode}=} options
+     * @return {Element}
+     * @override
+     */
+    override render(category: LH.ReportResult.Category, groups: {
+        [x: string]: LH.Result.ReportGroup;
+    }, options?: {
+        gatherMode: LH.Result.GatherMode;
+    } | undefined): Element;
+    /**
+     * Render the control to filter the audits by metric. The filtering is done at runtime by CSS only
+     * @param {LH.ReportResult.AuditRef[]} filterableMetrics
+     * @param {HTMLDivElement} categoryEl
+     */
+    renderMetricAuditFilter(filterableMetrics: LH.ReportResult.AuditRef[], categoryEl: HTMLDivElement): void;
+}
+export type DOM = import('./dom.js').DOM;
+import { CategoryRenderer } from "./category-renderer.js";
+//# sourceMappingURL=performance-category-renderer.d.ts.map

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

@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-'use strict';
 
 /** @typedef {import('./dom.js').DOM} DOM */
 
-import {Util} from './util.js';
 import {CategoryRenderer} from './category-renderer.js';
+import {ReportUtils} from './report-utils.js';
+import {Globals} from './report-globals.js';
 
 export class PerformanceCategoryRenderer extends CategoryRenderer {
   /**
@@ -30,7 +30,7 @@ export class PerformanceCategoryRenderer extends CategoryRenderer {
     const tmpl = this.dom.createComponent('metric');
     const element = this.dom.find('.lh-metric', tmpl);
     element.id = audit.result.id;
-    const rating = Util.calculateRating(audit.result.score, audit.result.scoreDisplayMode);
+    const rating = ReportUtils.calculateRating(audit.result.score, audit.result.scoreDisplayMode);
     element.classList.add(`lh-metric--${rating}`);
 
     const titleEl = this.dom.find('.lh-metric__title', tmpl);
@@ -40,7 +40,7 @@ export class PerformanceCategoryRenderer extends CategoryRenderer {
     valueEl.textContent = audit.result.displayValue || '';
 
     const descriptionEl = this.dom.find('.lh-metric__description', tmpl);
-    descriptionEl.appendChild(this.dom.convertMarkdownLinkSnippets(audit.result.description));
+    descriptionEl.append(this.dom.convertMarkdownLinkSnippets(audit.result.description));
 
     if (audit.result.scoreDisplayMode === 'error') {
       descriptionEl.textContent = '';
@@ -78,7 +78,7 @@ export class PerformanceCategoryRenderer extends CategoryRenderer {
       this.dom.find('span.lh-audit__display-text, div.lh-audit__display-text', element);
     const sparklineWidthPct = `${details.overallSavingsMs / scale * 100}%`;
     this.dom.find('div.lh-sparkline__bar', element).style.width = sparklineWidthPct;
-    displayEl.textContent = Util.i18n.formatSeconds(details.overallSavingsMs, 0.01);
+    displayEl.textContent = Globals.i18n.formatSeconds(details.overallSavingsMs, 0.01);
 
     // Set [title] tooltips
     if (audit.result.displayValue) {
@@ -117,8 +117,10 @@ export class PerformanceCategoryRenderer extends CategoryRenderer {
   _getScoringCalculatorHref(auditRefs) {
     // TODO: filter by !!acronym when dropping renderer support of v7 LHRs.
     const metrics = auditRefs.filter(audit => audit.group === 'metrics');
+    const tti = auditRefs.find(audit => audit.id === 'interactive');
     const fci = auditRefs.find(audit => audit.id === 'first-cpu-idle');
     const fmp = auditRefs.find(audit => audit.id === 'first-meaningful-paint');
+    if (tti) metrics.push(tti);
     if (fci) metrics.push(fci);
     if (fmp) metrics.push(fmp);
 
@@ -143,9 +145,9 @@ export class PerformanceCategoryRenderer extends CategoryRenderer {
     });
     const paramPairs = [...metricPairs];
 
-    if (Util.reportJson) {
-      paramPairs.push(['device', Util.reportJson.configSettings.formFactor]);
-      paramPairs.push(['version', Util.reportJson.lighthouseVersion]);
+    if (Globals.reportJson) {
+      paramPairs.push(['device', Globals.reportJson.configSettings.formFactor]);
+      paramPairs.push(['version', Globals.reportJson.lighthouseVersion]);
     }
 
     const params = new URLSearchParams(paramPairs);
@@ -177,10 +179,10 @@ export class PerformanceCategoryRenderer extends CategoryRenderer {
    * @override
    */
   render(category, groups, options) {
-    const strings = Util.i18n.strings;
+    const strings = Globals.strings;
     const element = this.dom.createElement('div', 'lh-category');
     element.id = category.id;
-    element.appendChild(this.renderCategoryHeader(category, groups, options));
+    element.append(this.renderCategoryHeader(category, groups, options));
 
     // Metrics.
     const metricAudits = category.auditRefs.filter(audit => audit.group === 'metrics');
@@ -189,7 +191,7 @@ export class PerformanceCategoryRenderer extends CategoryRenderer {
 
       // Metric descriptions toggle.
       const checkboxEl = this.dom.createElement('input', 'lh-metrics-toggle__input');
-      const checkboxId = `lh-metrics-toggle${Util.getUniqueSuffix()}`;
+      const checkboxId = `lh-metrics-toggle${Globals.getUniqueSuffix()}`;
       checkboxEl.setAttribute('aria-label', 'Toggle the display of metric descriptions');
       checkboxEl.type = 'checkbox';
       checkboxEl.id = checkboxId;
@@ -199,13 +201,13 @@ export class PerformanceCategoryRenderer extends CategoryRenderer {
       labelEl.htmlFor = checkboxId;
       const showEl = this.dom.createChildOf(labelEl, 'span', 'lh-metrics-toggle__labeltext--show');
       const hideEl = this.dom.createChildOf(labelEl, 'span', 'lh-metrics-toggle__labeltext--hide');
-      showEl.textContent = Util.i18n.strings.expandView;
-      hideEl.textContent = Util.i18n.strings.collapseView;
+      showEl.textContent = Globals.strings.expandView;
+      hideEl.textContent = Globals.strings.collapseView;
 
       const metricsBoxesEl = this.dom.createElement('div', 'lh-metrics-container');
       metricsGroupEl.insertBefore(metricsBoxesEl, metricsFooterEl);
       metricAudits.forEach(item => {
-        metricsBoxesEl.appendChild(this._renderMetric(item));
+        metricsBoxesEl.append(this._renderMetric(item));
       });
 
       // Only add the disclaimer with the score calculator link if the category was rendered with a score gauge.
@@ -213,7 +215,7 @@ export class PerformanceCategoryRenderer extends CategoryRenderer {
         const descriptionEl = this.dom.find('.lh-category-header__description', element);
         const estValuesEl = this.dom.createChildOf(descriptionEl, 'div', 'lh-metrics__disclaimer');
         const disclaimerEl = this.dom.convertMarkdownLinkSnippets(strings.varianceDisclaimer);
-        estValuesEl.appendChild(disclaimerEl);
+        estValuesEl.append(disclaimerEl);
 
         // Add link to score calculator.
         const calculatorLink = this.dom.createChildOf(estValuesEl, 'a', 'lh-calclink');
@@ -223,7 +225,7 @@ export class PerformanceCategoryRenderer extends CategoryRenderer {
       }
 
       metricsGroupEl.classList.add('lh-audit-group--metrics');
-      element.appendChild(metricsGroupEl);
+      element.append(metricsGroupEl);
     }
 
     // Filmstrip
@@ -233,13 +235,13 @@ export class PerformanceCategoryRenderer extends CategoryRenderer {
     if (thumbnailResult?.details) {
       timelineEl.id = thumbnailResult.id;
       const filmstripEl = this.detailsRenderer.render(thumbnailResult.details);
-      filmstripEl && timelineEl.appendChild(filmstripEl);
+      filmstripEl && timelineEl.append(filmstripEl);
     }
 
     // Opportunities
     const opportunityAudits = category.auditRefs
         .filter(audit => this._classifyPerformanceAudit(audit) === 'load-opportunity')
-        .filter(audit => !Util.showAsPassed(audit.result))
+        .filter(audit => !ReportUtils.showAsPassed(audit.result))
         .sort((auditA, auditB) => this._getWastedMs(auditB) - this._getWastedMs(auditA));
 
     const filterableMetrics = metricAudits.filter(a => !!a.relevantAudits);
@@ -267,13 +269,13 @@ export class PerformanceCategoryRenderer extends CategoryRenderer {
       opportunityAudits.forEach(item =>
         groupEl.insertBefore(this._renderOpportunity(item, scale), footerEl));
       groupEl.classList.add('lh-audit-group--load-opportunities');
-      element.appendChild(groupEl);
+      element.append(groupEl);
     }
 
     // Diagnostics
     const diagnosticAudits = category.auditRefs
         .filter(audit => this._classifyPerformanceAudit(audit) === 'diagnostic')
-        .filter(audit => !Util.showAsPassed(audit.result))
+        .filter(audit => !ReportUtils.showAsPassed(audit.result))
         .sort((a, b) => {
           const scoreA = a.result.scoreDisplayMode === 'informative' ? 100 : Number(a.result.score);
           const scoreB = b.result.scoreDisplayMode === 'informative' ? 100 : Number(b.result.score);
@@ -284,12 +286,13 @@ export class PerformanceCategoryRenderer extends CategoryRenderer {
       const [groupEl, footerEl] = this.renderAuditGroup(groups['diagnostics']);
       diagnosticAudits.forEach(item => groupEl.insertBefore(this.renderAudit(item), footerEl));
       groupEl.classList.add('lh-audit-group--diagnostics');
-      element.appendChild(groupEl);
+      element.append(groupEl);
     }
 
     // Passed audits
     const passedAudits = category.auditRefs
-        .filter(audit => this._classifyPerformanceAudit(audit) && Util.showAsPassed(audit.result));
+        .filter(audit =>
+          this._classifyPerformanceAudit(audit) && ReportUtils.showAsPassed(audit.result));
 
     if (!passedAudits.length) return element;
 
@@ -298,7 +301,7 @@ export class PerformanceCategoryRenderer extends CategoryRenderer {
       groupDefinitions: groups,
     };
     const passedElem = this.renderClump('passed', clumpOpts);
-    element.appendChild(passedElem);
+    element.append(passedElem);
 
     // Budgets
     /** @type {Array<Element>} */
@@ -318,7 +321,7 @@ export class PerformanceCategoryRenderer extends CategoryRenderer {
       const [groupEl, footerEl] = this.renderAuditGroup(groups.budgets);
       budgetTableEls.forEach(table => groupEl.insertBefore(table, footerEl));
       groupEl.classList.add('lh-audit-group--budgets');
-      element.appendChild(groupEl);
+      element.append(groupEl);
     }
 
     return element;
@@ -332,7 +335,7 @@ export class PerformanceCategoryRenderer extends CategoryRenderer {
   renderMetricAuditFilter(filterableMetrics, categoryEl) {
     const metricFilterEl = this.dom.createElement('div', 'lh-metricfilter');
     const textEl = this.dom.createChildOf(metricFilterEl, 'span', 'lh-metricfilter__text');
-    textEl.textContent = Util.i18n.strings.showRelevantAudits;
+    textEl.textContent = Globals.strings.showRelevantAudits;
 
     const filterChoices = /** @type {LH.ReportResult.AuditRef[]} */ ([
       ({acronym: 'All'}),
@@ -341,7 +344,7 @@ export class PerformanceCategoryRenderer extends CategoryRenderer {
 
     // Form labels need to reference unique IDs, but multiple reports rendered in the same DOM (eg PSI)
     // would mean ID conflict.  To address this, we 'scope' these radio inputs with a unique suffix.
-    const uniqSuffix = Util.getUniqueSuffix();
+    const uniqSuffix = Globals.getUniqueSuffix();
     for (const metric of filterChoices) {
       const elemId = `metric-${metric.acronym}-${uniqSuffix}`;
       const radioEl = this.dom.createChildOf(metricFilterEl, 'input', 'lh-metricfilter__radio');