core: deprecate passes, remove config navigations from FR

lighthouse-cli/test/cli/__snapshots__/index-test.js.snap

@@ -1494,9 +1494,11 @@ Object {
   "settings": Object {
     "additionalTraceCategories": null,
     "auditMode": false,
+    "blankPage": "about:blank",
     "blockedUrlPatterns": null,
     "budgets": null,
     "channel": "cli",
+    "cpuQuietThresholdMs": 1000,
     "debugNavigation": false,
     "disableStorageReset": false,
     "emulatedUserAgent": "Mozilla/5.0 (Linux; Android 7.0; Moto G (4)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4695.0 Mobile Safari/537.36 Chrome-Lighthouse",
@@ -1506,11 +1508,14 @@ Object {
     "locale": "en-US",
     "maxWaitForFcp": 30000,
     "maxWaitForLoad": 45000,
+    "networkQuietThresholdMs": 1000,
     "onlyAudits": null,
     "onlyCategories": null,
     "output": Array [
       "html",
     ],
+    "pauseAfterFcpMs": 1000,
+    "pauseAfterLoadMs": 1000,
     "precomputedLanternData": null,
     "screenEmulation": Object {
       "deviceScaleFactor": 2.625,
@@ -1657,9 +1662,11 @@ Object {
   "settings": Object {
     "additionalTraceCategories": null,
     "auditMode": true,
+    "blankPage": "about:blank",
     "blockedUrlPatterns": null,
     "budgets": null,
     "channel": "cli",
+    "cpuQuietThresholdMs": 1000,
     "debugNavigation": false,
     "disableStorageReset": false,
     "emulatedUserAgent": "Mozilla/5.0 (Linux; Android 7.0; Moto G (4)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4695.0 Mobile Safari/537.36 Chrome-Lighthouse",
@@ -1669,13 +1676,16 @@ Object {
     "locale": "en-US",
     "maxWaitForFcp": 30000,
     "maxWaitForLoad": 45000,
+    "networkQuietThresholdMs": 1000,
     "onlyAudits": Array [
       "metrics",
     ],
     "onlyCategories": null,
     "output": Array [
       "json",
     ],
+    "pauseAfterFcpMs": 1000,
+    "pauseAfterLoadMs": 1000,
     "precomputedLanternData": null,
     "screenEmulation": Object {
       "deviceScaleFactor": 2.625,

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

@@ -41,20 +41,6 @@ async function runLighthouse(url, configJson, testRunnerOptions = {}) {
     .finally(() => !isDebug && fs.rm(tmpPath, {recursive: true, force: true}));
 }
 
-/**
- * @param {LH.Config.Json=} configJson
- * @return {LH.Config.Json|undefined}
- */
-function convertToFraggleRockConfig(configJson) {
-  if (!configJson) return configJson;
-  if (!configJson.passes) return configJson;
-
-  return {
-    ...configJson,
-    navigations: configJson.passes.map(pass => ({...pass, id: pass.passName})),
-  };
-}
-
 /**
  * Internal runner.
  * @param {string} url
@@ -83,7 +69,6 @@ async function internalRun(url, tmpPath, configJson, options) {
 
   if (useFraggleRock) {
     args.push('--fraggle-rock');
-    configJson = convertToFraggleRockConfig(configJson);
   }
 
   // Config can be optionally provided.

lighthouse-cli/test/smokehouse/smokehouse.js

@@ -118,17 +118,38 @@ function purpleify(str) {
   return `${log.purple}${str}${log.reset}`;
 }
 
+/**
+ * @param {LH.Config.Json=} configJson
+ * @return {LH.Config.Json|undefined}
+ */
+function convertToFraggleRockConfig(configJson) {
+  if (!configJson) return configJson;
+  if (!configJson.passes) return configJson;
+
+  const settings = {...configJson.settings, ...configJson.passes[0]};
+
+  return {
+    ...configJson,
+    settings,
+  };
+}
+
 /**
  * Run Lighthouse in the selected runner.
  * @param {Smokehouse.TestDfn} smokeTestDefn
  * @param {{isDebug?: boolean, useFraggleRock?: boolean, retries: number, lighthouseRunner: Smokehouse.LighthouseRunner, takeNetworkRequestUrls?: () => string[]}} testOptions
  * @return {Promise<SmokehouseResult>}
  */
 async function runSmokeTest(smokeTestDefn, testOptions) {
-  const {id, config: configJson, expectations} = smokeTestDefn;
+  const {id, expectations} = smokeTestDefn;
   const {lighthouseRunner, retries, isDebug, useFraggleRock, takeNetworkRequestUrls} = testOptions;
   const requestedUrl = expectations.lhr.requestedUrl;
 
+  let configJson = smokeTestDefn.config;
+  if (useFraggleRock) {
+    configJson = convertToFraggleRockConfig(configJson);
+  }
+
   console.log(`${purpleify(id)} smoketest starting…`);
 
   // Rerun test until there's a passing result or retries are exhausted to prevent flakes.

lighthouse-core/config/constants.js

@@ -119,6 +119,14 @@ const defaultSettings = {
   onlyAudits: null,
   onlyCategories: null,
   skipAudits: null,
+
+  // The following settings are from SharedPassNavigationJson
+  // They are historically defined on a legacy pass but have been moved here as part of FR.
+  pauseAfterFcpMs: 1000,
+  pauseAfterLoadMs: 1000,
+  networkQuietThresholdMs: 1000,
+  cpuQuietThresholdMs: 1000,
+  blankPage: 'about:blank',
 };
 
 /** @type {LH.Config.Pass} */

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

@@ -70,7 +70,7 @@ function resolveExtensions(configJSON) {
     throw new Error('`lighthouse:default` is the only valid extension method.');
   }
 
-  const {artifacts, navigations, ...extensionJSON} = configJSON;
+  const {artifacts, ...extensionJSON} = configJSON;
   const defaultClone = deepCloneConfigJson(defaultConfig);
   const mergedConfig = mergeConfigFragment(defaultClone, extensionJSON);
 
@@ -79,11 +79,6 @@ function resolveExtensions(configJSON) {
     artifacts,
     artifact => artifact.id
   );
-  mergedConfig.navigations = mergeConfigFragmentArrayByKey(
-    defaultClone.navigations,
-    navigations,
-    navigation => navigation.id
-  );
 
   return mergedConfig;
 }
@@ -204,39 +199,33 @@ function overrideNavigationThrottlingWindows(navigation, settings) {
 }
 
 /**
- *
- * @param {LH.Config.NavigationJson[]|null|undefined} navigations
  * @param {LH.Config.AnyArtifactDefn[]|null|undefined} artifactDefns
  * @param {LH.Config.Settings} settings
  * @return {LH.Config.NavigationDefn[] | null}
  */
-function resolveNavigationsToDefns(navigations, artifactDefns, settings) {
-  if (!navigations) return null;
+function resolveFakeNavigations(artifactDefns, settings) {
   if (!artifactDefns) throw new Error('Cannot use navigations without defining artifacts');
 
   const status = {msg: 'Resolve navigation definitions', id: 'lh:config:resolveNavigationsToDefns'};
   log.time(status, 'verbose');
 
-  const artifactsById = new Map(artifactDefns.map(defn => [defn.id, defn]));
-
-  const navigationDefns = navigations.map(navigation => {
-    const navigationWithDefaults = {...defaultNavigationConfig, ...navigation};
-    const navId = navigationWithDefaults.id;
-    const artifacts = navigationWithDefaults.artifacts.map(id => {
-      const artifact = artifactsById.get(id);
-      if (!artifact) throw new Error(`Unrecognized artifact "${id}" in navigation "${navId}"`);
-      return artifact;
-    });
+  const resolvedNavigation = {
+    ...defaultNavigationConfig,
+    artifacts: artifactDefns,
+    pauseAfterFcpMs: settings.pauseAfterFcpMs,
+    pauseAfterLoadMs: settings.pauseAfterLoadMs,
+    networkQuietThresholdMs: settings.networkQuietThresholdMs,
+    cpuQuietThresholdMs: settings.cpuQuietThresholdMs,
+    blankPage: settings.blankPage,
+  };
 
-    const resolvedNavigation = {...navigationWithDefaults, artifacts};
-    overrideNavigationThrottlingWindows(resolvedNavigation, settings);
-    return resolvedNavigation;
-  });
+  overrideNavigationThrottlingWindows(resolvedNavigation, settings);
 
-  assertArtifactTopologicalOrder(navigationDefns);
+  const navigations = [resolvedNavigation];
+  assertArtifactTopologicalOrder(navigations);
 
   log.timeEnd(status);
-  return navigationDefns;
+  return navigations;
 }
 
 /**
@@ -257,7 +246,8 @@ function initializeConfig(configJSON, context) {
   overrideSettingsForGatherMode(settings, context);
 
   const artifacts = resolveArtifactsToDefns(configWorkingCopy.artifacts, configDir);
-  const navigations = resolveNavigationsToDefns(configWorkingCopy.navigations, artifacts, settings);
+
+  const navigations = resolveFakeNavigations(artifacts, settings);
 
   /** @type {LH.Config.FRConfig} */
   let config = {

lighthouse-core/fraggle-rock/config/default-config.js

@@ -98,7 +98,6 @@ const defaultConfig = {
     {id: artifacts.EmbeddedContent, gatherer: 'seo/embedded-content'},
     {id: artifacts.FontSize, gatherer: 'seo/font-size'},
     {id: artifacts.Inputs, gatherer: 'inputs'},
-    {id: artifacts.FullPageScreenshot, gatherer: 'full-page-screenshot'},
     {id: artifacts.GlobalListeners, gatherer: 'global-listeners'},
     {id: artifacts.IFrameElements, gatherer: 'iframe-elements'},
     {id: artifacts.ImageElements, gatherer: 'image-elements'},
@@ -128,62 +127,9 @@ const defaultConfig = {
     // Artifact copies are renamed for compatibility with legacy artifacts.
     {id: artifacts.devtoolsLogs, gatherer: 'devtools-log-compat'},
     {id: artifacts.traces, gatherer: 'trace-compat'},
-  ],
-  navigations: [
-    {
-      id: 'default',
-      pauseAfterFcpMs: 1000,
-      pauseAfterLoadMs: 1000,
-      networkQuietThresholdMs: 1000,
-      cpuQuietThresholdMs: 1000,
-      artifacts: [
-        // Artifacts which can be depended on come first.
-        artifacts.DevtoolsLog,
-        artifacts.Trace,
-
-        artifacts.Accessibility,
-        artifacts.AnchorElements,
-        artifacts.CacheContents,
-        artifacts.ConsoleMessages,
-        artifacts.CSSUsage,
-        artifacts.Doctype,
-        artifacts.DOMStats,
-        artifacts.EmbeddedContent,
-        artifacts.FontSize,
-        artifacts.Inputs,
-        artifacts.GlobalListeners,
-        artifacts.IFrameElements,
-        artifacts.ImageElements,
-        artifacts.InstallabilityErrors,
-        artifacts.InspectorIssues,
-        artifacts.JsUsage,
-        artifacts.LinkElements,
-        artifacts.MainDocumentContent,
-        artifacts.MetaElements,
-        artifacts.NetworkUserAgent,
-        artifacts.OptimizedImages,
-        artifacts.PasswordInputsWithPreventedPaste,
-        artifacts.ResponseCompression,
-        artifacts.RobotsTxt,
-        artifacts.ServiceWorker,
-        artifacts.ScriptElements,
-        artifacts.Scripts,
-        artifacts.SourceMaps,
-        artifacts.Stacks,
-        artifacts.TagsBlockingFirstPaint,
-        artifacts.TapTargets,
-        artifacts.TraceElements,
-        artifacts.ViewportDimensions,
-        artifacts.WebAppManifest,
 
-        // Compat artifacts come last.
-        artifacts.devtoolsLogs,
-        artifacts.traces,
-
-        // FullPageScreenshot comes at the very end so all other node analysis is captured.
-        artifacts.FullPageScreenshot,
-      ],
-    },
+    // FullPageScreenshot comes at the very end so all other node analysis is captured.
+    {id: artifacts.FullPageScreenshot, gatherer: 'full-page-screenshot'},
   ],
   settings: legacyDefaultConfig.settings,
   audits: [

lighthouse-core/test/fixtures/fraggle-rock/artifacts/sample-flow-artifacts.json

@@ -163,7 +163,12 @@
           "onlyCategories": null,
           "skipAudits": [
             "uses-http2"
-          ]
+          ],
+          "pauseAfterFcpMs": 1000,
+          "pauseAfterLoadMs": 1000,
+          "networkQuietThresholdMs": 1000,
+          "cpuQuietThresholdMs": 1000,
+          "blankPage": "about:blank"
         },
         "BenchmarkIndex": 2094,
         "HostUserAgent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4945.0 Safari/537.36",
@@ -313359,7 +313364,12 @@
           "onlyCategories": null,
           "skipAudits": [
             "uses-http2"
-          ]
+          ],
+          "pauseAfterFcpMs": 1000,
+          "pauseAfterLoadMs": 1000,
+          "networkQuietThresholdMs": 1000,
+          "cpuQuietThresholdMs": 1000,
+          "blankPage": "about:blank"
         },
         "BenchmarkIndex": 2096.5,
         "HostUserAgent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4945.0 Safari/537.36",
@@ -672706,7 +672716,12 @@
           "onlyCategories": null,
           "skipAudits": [
             "uses-http2"
-          ]
+          ],
+          "pauseAfterFcpMs": 1000,
+          "pauseAfterLoadMs": 1000,
+          "networkQuietThresholdMs": 1000,
+          "cpuQuietThresholdMs": 1000,
+          "blankPage": "about:blank"
         },
         "BenchmarkIndex": 2206.5,
         "HostUserAgent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4945.0 Safari/537.36",
@@ -675588,7 +675603,12 @@
           "onlyCategories": null,
           "skipAudits": [
             "uses-http2"
-          ]
+          ],
+          "pauseAfterFcpMs": 1000,
+          "pauseAfterLoadMs": 1000,
+          "networkQuietThresholdMs": 1000,
+          "cpuQuietThresholdMs": 1000,
+          "blankPage": "about:blank"
         },
         "BenchmarkIndex": 2210.5,
         "HostUserAgent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4945.0 Safari/537.36",