deps: update to typescript 4.1.2

build/gh-pages-app.js

@@ -98,6 +98,9 @@ class GhPagesApp {
     });
   }
 
+  /**
+   * @return {Promise<void>}
+   */
   deploy() {
     return new Promise((resolve, reject) => {
       ghPages.publish(this.distDir, {

lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js

@@ -62,7 +62,7 @@ class UnusedBytes extends Audit {
    * Estimates the number of bytes this network record would have consumed on the network based on the
    * uncompressed size (totalBytes). Uses the actual transfer size from the network record if applicable.
    *
-   * @param {LH.Artifacts.NetworkRequest=} networkRecord
+   * @param {LH.Artifacts.NetworkRequest|undefined} networkRecord
    * @param {number} totalBytes Uncompressed size of the resource
    * @param {LH.Crdp.Network.ResourceType=} resourceType
    * @return {number}

lighthouse-core/audits/byte-efficiency/unminified-css.js

@@ -52,7 +52,7 @@ class UnminifiedCSS extends ByteEfficiencyAudit {
 
   /**
    * @param {LH.Artifacts.CSSStyleSheetInfo} stylesheet
-   * @param {LH.Artifacts.NetworkRequest=} networkRecord
+   * @param {LH.Artifacts.NetworkRequest|undefined} networkRecord
    * @param {string} pageUrl
    * @return {{url: string, totalBytes: number, wastedBytes: number, wastedPercent: number}}
    */

lighthouse-core/audits/dobetterweb/charset.js

@@ -8,7 +8,7 @@
  * @fileoverview Audits a page to ensure charset it configured properly.
  * It must be defined within the first 1024 bytes of the HTML document, defined in the HTTP header, or the document source must start with a BOM.
  *
- * @see: https://github.com/GoogleChrome/lighthouse/issues/10023
+ * @see https://github.com/GoogleChrome/lighthouse/issues/10023
  */
 'use strict';
 

lighthouse-core/config/config.js

@@ -741,7 +741,7 @@ class Config {
 
   /**
    * @param {string} path
-   * @param {{}=} options
+   * @param {{}|undefined} options
    * @param {Array<string>} coreAuditList
    * @param {string=} configDir
    * @return {LH.Config.GathererDefn}

lighthouse-core/gather/driver.js

@@ -621,6 +621,7 @@ class Driver {
       throw new Error('_waitForFcp.cancel() called before it was defined');
     };
 
+    /** @type {Promise<void>} */
     const promise = new Promise((resolve, reject) => {
       const maxWaitTimeout = setTimeout(() => {
         reject(new LHError(LHError.errors.NO_FCP));
@@ -680,6 +681,7 @@ class Driver {
     }
     const networkStatusMonitor = this._networkStatusMonitor;
 
+    /** @type {Promise<void>} */
     const promise = new Promise((resolve, reject) => {
       const onIdle = () => {
         // eslint-disable-next-line no-use-before-define
@@ -791,6 +793,7 @@ class Driver {
     let cancel = () => {
       throw new Error('_waitForCPUIdle.cancel() called before it was defined');
     };
+    /** @type {Promise<void>} */
     const promise = new Promise((resolve, reject) => {
       checkForQuiet(this, resolve).catch(reject);
       cancel = () => {

lighthouse-core/gather/fetcher.js

@@ -156,8 +156,8 @@ class Fetcher {
       iframe.src = src;
       iframe.onload = iframe.onerror = () => {
         iframe.remove();
-        delete iframe.onload;
-        delete iframe.onerror;
+        iframe.onload = null;
+        iframe.onerror = null;
       };
       document.body.appendChild(iframe);
     }

lighthouse-core/gather/gatherers/image-elements.js

@@ -76,7 +76,6 @@ function getHTMLImages(allElements) {
       cssComputedPosition: getPosition(element, computedStyle),
       isCss: false,
       isPicture,
-      // @ts-expect-error: loading attribute not yet added to HTMLImageElement definition.
       loading: element.loading,
       resourceSize: 0, // this will get overwritten below
       usesObjectFit: ['cover', 'contain', 'scale-down', 'none'].includes(

lighthouse-core/lib/dependency-graph/simulator/simulator.js

@@ -143,11 +143,12 @@ class Simulator {
 
   /**
    * @param {Node} node
-   * @return {NodeTimingIntermediate}
+   * @return {Required<NodeTimingIntermediate>}
    */
   _getTimingData(node) {
     const timingData = this._nodeTimings.get(node);
     if (!timingData) throw new Error(`Unable to get timing data for node ${node.id}`);
+    // @ts-expect-error - Allow consumers to assume all values are defined.
     return timingData;
   }
 
@@ -405,7 +406,8 @@ class Simulator {
   _computeFinalNodeTimings() {
     /** @type {Array<[Node, LH.Gatherer.Simulation.NodeTiming]>} */
     const nodeTimingEntries = [];
-    for (const [node, timing] of this._nodeTimings) {
+    for (const node of this._nodeTimings.keys()) {
+      const timing = this._getTimingData(node);
       nodeTimingEntries.push([node, {
         startTime: timing.startTime,
         endTime: timing.endTime,

lighthouse-core/lib/lh-error.js

@@ -127,9 +127,10 @@ class LighthouseError extends Error {
    */
   static fromProtocolMessage(method, protocolError) {
     // extract all errors with a regex pattern to match against.
-    const protocolErrors = Object.values(LighthouseError.errors).filter(e => e.pattern);
     // if we find one, use the friendly LighthouseError definition
-    const matchedErrorDefinition = protocolErrors.find(e => e.pattern.test(protocolError.message));
+    const matchedErrorDefinition = Object.values(LighthouseError.errors)
+      .filter(e => e.pattern)
+      .find(e => e.pattern && e.pattern.test(protocolError.message));
     if (matchedErrorDefinition) {
       return new LighthouseError(matchedErrorDefinition);
     }

lighthouse-core/lib/proto-preprocessor.js

@@ -70,6 +70,7 @@ function processForProto(lhr) {
 
   // Drop the i18n icuMessagePaths. Painful in proto, and low priority to expose currently.
   if (reportJson.i18n && reportJson.i18n.icuMessagePaths) {
+    // @ts-expect-error
     delete reportJson.i18n.icuMessagePaths;
   }
 

lighthouse-core/report/html/renderer/util.js

@@ -81,6 +81,7 @@ class Util {
         // into 'debugdata' (LHR ≥5.0).
         // @ts-expect-error tsc rightly flags that these values shouldn't occur.
         if (audit.details.type === undefined || audit.details.type === 'diagnostic') {
+          // @ts-expect-error
           audit.details.type = 'debugdata';
         }
 

lighthouse-core/scripts/generate-bundlephobia-database.js

@@ -19,8 +19,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const getPackageVersionList = require('bundle-phobia-cli').fetchPackageStats.getPackageVersionList;
-const fetchPackageStats = require('bundle-phobia-cli').fetchPackageStats.fetchPackageStats;
+const {getPackageVersionList, fetchPackageStats} = require('bundle-phobia-cli').fetchPackageStats;
 const databasePath = path.join(__dirname,
   '../lib/large-javascript-libraries/bundlephobia-database.json');
 

lighthouse-core/scripts/lantern/constants.js

@@ -33,7 +33,7 @@ const path = require('path');
 
 /**
  * @typedef EstimateEvaluationSummary
- * @property {LanternEvaluation[]} evaluations
+ * @property {LanternEvaluation[]} [evaluations]
  * @property {number} p50
  * @property {number} p90
  * @property {number} p95
@@ -113,7 +113,10 @@ module.exports = {
    * @return {(LanternEvaluation & LanternSiteDefinition)|null}
    */
   evaluateSite(site, expectedMetrics, actualMetrics, metric, lanternMetric) {
-    const expected = Math.round(expectedMetrics[metric]);
+    const expectedRaw = expectedMetrics[metric];
+    if (expectedRaw === undefined) return null;
+
+    const expected = Math.round(expectedRaw);
     if (expected === 0) return null;
 
     const actual = Math.round(actualMetrics[lanternMetric]);
@@ -135,18 +138,21 @@ module.exports = {
    * @param {LanternSiteDefinition[]} entries
    * @param {keyof TargetMetrics} metric
    * @param {keyof LanternMetrics} lanternMetric
-   * @param {'lantern'|'baseline'} [lanternOrBaseline]
+   * @param {'lantern'|'baseline'} lanternOrBaseline
    * @return {EstimateEvaluationSummary}
    */
   evaluateAccuracy(entries, metric, lanternMetric, lanternOrBaseline = 'lantern') {
     const evaluations = [];
 
     const percentErrors = [];
     for (const entry of entries) {
+      const actualMetrics = entry[lanternOrBaseline];
+      if (!actualMetrics) throw new Error(`No metrics for ${metric} ${lanternMetric} ${lanternOrBaseline}`);
+
       const evaluation = this.evaluateSite(
         entry,
         entry.wpt3g,
-        entry[lanternOrBaseline],
+        actualMetrics,
         metric,
         lanternMetric
       );

lighthouse-core/scripts/lantern/print-correlations.js

@@ -117,8 +117,8 @@ function evaluateAndPrintAccuracy(metric, lanternMetric) {
     )}`.padEnd(30),
   ];
 
-  allEvaluations.push(...actualAccuracy.evaluations);
-  baselineEvaluations.push(...baselineAccuracy.evaluations);
+  if (actualAccuracy.evaluations) allEvaluations.push(...actualAccuracy.evaluations);
+  if (baselineAccuracy.evaluations) baselineEvaluations.push(...baselineAccuracy.evaluations);
 
   if (lanternMetric.includes('roughEstimate')) {
     console.log(...strings);

package.json

@@ -152,7 +152,7 @@
     "pretty-json-stringify": "^0.0.2",
     "puppeteer": "^1.19.0",
     "terser": "^4.2.0",
-    "typescript": "3.9.7",
+    "typescript": "4.1.2",
     "webtreemap-cdt": "^3.0.1"
   },
   "dependencies": {

yarn.lock

@@ -8074,10 +8074,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.9.7:
-  version "3.9.7"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
-  integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
+typescript@4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9"
+  integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==
 
 uglify-js@^3.1.4:
   version "3.4.9"