lighthouse 11.7.0-dev.20240408 → 11.7.0-dev.20240410

package/cli/cli-flags.js

@@ -53,8 +53,8 @@ function getYargsParser(manualArgv) {
         'lighthouse <url> --extra-headers=./path/to/file.json',
         'Path to JSON file of HTTP Header key/value pairs to send in requests')
     .example(
-        'lighthouse <url> --only-categories=performance,pwa',
-        'Only run the specified categories. Available categories: accessibility, best-practices, performance, pwa, seo')
+        'lighthouse <url> --only-categories=performance,seo',
+        'Only run the specified categories. Available categories: accessibility, best-practices, performance, seo')
 
     // We only have the single string positional argument, the url.
     .option('_', {
@@ -188,7 +188,7 @@ function getYargsParser(manualArgv) {
         array: true,
         type: 'string',
         coerce: splitCommaSeparatedValues,
-        describe: 'Only run the specified categories. Available categories: accessibility, best-practices, performance, pwa, seo',
+        describe: 'Only run the specified categories. Available categories: accessibility, best-practices, performance, seo',
       },
       'skip-audits': {
         array: true,

package/cli/test/smokehouse/config/exclusions.js

@@ -20,6 +20,7 @@ const exclusions = {
     'redirects-client-paint-server', 'redirects-multiple-server',
     'redirects-single-server', 'redirects-single-client',
     'redirects-history-push-state', 'redirects-scripts',
+    'redirects-http',
     // Disabled because these tests use settings that cannot be fully configured in
     // DevTools (e.g. throttling method "provided").
     'metrics-tricky-tti', 'metrics-tricky-tti-late-fcp', 'screenshot',

package/cli/test/smokehouse/core-tests.js

@@ -13,6 +13,7 @@ import dbw from './test-definitions/dobetterweb.js';
 import errorsExpiredSsl from './test-definitions/errors-expired-ssl.js';
 import errorsIframeExpiredSsl from './test-definitions/errors-iframe-expired-ssl.js';
 import errorsInfiniteLoop from './test-definitions/errors-infinite-loop.js';
+import fontSize from './test-definitions/font-size.js';
 import formsAutoComplete from './test-definitions/forms-autocomplete.js';
 import fpsMax from './test-definitions/fps-max.js';
 import fpsMaxPassive from './test-definitions/fps-max-passive.js';
@@ -31,9 +32,6 @@ import metricsDelayedFcp from './test-definitions/metrics-delayed-fcp.js';
 import metricsDelayedLcp from './test-definitions/metrics-delayed-lcp.js';
 import metricsTrickyTti from './test-definitions/metrics-tricky-tti.js';
 import metricsTrickyTtiLateFcp from './test-definitions/metrics-tricky-tti-late-fcp.js';
-import offlineOnlineOnly from './test-definitions/offline-online-only.js';
-import offlineReady from './test-definitions/offline-ready.js';
-import offlineSwBroken from './test-definitions/offline-sw-broken.js';
 import oopifRequests from './test-definitions/oopif-requests.js';
 import oopifScripts from './test-definitions/oopif-scripts.js';
 import perfBudgets from './test-definitions/perf-budgets.js';
@@ -45,13 +43,9 @@ import perfFonts from './test-definitions/perf-fonts.js';
 import perfFrameMetrics from './test-definitions/perf-frame-metrics.js';
 import perfPreload from './test-definitions/perf-preload.js';
 import perfTraceElements from './test-definitions/perf-trace-elements.js';
-import pwaAirhorner from './test-definitions/pwa-airhorner.js';
-import pwaCaltrain from './test-definitions/pwa-caltrain.js';
-import pwaChromestatus from './test-definitions/pwa-chromestatus.js';
-import pwaRocks from './test-definitions/pwa-rocks.js';
-import pwaSvgomg from './test-definitions/pwa-svgomg.js';
 import redirectsClientPaintServer from './test-definitions/redirects-client-paint-server.js';
 import redirectsHistoryPushState from './test-definitions/redirects-history-push-state.js';
+import redirectsHttp from './test-definitions/redirects-http.js';
 import redirectsMultipleServer from './test-definitions/redirects-multiple-server.js';
 import redirectsScripts from './test-definitions/redirects-scripts.js';
 import redirectsSelf from './test-definitions/redirects-self.js';
@@ -77,6 +71,7 @@ const smokeTests = [
   errorsExpiredSsl,
   errorsIframeExpiredSsl,
   errorsInfiniteLoop,
+  fontSize,
   formsAutoComplete,
   fpsMax,
   fpsMaxPassive,
@@ -95,9 +90,6 @@ const smokeTests = [
   metricsDelayedLcp,
   metricsTrickyTti,
   metricsTrickyTtiLateFcp,
-  offlineOnlineOnly,
-  offlineReady,
-  offlineSwBroken,
   oopifRequests,
   oopifScripts,
   perfBudgets,
@@ -109,13 +101,9 @@ const smokeTests = [
   perfFrameMetrics,
   perfPreload,
   perfTraceElements,
-  pwaAirhorner,
-  pwaCaltrain,
-  pwaChromestatus,
-  pwaRocks,
-  pwaSvgomg,
   redirectsClientPaintServer,
   redirectsHistoryPushState,
+  redirectsHttp,
   redirectsMultipleServer,
   redirectsScripts,
   redirectsSelf,

package/cli/test/smokehouse/frontends/smokehouse-bin.js

@@ -59,7 +59,7 @@ function getDefinitionsToRun(allTestDefns, requestedIds, excludedTests) {
   } else {
     smokes = allTestDefns.filter(test => {
       // Include all tests that *include* requested id.
-      // e.g. a requested 'pwa' will match 'pwa-airhorner', 'pwa-caltrain', etc
+      // e.g. a requested 'perf' will match 'perf-preload', 'perf-trace-elements', etc
       return requestedIds.some(requestedId => test.id.includes(requestedId));
     });
     console.log(`Running ONLY smoketests for: ${smokes.map(t => t.id).join(' ')}\n`);
@@ -125,7 +125,7 @@ async function begin() {
   const rawArgv = y
     .help('help')
     .usage('node $0 [<options>] <test-ids>')
-    .example('node $0 -j=1 pwa seo', 'run pwa and seo tests serially')
+    .example('node $0 -j=1 perf seo', 'run perf and seo tests serially')
     .option('_', {
       array: true,
       type: 'string',

package/core/audits/redirects-http.d.ts

@@ -0,0 +1,19 @@
+export default RedirectsHTTP;
+/**
+ * An audit for checking if a site starting on http redirects to https. The audit
+ * is marked not applicable if the requestedUrl is already https.
+ */
+declare class RedirectsHTTP extends Audit {
+    /**
+     * @param {LH.Artifacts} artifacts
+     * @return {LH.Audit.Product}
+     */
+    static audit(artifacts: LH.Artifacts): LH.Audit.Product;
+}
+export namespace UIStrings {
+    const title: string;
+    const failureTitle: string;
+    const description: string;
+}
+import { Audit } from './audit.js';
+//# sourceMappingURL=redirects-http.d.ts.map

package/core/audits/redirects-http.js

@@ -0,0 +1,75 @@
+/**
+ * @license Copyright 2024 The Lighthouse Authors. All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+
+import {Audit} from './audit.js';
+import * as i18n from '../lib/i18n/i18n.js';
+import UrlUtils from '../lib/url-utils.js';
+
+const UIStrings = {
+  /** Title of a Lighthouse audit that provides detail on HTTP to HTTPS redirects. This descriptive title is shown to users when HTTP traffic is redirected to HTTPS. */
+  title: 'Redirects HTTP traffic to HTTPS',
+  /** Title of a Lighthouse audit that provides detail on HTTP to HTTPS redirects. This descriptive title is shown to users when HTTP traffic is not redirected to HTTPS. */
+  failureTitle: 'Does not redirect HTTP traffic to HTTPS',
+  /** Description of a Lighthouse audit that tells the user why they should direct HTTP traffic to HTTPS. 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: 'Make sure that you redirect all HTTP ' +
+    'traffic to HTTPS in order to enable secure web features for all your users. [Learn more](https://developer.chrome.com/docs/lighthouse/pwa/redirects-http/).',
+};
+
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
+
+/**
+ * An audit for checking if a site starting on http redirects to https. The audit
+ * is marked not applicable if the requestedUrl is already https.
+ */
+class RedirectsHTTP extends Audit {
+  /**
+   * @return {LH.Audit.Meta}
+   */
+  static get meta() {
+    return {
+      id: 'redirects-http',
+      title: str_(UIStrings.title),
+      failureTitle: str_(UIStrings.failureTitle),
+      description: str_(UIStrings.description),
+      requiredArtifacts: ['URL'],
+      supportedModes: ['navigation'],
+    };
+  }
+
+  /**
+   * @param {LH.Artifacts} artifacts
+   * @return {LH.Audit.Product}
+   */
+  static audit(artifacts) {
+    if (!artifacts.URL.requestedUrl) {
+      throw new Error('Missing requestedUrl');
+    }
+
+    const requestedUrl = new URL(artifacts.URL.requestedUrl);
+    const finalDisplayedUrl = new URL(artifacts.URL.finalDisplayedUrl);
+
+    // Not applicable unless starting on http.
+    const startedInsecure = requestedUrl.protocol === 'http:';
+
+    // Relax requirements on localhost.
+    const isLocalhost = UrlUtils.isLikeLocalhost(finalDisplayedUrl.hostname);
+
+    if (!startedInsecure || isLocalhost) {
+      return {
+        score: null,
+        notApplicable: true,
+      };
+    }
+
+    const endedSecure = finalDisplayedUrl.protocol === 'https:';
+    return {
+      score: Number(endedSecure),
+    };
+  }
+}
+
+export default RedirectsHTTP;
+export {UIStrings};

package/core/config/default-config.js

@@ -90,15 +90,6 @@ const UIStrings = {
   seoCrawlingGroupTitle: 'Crawling and Indexing',
   /** Description of the navigation section within the Search Engine Optimization (SEO) category. Within this section are audits with descriptive titles that highlight ways to make a website accessible to search engine crawlers. */
   seoCrawlingGroupDescription: 'To appear in search results, crawlers need access to your app.',
-  /** Title of the Progressive Web Application (PWA) category of audits. This is displayed at the top of a list of audits focused on topics related to whether or not a site is a progressive web app, e.g. responds offline, uses a service worker, is on https, etc. Also used as a label of a score gauge. */
-  pwaCategoryTitle: 'PWA',
-  /** Description of the Progressive Web Application (PWA) category. This is displayed at the top of a list of audits focused on topics related to whether or not a site is a progressive web app, e.g. responds offline, uses a service worker, is on https, etc. No character length limits. The last sentence starting with 'Learn' becomes link text to additional documentation. */
-  pwaCategoryDescription: 'These checks validate the aspects of a Progressive Web App. ' +
-  '[Learn what makes a good Progressive Web App](https://web.dev/articles/pwa-checklist).',
-  /** Description of the Progressive Web Application (PWA) manual checks category, containing a list of additional validators must be run by hand in order to check all PWA best practices. This is displayed at the top of a list of manually run audits focused on topics related to whether or not a site is a progressive web app, e.g. responds offline, uses a service worker, is on https, etc.. No character length limits. */
-  pwaCategoryManualDescription: 'These checks are required by the baseline ' +
-  '[PWA Checklist](https://web.dev/articles/pwa-checklist) but are ' +
-  'not automatically checked by Lighthouse. They do not affect your score but it\'s important that you verify them manually.',
   /** Title of the Best Practices category of audits. This is displayed at the top of a list of audits focused on topics related to following web development best practices and accepted guidelines. Also used as a label of a score gauge; try to limit to 20 characters. */
   bestPracticesCategoryTitle: 'Best Practices',
   /** Title of the Trust & Safety group of audits. This is displayed at the top of a list of audits focused on maintaining user trust and protecting security in web development. */
@@ -109,10 +100,6 @@ const UIStrings = {
   bestPracticesBrowserCompatGroupTitle: 'Browser Compatibility',
   /** Title of the General group of the Best Practices category. Within this section are the audits that don't belong to a specific group but are of general interest. */
   bestPracticesGeneralGroupTitle: 'General',
-  /** Title of the Installable section of the web app category. Within this section are audits that check if Chrome supports installing the web site as an app on their device. */
-  pwaInstallableGroupTitle: 'Installable',
-  /** Title of the "PWA Optimized" section of the web app category. Within this section are audits that check if the developer has taken advantage of features to make their web page more enjoyable and engaging for the user. */
-  pwaOptimizedGroupTitle: 'PWA Optimized',
 };
 
 const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
@@ -137,7 +124,6 @@ const defaultConfig = {
     {id: 'Inputs', gatherer: 'inputs'},
     {id: 'IFrameElements', gatherer: 'iframe-elements'},
     {id: 'ImageElements', gatherer: 'image-elements'},
-    {id: 'InstallabilityErrors', gatherer: 'installability-errors'},
     {id: 'InspectorIssues', gatherer: 'inspector-issues'},
     {id: 'JsUsage', gatherer: 'js-usage'},
     {id: 'LinkElements', gatherer: 'link-elements'},
@@ -154,7 +140,6 @@ const defaultConfig = {
     {id: 'TagsBlockingFirstPaint', gatherer: 'dobetterweb/tags-blocking-first-paint'},
     {id: 'TraceElements', gatherer: 'trace-elements'},
     {id: 'ViewportDimensions', gatherer: 'viewport-dimensions'},
-    {id: 'WebAppManifest', gatherer: 'web-app-manifest'},
 
     // Artifact copies are renamed for compatibility with legacy artifacts.
     {id: 'devtoolsLogs', gatherer: 'devtools-log-compat'},
@@ -168,6 +153,7 @@ const defaultConfig = {
   ],
   audits: [
     'is-on-https',
+    'redirects-http',
     'viewport',
     'metrics/first-contentful-paint',
     'metrics/largest-contentful-paint',
@@ -185,11 +171,6 @@ const defaultConfig = {
     'user-timings',
     'critical-request-chains',
     'redirects',
-    'installable-manifest',
-    'splash-screen',
-    'themed-omnibox',
-    'maskable-icon',
-    'content-width',
     'image-aspect-ratio',
     'image-size-responsive',
     'deprecations',
@@ -219,9 +200,6 @@ const defaultConfig = {
     'prioritize-lcp-image',
     'csp-xss',
     'script-treemap-data',
-    'manual/pwa-cross-browser',
-    'manual/pwa-page-transitions',
-    'manual/pwa-each-page-has-url',
     'accessibility/accesskeys',
     'accessibility/aria-allowed-attr',
     'accessibility/aria-allowed-role',
@@ -344,12 +322,6 @@ const defaultConfig = {
       title: str_(UIStrings.diagnosticsGroupTitle),
       description: str_(UIStrings.diagnosticsGroupDescription),
     },
-    'pwa-installable': {
-      title: str_(UIStrings.pwaInstallableGroupTitle),
-    },
-    'pwa-optimized': {
-      title: str_(UIStrings.pwaOptimizedGroupTitle),
-    },
     'a11y-best-practices': {
       title: str_(UIStrings.a11yBestPracticesGroupTitle),
       description: str_(UIStrings.a11yBestPracticesGroupDescription),
@@ -574,6 +546,7 @@ const defaultConfig = {
       auditRefs: [
         // Trust & Safety
         {id: 'is-on-https', weight: 5, group: 'best-practices-trust-safety'},
+        {id: 'redirects-http', weight: 1, group: 'best-practices-trust-safety'},
         {id: 'geolocation-on-start', weight: 1, group: 'best-practices-trust-safety'},
         {id: 'notification-on-start', weight: 1, group: 'best-practices-trust-safety'},
         {id: 'csp-xss', weight: 0, group: 'best-practices-trust-safety'},
@@ -581,6 +554,8 @@ const defaultConfig = {
         {id: 'paste-preventing-inputs', weight: 3, group: 'best-practices-ux'},
         {id: 'image-aspect-ratio', weight: 1, group: 'best-practices-ux'},
         {id: 'image-size-responsive', weight: 1, group: 'best-practices-ux'},
+        {id: 'viewport', weight: 1, group: 'best-practices-ux'},
+        {id: 'font-size', weight: 1, group: 'best-practices-ux'},
         // Browser Compatibility
         {id: 'doctype', weight: 1, group: 'best-practices-browser-compat'},
         {id: 'charset', weight: 1, group: 'best-practices-browser-compat'},
@@ -599,42 +574,25 @@ const defaultConfig = {
       manualDescription: str_(UIStrings.seoCategoryManualDescription),
       supportedModes: ['navigation', 'snapshot'],
       auditRefs: [
-        {id: 'viewport', weight: 1, group: 'seo-mobile'},
+        // Should be at least 31% of the score, such that this audit failing
+        // results in the SEO category failing.
+        // Solve for w:
+        //    w / (w + T) >= 0.31
+        // where T is the sum of all the other weights.
+        {id: 'is-crawlable', weight: 93 / 23, group: 'seo-crawl'},
         {id: 'document-title', weight: 1, group: 'seo-content'},
         {id: 'meta-description', weight: 1, group: 'seo-content'},
         {id: 'http-status-code', weight: 1, group: 'seo-crawl'},
         {id: 'link-text', weight: 1, group: 'seo-content'},
         {id: 'crawlable-anchors', weight: 1, group: 'seo-crawl'},
-        {id: 'is-crawlable', weight: 1, group: 'seo-crawl'},
         {id: 'robots-txt', weight: 1, group: 'seo-crawl'},
         {id: 'image-alt', weight: 1, group: 'seo-content'},
         {id: 'hreflang', weight: 1, group: 'seo-content'},
         {id: 'canonical', weight: 1, group: 'seo-content'},
-        {id: 'font-size', weight: 1, group: 'seo-mobile'},
         // Manual audits
         {id: 'structured-data', weight: 0},
       ],
     },
-    'pwa': {
-      title: str_(UIStrings.pwaCategoryTitle),
-      description: str_(UIStrings.pwaCategoryDescription),
-      manualDescription: str_(UIStrings.pwaCategoryManualDescription),
-      supportedModes: ['navigation'],
-      auditRefs: [
-        // Installable
-        {id: 'installable-manifest', weight: 2, group: 'pwa-installable'},
-        // PWA Optimized
-        {id: 'splash-screen', weight: 1, group: 'pwa-optimized'},
-        {id: 'themed-omnibox', weight: 1, group: 'pwa-optimized'},
-        {id: 'content-width', weight: 1, group: 'pwa-optimized'},
-        {id: 'viewport', weight: 2, group: 'pwa-optimized'},
-        {id: 'maskable-icon', weight: 1, group: 'pwa-optimized'},
-        // Manual audits
-        {id: 'pwa-cross-browser', weight: 0},
-        {id: 'pwa-page-transitions', weight: 0},
-        {id: 'pwa-each-page-has-url', weight: 0},
-      ],
-    },
   },
 };
 

package/core/gather/driver/target-manager.js

@@ -180,7 +180,7 @@ class TargetManager extends ProtocolEventEmitter {
       throw err;
     } finally {
       // Resume the target if it was paused, but if it's unnecessary, we don't care about the error.
-      await newSession.sendCommand('Runtime.runIfWaitingForDebugger').catch(() => {});
+      await newSession.sendCommandAndIgnore('Runtime.runIfWaitingForDebugger');
     }
   }
 

package/core/gather/driver/wait-for-condition.js

@@ -498,9 +498,8 @@ async function waitForFullyLoaded(session, networkMonitor, options) {
       if (await isPageHung(session)) {
         log.warn('waitFor', 'Page appears to be hung, killing JavaScript...');
         // We don't await these, as we want to exit with PAGE_HUNG
-        void session.sendCommand('Emulation.setScriptExecutionDisabled', {value: true})
-          .catch(_ => {});
-        void session.sendCommand('Runtime.terminateExecution').catch(_ => {});
+        void session.sendCommandAndIgnore('Emulation.setScriptExecutionDisabled', {value: true});
+        void session.sendCommandAndIgnore('Runtime.terminateExecution');
         throw new LighthouseError(LighthouseError.errors.PAGE_HUNG);
       }
 

package/core/gather/driver.js

@@ -26,6 +26,7 @@ const throwingSession = {
   once: throwNotConnectedFn,
   off: throwNotConnectedFn,
   sendCommand: throwNotConnectedFn,
+  sendCommandAndIgnore: throwNotConnectedFn,
   dispose: throwNotConnectedFn,
 };
 

package/core/gather/session.d.ts

@@ -40,6 +40,14 @@ export class ProtocolSession extends ProtocolSession_base implements LH.Gatherer
      * @return {Promise<LH.CrdpCommands[C]['returnType']>}
      */
     sendCommand<C extends keyof import("puppeteer-core").ProtocolMapping.Commands>(method: C, ...params: import("puppeteer-core").ProtocolMapping.Commands[C]["paramsType"]): Promise<import("puppeteer-core").ProtocolMapping.Commands[C]["returnType"]>;
+    /**
+     * Send and if there's an error response, do not reject.
+     * @template {keyof LH.CrdpCommands} C
+     * @param {C} method
+     * @param {LH.CrdpCommands[C]['paramsType']} params
+     * @return {Promise<void>}
+     */
+    sendCommandAndIgnore<C_1 extends keyof import("puppeteer-core").ProtocolMapping.Commands>(method: C_1, ...params: import("puppeteer-core").ProtocolMapping.Commands[C_1]["paramsType"]): Promise<void>;
     /**
      * Disposes of a session so that it can no longer talk to Chrome.
      * @return {Promise<void>}

package/core/gather/session.js

@@ -120,6 +120,18 @@ class ProtocolSession extends CrdpEventEmitter {
     });
   }
 
+  /**
+   * Send and if there's an error response, do not reject.
+   * @template {keyof LH.CrdpCommands} C
+   * @param {C} method
+   * @param {LH.CrdpCommands[C]['paramsType']} params
+   * @return {Promise<void>}
+   */
+  sendCommandAndIgnore(method, ...params) {
+    return this.sendCommand(method, ...params)
+      .catch(e => log.verbose('session', method, e.message)).then(_ => void 0);
+  }
+
   /**
    * Disposes of a session so that it can no longer talk to Chrome.
    * @return {Promise<void>}

package/core/lib/lantern/network-node.js

@@ -7,8 +7,32 @@
 import * as Lantern from './types/lantern.js';
 import {NetworkRequestTypes} from './lantern.js';
 import {BaseNode} from './base-node.js';
-// TODO(15841): bring impl of isNonNetworkRequest inside lantern and remove this.
-import UrlUtils from '../url-utils.js';
+
+const NON_NETWORK_SCHEMES = [
+  'blob', // @see https://developer.mozilla.org/en-US/docs/Web/API/URL/createObjectURL
+  'data', // @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs
+  'intent', // @see https://developer.chrome.com/docs/multidevice/android/intents/
+  'file', // @see https://en.wikipedia.org/wiki/File_URI_scheme
+  'filesystem', // @see https://developer.mozilla.org/en-US/docs/Web/API/FileSystem
+  'chrome-extension',
+];
+
+/**
+ * Use `NetworkRequest.isNonNetworkRequest(req)` if working with a request.
+ * Note: the `protocol` field from CDP can be 'h2', 'http', (not 'https'!) or it'll be url's scheme.
+ *   https://source.chromium.org/chromium/chromium/src/+/main:content/browser/devtools/protocol/network_handler.cc;l=598-611;drc=56d4a9a9deb30be73adcee8737c73bcb2a5ab64f
+ * However, a `new URL(href).protocol` has a colon suffix.
+ *   https://url.spec.whatwg.org/#dom-url-protocol
+ * A URL's `scheme` is specced as the `protocol` sans-colon, but isn't exposed on a URL object.
+ * This method can take all 3 of these string types as a parameter.
+ * @param {string} protocol Either a networkRequest's `protocol` per CDP or a `new URL(href).protocol`
+ * @return {boolean}
+ */
+function isNonNetworkProtocol(protocol) {
+  // Strip off any colon
+  const urlScheme = protocol.includes(':') ? protocol.slice(0, protocol.indexOf(':')) : protocol;
+  return NON_NETWORK_SCHEMES.includes(urlScheme);
+}
 
 /**
  * @template [T=any]
@@ -75,9 +99,9 @@ class NetworkNode extends BaseNode {
    */
   get isNonNetworkProtocol() {
     // The 'protocol' field in devtools a string more like a `scheme`
-    return UrlUtils.isNonNetworkProtocol(this.request.protocol) ||
+    return isNonNetworkProtocol(this.request.protocol) ||
       // But `protocol` can fail to be populated if the request fails, so fallback to scheme.
-      UrlUtils.isNonNetworkProtocol(this.request.parsedURL.scheme);
+      isNonNetworkProtocol(this.request.parsedURL.scheme);
   }
 
   /**

package/core/runner.js

@@ -199,32 +199,27 @@ class Runner {
         data: sentryContext,
       });
 
-      /** @type {LH.Artifacts} */
-      let artifacts;
       if (settings.auditMode && !settings.gatherMode) {
         // No browser required, just load the artifacts from disk.
         const path = this._getDataSavePath(settings);
-        artifacts = assetSaver.loadArtifacts(path);
-      } else {
-        const runnerStatus = {msg: 'Gather phase', id: 'lh:runner:gather'};
-        log.time(runnerStatus, 'verbose');
-
-        artifacts = await gatherFn({
-          resolvedConfig: options.resolvedConfig,
-        });
-
-        log.timeEnd(runnerStatus);
-
-        // If `gather` is run multiple times before `audit`, the timing entries for each `gather` can pollute one another.
-        // We need to clear the timing entries at the end of gathering.
-        // Set artifacts.Timing again to ensure lh:runner:gather is included.
-        artifacts.Timing = log.takeTimeEntries();
-
-        // -G means save these to disk (e.g. ./latest-run).
-        if (settings.gatherMode) {
-          const path = this._getDataSavePath(settings);
-          await assetSaver.saveArtifacts(artifacts, path);
-        }
+        return assetSaver.loadArtifacts(path);
+      }
+
+      const runnerStatus = {msg: 'Gather phase', id: 'lh:runner:gather'};
+      log.time(runnerStatus, 'verbose');
+
+      const artifacts = await gatherFn({resolvedConfig: options.resolvedConfig});
+      log.timeEnd(runnerStatus);
+
+      // If `gather` is run multiple times before `audit`, the timing entries for each `gather` can pollute one another.
+      // We need to clear the timing entries at the end of gathering.
+      // Set artifacts.Timing again to ensure lh:runner:gather is included.
+      artifacts.Timing = log.takeTimeEntries();
+
+      // -G means save these to disk (e.g. ./latest-run).
+      if (settings.gatherMode) {
+        const path = this._getDataSavePath(settings);
+        await assetSaver.saveArtifacts(artifacts, path);
       }
 
       return artifacts;