lighthouse 9.5.0-dev.20220502 → 9.5.0-dev.20220505

package/dist/report/bundle.esm.js

@@ -6108,4 +6108,6 @@ function renderReport(lhr, opts = {}) {
   return rootEl;
 }
 
-export { DOM, ReportRenderer, ReportUIFeatures, renderReport };
+const swapLocale = _ => {}; const format = _ => {};
+
+export { DOM, ReportRenderer, ReportUIFeatures, format, renderReport, swapLocale };

package/jest.config.js

@@ -6,7 +6,7 @@
 'use strict';
 
 module.exports = {
-  setupFilesAfterEnv: ['./lighthouse-core/test/test-utils.js'],
+  setupFilesAfterEnv: ['./lighthouse-core/test/jest-setup/setup.js'],
   testEnvironment: 'node',
   testMatch: [
     '**/lighthouse-core/**/*-test.js',

package/lighthouse-cli/cli-flags.js

@@ -123,10 +123,10 @@ function getFlags(manualArgv, options = {}) {
           type: 'boolean',
           describe: 'Pause after page load to wait for permission to continue the run, evaluate `continueLighthouseRun` in the console to continue.',
         },
-        'fraggle-rock': {
+        'legacy-navigation': {
           type: 'boolean',
           default: false,
-          describe: '[EXPERIMENTAL] Use the new Fraggle Rock navigation runner to gather results.',
+          describe: '[DEPRECATED] Use the legacy navigation runner to gather results. Only use this if you are using a pre-10.0 custom Lighthouse config, or if Lighthouse unexpectedly fails after updating to 10.0. Please file a bug if you need this flag for Lighthouse to work.',
         },
         'additional-trace-categories': {
           type: 'string',

package/lighthouse-cli/run.js

@@ -225,15 +225,16 @@ async function runLighthouse(url, flags, config) {
       flags.port = launchedChrome.port;
     }
 
-    if (flags.fraggleRock) {
-      flags.channel = 'fraggle-rock-cli';
+    if (flags.legacyNavigation) {
+      log.warn('CLI', 'Legacy navigation CLI is deprecated');
+      flags.channel = 'legacy-navigation-cli';
     } else {
       flags.channel = 'cli';
     }
 
-    const runnerResult = flags.fraggleRock ?
-       await lighthouse(url, flags, config) :
-       await lighthouse.legacyNavigation(url, flags, config);
+    const runnerResult = flags.legacyNavigation ?
+       await lighthouse.legacyNavigation(url, flags, config) :
+       await lighthouse(url, flags, config);
 
     // If in gatherMode only, there will be no runnerResult.
     if (runnerResult) {

package/lighthouse-cli/test/smokehouse/lighthouse-runners/bundle.js

@@ -8,47 +8,76 @@
  * @fileoverview  A runner that launches Chrome and executes Lighthouse via a
  * bundle to test that bundling has produced correct and runnable code.
  * Currently uses `lighthouse-dt-bundle.js`.
+ * Runs in a worker to avoid messing up marky's global state.
  */
 
 import fs from 'fs';
+import os from 'os';
+import {Worker, isMainThread, parentPort, workerData} from 'worker_threads';
+import {once} from 'events';
 
 import puppeteer from 'puppeteer-core';
 import ChromeLauncher from 'chrome-launcher';
 
 import ChromeProtocol from '../../../../lighthouse-core/gather/connections/cri.js';
 import {LH_ROOT} from '../../../../root.js';
+import {loadArtifacts, saveArtifacts} from '../../../../lighthouse-core/lib/asset-saver.js';
 
-const originalBuffer = global.Buffer;
-const originalRequire = global.require;
-if (typeof globalThis === 'undefined') {
-  // @ts-expect-error - exposing for loading of dt-bundle.
-  global.globalThis = global;
+// This runs only in the worker. The rest runs on the main thread.
+if (!isMainThread && parentPort) {
+  (async () => {
+    const {url, configJson, testRunnerOptions} = workerData;
+    try {
+      const result = await runBundledLighthouse(url, configJson, testRunnerOptions);
+      // Save to assets directory because LighthouseError won't survive postMessage.
+      const assetsDir = fs.mkdtempSync(os.tmpdir() + '/smoke-bundle-assets-');
+      await saveArtifacts(result.artifacts, assetsDir);
+      const value = {
+        lhr: result.lhr,
+        assetsDir,
+      };
+      parentPort?.postMessage({type: 'result', value});
+    } catch (err) {
+      console.error(err);
+      parentPort?.postMessage({type: 'error', value: err});
+    }
+  })();
 }
 
-// Load bundle, which creates a `global.runBundledLighthouse`.
-eval(fs.readFileSync(LH_ROOT + '/dist/lighthouse-dt-bundle.js', 'utf-8'));
-
-global.require = originalRequire;
-global.Buffer = originalBuffer;
-
-/** @type {import('../../../../lighthouse-core/index.js')} */
-// @ts-expect-error - not worth giving test global an actual type.
-const lighthouse = global.runBundledLighthouse;
-
 /**
- * Launch Chrome and do a full Lighthouse run via the Lighthouse DevTools bundle.
  * @param {string} url
- * @param {LH.Config.Json=} configJson
- * @param {{isDebug?: boolean, useFraggleRock?: boolean}=} testRunnerOptions
- * @return {Promise<{lhr: LH.Result, artifacts: LH.Artifacts, log: string}>}
+ * @param {LH.Config.Json|undefined} configJson
+ * @param {{isDebug?: boolean, useFraggleRock?: boolean}} testRunnerOptions
+ * @return {Promise<{lhr: LH.Result, artifacts: LH.Artifacts}>}
  */
-async function runLighthouse(url, configJson, testRunnerOptions = {}) {
+async function runBundledLighthouse(url, configJson, testRunnerOptions) {
+  if (isMainThread || !parentPort) {
+    throw new Error('must be called in worker');
+  }
+
+  const originalBuffer = global.Buffer;
+  const originalRequire = global.require;
+  if (typeof globalThis === 'undefined') {
+    // @ts-expect-error - exposing for loading of dt-bundle.
+    global.globalThis = global;
+  }
+
+  // Load bundle, which creates a `global.runBundledLighthouse`.
+  eval(fs.readFileSync(LH_ROOT + '/dist/lighthouse-dt-bundle.js', 'utf-8'));
+
+  global.require = originalRequire;
+  global.Buffer = originalBuffer;
+
+  /** @type {import('../../../../lighthouse-core/index.js')} */
+  // @ts-expect-error - not worth giving test global an actual type.
+  const lighthouse = global.runBundledLighthouse;
+
   // Launch and connect to Chrome.
   const launchedChrome = await ChromeLauncher.launch();
   const port = launchedChrome.port;
 
+  // Run Lighthouse.
   try {
-    // Run Lighthouse.
     const logLevel = testRunnerOptions.isDebug ? 'info' : undefined;
     let runnerResult;
     if (testRunnerOptions.useFraggleRock) {
@@ -66,7 +95,6 @@ async function runLighthouse(url, configJson, testRunnerOptions = {}) {
     return {
       lhr: runnerResult.lhr,
       artifacts: runnerResult.artifacts,
-      log: '', // TODO: if want to run in parallel, need to capture lighthouse-logger output.
     };
   } finally {
     // Clean up and return results.
@@ -74,6 +102,53 @@ async function runLighthouse(url, configJson, testRunnerOptions = {}) {
   }
 }
 
+/**
+ * Launch Chrome and do a full Lighthouse run via the Lighthouse DevTools bundle.
+ * @param {string} url
+ * @param {LH.Config.Json=} configJson
+ * @param {{isDebug?: boolean, useFraggleRock?: boolean}=} testRunnerOptions
+ * @return {Promise<{lhr: LH.Result, artifacts: LH.Artifacts, log: string}>}
+ */
+async function runLighthouse(url, configJson, testRunnerOptions = {}) {
+  /** @type {string[]} */
+  const logs = [];
+  const worker = new Worker(new URL(import.meta.url), {
+    stdout: true,
+    stderr: true,
+    workerData: {url, configJson, testRunnerOptions},
+  });
+  worker.stdout.setEncoding('utf8');
+  worker.stderr.setEncoding('utf8');
+  worker.stdout.addListener('data', (data) => {
+    process.stdout.write(data);
+    logs.push(`STDOUT: ${data}`);
+  });
+  worker.stderr.addListener('data', (data) => {
+    process.stderr.write(data);
+    logs.push(`STDERR: ${data}`);
+  });
+  const [workerResponse] = await once(worker, 'message');
+  const log = logs.join('') + '\n';
+
+  if (workerResponse.type === 'error') {
+    new Error(`Worker returned an error: ${workerResponse.value}\nLog:\n${log}`);
+  }
+
+  const result = workerResponse.value;
+  if (!result.lhr || !result.assetsDir) {
+    throw new Error(`invalid response from worker:\n${JSON.stringify(result, null, 2)}`);
+  }
+
+  const artifacts = loadArtifacts(result.assetsDir);
+  fs.rmSync(result.assetsDir, {recursive: true});
+
+  return {
+    lhr: result.lhr,
+    artifacts,
+    log,
+  };
+}
+
 export {
   runLighthouse,
 };

package/lighthouse-cli/test/smokehouse/lighthouse-runners/cli.js

@@ -82,8 +82,9 @@ async function internalRun(url, tmpPath, configJson, options) {
   ];
 
   if (useFraggleRock) {
-    args.push('--fraggle-rock');
     configJson = convertToFraggleRockConfig(configJson);
+  } else {
+    args.push('--legacy-navigation');
   }
 
   // Config can be optionally provided.

package/lighthouse-core/audits/accessibility/listitem.js

@@ -15,13 +15,13 @@ const i18n = require('../../lib/i18n/i18n.js');
 
 const UIStrings = {
   /** Title of an accesibility audit that evaluates if any list item elements do not have list parent elements. This title is descriptive of the successful state and is shown to users when no user action is required. */
-  title: 'List items (`<li>`) are contained within `<ul>` or `<ol>` parent elements',
+  title: 'List items (`<li>`) are contained within `<ul>`, `<ol>` or `<menu>` parent elements',
   /** Title of an accesibility audit that evaluates if any list item elements do not have list parent elements. This title is descriptive of the failing state and is shown to users when there is a failure that needs to be addressed. */
-  failureTitle: 'List items (`<li>`) are not contained within `<ul>` ' +
-      'or `<ol>` parent elements.',
+  failureTitle: 'List items (`<li>`) are not contained within `<ul>`, ' +
+      '`<ol>` or `<menu>` parent elements.',
   /** Description of a Lighthouse audit that tells the user *why* they should try to pass. This is displayed after a user expands the section to see more. No character length limits. 'Learn More' becomes link text to additional documentation. */
   description: 'Screen readers require list items (`<li>`) to be contained within a ' +
-      'parent `<ul>` or `<ol>` to be announced properly. ' +
+      'parent `<ul>`, `<ol>` or `<menu>` to be announced properly. ' +
       '[Learn more](https://dequeuniversity.com/rules/axe/4.4/listitem).',
 };
 

package/lighthouse-core/computed/critical-request-chains.js

@@ -117,6 +117,9 @@ class CriticalRequestChains {
       // Ignore if some ancestor is not a critical request.
       if (networkPath.some(r => !CriticalRequestChains.isCritical(r, mainResource))) return;
 
+      // Ignore non-network things (like data urls).
+      if (NetworkRequest.isNonNetworkRequest(node.record)) return;
+
       addChain(networkPath);
     }, getNextNodes);
 

package/lighthouse-core/fraggle-rock/gather/driver.js

@@ -74,7 +74,7 @@ class Driver {
     const session = await this._page.target().createCDPSession();
     this._session = this.defaultSession = new ProtocolSession(session);
     this._executionContext = new ExecutionContext(this._session);
-    this._fetcher = new Fetcher(this._session, this._executionContext);
+    this._fetcher = new Fetcher(this._session);
     log.timeEnd(status);
   }
 

package/lighthouse-core/fraggle-rock/gather/session.js

@@ -96,7 +96,7 @@ class ProtocolSession {
     /** @param {LH.Puppeteer.CDPSession} session */
     const listener = session => callback(new ProtocolSession(session));
     this._callbackMap.set(callback, listener);
-    this._session.connection().on('sessionattached', listener);
+    this._getConnection().on('sessionattached', listener);
   }
 
   /**
@@ -106,7 +106,7 @@ class ProtocolSession {
   removeSessionAttachedListener(callback) {
     const listener = this._callbackMap.get(callback);
     if (!listener) return;
-    this._session.connection().off('sessionattached', listener);
+    this._getConnection().off('sessionattached', listener);
   }
 
   /**
@@ -171,6 +171,12 @@ class ProtocolSession {
     this._session.removeAllListeners();
     await this._session.detach();
   }
+
+  _getConnection() {
+    const connection = this._session.connection();
+    if (!connection) throw new Error('Connection has been closed.');
+    return connection;
+  }
 }
 
 module.exports = ProtocolSession;

package/lighthouse-core/gather/driver.js

@@ -64,7 +64,7 @@ class Driver {
   defaultSession = this;
 
   // eslint-disable-next-line no-invalid-this
-  fetcher = new Fetcher(this.defaultSession, this.executionContext);
+  fetcher = new Fetcher(this.defaultSession);
 
   /**
    * @param {Connection} connection

package/lighthouse-core/gather/fetcher.js

@@ -6,124 +6,55 @@
 'use strict';
 
 /**
- * @fileoverview Fetcher is a utility for making requests within the context of the page.
- * Requests can circumvent CORS, and so are good for fetching source maps that may be hosted
- * on a different origin.
+ * @fileoverview Fetcher is a utility for making requests to any arbitrary resource,
+ * ignoring normal browser constraints such as CORS.
  */
 
-/* global document */
+/* global fetch */
 
 /** @typedef {{content: string|null, status: number|null}} FetchResponse */
 
-const log = require('lighthouse-logger');
-const {getBrowserVersion} = require('./driver/environment.js');
-
 class Fetcher {
   /**
    * @param {LH.Gatherer.FRProtocolSession} session
-   * @param {import('./driver/execution-context.js')} executionContext
    */
-  constructor(session, executionContext) {
+  constructor(session) {
     this.session = session;
-    this.executionContext = executionContext;
-    /** @type {Map<string, (event: LH.Crdp.Fetch.RequestPausedEvent) => void>} */
-    this._onRequestPausedHandlers = new Map();
-    this._onRequestPaused = this._onRequestPaused.bind(this);
-    this._enabled = false;
   }
 
   /**
-   * Chrome M92 and above:
-   * We use `Network.loadNetworkResource` to fetch each resource.
-   *
-   * Chrome <M92:
-   * The Fetch domain accepts patterns for controlling what requests are intercepted, but we
-   * enable the domain for all patterns and filter events at a lower level to support multiple
-   * concurrent usages. Reasons for this:
-   *
-   * 1) only one set of patterns may be applied for the entire domain.
-   * 2) every request that matches the patterns are paused and only resumes when certain Fetch
-   *    commands are sent. So a listener of the `Fetch.requestPaused` event must either handle
-   *    the requests it cares about, or explicitly allow them to continue.
-   * 3) if multiple commands to continue the same request are sent, protocol errors occur.
+   * Fetches any resource using the network directly.
    *
-   * So instead we have one global `Fetch.enable` / `Fetch.requestPaused` pair, and allow specific
-   * urls to be intercepted via `fetcher._setOnRequestPausedHandler`.
-   */
-  async enable() {
-    if (this._enabled) return;
-
-    this._enabled = true;
-    await this.session.sendCommand('Fetch.enable', {
-      patterns: [{requestStage: 'Request'}, {requestStage: 'Response'}],
-    });
-    await this.session.on('Fetch.requestPaused', this._onRequestPaused);
-  }
-
-  async disable() {
-    if (!this._enabled) return;
-
-    this._enabled = false;
-    await this.session.off('Fetch.requestPaused', this._onRequestPaused);
-    await this.session.sendCommand('Fetch.disable');
-    this._onRequestPausedHandlers.clear();
-  }
-
-  /**
    * @param {string} url
-   * @param {(event: LH.Crdp.Fetch.RequestPausedEvent) => void} handler
-   */
-  async _setOnRequestPausedHandler(url, handler) {
-    this._onRequestPausedHandlers.set(url, handler);
-  }
-
-  /**
-   * @param {LH.Crdp.Fetch.RequestPausedEvent} event
+   * @param {{timeout: number}=} options timeout is in ms
+   * @return {Promise<FetchResponse>}
    */
-  _onRequestPaused(event) {
-    const handler = this._onRequestPausedHandlers.get(event.request.url);
-    if (handler) {
-      handler(event);
-    } else {
-      // Nothing cares about this URL, so continue.
-      this.session.sendCommand('Fetch.continueRequest', {requestId: event.requestId}).catch(err => {
-        log.error('Fetcher', `Failed to continueRequest: ${err.message}`);
-      });
+  async fetchResource(url, options = {timeout: 2_000}) {
+    // In Lightrider, `Network.loadNetworkResource` is not implemented, but fetch
+    // is configured to work for any resource.
+    if (global.isLightrider) {
+      return this._wrapWithTimeout(this._fetchWithFetchApi(url), options.timeout);
     }
-  }
 
-  /**
-   * `Network.loadNetworkResource` was introduced in M88.
-   * The long timeout bug with `IO.read` was fixed in M92:
-   * https://bugs.chromium.org/p/chromium/issues/detail?id=1191757
-   * Lightrider has a bug forcing us to use the old version for now:
-   * https://docs.google.com/document/d/1V-DxgsOFMPxUuFrdGPQpyiCqSljvgNlOqXCtqDtd0b8/edit?usp=sharing&resourcekey=0-aIaIqcHFKG-0dX4MAudBEw
-   * @return {Promise<boolean>}
-   */
-  async shouldUseLegacyFetcher() {
-    const {milestone} = await getBrowserVersion(this.session);
-    return milestone < 92 || Boolean(global.isLightrider);
+    return this._fetchResourceOverProtocol(url, options);
   }
 
   /**
-   * Requires that `fetcher.enable` has been called.
-   *
-   * Fetches any resource in a way that circumvents CORS.
-   *
    * @param {string} url
-   * @param {{timeout: number}=} options timeout is in ms
    * @return {Promise<FetchResponse>}
    */
-  async fetchResource(url, options = {timeout: 2_000}) {
-    if (!this._enabled) {
-      throw new Error('Must call `enable` before using fetchResource');
-    }
+  async _fetchWithFetchApi(url) {
+    const response = await fetch(url);
 
-    if (await this.shouldUseLegacyFetcher()) {
-      return this._fetchResourceIframe(url, options);
-    }
+    let content = null;
+    try {
+      content = await response.text();
+    } catch {}
 
-    return this._fetchResourceOverProtocol(url, options);
+    return {
+      content,
+      status: response.status,
+    };
   }
 
   /**
@@ -172,18 +103,6 @@ class Fetcher {
     };
   }
 
-  /**
-   * @param {string} requestId
-   * @return {Promise<string>}
-   */
-  async _resolveResponseBody(requestId) {
-    const responseBody = await this.session.sendCommand('Fetch.getResponseBody', {requestId});
-    if (responseBody.base64Encoded) {
-      return Buffer.from(responseBody.body, 'base64').toString();
-    }
-    return responseBody.body;
-  }
-
   /**
    * @param {string} url
    * @param {{timeout: number}} options timeout is in ms
@@ -191,18 +110,7 @@ class Fetcher {
    */
   async _fetchResourceOverProtocol(url, options) {
     const startTime = Date.now();
-
-    /** @type {NodeJS.Timeout} */
-    let timeoutHandle;
-    const timeoutPromise = new Promise((_, reject) => {
-      timeoutHandle = setTimeout(reject, options.timeout, new Error('Timed out fetching resource'));
-    });
-
-    const responsePromise = this._loadNetworkResource(url);
-
-    /** @type {{stream: LH.Crdp.IO.StreamHandle|null, status: number|null}} */
-    const response = await Promise.race([responsePromise, timeoutPromise])
-      .finally(() => clearTimeout(timeoutHandle));
+    const response = await this._wrapWithTimeout(this._loadNetworkResource(url), options.timeout);
 
     const isOk = response.status && response.status >= 200 && response.status <= 299;
     if (!response.stream || !isOk) return {status: response.status, content: null};
@@ -213,105 +121,21 @@ class Fetcher {
   }
 
   /**
-   * Fetches resource by injecting an iframe into the page.
-   * @param {string} url
-   * @param {{timeout: number}} options timeout is in ms
-   * @return {Promise<FetchResponse>}
+   * @template T
+   * @param {Promise<T>} promise
+   * @param {number} ms
    */
-  async _fetchResourceIframe(url, options) {
-    /** @type {Promise<FetchResponse>} */
-    const requestInterceptionPromise = new Promise((resolve, reject) => {
-      /** @param {LH.Crdp.Fetch.RequestPausedEvent} event */
-      const handlerAsync = async event => {
-        const {requestId, responseStatusCode} = event;
-
-        // The first requestPaused event is for the request stage. Continue it.
-        if (!responseStatusCode) {
-          // Remove cookies so we aren't buying stuff on Amazon.
-          const headers = Object.entries(event.request.headers)
-            .filter(([name]) => name !== 'Cookie')
-            .map(([name, value]) => {
-              return {name, value};
-            });
-
-          await this.session.sendCommand('Fetch.continueRequest', {
-            requestId,
-            headers,
-          });
-          return;
-        }
-
-        if (responseStatusCode >= 200 && responseStatusCode <= 299) {
-          resolve({
-            status: responseStatusCode,
-            content: await this._resolveResponseBody(requestId),
-          });
-        } else {
-          resolve({status: responseStatusCode, content: null});
-        }
-
-        // Fail the request (from the page's perspective) so that the iframe never loads.
-        await this.session.sendCommand('Fetch.failRequest', {requestId, errorReason: 'Aborted'});
-      };
-      this._setOnRequestPausedHandler(url, event => handlerAsync(event).catch(reject));
-    });
-
-    /**
-     * @param {string} src
-     */
-    /* c8 ignore start */
-    function injectIframe(src) {
-      const iframe = document.createElement('iframe');
-      // Try really hard not to affect the page.
-      iframe.style.display = 'none';
-      iframe.style.visibility = 'hidden';
-      iframe.style.position = 'absolute';
-      iframe.style.top = '-1000px';
-      iframe.style.left = '-1000px';
-      iframe.style.width = '1px';
-      iframe.style.height = '1px';
-      iframe.src = src;
-      iframe.onload = iframe.onerror = () => {
-        iframe.remove();
-        iframe.onload = null;
-        iframe.onerror = null;
-      };
-      document.body.appendChild(iframe);
-    }
-    /* c8 ignore stop */
-
+  async _wrapWithTimeout(promise, ms) {
     /** @type {NodeJS.Timeout} */
-    let asyncTimeout;
-    /** @type {Promise<never>} */
+    let timeoutHandle;
     const timeoutPromise = new Promise((_, reject) => {
-      asyncTimeout = setTimeout(reject, options.timeout, new Error('Timed out fetching resource.'));
-    });
-
-    const racePromise = Promise.race([
-      timeoutPromise,
-      requestInterceptionPromise,
-    ]).finally(() => clearTimeout(asyncTimeout));
-
-    // Temporarily disable auto-attaching for this iframe.
-    await this.session.sendCommand('Target.setAutoAttach', {
-      autoAttach: false,
-      waitForDebuggerOnStart: false,
-    });
-
-    const injectionPromise = this.executionContext.evaluate(injectIframe, {
-      args: [url],
-      useIsolation: true,
+      timeoutHandle = setTimeout(reject, ms, new Error('Timed out fetching resource'));
     });
 
-    const [fetchResult] = await Promise.all([racePromise, injectionPromise]);
-
-    await this.session.sendCommand('Target.setAutoAttach', {
-      flatten: true,
-      autoAttach: true,
-      waitForDebuggerOnStart: true,
-    });
-
-    return fetchResult;
+    /** @type {Promise<T>} */
+    const wrappedPromise = await Promise.race([promise, timeoutPromise])
+      .finally(() => clearTimeout(timeoutHandle));
+    return wrappedPromise;
   }
 }
 

package/lighthouse-core/gather/gather-runner.js

@@ -183,11 +183,6 @@ class GatherRunner {
       const resetStorage = !options.settings.disableStorageReset;
       if (resetStorage) await storage.clearDataForOrigin(session, options.requestedUrl);
 
-      // Disable fetcher, in case a gatherer enabled it.
-      // This cleanup should be removed once the only usage of
-      // fetcher (fetching arbitrary URLs) is replaced by new protocol support.
-      await driver.fetcher.disable();
-
       await driver.disconnect();
     } catch (err) {
       // Ignore disconnecting error if browser was already closed.
@@ -524,12 +519,6 @@ class GatherRunner {
           await GatherRunner.populateBaseArtifacts(passContext);
           isFirstPass = false;
         }
-
-        // Disable fetcher for every pass, in case a gatherer enabled it.
-        // Noop if fetcher was never enabled.
-        // This cleanup should be removed once the only usage of
-        // fetcher (fetching arbitrary URLs) is replaced by new protocol support.
-        await driver.fetcher.disable();
       }
 
       await GatherRunner.disposeDriver(driver, options);

package/lighthouse-core/gather/gatherers/seo/robots-txt.js

@@ -7,25 +7,6 @@
 
 const FRGatherer = require('../../../fraggle-rock/gather/base-gatherer.js');
 
-/* global fetch, location */
-
-/** @return {Promise<LH.Artifacts['RobotsTxt']>} */
-/* c8 ignore start */
-async function getRobotsTxtContent() {
-  try {
-    const response = await fetch(new URL('/robots.txt', location.href).href);
-    if (!response.ok) {
-      return {status: response.status, content: null};
-    }
-
-    const content = await response.text();
-    return {status: response.status, content};
-  } catch (err) {
-    return {status: null, content: null, errorMessage: err.message};
-  }
-}
-/* c8 ignore stop */
-
 class RobotsTxt extends FRGatherer {
   /** @type {LH.Gatherer.GathererMeta} */
   meta = {
@@ -37,18 +18,8 @@ class RobotsTxt extends FRGatherer {
    * @return {Promise<LH.Artifacts['RobotsTxt']>}
    */
   async getArtifact(passContext) {
-    // Iframe fetcher still has issues with CSPs.
-    // Only use the fetcher if we are fetching over the protocol.
-    if (await passContext.driver.fetcher.shouldUseLegacyFetcher()) {
-      return passContext.driver.executionContext.evaluate(getRobotsTxtContent, {
-        args: [],
-        useIsolation: true,
-      });
-    }
-
     const {finalUrl} = passContext.baseArtifacts.URL;
     const robotsUrl = new URL('/robots.txt', finalUrl).href;
-    await passContext.driver.fetcher.enable();
     return passContext.driver.fetcher.fetchResource(robotsUrl)
       .catch(err => ({status: null, content: null, errorMessage: err.message}));
   }

package/lighthouse-core/gather/gatherers/source-maps.js

@@ -143,7 +143,6 @@ class SourceMaps extends FRGatherer {
    * @return {Promise<LH.Artifacts['SourceMaps']>}
    */
   async getArtifact(context) {
-    await context.driver.fetcher.enable();
     const eventProcessPromises = this._scriptParsedEvents
       .map((event) => this._retrieveMapFromScriptParsedEvent(context.driver, event));
     return Promise.all(eventProcessPromises);

package/lighthouse-core/index.js

@@ -94,7 +94,7 @@ lighthouse.generateConfig = generateConfig;
 lighthouse.getAuditList = Runner.getAuditList;
 lighthouse.traceCategories = require('./gather/driver.js').traceCategories;
 lighthouse.Audit = require('./audits/audit.js');
-lighthouse.Gatherer = require('./gather/gatherers/gatherer.js');
+lighthouse.Gatherer = require('./fraggle-rock/gather/base-gatherer.js');
 
 // Explicit type reference (hidden by makeComputedArtifact) for d.ts export.
 // TODO(esmodules): should be a workaround for module.export and can be removed when in esm.

package/lighthouse-core/lib/stack-packs.js

@@ -19,11 +19,10 @@ const stackPacksToInclude = [
     packId: 'wordpress',
     requiredStacks: ['js:wordpress'],
   },
-  // waiting for https://github.com/johnmichel/Library-Detector-for-Chrome/pull/193
-  // {
-  //   packId: 'ezoic',
-  //   requiredStacks: ['js:ezoic'],
-  // },
+  {
+    packId: 'ezoic',
+    requiredStacks: ['js:ezoic'],
+  },
   {
     packId: 'drupal',
     requiredStacks: ['js:drupal'],

package/lighthouse-core/lib/tracehouse/task-groups.js

@@ -50,6 +50,7 @@ const taskGroups = {
       'UpdateLayer',
       'UpdateLayerTree',
       'CompositeLayers',
+      'PrePaint', // New name for UpdateLayerTree: https://crrev.com/c/3519012
     ],
   },
   scriptParseCompile: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lighthouse",
-  "version": "9.5.0-dev.20220502",
+  "version": "9.5.0-dev.20220505",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./lighthouse-core/index.js",
   "bin": {
@@ -37,7 +37,7 @@
     "start": "yarn build-report --standalone && node ./lighthouse-cli/index.js",
     "jest": "node --experimental-vm-modules ./node_modules/jest/bin/jest.js",
     "test": "yarn diff:sample-json && yarn lint --quiet && yarn unit && yarn type-check",
-    "test-bundle": "yarn smoke --runner bundle -j=1 --retries=2",
+    "test-bundle": "yarn smoke --runner bundle --retries=2",
     "test-clients": "yarn jest \"$PWD/clients/\" && yarn jest --testMatch=\"**/clients/test/**/*-test-pptr.js\"",
     "test-viewer": "yarn unit-viewer && yarn jest --testMatch=\"**/viewer/**/*-test-pptr.js\"",
     "test-treemap": "yarn unit-treemap && yarn jest --testMatch=\"**/treemap/**/*-test-pptr.js\"",
@@ -163,7 +163,7 @@
     "pako": "^2.0.3",
     "preact": "^10.5.14",
     "pretty-json-stringify": "^0.0.2",
-    "puppeteer": "10.2.0",
+    "puppeteer": "13.7.0",
     "resolve": "^1.20.0",
     "rollup": "^2.52.7",
     "rollup-plugin-node-resolve": "^5.2.0",
@@ -190,7 +190,7 @@
     "http-link-header": "^0.8.0",
     "intl-messageformat": "^4.4.0",
     "jpeg-js": "^0.4.3",
-    "js-library-detector": "^6.4.0",
+    "js-library-detector": "^6.5.0",
     "lighthouse-logger": "^1.3.0",
     "lighthouse-stack-packs": "^1.8.1",
     "lodash": "^4.17.21",
@@ -199,7 +199,7 @@
     "open": "^8.4.0",
     "parse-cache-control": "1.0.1",
     "ps-list": "^8.0.0",
-    "puppeteer-core": "^10.2.0",
+    "puppeteer-core": "^13.7.0",
     "robots-parser": "^3.0.0",
     "semver": "^5.3.0",
     "speedline-core": "^1.4.3",

package/report/clients/bundle.js

@@ -15,3 +15,4 @@ export {DOM} from '../renderer/dom.js';
 export {ReportRenderer} from '../renderer/report-renderer.js';
 export {ReportUIFeatures} from '../renderer/report-ui-features.js';
 export {renderReport} from '../renderer/api.js';
+export {swapLocale, format} from '../../shared/localization/i18n-module.js';

package/report/test/renderer/__snapshots__/report-renderer-axe-test.js.snap

@@ -1,107 +1,15 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ReportRendererAxe with aXe renders without axe violations 2`] = `
+exports[`ReportRendererAxe with aXe renders without axe violations 1`] = `
 Array [
   Object {
-    "description": "Ensures every id attribute value is unique",
-    "help": "id attribute value must be unique",
-    "helpUrl": "https://dequeuniversity.com/rules/axe/4.4/duplicate-id?application=axeAPI",
     "id": "duplicate-id",
-    "impact": "minor",
-    "nodes": Array [
-      Object {
-        "all": Array [],
-        "any": Array [
-          Object {
-            "data": "viewport",
-            "id": "duplicate-id",
-            "impact": "minor",
-            "message": "Document has multiple static elements with the same id attribute: viewport",
-            "relatedNodes": Array [
-              Object {
-                "html": "<div class=\\"lh-audit lh-audit--binary lh-audit--pass\\" id=\\"viewport\\">",
-                "target": Array [
-                  "#seo > .lh-audit-group:nth-child(4) > .lh-clump--passed.lh-clump > .lh-audit--binary.lh-audit--pass.lh-audit:nth-child(2)",
-                ],
-              },
-              Object {
-                "html": "<div class=\\"lh-audit lh-audit--binary lh-audit--pass\\" id=\\"viewport\\">",
-                "target": Array [
-                  ".lh-audit-group--pwa-optimized > .lh-audit--binary.lh-audit--pass.lh-audit:nth-child(6)",
-                ],
-              },
-            ],
-          },
-        ],
-        "failureSummary": "Fix any of the following:
-  Document has multiple static elements with the same id attribute: viewport",
-        "html": "<div class=\\"lh-audit lh-audit--binary lh-audit--pass\\" id=\\"viewport\\">",
-        "impact": "minor",
-        "none": Array [],
-        "target": Array [
-          ".lh-audit--binary.lh-audit--pass.lh-audit:nth-child(20)",
-        ],
-      },
-      Object {
-        "all": Array [],
-        "any": Array [
-          Object {
-            "data": "image-alt",
-            "id": "duplicate-id",
-            "impact": "minor",
-            "message": "Document has multiple static elements with the same id attribute: image-alt",
-            "relatedNodes": Array [
-              Object {
-                "html": "<div class=\\"lh-audit lh-audit--binary lh-audit--fail\\" id=\\"image-alt\\">",
-                "target": Array [
-                  ".lh-audit-group--seo-content > .lh-audit--fail.lh-audit--binary.lh-audit:nth-child(3)",
-                ],
-              },
-            ],
-          },
-        ],
-        "failureSummary": "Fix any of the following:
-  Document has multiple static elements with the same id attribute: image-alt",
-        "html": "<div class=\\"lh-audit lh-audit--binary lh-audit--fail\\" id=\\"image-alt\\">",
-        "impact": "minor",
-        "none": Array [],
-        "target": Array [
-          ".lh-audit-group--a11y-names-labels > .lh-audit--fail.lh-audit--binary.lh-audit:nth-child(2)",
-        ],
-      },
-      Object {
-        "all": Array [],
-        "any": Array [
-          Object {
-            "data": "document-title",
-            "id": "duplicate-id",
-            "impact": "minor",
-            "message": "Document has multiple static elements with the same id attribute: document-title",
-            "relatedNodes": Array [
-              Object {
-                "html": "<div class=\\"lh-audit lh-audit--binary lh-audit--pass\\" id=\\"document-title\\">",
-                "target": Array [
-                  "#seo > .lh-audit-group:nth-child(4) > .lh-clump--passed.lh-clump > .lh-audit--binary.lh-audit--pass.lh-audit:nth-child(3)",
-                ],
-              },
-            ],
-          },
-        ],
-        "failureSummary": "Fix any of the following:
+    "message": "Fix any of the following:
+  Document has multiple static elements with the same id attribute: viewport
+Fix any of the following:
+  Document has multiple static elements with the same id attribute: image-alt
+Fix any of the following:
   Document has multiple static elements with the same id attribute: document-title",
-        "html": "<div class=\\"lh-audit lh-audit--binary lh-audit--pass\\" id=\\"document-title\\">",
-        "impact": "minor",
-        "none": Array [],
-        "target": Array [
-          ".lh-audit--binary.lh-audit--pass.lh-audit:nth-child(13)",
-        ],
-      },
-    ],
-    "tags": Array [
-      "cat.parsing",
-      "wcag2a",
-      "wcag411",
-    ],
   },
 ]
 `;

package/report/test/renderer/report-renderer-axe-test.js

@@ -45,6 +45,8 @@ describe('ReportRendererAxe', () => {
           'heading-order': {enabled: true},
           'meta-viewport': {enabled: true},
           'aria-treeitem-name': {enabled: true},
+          // TODO: re-enable. https://github.com/GoogleChrome/lighthouse/issues/13918
+          'color-contrast': {enabled: false},
         },
       };
 
@@ -75,21 +77,7 @@ describe('ReportRendererAxe', () => {
           message: v.nodes.map((n) => n.failureSummary).join('\n'),
         };
       });
-      expect(axeSummary).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "id": "duplicate-id",
-    "message": "Fix any of the following:
-  Document has multiple static elements with the same id attribute: viewport
-Fix any of the following:
-  Document has multiple static elements with the same id attribute: image-alt
-Fix any of the following:
-  Document has multiple static elements with the same id attribute: document-title",
-  },
-]
-`);
-
-      expect(axeResults.violations).toMatchSnapshot();
+      expect(axeSummary).toMatchSnapshot();
     },
     // This test takes 10s on fast hardware, but can take longer in CI.
     // https://github.com/dequelabs/axe-core/tree/b573b1c1/doc/examples/jest_react#timeout-issues

package/report/test-assets/faux-psi-template.html

@@ -119,7 +119,7 @@ body {
   border-width: 1px 0;
   padding: 4px;
 }
-button {
+#reanalyze {
   background-color: hsl(216deg 100% 50%);
   border-radius: 4px;
   color: white;
@@ -133,8 +133,9 @@ button {
 </head>
 <body >
   <noscript>PSI requires JavaScript. Please enable.</noscript>
+  <button type=button id="translate">→ Español</button>
   <div class="page">
-    <button type=button>Reanalyze</button>
+    <button type=button id="reanalyze">Reanalyze</button>
     <div class="tabset">
       <input type="radio" name="tabset" id="tab1" aria-controls="mobile" checked />
       <label for="tab1">Mobile</label>

package/report/test-assets/faux-psi.js

@@ -17,7 +17,12 @@ const wait = (ms = 100) => new Promise(resolve => setTimeout(resolve, ms));
 (async function __initPsiReports__() {
   renderLHReport();
 
-  document.querySelector('button')?.addEventListener('click', () => {
+  document.querySelector('button#reanalyze')?.addEventListener('click', () => {
+    renderLHReport();
+  });
+
+  document.querySelector('button#translate')?.addEventListener('click', async () => {
+    await swapLhrLocale('es');
     renderLHReport();
   });
 })();
@@ -82,6 +87,22 @@ async function renderLHReport() {
   }
 }
 
+/**
+ * @param {LH.Locale} locale
+ */
+async function swapLhrLocale(locale) {
+  const response = await fetch(`https://www.gstatic.com/pagespeed/insights/ui/locales/${locale}.json`);
+  /** @type {import('../../shared/localization/locales').LhlMessages} */
+  const lhlMessages = await response.json();
+  console.log(lhlMessages);
+  if (!lhlMessages) throw new Error(`could not fetch data for locale: ${locale}`);
+
+  lighthouseRenderer.format.registerLocaleData(locale, lhlMessages);
+  // @ts-expect-error LHR global
+  window.__LIGHTHOUSE_JSON__ = lighthouseRenderer.swapLocale(window.__LIGHTHOUSE_JSON__, locale)
+    .lhr;
+}
+
 
 /**
  * Tweak the LHR to make the desktop and mobile reports easier to identify.

package/shared/localization/locales/en-US.json

@@ -450,13 +450,13 @@
     "message": "Lists contain only `<li>` elements and script supporting elements (`<script>` and `<template>`)."
   },
   "lighthouse-core/audits/accessibility/listitem.js | description": {
-    "message": "Screen readers require list items (`<li>`) to be contained within a parent `<ul>` or `<ol>` to be announced properly. [Learn more](https://dequeuniversity.com/rules/axe/4.4/listitem)."
+    "message": "Screen readers require list items (`<li>`) to be contained within a parent `<ul>`, `<ol>` or `<menu>` to be announced properly. [Learn more](https://dequeuniversity.com/rules/axe/4.4/listitem)."
   },
   "lighthouse-core/audits/accessibility/listitem.js | failureTitle": {
-    "message": "List items (`<li>`) are not contained within `<ul>` or `<ol>` parent elements."
+    "message": "List items (`<li>`) are not contained within `<ul>`, `<ol>` or `<menu>` parent elements."
   },
   "lighthouse-core/audits/accessibility/listitem.js | title": {
-    "message": "List items (`<li>`) are contained within `<ul>` or `<ol>` parent elements"
+    "message": "List items (`<li>`) are contained within `<ul>`, `<ol>` or `<menu>` parent elements"
   },
   "lighthouse-core/audits/accessibility/meta-refresh.js | description": {
     "message": "Users do not expect a page to refresh automatically, and doing so will move focus back to the top of the page. This may create a frustrating or confusing experience. [Learn more](https://dequeuniversity.com/rules/axe/4.4/meta-refresh)."

package/shared/localization/locales/en-XL.json

@@ -450,13 +450,13 @@
     "message": "L̂íŝt́ŝ ćôńt̂áîń ôńl̂ý `<li>` êĺêḿêńt̂ś âńd̂ śĉŕîṕt̂ śûṕp̂ór̂t́îńĝ él̂ém̂én̂t́ŝ (`<script>` án̂d́ `<template>`)."
   },
   "lighthouse-core/audits/accessibility/listitem.js | description": {
-    "message": "Ŝćr̂éêń r̂éâd́êŕŝ ŕêq́ûír̂é l̂íŝt́ ît́êḿŝ (`<li>`) t́ô b́ê ćôńt̂áîńêd́ ŵít̂h́îń â ṕâŕêńt̂ `<ul>` ór̂ `<ol>` t́ô b́ê án̂ńôún̂ćêd́ p̂ŕôṕêŕl̂ý. [L̂éâŕn̂ ḿôŕê](https://dequeuniversity.com/rules/axe/4.4/listitem)."
+    "message": "Ŝćr̂éêń r̂éâd́êŕŝ ŕêq́ûír̂é l̂íŝt́ ît́êḿŝ (`<li>`) t́ô b́ê ćôńt̂áîńêd́ ŵít̂h́îń â ṕâŕêńt̂ `<ul>`, `<ol>` ór̂ `<menu>` t́ô b́ê án̂ńôún̂ćêd́ p̂ŕôṕêŕl̂ý. [L̂éâŕn̂ ḿôŕê](https://dequeuniversity.com/rules/axe/4.4/listitem)."
   },
   "lighthouse-core/audits/accessibility/listitem.js | failureTitle": {
-    "message": "L̂íŝt́ ît́êḿŝ (`<li>`) ár̂é n̂ót̂ ćôńt̂áîńêd́ ŵít̂h́îń `<ul>` ôŕ `<ol>` p̂ár̂én̂t́ êĺêḿêńt̂ś."
+    "message": "L̂íŝt́ ît́êḿŝ (`<li>`) ár̂é n̂ót̂ ćôńt̂áîńêd́ ŵít̂h́îń `<ul>`, `<ol>` ôŕ `<menu>` p̂ár̂én̂t́ êĺêḿêńt̂ś."
   },
   "lighthouse-core/audits/accessibility/listitem.js | title": {
-    "message": "L̂íŝt́ ît́êḿŝ (`<li>`) ár̂é ĉón̂t́âín̂éd̂ ẃît́ĥín̂ `<ul>` ór̂ `<ol>` ṕâŕêńt̂ él̂ém̂én̂t́ŝ"
+    "message": "L̂íŝt́ ît́êḿŝ (`<li>`) ár̂é ĉón̂t́âín̂éd̂ ẃît́ĥín̂ `<ul>`, `<ol>` ór̂ `<menu>` ṕâŕêńt̂ él̂ém̂én̂t́ŝ"
   },
   "lighthouse-core/audits/accessibility/meta-refresh.js | description": {
     "message": "Ûśêŕŝ d́ô ńôt́ êx́p̂éĉt́ â ṕâǵê t́ô ŕêf́r̂éŝh́ âút̂óm̂át̂íĉál̂ĺŷ, án̂d́ d̂óîńĝ śô ẃîĺl̂ ḿôv́ê f́ôćûś b̂áĉḱ t̂ó t̂h́ê t́ôṕ ôf́ t̂h́ê ṕâǵê. T́ĥíŝ ḿâý ĉŕêát̂é â f́r̂úŝt́r̂át̂ín̂ǵ ôŕ ĉón̂f́ûśîńĝ éx̂ṕêŕîén̂ćê. [Ĺêár̂ń m̂ór̂é](https://dequeuniversity.com/rules/axe/4.4/meta-refresh)."

package/types/externs.d.ts

@@ -149,8 +149,8 @@ export interface CliFlags extends Flags {
   quiet: boolean;
   /** A flag to print the normalized config for the given config and options, then exit. */
   printConfig: boolean;
-  /** Use the new Fraggle Rock navigation runner to gather CLI results. */
-  fraggleRock: boolean;
+  /** Use the legacy navigation runner to gather CLI results. */
+  legacyNavigation: boolean;
   /** Path to the file where precomputed lantern data should be read from. */
   precomputedLanternDataPath?: string;
   /** Path to the file where precomputed lantern data should be written to. */