lighthouse 13.5.0-dev.20261006 → 13.5.0-dev.20261008

package/core/audits/insights/insight-audit.d.ts

@@ -21,6 +21,15 @@ export function adaptInsightToAuditProduct<T extends keyof import("@paulirish/tr
     numericValue?: number;
     numericUnit?: LH.Audit.NumericProduct["numericUnit"];
 } | LH.Audit.Details | undefined): Promise<LH.Audit.Product>;
+/**
+ * @param {LH.Artifacts} artifacts
+ * @param {LH.Audit.Context} context
+ * @return {Promise<{insights: import('@paulirish/trace_engine/models/trace/insights/types.js').InsightSet|undefined, data: LH.Artifacts.TraceEngineResult['data']}>}
+ */
+export function getInsightSet(artifacts: LH.Artifacts, context: LH.Audit.Context): Promise<{
+    insights: import("@paulirish/trace_engine/models/trace/insights/types.js").InsightSet | undefined;
+    data: LH.Artifacts.TraceEngineResult["data"];
+}>;
 /**
  * @param {LH.Artifacts.TraceElement[]} traceElements
  * @param {number|null|undefined} nodeId

package/core/audits/insights/insight-audit.js

@@ -29,7 +29,7 @@ async function getInsightSet(artifacts, context) {
   const navigationId = processedTrace.timeOriginEvt.args.data?.navigationId;
   const insights = navigationId ?
     [...traceEngineResult.insights.values()]
-      .find(insightSet => insightSet.navigation?.args.data?.navigationId) :
+      .find(insightSet => insightSet.navigation?.args.data?.navigationId === navigationId) :
     traceEngineResult.insights.get(NO_NAVIGATION);
 
   return {insights, data: traceEngineResult.data};
@@ -225,5 +225,6 @@ function makeNodeItemForNodeId(traceElements, nodeId) {
 
 export {
   adaptInsightToAuditProduct,
+  getInsightSet,
   makeNodeItemForNodeId,
 };

package/core/computed/trace-engine-result.js

@@ -26,7 +26,9 @@ class TraceEngineResult {
    * @return {Promise<LH.Artifacts.TraceEngineResult>}
    */
   static async runTraceEngine(_traceEvents, settings, SourceMaps, HostDPR) {
-    const processor = new TraceEngine.TraceProcessor(TraceEngine.TraceHandlers);
+    const config = TraceEngine.Types.Configuration.defaults();
+    config.enableSoftNavigation = false;
+    const processor = new TraceEngine.TraceProcessor(TraceEngine.TraceHandlers, config);
     const traceEvents =
       /** @type {import('@paulirish/trace_engine').Types.Events.Event[]} */ (_traceEvents);
 

package/core/config/constants.d.ts

@@ -1,31 +1,4 @@
-export const throttling: {
-    DEVTOOLS_RTT_ADJUSTMENT_FACTOR: number;
-    DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR: number;
-    mobileSlow4G: {
-        rttMs: number;
-        throughputKbps: number;
-        requestLatencyMs: number;
-        downloadThroughputKbps: number;
-        uploadThroughputKbps: number;
-        cpuSlowdownMultiplier: number;
-    };
-    mobileRegular3G: {
-        rttMs: number;
-        throughputKbps: number;
-        requestLatencyMs: number;
-        downloadThroughputKbps: number;
-        uploadThroughputKbps: number;
-        cpuSlowdownMultiplier: number;
-    };
-    desktopDense4G: {
-        rttMs: number;
-        throughputKbps: number;
-        cpuSlowdownMultiplier: number;
-        requestLatencyMs: number;
-        downloadThroughputKbps: number;
-        uploadThroughputKbps: number;
-    };
-};
+export const throttling: Lantern.Simulation.ThrottlingSettings;
 export namespace screenEmulationMetrics {
     export { MOTOGPOWER_EMULATION_METRICS as mobile };
     export { DESKTOP_EMULATION_METRICS as desktop };
@@ -42,6 +15,7 @@ export namespace nonSimulatedSettingsOverrides {
     let networkQuietThresholdMs: number;
     let cpuQuietThresholdMs: number;
 }
+import * as Lantern from '../lib/lantern/lantern.js';
 /**
  * @type {Required<LH.SharedFlagsSettings['screenEmulation']>}
  */

package/core/lib/legacy-javascript/legacy-javascript.d.ts

@@ -2,6 +2,7 @@ export type Pattern = {
     name: string;
     expression: string;
     estimateBytes?: (content: string) => number;
+    resolveName?: (match: string) => string;
 };
 export type PatternMatchResult = {
     name: string;

package/core/lib/legacy-javascript/legacy-javascript.js

@@ -11,7 +11,7 @@
  * ./core/scripts/legacy-javascript - verification tool.
  */
 
-/** @typedef {{name: string, expression: string, estimateBytes?: (content: string) => number}} Pattern */
+/** @typedef {{name: string, expression: string, estimateBytes?: (content: string) => number, resolveName?: (match: string) => string}} Pattern */
 /** @typedef {{name: string, line: number, column: number}} PatternMatchResult */
 /** @typedef {{matches: PatternMatchResult[], estimatedByteSavings: number}} Result */
 
@@ -27,7 +27,7 @@ const graph = graph_;
 /**
  * Takes a list of patterns (consisting of a name identifier and a RegExp expression string)
  * and via `match` returns match results with line / column information for a given code input.
- * Only returns the first match per pattern given.
+ * Only returns the first match per pattern name.
  */
 class CodePatternMatcher {
   /**
@@ -45,12 +45,13 @@ class CodePatternMatcher {
     if (!this.re) {
       const patternsExpression =
         this.patterns.map(pattern => `(${pattern.expression})`).join('|');
-      this.re = new RegExp(`(^\r\n|\r|\n)|${patternsExpression}`, 'g');
+      this.re = new RegExp(patternsExpression, 'g');
     }
 
     // Reset RegExp state.
     this.re.lastIndex = 0;
 
+    /** @type {Set<string>} */
     const seen = new Set();
     /** @type {PatternMatchResult[]} */
     const matches = [];
@@ -58,29 +59,41 @@ class CodePatternMatcher {
     let result;
     let line = 0;
     let lineBeginsAtIndex = 0;
+    let scannedToIndex = 0;
     // Each pattern maps to one subgroup in the generated regex. For each iteration of RegExp.exec,
     // only one subgroup will be defined. Exec until no more matches.
     while ((result = this.re.exec(code)) !== null) {
-      // Discard first value in `result` - it's just the entire match.
-      const captureGroups = result.slice(1);
-      // isNewline - truthy if matching a newline, used to track the line number.
-      // `patternExpressionMatches` maps to each possible pattern in `this.patterns`.
-      // Only one of [isNewline, ...patternExpressionMatches] is ever truthy.
-      const [isNewline, ...patternExpressionMatches] = captureGroups;
-      if (isNewline) {
-        line++;
-        lineBeginsAtIndex = result.index + 1;
-        continue;
+      let patternIndex = -1;
+      for (let i = 1; i < result.length; i++) {
+        if (result[i] !== undefined) {
+          patternIndex = i - 1;
+          break;
+        }
       }
-      const pattern = this.patterns[patternExpressionMatches.findIndex(Boolean)];
+      if (patternIndex === -1) continue;
 
-      if (seen.has(pattern)) {
+      const pattern = this.patterns[patternIndex];
+      const name = pattern.resolveName ? pattern.resolveName(result[0]) : pattern.name;
+      if (seen.has(name)) {
         continue;
       }
-      seen.add(pattern);
+      seen.add(name);
+
+      // Lazily advance line and column tracking up to `result.index`.
+      // Because `[scannedToIndex, result.index)` includes the text of any previous matches,
+      // this also accounts for newlines inside multi-line matches.
+      // Scanning for `\n` handles both LF (`\n`) and CRLF (`\r\n`) line endings since
+      // the next line always begins at `nlIdx + 1`.
+      let nlIdx = code.indexOf('\n', scannedToIndex);
+      while (nlIdx !== -1 && nlIdx < result.index) {
+        line++;
+        lineBeginsAtIndex = nlIdx + 1;
+        nlIdx = code.indexOf('\n', lineBeginsAtIndex);
+      }
+      scannedToIndex = result.index;
 
       matches.push({
-        name: pattern.name,
+        name,
         line,
         column: result.index - lineBeginsAtIndex,
       });
@@ -90,70 +103,6 @@ class CodePatternMatcher {
   }
 }
 
-/**
- * @param {string?} object
- * @param {string} property
- * @param {string} coreJs3Module
- */
-function buildPolyfillExpression(object, property, coreJs3Module) {
-  const qt = (/** @type {string} */ token) =>
-    `['"]${token}['"]`; // don't worry about matching string delims
-
-  let expression = '';
-
-  if (object) {
-    // String.prototype.startsWith =
-    expression += `${object}\\.${property}\\s?=[^=]`;
-  } else {
-    // Promise =
-    // window.Promise =// Promise =Z
-    // but not: SomePromise =
-    expression += `(?:window\\.|[\\s;]+)${property}\\s?=[^=]`;
-  }
-
-  // String.prototype['startsWith'] =
-  if (object) {
-    expression += `|${object}\\[${qt(property)}\\]\\s?=[^=]`;
-  }
-
-  // Object.defineProperty(String.prototype, 'startsWith'
-  expression += `|defineProperty\\(${object || 'window'},\\s?${qt(property)}`;
-
-  // es-shims
-  // no(Object,{entries:r},{entries:function
-  if (object) {
-    expression += `|\\(${object},\\s*{${property}:.*},\\s*{${property}`;
-  }
-
-  // core-js
-  if (object) {
-    const objectWithoutPrototype = object.replace('.prototype', '');
-    // e(e.S,"Object",{values
-    // Minified + mangled pattern found in CDN babel-polyfill.
-    // see https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/7.2.5/polyfill.min.js
-    // TODO: perhaps this is the wrong place to check for a CDN polyfill. Remove?
-    // expression += `|;e\\([^,]+,${qt(objectWithoutPrototype)},{${property}:`;
-
-    // core-js@3 minified pattern.
-    // {target:"Array",proto:true},{fill:fill
-    // {target:"Array",proto:true,forced:!HAS_SPECIES_SUPPORT||!USES_TO_LENGTH},{filter:
-    expression += `|{target:${qt(objectWithoutPrototype)}[^;]*},{${property}:`;
-  } else {
-    // Detect polyfills for new classes: Map, Set, WeakSet, etc.
-    // TODO: so far, no class polyfills are enabled for detection.
-    // See `modulesToSkip` in create-polyfill-module-data.js
-
-    // collection("Map",
-    // expression += `|collection\\(${qt(property)},`;
-  }
-
-  // Un-minified code may have module names.
-  // core-js/modules/es.object.is-frozen
-  expression += `|${coreJs3Module.replaceAll('.', '\\.')}(?:\\.js)?"`;
-
-  return expression;
-}
-
 function getCoreJsPolyfillData() {
   return polyfillModuleData.filter(d => d.corejs).map(d => {
     return {
@@ -164,34 +113,171 @@ function getCoreJsPolyfillData() {
 }
 
 /**
+ * Builds factored polyfill patterns grouped by receiver object, core-js target, and
+ * core-js module prefix so the regex engine evaluates a few shared branches instead
+ * of repeating common prefixes (like `defineProperty(`, `{target:`, `Array.prototype.`)
+ * once per polyfill.
+ *
  * @return {Pattern[]}
  */
 function getPolyfillPatterns() {
-  /** @type {Pattern[]} */
-  const patterns = [];
+  /** @param {string} str */
+  const escapeRegExp = str => str.replaceAll('.', '\\.');
+
+  /** @type {Map<string, string[]>} */
+  const byObject = new Map();
+  /** @type {Map<string, string[]>} */
+  const byTarget = new Map();
+  /** @type {Map<string, string>} */
+  const targetPropToName = new Map();
+  /** @type {Map<string, string>} */
+  const coreJsModuleToName = new Map();
+  /** @type {Map<string, string[]>} */
+  const byModulePrefix = new Map();
 
   for (const {name, coreJs3Module} of getCoreJsPolyfillData()) {
     const parts = name.split('.');
-    const object = parts.length > 1 ? parts.slice(0, parts.length - 1).join('.') : null;
+    const object = parts.slice(0, parts.length - 1).join('.');
     const property = parts[parts.length - 1];
-    patterns.push({
-      name,
-      expression: buildPolyfillExpression(object, property, coreJs3Module),
-    });
+
+    let objProps = byObject.get(object);
+    if (!objProps) {
+      objProps = [];
+      byObject.set(object, objProps);
+    }
+    objProps.push(property);
+
+    const target = object.replace('.prototype', '');
+    let targetProps = byTarget.get(target);
+    if (!targetProps) {
+      targetProps = [];
+      byTarget.set(target, targetProps);
+    }
+    targetProps.push(property);
+    targetPropToName.set(`${target}.${property}`, name);
+
+    coreJsModuleToName.set(coreJs3Module, name);
+    const modParts = coreJs3Module.split('.');
+    const modPrefix = modParts.slice(0, 2).join('.');
+    const modRest = modParts.slice(2).join('.');
+    let modRests = byModulePrefix.get(modPrefix);
+    if (!modRests) {
+      modRests = [];
+      byModulePrefix.set(modPrefix, modRests);
+    }
+    modRests.push(modRest);
+  }
+
+  // 1. Direct property assignment: `String.prototype.startsWith =`
+  const directBranches = [];
+  for (const [object, props] of byObject) {
+    directBranches.push(`${escapeRegExp(object)}\\.(?:${props.join('|')})\\s?=[^=]`);
+  }
+
+  // 2. Bracket property assignment: `String.prototype['startsWith'] =`
+  const bracketBranches = [];
+  for (const [object, props] of byObject) {
+    bracketBranches.push(`${escapeRegExp(object)}\\[['"](?:${props.join('|')})['"]\\]\\s?=[^=]`);
+  }
+
+  // 3. Object.defineProperty: `Object.defineProperty(String.prototype, 'startsWith'`
+  const definePropBranches = [];
+  for (const [object, props] of byObject) {
+    definePropBranches.push(`${escapeRegExp(object)},\\s?['"](?:${props.join('|')})['"]`);
+  }
+
+  // 4. es-shims: `no(Object,{entries:r},{entries:function`
+  const esShimsBranches = [];
+  for (const [object, props] of byObject) {
+    const propAlt = `(?:${props.join('|')})`;
+    esShimsBranches.push(`${escapeRegExp(object)},\\s*{${propAlt}:.*},\\s*{${propAlt}`);
+  }
+
+  // 5. core-js@3 minified pattern:
+  // `{target:"Array",proto:true},{fill:fill`
+  // `{target:"Array",proto:true,forced:!HAS_SPECIES_SUPPORT||!USES_TO_LENGTH},{filter:`
+  const targetBranches = [];
+  for (const [target, props] of byTarget) {
+    targetBranches.push(`['"]${escapeRegExp(target)}['"][^;]*?},{(?:${props.join('|')}):`);
+  }
+
+  // 6. Un-minified core-js module names: `core-js/modules/es.object.is-frozen`
+  const moduleBranches = [];
+  for (const [prefix, rests] of byModulePrefix) {
+    moduleBranches.push(
+      `${escapeRegExp(prefix)}\\.(?:${rests.map(escapeRegExp).join('|')})`
+    );
   }
 
-  return patterns;
+  return [
+    {
+      name: 'direct-assignment',
+      expression: directBranches.join('|'),
+      resolveName: match => match.slice(0, match.indexOf('=')).trimEnd(),
+    },
+    {
+      name: 'bracket-assignment',
+      expression: bracketBranches.join('|'),
+      resolveName: match => {
+        const bracketIdx = match.indexOf('[');
+        const closeIdx = match.indexOf(']', bracketIdx);
+        return `${match.slice(0, bracketIdx)}.${match.slice(bracketIdx + 2, closeIdx - 1)}`;
+      },
+    },
+    {
+      name: 'defineProperty',
+      expression: `defineProperty\\((?:${definePropBranches.join('|')})`,
+      resolveName: match => {
+        const openIdx = match.indexOf('(');
+        const commaIdx = match.indexOf(',', openIdx);
+        const obj = match.slice(openIdx + 1, commaIdx);
+        const prop = match.slice(commaIdx + 1).trimStart().slice(1, -1);
+        return `${obj}.${prop}`;
+      },
+    },
+    {
+      name: 'es-shims',
+      expression: `\\((?:${esShimsBranches.join('|')})`,
+      resolveName: match => {
+        const commaIdx = match.indexOf(',');
+        const obj = match.slice(1, commaIdx);
+        const braceIdx = match.indexOf('{', commaIdx);
+        const colonIdx = match.indexOf(':', braceIdx);
+        const prop = match.slice(braceIdx + 1, colonIdx);
+        return `${obj}.${prop}`;
+      },
+    },
+    {
+      name: 'core-js-target',
+      expression: `{target:(?:${targetBranches.join('|')})`,
+      resolveName: match => {
+        const targetEnd = match.indexOf(match[8], 9);
+        const target = match.slice(9, targetEnd);
+        const lastBrace = match.lastIndexOf('{');
+        const prop = match.slice(lastBrace + 1, -1);
+        return /** @type {string} */ (targetPropToName.get(`${target}.${prop}`));
+      },
+    },
+    {
+      name: 'core-js-module',
+      expression: `(?:${moduleBranches.join('|')})(?:\\.js)?"`,
+      resolveName: match => {
+        const mod = match.endsWith('.js"') ? match.slice(0, -4) : match.slice(0, -1);
+        return /** @type {string} */ (coreJsModuleToName.get(mod));
+      },
+    },
+  ];
 }
 
 /**
  * @return {Pattern[]}
  */
 function getTransformPatterns() {
-/**
- * @param {string} content
- * @param {RegExp|string} pattern
- * @return {number}
- */
+  /**
+   * @param {string} content
+   * @param {RegExp|string} pattern
+   * @return {number}
+   */
   const count = (content, pattern) => {
     // Split is slightly faster than match.
     if (typeof pattern === 'string') {
@@ -259,6 +345,17 @@ function getTransformPatterns() {
   ];
 }
 
+const transformPatterns = getTransformPatterns();
+const transformPatternsByName = new Map(transformPatterns.map(p => [p.name, p]));
+
+/** @type {Map<string, string>} */
+const moduleToPolyfillName = new Map();
+for (const {name, modules} of polyfillModuleData) {
+  for (const mod of modules) {
+    moduleToPolyfillName.set(mod, name);
+  }
+}
+
 /**
  * @param {string} content
  * @param {PatternMatchResult[]} matches
@@ -287,7 +384,7 @@ function estimateWastedBytes(content, matches) {
   let estimatedWastedBytesFromTransforms = 0;
 
   for (const result of transformResults) {
-    const pattern = getTransformPatterns().find(p => p.name === result.name);
+    const pattern = transformPatternsByName.get(result.name);
     if (!pattern || !pattern.estimateBytes || !content) continue;
     estimatedWastedBytesFromTransforms += pattern.estimateBytes(content);
   }
@@ -299,7 +396,7 @@ function estimateWastedBytes(content, matches) {
 
 const matcher = new CodePatternMatcher([
   ...getPolyfillPatterns(),
-  ...getTransformPatterns(),
+  ...transformPatterns,
 ]);
 
 /**
@@ -315,20 +412,47 @@ function detectLegacyJavaScript(content, map) {
 
   // If it's a bundle with source maps, add in the polyfill modules by name too.
   if (map) {
-    for (const {name, modules} of polyfillModuleData) {
-      // Skip if the pattern matching found a match for this polyfill.
-      if (matches.some(m => m.name === name)) continue;
-
-      const source = map.sourceURLs().find(source => modules.some(module => {
-        return source.endsWith(`/${module}.js`) || source.includes(`node_modules/${module}/`);
-      }));
-      if (!source) continue;
-
-      const mapping = map.mappings().find(m => m.sourceURL === source);
-      if (mapping) {
-        matches.push({name, line: mapping.lineNumber, column: mapping.columnNumber});
-      } else {
-        matches.push({name, line: 0, column: 0});
+    const matchedNames = new Set(matches.map(m => m.name));
+    /** @type {Array<{name: string, source: string}>} */
+    const foundInMap = [];
+
+    for (const source of map.sourceURLs()) {
+      if (source.endsWith('.js')) {
+        const slashIdx = source.lastIndexOf('/');
+        if (slashIdx !== -1) {
+          const polyfillName = moduleToPolyfillName.get(source.slice(slashIdx + 1, -3));
+          if (polyfillName && !matchedNames.has(polyfillName)) {
+            matchedNames.add(polyfillName);
+            foundInMap.push({name: polyfillName, source});
+          }
+        }
+      }
+      if (source.includes('node_modules/')) {
+        let nmIdx = source.indexOf('node_modules/');
+        while (nmIdx !== -1) {
+          const modStart = nmIdx + 13; // 'node_modules/'.length
+          const nextSlash = source.indexOf('/', modStart);
+          if (nextSlash !== -1) {
+            const polyfillName = moduleToPolyfillName.get(source.slice(modStart, nextSlash));
+            if (polyfillName && !matchedNames.has(polyfillName)) {
+              matchedNames.add(polyfillName);
+              foundInMap.push({name: polyfillName, source});
+            }
+          }
+          nmIdx = source.indexOf('node_modules/', modStart);
+        }
+      }
+    }
+
+    if (foundInMap.length > 0) {
+      const mappings = map.mappings();
+      for (const {name, source} of foundInMap) {
+        const mapping = mappings.find(m => m.sourceURL === source);
+        if (mapping) {
+          matches.push({name, line: mapping.lineNumber, column: mapping.columnNumber});
+        } else {
+          matches.push({name, line: 0, column: 0});
+        }
       }
     }
   }