lighthouse 8.3.0-dev.20210907 → 8.3.0

package/lighthouse-core/fraggle-rock/config/validation.js

@@ -5,10 +5,6 @@
  */
 'use strict';
 
-const Audit = require('../../audits/audit.js');
-const BaseFRGatherer = require('../gather/base-gatherer.js');
-const i18n = require('../../lib/i18n/i18n.js');
-
 /**
  * @param {LH.Config.GathererDefn | LH.Config.AnyFRGathererDefn} gathererDefn
  * @return {gathererDefn is LH.Config.AnyFRGathererDefn}
@@ -38,177 +34,6 @@ function isValidArtifactDependency(dependent, dependency) {
   return true;
 }
 
-/**
- * Throws an error if the provided object does not implement the required Fraggle Rock gatherer interface.
- * @param {LH.Config.AnyFRGathererDefn} gathererDefn
- */
-function assertValidFRGatherer(gathererDefn) {
-  const gatherer = gathererDefn.instance;
-  const gathererName = gatherer.name;
-
-  if (typeof gatherer.meta !== 'object') {
-    throw new Error(`${gathererName} gatherer did not provide a meta object.`);
-  }
-
-  if (gatherer.meta.supportedModes.length === 0) {
-    throw new Error(`${gathererName} gatherer did not support any gather modes.`);
-  }
-
-  if (
-    typeof gatherer.getArtifact !== 'function' ||
-    gatherer.getArtifact === BaseFRGatherer.prototype.getArtifact
-  ) {
-    throw new Error(`${gathererName} gatherer did not define a "getArtifact" method.`);
-  }
-}
-
-/**
- * Throws an error if the provided object does not implement the required navigations interface.
- * @param {LH.Config.FRConfig['navigations']} navigationsDefn
- * @return {{warnings: string[]}}
- */
-function assertValidFRNavigations(navigationsDefn) {
-  if (!navigationsDefn || !navigationsDefn.length) return {warnings: []};
-
-  /** @type {string[]} */
-  const warnings = [];
-
-  // Assert that the first navigation has loadFailureMode fatal.
-  const firstNavigation = navigationsDefn[0];
-  if (firstNavigation.loadFailureMode !== 'fatal') {
-    const currentMode = firstNavigation.loadFailureMode;
-    const warning = [
-      `"${firstNavigation.id}" is the first navigation but had a failure mode of ${currentMode}.`,
-      `The first navigation will always be treated as loadFailureMode=fatal.`,
-    ].join(' ');
-
-    warnings.push(warning);
-    firstNavigation.loadFailureMode = 'fatal';
-  }
-
-  // Assert that navigations have unique IDs.
-  const navigationIds = navigationsDefn.map(navigation => navigation.id);
-  const duplicateId = navigationIds.find(
-    (id, i) => navigationIds.slice(i + 1).some(other => id === other)
-  );
-
-  if (duplicateId) {
-    throw new Error(`Navigation must have unique identifiers, but "${duplicateId}" was repeated.`);
-  }
-
-  return {warnings};
-}
-
-/**
- * Throws an error if the provided object does not implement the required properties of an audit
- * definition.
- * @param {LH.Config.AuditDefn} auditDefinition
- */
-function assertValidAudit(auditDefinition) {
-  const {implementation, path: auditPath} = auditDefinition;
-  const auditName = auditPath ||
-    (implementation && implementation.meta && implementation.meta.id) ||
-    'Unknown audit';
-
-  if (typeof implementation.audit !== 'function' || implementation.audit === Audit.audit) {
-    throw new Error(`${auditName} has no audit() method.`);
-  }
-
-  if (typeof implementation.meta.id !== 'string') {
-    throw new Error(`${auditName} has no meta.id property, or the property is not a string.`);
-  }
-
-  if (!i18n.isStringOrIcuMessage(implementation.meta.title)) {
-    throw new Error(`${auditName} has no meta.title property, or the property is not a string.`);
-  }
-
-  // If it'll have a ✔ or ✖ displayed alongside the result, it should have failureTitle
-  if (
-    !i18n.isStringOrIcuMessage(implementation.meta.failureTitle) &&
-    implementation.meta.scoreDisplayMode === Audit.SCORING_MODES.BINARY
-  ) {
-    throw new Error(`${auditName} has no meta.failureTitle and should.`);
-  }
-
-  if (!i18n.isStringOrIcuMessage(implementation.meta.description)) {
-    throw new Error(
-      `${auditName} has no meta.description property, or the property is not a string.`
-    );
-  } else if (implementation.meta.description === '') {
-    throw new Error(
-      `${auditName} has an empty meta.description string. Please add a description for the UI.`
-    );
-  }
-
-  if (!Array.isArray(implementation.meta.requiredArtifacts)) {
-    throw new Error(
-      `${auditName} has no meta.requiredArtifacts property, or the property is not an array.`
-    );
-  }
-}
-
-/**
- * @param {LH.Config.FRConfig['categories']} categories
- * @param {LH.Config.FRConfig['audits']} audits
- * @param {LH.Config.FRConfig['groups']} groups
- */
-function assertValidCategories(categories, audits, groups) {
-  if (!categories) {
-    return;
-  }
-
-  /** @type {Map<string, LH.Config.AuditDefn>} */
-  const auditsKeyedById = new Map((audits || []).map(audit => {
-    return [audit.implementation.meta.id, audit];
-  }));
-
-  Object.keys(categories).forEach(categoryId => {
-    categories[categoryId].auditRefs.forEach((auditRef, index) => {
-      if (!auditRef.id) {
-        throw new Error(`missing an audit id at ${categoryId}[${index}]`);
-      }
-
-      const audit = auditsKeyedById.get(auditRef.id);
-      if (!audit) {
-        throw new Error(`could not find ${auditRef.id} audit for category ${categoryId}`);
-      }
-
-      const auditImpl = audit.implementation;
-      const isManual = auditImpl.meta.scoreDisplayMode === 'manual';
-      if (categoryId === 'accessibility' && !auditRef.group && !isManual) {
-        throw new Error(`${auditRef.id} accessibility audit does not have a group`);
-      }
-
-      if (auditRef.weight > 0 && isManual) {
-        throw new Error(`${auditRef.id} is manual but has a positive weight`);
-      }
-
-      if (auditRef.group && (!groups || !groups[auditRef.group])) {
-        throw new Error(`${auditRef.id} references unknown group ${auditRef.group}`);
-      }
-    });
-  });
-}
-
-/**
- * Validate the settings after they've been built.
- * @param {LH.Config.Settings} settings
- */
-function assertValidSettings(settings) {
-  if (!settings.formFactor) {
-    throw new Error(`\`settings.formFactor\` must be defined as 'mobile' or 'desktop'. See https://github.com/GoogleChrome/lighthouse/blob/master/docs/emulation.md`);
-  }
-
-  if (!settings.screenEmulation.disabled) {
-    // formFactor doesn't control emulation. So we don't want a mismatch:
-    //   Bad mismatch A: user wants mobile emulation but scoring is configured for desktop
-    //   Bad mismtach B: user wants everything desktop and set formFactor, but accidentally not screenEmulation
-    if (settings.screenEmulation.mobile !== (settings.formFactor === 'mobile')) {
-      throw new Error(`Screen emulation mobile setting (${settings.screenEmulation.mobile}) does not match formFactor setting (${settings.formFactor}). See https://github.com/GoogleChrome/lighthouse/blob/master/docs/emulation.md`);
-    }
-  }
-}
-
 /**
  * Asserts that artifacts are in a valid dependency order that can be computed.
  *
@@ -230,26 +55,6 @@ function assertArtifactTopologicalOrder(navigations) {
   }
 }
 
-/**
- * @param {LH.Config.FRConfig} config
- * @return {{warnings: string[]}}
- */
-function assertValidConfig(config) {
-  const {warnings} = assertValidFRNavigations(config.navigations);
-
-  for (const artifactDefn of config.artifacts || []) {
-    assertValidFRGatherer(artifactDefn.gatherer);
-  }
-
-  for (const auditDefn of config.audits || []) {
-    assertValidAudit(auditDefn);
-  }
-
-  assertValidCategories(config.categories, config.audits, config.groups);
-  assertValidSettings(config.settings);
-  return {warnings};
-}
-
 /**
  * @param {string} artifactId
  * @param {string} dependencyKey
@@ -283,13 +88,7 @@ function throwInvalidArtifactDependency(artifactId, dependencyKey) {
 module.exports = {
   isFRGathererDefn,
   isValidArtifactDependency,
-  assertValidFRGatherer,
-  assertValidFRNavigations,
-  assertValidAudit,
-  assertValidCategories,
-  assertValidSettings,
   assertArtifactTopologicalOrder,
-  assertValidConfig,
   throwInvalidDependencyOrder,
   throwInvalidArtifactDependency,
 };

package/lighthouse-core/fraggle-rock/gather/base-artifacts.js

@@ -77,10 +77,6 @@ function finalizeArtifacts(baseArtifacts, gathererArtifacts) {
   artifacts.Timing = log.getTimeEntries();
   artifacts.LighthouseRunWarnings = deduplicateWarnings(warnings);
 
-  if (artifacts.PageLoadError && !artifacts.URL.finalUrl) {
-    artifacts.URL.finalUrl = artifacts.URL.requestedUrl;
-  }
-
   // Check that the runner remembered to mutate the special-case URL artifact.
   if (!artifacts.URL.requestedUrl) throw new Error('Runner did not set requestedUrl');
   if (!artifacts.URL.finalUrl) throw new Error('Runner did not set finalUrl');

package/lighthouse-core/fraggle-rock/gather/navigation-runner.js

@@ -88,7 +88,6 @@ async function _navigate(navigationContext) {
   try {
     const {finalUrl, warnings} = await gotoURL(driver, requestedUrl, {
       ...navigationContext.navigation,
-      debugNavigation: config.settings.debugNavigation,
       maxWaitForFcp: config.settings.maxWaitForFcp,
       maxWaitForLoad: config.settings.maxWaitForLoad,
       waitUntil: navigationContext.navigation.pauseAfterFcpMs ? ['fcp', 'load'] : ['load'],
@@ -105,9 +104,9 @@ async function _navigate(navigationContext) {
 /**
  * @param {NavigationContext} navigationContext
  * @param {PhaseState} phaseState
- * @return {Promise<{devtoolsLog: LH.DevtoolsLog, records: Array<LH.Artifacts.NetworkRequest>} | undefined>}
+ * @return {Promise<Array<LH.Artifacts.NetworkRequest> | undefined>}
  */
