lighthouse 9.1.0-dev.20211214 → 9.1.0-dev.20211215

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

@@ -200,19 +200,6 @@ class UnusedBytes extends Audit {
     return Math.round(Math.max(savings, 0) / 10) * 10;
   }
 
-  /**
-   * @param {number} wastedBytes
-   * @param {Simulator} simulator
-   */
-  static computeWastedMsWithThroughput(wastedBytes, simulator) {
-    const bitsPerSecond = simulator.getOptions().throughput;
-    // https://github.com/GoogleChrome/lighthouse/pull/13323#issuecomment-962031709
-    if (bitsPerSecond === 0) return 0;
-    const wastedBits = wastedBytes * 8;
-    const wastedMs = wastedBits / bitsPerSecond * 1000;
-    return wastedMs;
-  }
-
   /**
    * @param {ByteEfficiencyProduct} result
    * @param {Node|null} graph
@@ -232,7 +219,7 @@ class UnusedBytes extends Audit {
         providedWastedBytesByUrl: result.wastedBytesByUrl,
       });
     } else {
-      wastedMs = this.computeWastedMsWithThroughput(wastedBytes, simulator);
+      wastedMs = simulator.computeWastedMsFromWastedBytes(wastedBytes);
     }
 
     let displayValue = result.displayValue || '';

package/lighthouse-core/computed/load-simulator.js

@@ -24,6 +24,7 @@ class LoadSimulator {
     const options = {
       additionalRttByOrigin: networkAnalysis.additionalRttByOrigin,
       serverResponseTimeByOrigin: networkAnalysis.serverResponseTimeByOrigin,
+      observedThroughput: networkAnalysis.throughput,
     };
 
     // If we have precomputed lantern data, overwrite our observed estimates and use precomputed instead

package/lighthouse-core/gather/gatherers/seo/font-size.js

@@ -36,25 +36,28 @@ function hasFontSizeDeclaration(style) {
 
 /**
  * Computes the CSS specificity of a given selector, i.e. #id > .class > div
+ * TODO: Handle pseudo selectors (:not(), :where, :nth-child) and attribute selectors
  * LIMITATION: !important is not respected
  *
  * @see https://developer.mozilla.org/en-US/docs/Web/CSS/Specificity
  * @see https://www.smashingmagazine.com/2010/04/css-specificity-and-inheritance/
+ * @see https://drafts.csswg.org/selectors-4/#specificity-rules
  *
  * @param {string} selector
  * @return {number}
  */
 function computeSelectorSpecificity(selector) {
-  const tokens = selector.split(' ');
+  // Remove universal selector and separator characters, then split.
+  const tokens = selector.replace(/[*\s+>~]/g, ' ').split(' ');
 
   let numIDs = 0;
   let numClasses = 0;
   let numTypes = 0;
 
   for (const token of tokens) {
-    const ids = token.match(/\b#[a-z0-9]+/g) || [];
-    const classes = token.match(/\b\.[a-z0-9]+/g) || [];
-    const types = token.match(/^[a-z]+/) ? [1] : [];
+    const ids = token.match(/(\b|^)#[a-z0-9_-]+/gi) || [];
+    const classes = token.match(/(\b|^)\.[a-z0-9_-]+/gi) || [];
+    const types = token.match(/^[a-z]+/i) ? [1] : [];
     numIDs += ids.length;
     numClasses += classes.length;
     numTypes += types.length;

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

@@ -486,6 +486,23 @@ class Simulator {
     };
   }
 
+  /**
+   * @param {number} wastedBytes
+   */
+  computeWastedMsFromWastedBytes(wastedBytes) {
+    const {throughput, observedThroughput} = this._options;
+
+    // https://github.com/GoogleChrome/lighthouse/pull/13323#issuecomment-962031709
+    // 0 throughput means the no (additional) throttling is expected.
+    // This is common for desktop + devtools throttling where throttling is additive and we don't want any additional.
+    const bitsPerSecond = throughput === 0 ? observedThroughput : throughput;
+    if (bitsPerSecond === 0) return 0;
+
+    const wastedBits = wastedBytes * 8;
+    const wastedMs = wastedBits / bitsPerSecond * 1000;
+    return wastedMs;
+  }
+
   /** @return {Map<string, LH.Gatherer.Simulation.Result['nodeTimings']>} */
   static get ALL_NODE_TIMINGS() {
     return ALL_SIMULATION_NODE_TIMINGS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lighthouse",
-  "version": "9.1.0-dev.20211214",
+  "version": "9.1.0-dev.20211215",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./lighthouse-core/index.js",
   "bin": {

package/types/gatherer.d.ts

@@ -153,6 +153,7 @@ declare module Gatherer {
     interface Options {
       rtt?: number;
       throughput?: number;
+      observedThroughput: number;
       maximumConcurrentRequests?: number;
       cpuSlowdownMultiplier?: number;
       layoutTaskMultiplier?: number;