lighthouse 9.5.0-dev.20220607 → 9.6.2

package/lighthouse-core/audits/dobetterweb/doctype.js

@@ -19,14 +19,12 @@ const UIStrings = {
     '[Learn more](https://web.dev/doctype/).',
   /** Explanatory message stating that the document has no doctype. */
   explanationNoDoctype: 'Document must contain a doctype',
-  /** Explanatory message stating that the document has wrong doctype */
-  explanationWrongDoctype: 'Document contains a doctype that triggers quirks-mode',
   /** Explanatory message stating that the publicId field is not empty. */
   explanationPublicId: 'Expected publicId to be an empty string',
   /** Explanatory message stating that the systemId field is not empty. */
   explanationSystemId: 'Expected systemId to be an empty string',
   /** Explanatory message stating that the doctype is set, but is not "html" and is therefore invalid. */
-  explanationBadDoctype: 'Doctype name must be the string `html`',
+  explanationBadDoctype: 'Doctype name must be the lowercase string `html`',
 };
 
 const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
@@ -58,10 +56,9 @@ class Doctype extends Audit {
     }
 
     // only set constants once we know there is a doctype
-    const doctypeName = artifacts.Doctype.name;
+    const doctypeName = artifacts.Doctype.name.trim();
     const doctypePublicId = artifacts.Doctype.publicId;
     const doctypeSystemId = artifacts.Doctype.systemId;
-    const compatMode = artifacts.Doctype.documentCompatMode;
 
     if (doctypePublicId !== '') {
       return {
@@ -77,25 +74,17 @@ class Doctype extends Audit {
       };
     }
 
-    /* Note that the casing of this property is normalized to be lowercase.
-       see: https://html.spec.whatwg.org/#doctype-name-state */
-    if (doctypeName !== 'html') {
+    /* Note that the value for name is case sensitive,
+       and must be the string `html`. For details see:
+       https://html.spec.whatwg.org/multipage/parsing.html#the-initial-insertion-mode */
+    if (doctypeName === 'html') {
       return {
-        score: 0,
-        explanation: str_(UIStrings.explanationBadDoctype),
-      };
-    }
-
-    // Catch-all for any quirks-mode situations the above checks didn't get.
-    // https://github.com/GoogleChrome/lighthouse/issues/10030
-    if (compatMode === 'BackCompat') {
-      return {
-        score: 0,
-        explanation: str_(UIStrings.explanationWrongDoctype),
+        score: 1,
       };
     } else {
       return {
-        score: 1,
+        score: 0,
+        explanation: str_(UIStrings.explanationBadDoctype),
       };
     }
   }

package/lighthouse-core/audits/dobetterweb/geolocation-on-start.js

@@ -38,7 +38,7 @@ class GeolocationOnStart extends ViolationAudit {
       failureTitle: str_(UIStrings.failureTitle),
       description: str_(UIStrings.description),
       supportedModes: ['navigation'],
-      requiredArtifacts: ['ConsoleMessages', 'SourceMaps', 'Scripts'],
+      requiredArtifacts: ['ConsoleMessages', 'SourceMaps', 'ScriptElements'],
     };
   }
 

package/lighthouse-core/audits/dobetterweb/no-document-write.js

@@ -54,7 +54,7 @@ class NoDocWriteAudit extends ViolationAudit {
       title: str_(UIStrings.title),
       failureTitle: str_(UIStrings.failureTitle),
       description: str_(UIStrings.description),
-      requiredArtifacts: ['ConsoleMessages', 'SourceMaps', 'Scripts'],
+      requiredArtifacts: ['ConsoleMessages', 'SourceMaps', 'ScriptElements'],
     };
   }
 

package/lighthouse-core/audits/dobetterweb/notification-on-start.js