-async function _collectNetworkData(navigationContext, phaseState) {
+async function _collectNetworkRecords(navigationContext, phaseState) {
   const devtoolsLogArtifactDefn = phaseState.artifactDefinitions.find(
     definition => definition.gatherer.instance.meta.symbol === DevtoolsLog.symbol
   );
@@ -119,7 +118,7 @@ async function _collectNetworkData(navigationContext, phaseState) {
 
   const devtoolsLog = await phaseState.artifactState.getArtifact[devtoolsLogArtifactId];
   const records = await NetworkRecords.request(devtoolsLog, navigationContext);
-  return {devtoolsLog, records};
+  return records;
 }
 
 /**
@@ -137,12 +136,12 @@ async function _computeNavigationResult(
 ) {
   const {navigationError, finalUrl} = navigateResult;
   const warnings = [...setupResult.warnings, ...navigateResult.warnings];
-  const networkData = await _collectNetworkData(navigationContext, phaseState);
-  const pageLoadError = networkData
+  const networkRecords = await _collectNetworkRecords(navigationContext, phaseState);
+  const pageLoadError = networkRecords
     ? getPageLoadError(navigationError, {
       url: finalUrl,
       loadFailureMode: navigationContext.navigation.loadFailureMode,
-      networkRecords: networkData.records,
+      networkRecords,
     })
     : navigationError;
 
@@ -151,15 +150,10 @@ async function _computeNavigationResult(
     const localizedMessage = i18n.getFormatted(pageLoadError.friendlyMessage, locale);
     log.error('NavigationRunner', localizedMessage, navigationContext.requestedUrl);
 
-    /** @type {Partial<LH.GathererArtifacts>} */
-    const artifacts = {};
-    const pageLoadErrorId = `pageLoadError-${navigationContext.navigation.id}`;
-    if (networkData) artifacts.devtoolsLogs = {[pageLoadErrorId]: networkData.devtoolsLog};
-
     return {
       finalUrl,
       pageLoadError,
-      artifacts,
+      artifacts: {},
       warnings: [...warnings, pageLoadError.friendlyMessage],
     };
   } else {
@@ -217,12 +211,11 @@ async function _navigations({driver, config, requestedUrl, computedCache}) {
       computedCache,
     };
 
-    let shouldHaltNavigations = false;
     const navigationResult = await _navigation(navigationContext);
     if (navigation.loadFailureMode === 'fatal') {
       if (navigationResult.pageLoadError) {
         artifacts.PageLoadError = navigationResult.pageLoadError;
-        shouldHaltNavigations = true;
+        break;
       }
 
       artifacts.URL = {requestedUrl, finalUrl: navigationResult.finalUrl};
@@ -230,7 +223,6 @@ async function _navigations({driver, config, requestedUrl, computedCache}) {
 
     LighthouseRunWarnings.push(...navigationResult.warnings);
     Object.assign(artifacts, navigationResult.artifacts);
-    if (shouldHaltNavigations) break;
   }
 
   return {artifacts: {...artifacts, LighthouseRunWarnings}};

package/lighthouse-core/fraggle-rock/gather/runner-helpers.js

@@ -22,8 +22,6 @@
 
 /** @typedef {LH.Gatherer.FRTransitionalContext<LH.Gatherer.DependencyKey>['dependencies']} Dependencies */
 
-const log = require('lighthouse-logger');
-
 /**
  *
  * @param {{id: string}} dependency
@@ -77,8 +75,6 @@ async function collectPhaseArtifacts(options) {
   const priorPhaseArtifacts = (priorPhase && artifactState[priorPhase]) || {};
 
   for (const artifactDefn of artifactDefinitions) {
-    const logLevel = phase === 'getArtifact' ? 'log' : 'verbose';
-    log[logLevel](`artifacts:${phase}`, artifactDefn.id);
     const gatherer = artifactDefn.gatherer.instance;
 
     const priorArtifactPromise = priorPhaseArtifacts[artifactDefn.id] || Promise.resolve();

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

@@ -5,12 +5,8 @@
  */
 'use strict';
 
-const LHError = require('../../lib/lh-error.js');
 const SessionEmitMonkeypatch = Symbol('monkeypatch');
 
-// Controls how long to wait for a response after sending a DevTools protocol command.
-const DEFAULT_PROTOCOL_TIMEOUT = 30000;
-
 /** @implements {LH.Gatherer.FRProtocolSession} */
 class ProtocolSession {
   /**
@@ -18,8 +14,6 @@ class ProtocolSession {
    */
   constructor(session) {
     this._session = session;
-    /** @type {number|undefined} */
-    this._nextProtocolTimeout = undefined;
 
     // FIXME: Monkeypatch puppeteer to be able to listen to *all* protocol events.
     // This patched method will now emit a copy of every event on `*`.
@@ -38,21 +32,21 @@ class ProtocolSession {
    * @return {boolean}
    */
   hasNextProtocolTimeout() {
-    return this._nextProtocolTimeout !== undefined;
+    return false;
   }
 
   /**
    * @return {number}
    */
   getNextProtocolTimeout() {
-    return this._nextProtocolTimeout || DEFAULT_PROTOCOL_TIMEOUT;
+    return Number.MAX_SAFE_INTEGER;
   }
 
   /**
    * @param {number} ms
    */
-  setNextProtocolTimeout(ms) {
-    this._nextProtocolTimeout = ms;
+  setNextProtocolTimeout(ms) { // eslint-disable-line no-unused-vars
+    // TODO(FR-COMPAT): support protocol timeout
   }
 
   /**
@@ -108,26 +102,7 @@ class ProtocolSession {
    * @return {Promise<LH.CrdpCommands[C]['returnType']>}
    */
   sendCommand(method, ...params) {
-    const timeoutMs = this.getNextProtocolTimeout();
-    this._nextProtocolTimeout = undefined;
-
-    /** @type {NodeJS.Timer|undefined} */
-    let timeout;
-    const timeoutPromise = new Promise((resolve, reject) => {
-      if (timeoutMs === Infinity) return;
-
-      timeout = setTimeout((() => {
-        const err = new LHError(LHError.errors.PROTOCOL_TIMEOUT, {protocolMethod: method});
-        reject(err);
-      }), timeoutMs);
-    });
-
-    const resultPromise = this._session.send(method, ...params);
-    const resultWithTimeoutPromise = Promise.race([resultPromise, timeoutPromise]);
-
-    return resultWithTimeoutPromise.finally(() => {
-      if (timeout) clearTimeout(timeout);
-    });
+    return this._session.send(method, ...params);
   }
 }
 

package/lighthouse-core/gather/driver/navigation.js

@@ -6,7 +6,7 @@
 'use strict';
 
 const NetworkMonitor = require('./network-monitor.js');
-const {waitForFullyLoaded, waitForFrameNavigated, waitForUserToContinue} = require('./wait-for-condition.js'); // eslint-disable-line max-len
+const {waitForFullyLoaded, waitForFrameNavigated} = require('./wait-for-condition.js');
 const constants = require('../../config/constants.js');
 const i18n = require('../../lib/i18n/i18n.js');
 const URL = require('../../lib/url-shim.js');
@@ -39,7 +39,7 @@ const DEFAULT_NETWORK_QUIET_THRESHOLD = 5000;
 // Controls how long to wait between longtasks before determining the CPU is idle, off by default
 const DEFAULT_CPU_QUIET_THRESHOLD = 0;
 
-/** @typedef {{waitUntil: Array<'fcp'|'load'|'navigated'>} & LH.Config.SharedPassNavigationJson & Partial<Pick<LH.Config.Settings, 'maxWaitForFcp'|'maxWaitForLoad'|'debugNavigation'>>} NavigationOptions */
+/** @typedef {{waitUntil: Array<'fcp'|'load'|'navigated'>} & LH.Config.SharedPassNavigationJson & Partial<Pick<LH.Config.Settings, 'maxWaitForFcp'|'maxWaitForLoad'>>} NavigationOptions */
 
 /** @param {NavigationOptions} options */
 function resolveWaitForFullyLoadedOptions(options) {
@@ -121,10 +121,6 @@ async function gotoURL(driver, url, options) {
   await waitforPageNavigateCmd;
   await networkMonitor.disable();
 
-  if (options.debugNavigation) {
-    await waitForUserToContinue(driver);
-  }
-
   return {
     finalUrl,
     warnings: getNavigationWarnings({timedOut, finalUrl, requestedUrl: url}),
@@ -142,7 +138,10 @@ function getNavigationWarnings(navigation) {
 
   if (navigation.timedOut) warnings.push(str_(UIStrings.warningTimeout));
 
-  if (!URL.equalWithExcludedFragments(requestedUrl, finalUrl)) {
+  if (
+    !URL.equalWithExcludedFragments(requestedUrl, finalUrl) &&
+    !finalUrl.startsWith('chrome-error://')
+  ) {
     warnings.push(str_(UIStrings.warningRedirected, {
       requested: requestedUrl,
       final: finalUrl,

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

@@ -490,32 +490,6 @@ async function waitForFullyLoaded(session, networkMonitor, options) {
   return cleanupFn();
 }
 
-/**
- * @param {LH.Gatherer.FRTransitionalDriver} driver
- */
-function waitForUserToContinue(driver) {
-  /* c8 ignore start */
-  function createInPagePromise() {
-    let resolve = () => {};
-    /** @type {Promise<void>} */
-    const promise = new Promise(r => resolve = r);
-
-    // eslint-disable-next-line no-console
-    console.log([
-      `You have enabled Lighthouse navigation debug mode.`,
-      `When you have finished inspecting the page, evaluate "continueLighthouseRun()"`,
-      `in the console to continue with the Lighthouse run.`,
-    ].join(' '));
-
-    window.continueLighthouseRun = resolve;
-    return promise;
-  }
-  /* c8 ignore stop */
-
-  driver.defaultSession.setNextProtocolTimeout(2 ** 31 - 1);
-  return driver.executionContext.evaluate(createInPagePromise, {args: []});
-}
-
 module.exports = {
   waitForNothing,
   waitForFrameNavigated,
@@ -524,5 +498,4 @@ module.exports = {
   waitForNetworkIdle,
   waitForCPUIdle,
   waitForFullyLoaded,
-  waitForUserToContinue,
 };

package/lighthouse-core/gather/fetcher.js

@@ -92,19 +92,6 @@ class Fetcher {
     }
   }
 
-  /**
-   * `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);
-  }
-
   /**
    * Requires that `fetcher.enable` has been called.
    *
@@ -119,11 +106,14 @@ class Fetcher {
       throw new Error('Must call `enable` before using fetchResource');
     }
 
-    if (await this.shouldUseLegacyFetcher()) {
-      return this._fetchResourceIframe(url, options);
+    // `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
+    const {milestone} = await getBrowserVersion(this.session);
+    if (milestone >= 92) {
+      return await this._fetchResourceOverProtocol(url, options);
     }
-
-    return this._fetchResourceOverProtocol(url, options);
+    return await this._fetchResourceIframe(url, options);
   }
 
   /**

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

@@ -74,7 +74,6 @@ class GatherRunner {
       const {finalUrl, warnings} = await navigation.gotoURL(driver, requestedUrl, {
         waitUntil: passContext.passConfig.recordTrace ?
           ['load', 'fcp'] : ['load'],
-        debugNavigation: passContext.settings.debugNavigation,
         maxWaitForFcp: passContext.settings.maxWaitForFcp,
         maxWaitForLoad: passContext.settings.maxWaitForLoad,
         ...passContext.passConfig,

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

@@ -6,6 +6,7 @@
 'use strict';
 
 const FRGatherer = require('../../../fraggle-rock/gather/base-gatherer.js');
+const {getBrowserVersion} = require('../../driver/environment.js');
 
 /* global fetch, location */
 
@@ -37,9 +38,12 @@ class RobotsTxt extends FRGatherer {
    * @return {Promise<LH.Artifacts['RobotsTxt']>}
    */
   async getArtifact(passContext) {
+    const {milestone} = await getBrowserVersion(passContext.driver.defaultSession);
+
+    // TODO: Remove when 92 hits stable.
     // Iframe fetcher still has issues with CSPs.
-    // Only use the fetcher if we are fetching over the protocol.
-    if (await passContext.driver.fetcher.shouldUseLegacyFetcher()) {
+    // Only use the fetcher if we are fetching over the CDP.
+    if (milestone < 92) {
       return passContext.driver.executionContext.evaluate(getRobotsTxtContent, {
         args: [],
         useIsolation: true,

package/lighthouse-core/gather/gatherers/seo/tap-targets.js

@@ -205,7 +205,7 @@ function gatherTapTargets(tapTargetsSelector, className) {
 
   /** @type {{
     tapTargetElement: Element,
-    clientRects: LH.Artifacts.Rect[]
+    clientRects: ClientRect[]
   }[]} */
   const tapTargetsWithClientRects = [];
   tapTargetElements.forEach(tapTargetElement => {
@@ -238,7 +238,7 @@ function gatherTapTargets(tapTargetsSelector, className) {
 
   /** @type {{
     tapTargetElement: Element,
-    visibleClientRects: LH.Artifacts.Rect[]
+    visibleClientRects: ClientRect[]
   }[]} */
   const tapTargetsWithVisibleClientRects = [];
   // We use separate loop here to get visible client rects because that involves

package/lighthouse-core/gather/gatherers/stacks.js

@@ -120,7 +120,7 @@ class Stacks extends FRGatherer {
    * @param {LH.Gatherer.FRTransitionalContext} context
    * @return {Promise<LH.Artifacts['Stacks']>}
    */
-  async getArtifact(context) {
+  async snapshot(context) {
     return Stacks.collectStacks(context.driver.executionContext);
   }
 }

package/lighthouse-core/lib/asset-saver.js

@@ -142,7 +142,7 @@ function saveLhr(lhr, basePath) {
 /**
  * Filter traces and extract screenshots to prepare for saving.
  * @param {LH.Artifacts} artifacts
- * @param {LH.Result['audits']} [audits]
+ * @param {LH.Audit.Results} [audits]
  * @return {Promise<Array<PreparedAssets>>}
  */
 async function prepareAssets(artifacts, audits) {
@@ -272,7 +272,7 @@ async function saveLanternDebugTraces(pathWithBasename) {
 /**
  * Writes trace(s) and associated asset(s) to disk.
  * @param {LH.Artifacts} artifacts
- * @param {LH.Result['audits']} audits
+ * @param {LH.Audit.Results} audits
  * @param {string} pathWithBasename
  * @return {Promise<void>}
  */

package/lighthouse-core/lib/cdt/SDK.js

@@ -46,7 +46,6 @@ SDK.TextSourceMap.prototype.mappings = function() {
 };
 
 const originalReversedMappings = SDK.TextSourceMap.prototype._reversedMappings;
-/** @param {string} sourceURL */
 SDK.TextSourceMap.prototype._reversedMappings = function(sourceURL) {
   const mappings = originalReversedMappings.call(this, sourceURL);
   extendArray(mappings);

package/lighthouse-core/lib/csp-evaluator.js

@@ -28,11 +28,12 @@ const UIStrings = {
   missingScriptSrc: 'script-src directive is missing. ' +
     'This can allow the execution of unsafe scripts.',
   /** Message shown when a CSP does not have a script-src directive. Shown in a table with a list of other CSP vulnerabilities and suggestions. "CSP" stands for "Content Security Policy". "object-src" and "'none'" do not need to be translated. */
-  missingObjectSrc: 'Missing object-src allows the injection of plugins ' +
-    'that execute unsafe scripts. Consider setting object-src to \'none\' if you can.',
+  missingObjectSrc: 'Elements controlled by object-src are considered legacy features. ' +
+    'Consider setting object-src to \'none\' to prevent the injection of ' +
+    'plugins that execute unsafe scripts.',
   /** Message shown when a CSP uses a domain allowlist to filter out malicious scripts. Shown in a table with a list of other CSP vulnerabilities and suggestions. "CSP" stands for "Content Security Policy". "CSP", "'strict-dynamic'", "nonces", and "hashes" do not need to be translated. "allowlists" can be interpreted as "whitelist". */
   strictDynamic: 'Host allowlists can frequently be bypassed. Consider using ' +
-    'CSP nonces or hashes instead, along with \'strict-dynamic\' if necessary.',
+    '\'strict-dynamic\' in combination with CSP nonces or hashes.',
   /** Message shown when a CSP allows inline scripts to be run in the page. Shown in a table with a list of other CSP vulnerabilities and suggestions. "CSP" stands for "Content Security Policy". "CSP", "'unsafe-inline'", "nonces", and "hashes" do not need to be translated. */
   unsafeInline: '\'unsafe-inline\' allows the execution of unsafe in-page scripts ' +
     'and event handlers. Consider using CSP nonces or hashes to allow scripts individually.',
@@ -75,18 +76,6 @@ const UIStrings = {
   /** Message shown when a CSP uses the deprecated disown-opener directive. Shown in a table with a list of other CSP vulnerabilities and suggestions. "CSP" stands for "Content Security Policy". "disown-opener", "CSP3" and "Cross-Origin-Opener-Policy" do not need to be translated. */
   deprecatedDisownOpener: 'disown-opener is deprecated since CSP3. ' +
     'Please, use the Cross-Origin-Opener-Policy header instead.',
-  /**
-   * @description Message shown when a CSP wildcard allows unsafe scripts to be run in the page. Shown in a table with a list of other CSP vulnerabilities and suggestions. "CSP" stands for "Content Security Policy".
-   *  @example {*} keyword
-   */
-  plainWildcards: 'Avoid using plain wildcards ({keyword}) in this directive. ' +
-    'Plain wildcards allow scripts to be sourced from an unsafe domain.',
-  /**
-   * @description Message shown when a CSP URL scheme allows unsafe scripts to be run in the page. Shown in a table with a list of other CSP vulnerabilities and suggestions. "CSP" stands for "Content Security Policy".
-   *  @example {https:} keyword
-   */
-  plainUrlScheme: 'Avoid using plain URL schemes ({keyword}) in this directive. ' +
-    'Plain URL schemes allow scripts to be sourced from an unsafe domain.',
 };
 
 const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
@@ -102,8 +91,6 @@ const FINDING_TO_UI_STRING = {
     [Directive.OBJECT_SRC]: str_(UIStrings.missingObjectSrc),
   },
   [Type.SCRIPT_UNSAFE_INLINE]: str_(UIStrings.unsafeInline),
-  [Type.PLAIN_WILDCARD]: UIStrings.plainWildcards,
-  [Type.PLAIN_URL_SCHEMES]: UIStrings.plainUrlScheme,
   [Type.NONCE_LENGTH]: str_(UIStrings.nonceLength),
   [Type.NONCE_CHARSET]: str_(UIStrings.nonceCharset),
   [Type.DEPRECATED_DIRECTIVE]: {