@@ -38,7 +38,7 @@ class NotificationOnStart extends ViolationAudit {
       failureTitle: str_(UIStrings.failureTitle),
       description: str_(UIStrings.description),
       supportedModes: ['navigation'],
-      requiredArtifacts: ['ConsoleMessages', 'SourceMaps', 'Scripts'],
+      requiredArtifacts: ['ConsoleMessages', 'SourceMaps', 'ScriptElements'],
     };
   }
 

package/lighthouse-core/audits/dobetterweb/uses-http2.js

@@ -202,7 +202,6 @@ class UsesHTTP2Audit extends Audit {
   static async audit(artifacts, context) {
     const trace = artifacts.traces[Audit.DEFAULT_PASS];
     const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
-    const URL = artifacts.URL;
     const networkRecords = await NetworkRecords.request(devtoolsLog, context);
     const resources = UsesHTTP2Audit.determineNonHttp2Resources(networkRecords);
 
@@ -233,7 +232,7 @@ class UsesHTTP2Audit extends Audit {
       devtoolsLog,
       settings,
     };
-    const graph = await PageDependencyGraph.request({trace, devtoolsLog, URL}, context);
+    const graph = await PageDependencyGraph.request({trace, devtoolsLog}, context);
     const simulator = await LoadSimulator.request(simulatorOptions, context);
     const wastedMs = UsesHTTP2Audit.computeWasteWithTTIGraph(resources, graph, simulator);
 

package/lighthouse-core/audits/dobetterweb/uses-passive-event-listeners.js

@@ -37,7 +37,7 @@ class PassiveEventsAudit extends ViolationAudit {
       title: str_(UIStrings.title),
       failureTitle: str_(UIStrings.failureTitle),
       description: str_(UIStrings.description),
-      requiredArtifacts: ['ConsoleMessages', 'SourceMaps', 'Scripts'],
+      requiredArtifacts: ['ConsoleMessages', 'SourceMaps', 'ScriptElements'],
     };
   }
 

package/lighthouse-core/audits/errors-in-console.js

@@ -40,7 +40,7 @@ class ErrorLogs extends Audit {
       title: str_(UIStrings.title),
       failureTitle: str_(UIStrings.failureTitle),
       description: str_(UIStrings.description),
-      requiredArtifacts: ['ConsoleMessages', 'SourceMaps', 'Scripts'],
+      requiredArtifacts: ['ConsoleMessages', 'SourceMaps', 'ScriptElements'],
     };
   }
 
@@ -87,7 +87,7 @@ class ErrorLogs extends Audit {
     const consoleRows = artifacts.ConsoleMessages
       .filter(item => item.level === 'error')
       .map(item => {
-        const bundle = bundles.find(bundle => bundle.script.scriptId === item.scriptId);
+        const bundle = bundles.find(bundle => bundle.script.src === item.url);
         return {
           source: item.source,
           description: item.text,

package/lighthouse-core/audits/long-tasks.js

@@ -42,7 +42,7 @@ class LongTasks extends Audit {
       scoreDisplayMode: Audit.SCORING_MODES.INFORMATIVE,
       title: str_(UIStrings.title),
       description: str_(UIStrings.description),
-      requiredArtifacts: ['traces', 'devtoolsLogs', 'URL'],
+      requiredArtifacts: ['traces', 'devtoolsLogs'],
     };
   }
 
@@ -53,7 +53,6 @@ class LongTasks extends Audit {
    */
   static async audit(artifacts, context) {
     const settings = context.settings || {};
-    const URL = artifacts.URL;
     const trace = artifacts.traces[Audit.DEFAULT_PASS];
     const tasks = await MainThreadTasks.request(trace, context);
     const devtoolsLog = artifacts.devtoolsLogs[LongTasks.DEFAULT_PASS];
@@ -64,7 +63,7 @@ class LongTasks extends Audit {
 
     if (settings.throttlingMethod === 'simulate') {
       const simulatorOptions = {devtoolsLog, settings: context.settings};
-      const pageGraph = await PageDependencyGraph.request({trace, devtoolsLog, URL}, context);
+      const pageGraph = await PageDependencyGraph.request({trace, devtoolsLog}, context);
       const simulator = await LoadSimulator.request(simulatorOptions, context);
       const simulation = await simulator.simulate(pageGraph, {label: 'long-tasks-diagnostic'});
       for (const [node, timing] of simulation.nodeTimings.entries()) {

package/lighthouse-core/audits/metrics/first-contentful-paint-3g.js

@@ -21,7 +21,7 @@ class FirstContentfulPaint3G extends Audit {
         `painted while on a 3G network. [Learn more](https://developers.google.com/web/tools/lighthouse/audits/first-contentful-paint).`,
       scoreDisplayMode: Audit.SCORING_MODES.NUMERIC,
       supportedModes: ['navigation'],
-      requiredArtifacts: ['traces', 'devtoolsLogs', 'GatherContext', 'URL'],
+      requiredArtifacts: ['traces', 'devtoolsLogs', 'GatherContext'],
     };
   }
 
@@ -49,7 +49,7 @@ class FirstContentfulPaint3G extends Audit {
     const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
     /** @type {Immutable<LH.Config.Settings>} */
     const settings = {...context.settings, throttlingMethod: 'simulate', throttling: regular3G};
-    const metricComputationData = {trace, devtoolsLog, gatherContext, settings, URL: artifacts.URL};
+    const metricComputationData = {trace, devtoolsLog, gatherContext, settings};
     const metricResult = await ComputedFcp.request(metricComputationData, context);
 
     return {

package/lighthouse-core/audits/metrics/first-contentful-paint.js

@@ -28,7 +28,7 @@ class FirstContentfulPaint extends Audit {
       description: str_(UIStrings.description),
       scoreDisplayMode: Audit.SCORING_MODES.NUMERIC,
       supportedModes: ['navigation'],
-      requiredArtifacts: ['traces', 'devtoolsLogs', 'GatherContext', 'URL'],
+      requiredArtifacts: ['traces', 'devtoolsLogs', 'GatherContext'],
     };
   }
 
@@ -65,8 +65,7 @@ class FirstContentfulPaint extends Audit {
     const trace = artifacts.traces[Audit.DEFAULT_PASS];
     const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
     const gatherContext = artifacts.GatherContext;
-    const metricComputationData = {trace, devtoolsLog, gatherContext,
-      settings: context.settings, URL: artifacts.URL};
+    const metricComputationData = {trace, devtoolsLog, gatherContext, settings: context.settings};
     const metricResult = await ComputedFcp.request(metricComputationData, context);
     const options = context.options[context.settings.formFactor];
 

package/lighthouse-core/audits/metrics/first-meaningful-paint.js

@@ -28,7 +28,7 @@ class FirstMeaningfulPaint extends Audit {
       description: str_(UIStrings.description),
       scoreDisplayMode: Audit.SCORING_MODES.NUMERIC,
       supportedModes: ['navigation'],
-      requiredArtifacts: ['traces', 'devtoolsLogs', 'GatherContext', 'URL'],
+      requiredArtifacts: ['traces', 'devtoolsLogs', 'GatherContext'],
     };
   }
 
@@ -68,8 +68,7 @@ class FirstMeaningfulPaint extends Audit {
     const trace = artifacts.traces[Audit.DEFAULT_PASS];
     const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
     const gatherContext = artifacts.GatherContext;
-    const metricComputationData = {trace, devtoolsLog, gatherContext,
-      settings: context.settings, URL: artifacts.URL};
+    const metricComputationData = {trace, devtoolsLog, gatherContext, settings: context.settings};
     const metricResult = await ComputedFmp.request(metricComputationData, context);
     const options = context.options[context.settings.formFactor];
 

package/lighthouse-core/audits/metrics/interactive.js

@@ -34,7 +34,7 @@ class InteractiveMetric extends Audit {
       description: str_(UIStrings.description),
       scoreDisplayMode: Audit.SCORING_MODES.NUMERIC,
       supportedModes: ['navigation'],
-      requiredArtifacts: ['traces', 'devtoolsLogs', 'GatherContext', 'URL'],
+      requiredArtifacts: ['traces', 'devtoolsLogs', 'GatherContext'],
     };
   }
 
@@ -71,8 +71,7 @@ class InteractiveMetric extends Audit {
     const trace = artifacts.traces[Audit.DEFAULT_PASS];
     const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
     const gatherContext = artifacts.GatherContext;
-    const metricComputationData = {trace, devtoolsLog, gatherContext,
-      settings: context.settings, URL: artifacts.URL};
+    const metricComputationData = {trace, devtoolsLog, gatherContext, settings: context.settings};
     const metricResult = await Interactive.request(metricComputationData, context);
     const timeInMs = metricResult.timing;
     const options = context.options[context.settings.formFactor];

package/lighthouse-core/audits/metrics/largest-contentful-paint.js

@@ -29,7 +29,7 @@ class LargestContentfulPaint extends Audit {
       description: str_(UIStrings.description),
       scoreDisplayMode: Audit.SCORING_MODES.NUMERIC,
       supportedModes: ['navigation'],
-      requiredArtifacts: ['HostUserAgent', 'traces', 'devtoolsLogs', 'GatherContext', 'URL'],
+      requiredArtifacts: ['HostUserAgent', 'traces', 'devtoolsLogs', 'GatherContext'],
     };
   }
 
@@ -74,8 +74,7 @@ class LargestContentfulPaint extends Audit {
     const trace = artifacts.traces[Audit.DEFAULT_PASS];
     const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
     const gatherContext = artifacts.GatherContext;
-    const metricComputationData = {trace, devtoolsLog, gatherContext,
-      settings: context.settings, URL: artifacts.URL};
+    const metricComputationData = {trace, devtoolsLog, gatherContext, settings: context.settings};
 
     let metricResult;
     try {

package/lighthouse-core/audits/metrics/max-potential-fid.js

@@ -33,7 +33,7 @@ class MaxPotentialFID extends Audit {
       description: str_(UIStrings.description),
       scoreDisplayMode: Audit.SCORING_MODES.NUMERIC,
       supportedModes: ['navigation'],
-      requiredArtifacts: ['traces', 'devtoolsLogs', 'GatherContext', 'URL'],
+      requiredArtifacts: ['traces', 'devtoolsLogs', 'GatherContext'],
     };
   }
 
@@ -57,8 +57,7 @@ class MaxPotentialFID extends Audit {
     const trace = artifacts.traces[Audit.DEFAULT_PASS];
     const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
     const gatherContext = artifacts.GatherContext;
-    const metricComputationData = {trace, devtoolsLog, gatherContext,
-      settings: context.settings, URL: artifacts.URL};
+    const metricComputationData = {trace, devtoolsLog, gatherContext, settings: context.settings};
     const metricResult = await ComputedFid.request(metricComputationData, context);
 
     return {

package/lighthouse-core/audits/metrics/speed-index.js

@@ -28,7 +28,7 @@ class SpeedIndex extends Audit {
       description: str_(UIStrings.description),
       scoreDisplayMode: Audit.SCORING_MODES.NUMERIC,
       supportedModes: ['navigation'],
-      requiredArtifacts: ['traces', 'devtoolsLogs', 'GatherContext', 'URL'],
+      requiredArtifacts: ['traces', 'devtoolsLogs', 'GatherContext'],
     };
   }
 
@@ -67,8 +67,7 @@ class SpeedIndex extends Audit {
     const trace = artifacts.traces[Audit.DEFAULT_PASS];
     const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
     const gatherContext = artifacts.GatherContext;
-    const metricComputationData = {trace, devtoolsLog, gatherContext,
-      settings: context.settings, URL: artifacts.URL};
+    const metricComputationData = {trace, devtoolsLog, gatherContext, settings: context.settings};
     const metricResult = await ComputedSi.request(metricComputationData, context);
     const options = context.options[context.settings.formFactor];
 

package/lighthouse-core/audits/metrics/total-blocking-time.js

@@ -27,7 +27,7 @@ class TotalBlockingTime extends Audit {
       title: str_(i18n.UIStrings.totalBlockingTimeMetric),
       description: str_(UIStrings.description),
       scoreDisplayMode: Audit.SCORING_MODES.NUMERIC,
-      requiredArtifacts: ['traces', 'devtoolsLogs', 'GatherContext', 'URL'],
+      requiredArtifacts: ['traces', 'devtoolsLogs', 'GatherContext'],
     };
   }
 
@@ -88,8 +88,7 @@ class TotalBlockingTime extends Audit {
     const trace = artifacts.traces[Audit.DEFAULT_PASS];
     const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
     const gatherContext = artifacts.GatherContext;
-    const metricComputationData = {trace, devtoolsLog, gatherContext,
-      settings: context.settings, URL: artifacts.URL};
+    const metricComputationData = {trace, devtoolsLog, gatherContext, settings: context.settings};
     if (
       gatherContext.gatherMode === 'timespan' &&
       context.settings.throttlingMethod === 'simulate'

package/lighthouse-core/audits/metrics.js

@@ -29,7 +29,7 @@ class Metrics extends Audit {
       title: 'Metrics',
       description: 'Collects all available metrics.',
       supportedModes: ['navigation'],
-      requiredArtifacts: ['traces', 'devtoolsLogs', 'GatherContext', 'URL'],
+      requiredArtifacts: ['traces', 'devtoolsLogs', 'GatherContext'],
     };
   }
 
@@ -42,9 +42,8 @@ class Metrics extends Audit {
     const gatherContext = artifacts.GatherContext;
     const trace = artifacts.traces[Audit.DEFAULT_PASS];
     const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
-    const URL = artifacts.URL;
     const summary = await ComputedTimingSummary
-      .request({trace, devtoolsLog, gatherContext, settings: context.settings, URL}, context);
+      .request({trace, devtoolsLog, gatherContext, settings: context.settings}, context);
     const metrics = summary.metrics;
     const debugInfo = summary.debugInfo;
 

package/lighthouse-core/audits/no-unload-listeners.js

@@ -30,7 +30,7 @@ class NoUnloadListeners extends Audit {
       title: str_(UIStrings.title),
       failureTitle: str_(UIStrings.failureTitle),
       description: str_(UIStrings.description),
-      requiredArtifacts: ['GlobalListeners', 'SourceMaps', 'Scripts'],
+      requiredArtifacts: ['GlobalListeners', 'JsUsage', 'SourceMaps', 'ScriptElements'],
     };
   }
 
@@ -54,25 +54,33 @@ class NoUnloadListeners extends Audit {
       {key: 'source', itemType: 'source-location', text: str_(i18n.UIStrings.columnSource)},
     ];
 
+    // Look up scriptId to script URL via the JsUsage artifact.
+    /** @type {Map<string, string>} */
+    const scriptIdToUrl = new Map();
+    for (const [url, usages] of Object.entries(artifacts.JsUsage)) {
+      for (const usage of usages) {
+        scriptIdToUrl.set(usage.scriptId, url);
+      }
+    }
+
     /** @type {Array<{source: LH.Audit.Details.ItemValue}>} */
     const tableItems = unloadListeners.map(listener => {
-      const {lineNumber, columnNumber} = listener;
-      const script = artifacts.Scripts.find(s => s.scriptId === listener.scriptId);
+      const url = scriptIdToUrl.get(listener.scriptId);
 
       // If we can't find a url, still show something so the user can manually
       // look for where an `unload` handler is being created.
-      if (!script) {
+      if (!url) {
         return {
           source: {
             type: 'url',
-            value: `(unknown):${lineNumber}:${columnNumber}`,
+            value: '(unknown)',
           },
         };
       }
 
-      const bundle = bundles.find(bundle => bundle.script.scriptId === script.scriptId);
+      const bundle = bundles.find(bundle => bundle.script.src === url);
       return {
-        source: Audit.makeSourceLocation(script.url, lineNumber, columnNumber, bundle),
+        source: Audit.makeSourceLocation(url, listener.lineNumber, listener.columnNumber, bundle),
       };
     });
 

package/lighthouse-core/audits/predictive-perf.js

@@ -47,11 +47,10 @@ class PredictivePerf extends Audit {
     const gatherContext = artifacts.GatherContext;
     const trace = artifacts.traces[Audit.DEFAULT_PASS];
     const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
-    const URL = artifacts.URL;
     /** @type {LH.Config.Settings} */
     // @ts-expect-error - TODO(bckenny): allow optional `throttling` settings
     const settings = {}; // Use default settings.
-    const computationData = {trace, devtoolsLog, gatherContext, settings, URL};
+    const computationData = {trace, devtoolsLog, gatherContext, settings};
     const fcp = await LanternFcp.request(computationData, context);
     const fmp = await LanternFmp.request(computationData, context);
     const tti = await LanternInteractive.request(computationData, context);

package/lighthouse-core/audits/preload-lcp-image.js

@@ -17,8 +17,8 @@ const UIStrings = {
   /** Title of a lighthouse audit that tells a user to preload an image in order to improve their LCP time. */
   title: 'Preload Largest Contentful Paint image',
   /** Description of a lighthouse audit that tells a user to preload an image in order to improve their LCP time.  */
-  description: 'If the LCP element is dynamically added to the page, you should preload the ' +
-    'image in order to improve LCP. [Learn more](https://web.dev/optimize-lcp/#preload-important-resources).',
+  description: 'Preload the image used by ' +
+    'the LCP element in order to improve your LCP time. [Learn more](https://web.dev/optimize-lcp/#preload-important-resources).',
 };
 
 const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
@@ -203,7 +203,7 @@ class PreloadLCPImageAudit extends Audit {
     const trace = artifacts.traces[PreloadLCPImageAudit.DEFAULT_PASS];
     const devtoolsLog = artifacts.devtoolsLogs[PreloadLCPImageAudit.DEFAULT_PASS];
     const URL = artifacts.URL;
-    const metricData = {trace, devtoolsLog, gatherContext, settings: context.settings, URL};
+    const metricData = {trace, devtoolsLog, gatherContext, settings: context.settings};
     const lcpElement = artifacts.TraceElements
       .find(element => element.traceEventType === 'largest-contentful-paint');
 

package/lighthouse-core/audits/redirects.js

@@ -93,7 +93,7 @@ class Redirects extends Audit {
     const networkRecords = await NetworkRecords.request(devtoolsLog, context);
     const mainResource = await MainResource.request({URL: artifacts.URL, devtoolsLog}, context);
 
-    const metricComputationData = {trace, devtoolsLog, gatherContext, settings, URL: artifacts.URL};
+    const metricComputationData = {trace, devtoolsLog, gatherContext, settings};
     const metricResult = await LanternInteractive.request(metricComputationData, context);
 
     /** @type {Map<string, LH.Gatherer.Simulation.NodeTiming>} */

package/lighthouse-core/audits/script-treemap-data.js

@@ -19,7 +19,6 @@ const Audit = require('./audit.js');
 const JsBundles = require('../computed/js-bundles.js');
 const UnusedJavaScriptSummary = require('../computed/unused-javascript-summary.js');
 const ModuleDuplication = require('../computed/module-duplication.js');
-const {isInline} = require('../lib/script-helpers.js');
 
 class ScriptTreemapDataAudit extends Audit {
   /**
@@ -32,7 +31,7 @@ class ScriptTreemapDataAudit extends Audit {
       title: 'Script Treemap Data',
       description: 'Used for treemap app',
       requiredArtifacts:
-        ['traces', 'devtoolsLogs', 'SourceMaps', 'Scripts', 'JsUsage', 'URL'],
+        ['traces', 'devtoolsLogs', 'SourceMaps', 'ScriptElements', 'JsUsage', 'URL'],
     };
   }
 
@@ -149,10 +148,10 @@ class ScriptTreemapDataAudit extends Audit {
    * Returns nodes where the first level of nodes are URLs.
    * Every external script has a node.
    * All inline scripts are combined into a single node.
-   * If a script has a source map, that node will be created by makeScriptNode.
+   * If a script has a source map, that node will be set by makeNodeFromSourceMapData.
    *
    * Example return result:
-     - index.html (inline scripts)
+     - index.html (inlines scripts)
      - main.js
      - - webpack://
      - - - react.js
@@ -166,22 +165,45 @@ class ScriptTreemapDataAudit extends Audit {
   static async makeNodes(artifacts, context) {
     /** @type {LH.Treemap.Node[]} */
     const nodes = [];
-    /** @type {Map<string, LH.Treemap.Node>} */
-    const htmlNodesByFrameId = new Map();
+
+    let inlineScriptLength = 0;
+    for (const scriptElement of artifacts.ScriptElements) {
+      // No src means script is inline.
+      // Combine these ScriptElements so that inline scripts show up as a single root node.
+      if (!scriptElement.src) {
+        inlineScriptLength += (scriptElement.content || '').length;
+      }
+    }
+    if (inlineScriptLength) {
+      const name = artifacts.URL.finalUrl;
+      nodes.push({
+        name,
+        resourceBytes: inlineScriptLength,
+      });
+    }
+
     const bundles = await JsBundles.request(artifacts, context);
     const duplicationByPath = await ModuleDuplication.request(artifacts, context);
 
-    for (const script of artifacts.Scripts) {
-      if (script.scriptLanguage !== 'JavaScript') continue;
+    for (const scriptElement of artifacts.ScriptElements) {
+      if (!scriptElement.src) continue;
+
+      const name = scriptElement.src;
+      const bundle = bundles.find(bundle => scriptElement.src === bundle.script.src);
+      const scriptCoverages = artifacts.JsUsage[scriptElement.src] || [];
+      if (!bundle && scriptCoverages.length === 0) {
+        // No bundle and no coverage information, so simply make a single node
+        // detailing how big the script is.
 
-      const name = script.url;
-      const bundle = bundles.find(bundle => script.scriptId === bundle.script.scriptId);
-      const scriptCoverage = /** @type {LH.Artifacts['JsUsage'][string] | undefined} */
-        (artifacts.JsUsage[script.scriptId]);
-      const unusedJavascriptSummary = scriptCoverage ?
-        await UnusedJavaScriptSummary.request(
-          {scriptId: script.scriptId, scriptCoverage, bundle}, context) :
-        undefined;
+        nodes.push({
+          name,
+          resourceBytes: scriptElement.content?.length || 0,
+        });
+        continue;
+      }
+
+      const unusedJavascriptSummary = await UnusedJavaScriptSummary.request(
+        {url: scriptElement.src, scriptCoverages, bundle}, context);
 
       /** @type {LH.Treemap.Node} */
       let node;
@@ -196,7 +218,7 @@ class ScriptTreemapDataAudit extends Audit {
             resourceBytes: bundle.sizes.files[source],
           };
 
-          if (unusedJavascriptSummary?.sourcesWastedBytes) {
+          if (unusedJavascriptSummary.sourcesWastedBytes) {
             sourceData.unusedBytes = unusedJavascriptSummary.sourcesWastedBytes[source];
           }
 
@@ -219,46 +241,24 @@ class ScriptTreemapDataAudit extends Audit {
           const sourceData = {
             resourceBytes: bundle.sizes.unmappedBytes,
           };
-          if (unusedJavascriptSummary?.sourcesWastedBytes) {
+          if (unusedJavascriptSummary.sourcesWastedBytes) {
             sourceData.unusedBytes = unusedJavascriptSummary.sourcesWastedBytes['(unmapped)'];
           }
           sourcesData['(unmapped)'] = sourceData;
         }
 
-        node = this.makeScriptNode(script.url, bundle.rawMap.sourceRoot || '', sourcesData);
+        node = this.makeScriptNode(scriptElement.src, bundle.rawMap.sourceRoot || '', sourcesData);
       } else {
         // No valid source map for this script, so we can only produce a single node.
+
         node = {
           name,
-          resourceBytes: unusedJavascriptSummary?.totalBytes ?? script.length ?? 0,
-          unusedBytes: unusedJavascriptSummary?.wastedBytes,
+          resourceBytes: unusedJavascriptSummary.totalBytes,
+          unusedBytes: unusedJavascriptSummary.wastedBytes,
         };
       }
 
-      // If this is an inline script, place the node inside a top-level (aka depth-one) node.
-      // Also separate each iframe / the main page's inline scripts into their own top-level nodes.
-      if (isInline(script)) {
-        let htmlNode = htmlNodesByFrameId.get(script.executionContextAuxData.frameId);
-        if (!htmlNode) {
-          htmlNode = {
-            name,
-            resourceBytes: 0,
-            unusedBytes: undefined,
-            children: [],
-          };
-          htmlNodesByFrameId.set(script.executionContextAuxData.frameId, htmlNode);
-          nodes.push(htmlNode);
-        }
-        htmlNode.resourceBytes += node.resourceBytes;
-        if (node.unusedBytes) htmlNode.unusedBytes = (htmlNode.unusedBytes || 0) + node.unusedBytes;
-        node.name = script.content ?
-          '(inline) ' + script.content.trimStart().substring(0, 15) + '…' :
-          '(inline)';
-        htmlNode.children?.push(node);
-      } else {
-        // Non-inline scripts each have their own top-level node.
-        nodes.push(node);
-      }
+      nodes.push(node);
     }
 
     return nodes;

package/lighthouse-core/audits/seo/http-status-code.js

@@ -6,10 +6,11 @@
 'use strict';
 
 const Audit = require('../audit.js');
+const NetworkRecords = require('../../computed/network-records.js');
 const HTTP_UNSUCCESSFUL_CODE_LOW = 400;
 const HTTP_UNSUCCESSFUL_CODE_HIGH = 599;
 const i18n = require('../../lib/i18n/i18n.js');
-const MainResource = require('../../computed/main-resource.js');
+const NetworkAnalyzer = require('../../lib/dependency-graph/simulator/network-analyzer.js');
 
 const UIStrings = {
   /** Title of a Lighthouse audit that provides detail on the HTTP status code a page responds with. This descriptive title is shown when the page has responded with a valid HTTP status code. */
@@ -46,7 +47,8 @@ class HTTPStatusCode extends Audit {
   static async audit(artifacts, context) {
     const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
     const URL = artifacts.URL;
-    const mainResource = await MainResource.request({devtoolsLog, URL}, context);
+    const networkRecords = await NetworkRecords.request(devtoolsLog, context);
+    const mainResource = NetworkAnalyzer.findMainDocument(networkRecords, URL.finalUrl);
 
     const statusCode = mainResource.statusCode;
 

package/lighthouse-core/audits/seo/link-text.js

@@ -119,8 +119,6 @@ class LinkText extends Audit {
         if (
           href.startsWith('javascript:') ||
           href.startsWith('mailto:') ||
-          // This line prevents the audit from flagging anchor links.
-          // In this case it is better to use `finalUrl` than `mainDocumentUrl`.
           URL.equalWithExcludedFragments(link.href, artifacts.URL.finalUrl)
         ) {
           return false;