lighthouse 9.5.0-dev.20220509 → 9.6.1

package/flow-report/src/summary/category.tsx

@@ -132,7 +132,7 @@ const SummaryTooltip: FunctionComponent<{
               {
                 !displayAsFraction && category.score !== null && <>
                   <span> · </span>
-                  <span>{i18n.formatInteger(category.score * 100)}</span>
+                  <span>{i18n.formatNumber(category.score * 100)}</span>
                 </>
               }
             </div>

package/jest.config.js

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

package/lighthouse-cli/.eslintrc.cjs

@@ -3,8 +3,12 @@
  * 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.
  */
+'use strict';
 
 module.exports = {
+  env: {
+    browser: true,
+  },
   rules: {
     // TODO(esmodules): move to root eslint when all code is ESM
     // or when this is resolved: https://github.com/import-js/eslint-plugin-import/issues/2214
@@ -22,7 +26,4 @@ module.exports = {
     'import/group-exports': 2,
     'import/exports-last': 2,
   },
-  parserOptions: {
-    sourceType: 'module',
-  },
 };

package/lighthouse-cli/bin.js

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 /**
  * @fileoverview The relationship between these CLI modules:

package/lighthouse-cli/cli-flags.js

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 /* eslint-disable max-len */
 
@@ -123,10 +124,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.',
         },
-        'legacy-navigation': {
+        'fraggle-rock': {
           type: 'boolean',
           default: false,
-          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.',
+          describe: '[EXPERIMENTAL] Use the new Fraggle Rock navigation runner to gather results.',
         },
         'additional-trace-categories': {
           type: 'string',
@@ -177,7 +178,7 @@ function getFlags(manualArgv, options = {}) {
         },
         'enable-error-reporting': {
           type: 'boolean',
-          describe: 'Enables error reporting, overriding any saved preference. --no-enable-error-reporting will do the opposite. More: https://github.com/GoogleChrome/lighthouse/blob/master/docs/error-reporting.md',
+          describe: 'Enables error reporting, overriding any saved preference. --no-enable-error-reporting will do the opposite. More: https://git.io/vFFTO',
         },
         'gather-mode': {
           alias: 'G',

package/lighthouse-cli/commands/commands.js

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 export {listAudits} from './list-audits.js';
 export {listTraceCategories} from './list-trace-categories.js';

package/lighthouse-cli/commands/list-audits.js

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 import lighthouse from '../../lighthouse-core/index.js';
 

package/lighthouse-cli/commands/list-locales.js

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 import locales from '../../shared/localization/locales.js';
 

package/lighthouse-cli/commands/list-trace-categories.js

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 import lighthouse from '../../lighthouse-core/index.js';
 

package/lighthouse-cli/index.js

@@ -4,6 +4,7 @@
  * 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.
  */
+'use strict';
 
 import {begin} from './bin.js';
 

package/lighthouse-cli/printer.js

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 import fs from 'fs';
 

package/lighthouse-cli/run.js

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 /* eslint-disable no-console */
 
@@ -193,6 +194,27 @@ async function potentiallyKillChrome(launchedChrome) {
   });
 }
 
+/**
+ * @param {string} url
+ * @param {LH.CliFlags} flags
+ * @param {LH.Config.Json|undefined} config
+ * @param {ChromeLauncher.LaunchedChrome} launchedChrome
+ * @return {Promise<LH.RunnerResult|undefined>}
+ */
+async function runLighthouseWithFraggleRock(url, flags, config, launchedChrome) {
+  const fraggleRock = (await import('../lighthouse-core/fraggle-rock/api.js')).default;
+  const puppeteer = (await import('puppeteer')).default;
+  const browser = await puppeteer.connect({browserURL: `http://localhost:${launchedChrome.port}`});
+  const page = await browser.newPage();
+  flags.channel = 'fraggle-rock-cli';
+  const configContext = {
+    configPath: flags.configPath,
+    settingsOverrides: flags,
+    logLevel: flags.logLevel,
+  };
+  return fraggleRock.navigation(url, {page, config, configContext});
+}
+
 /**
  * @param {string} url
  * @param {LH.CliFlags} flags
@@ -225,15 +247,8 @@ async function runLighthouse(url, flags, config) {
       flags.port = launchedChrome.port;
     }
 
-    if (flags.legacyNavigation) {
-      log.warn('CLI', 'Legacy navigation CLI is deprecated');
-      flags.channel = 'legacy-navigation-cli';
-    } else {
-      flags.channel = 'cli';
-    }
-
-    const runnerResult = flags.legacyNavigation ?
-       await lighthouse.legacyNavigation(url, flags, config) :
+    const runnerResult = flags.fraggleRock && launchedChrome ?
+       await runLighthouseWithFraggleRock(url, flags, config, launchedChrome) :
        await lighthouse(url, flags, config);
 
     // If in gatherMode only, there will be no runnerResult.

package/lighthouse-cli/sentry-prompt.js

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 import Configstore from 'configstore';
 import Confirm from 'enquirer';

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

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 import a11y from './test-definitions/a11y.js';
 import byteEfficiency from './test-definitions/byte-efficiency.js';

package/lighthouse-cli/test/smokehouse/frontends/back-compat-util.js

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 /**
  * COMPAT: update from the old TestDefn format (array of `expectations` per

package/lighthouse-cli/test/smokehouse/frontends/lib.js

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 /**
  * @fileoverview Smoke test runner.

package/lighthouse-cli/test/smokehouse/frontends/node.js

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 /**
  * @fileoverview A smokehouse frontend for running within a node process.

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

@@ -4,6 +4,7 @@
  * 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.
  */
+'use strict';
 
 /**
  * @fileoverview A smokehouse frontend for running from the command line. Parse

package/lighthouse-cli/test/smokehouse/lib/child-process-error.js

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 /**
  * An extension of Error that includes any stdout or stderr from a child

package/lighthouse-cli/test/smokehouse/lib/concurrent-mapper.js

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 /**
  * A class that maintains a concurrency pool to coordinate many jobs that should

package/lighthouse-cli/test/smokehouse/lib/local-console.js

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 /**
  * A simple buffered log to use in place of `console`.

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

@@ -3,98 +3,59 @@
  * 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.
  */
+'use strict';
 
 /**
  * @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';
 
-// 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});
-    }
-  })();
+const originalRequire = global.require;
+if (typeof globalThis === 'undefined') {
+  // @ts-expect-error - exposing for loading of dt-bundle.
+  global.globalThis = global;
 }
 
-/**
- * @param {string} url
- * @param {LH.Config.Json|undefined} configJson
- * @param {{isDebug?: boolean, useFraggleRock?: boolean}} testRunnerOptions
- * @return {Promise<{lhr: LH.Result, artifacts: LH.Artifacts}>}
- */
-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'));
+// 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;
+global.require = originalRequire;
 
-  /** @type {import('../../../../lighthouse-core/index.js')} */
-  // @ts-expect-error - not worth giving test global an actual type.
-  const lighthouse = global.runBundledLighthouse;
+/** @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 CLI.
+ * @param {string} url
+ * @param {LH.Config.Json=} configJson
+ * @param {{isDebug?: boolean}=} testRunnerOptions
+ * @return {Promise<{lhr: LH.Result, artifacts: LH.Artifacts, log: string}>}
+ */
+async function runLighthouse(url, configJson, testRunnerOptions = {}) {
   // Launch and connect to Chrome.
   const launchedChrome = await ChromeLauncher.launch();
   const port = launchedChrome.port;
+  const connection = new ChromeProtocol(port);
 
-  // Run Lighthouse.
   try {
+    // Run Lighthouse.
     const logLevel = testRunnerOptions.isDebug ? 'info' : undefined;
-    let runnerResult;
-    if (testRunnerOptions.useFraggleRock) {
-      // Puppeteer is not included in the bundle, we must create the page here.
-      const browser = await puppeteer.connect({browserURL: `http://localhost:${port}`});
-      const page = await browser.newPage();
-      runnerResult = await lighthouse(url, {port, logLevel}, configJson, page);
-    } else {
-      const connection = new ChromeProtocol(port);
-      runnerResult =
-        await lighthouse.legacyNavigation(url, {port, logLevel}, configJson, connection);
-    }
+    const runnerResult = await lighthouse(url, {port, logLevel}, configJson, connection);
     if (!runnerResult) throw new Error('No runnerResult');
 
     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.
@@ -102,53 +63,6 @@ async function runBundledLighthouse(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

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 /**
  * @fileoverview  A runner that executes Lighthouse via the Lighthouse CLI to
@@ -77,14 +78,14 @@ async function internalRun(url, tmpPath, configJson, options) {
     '--output=json',
     `-G=${artifactsDirectory}`,
     `-A=${artifactsDirectory}`,
+    '--quiet',
     '--port=0',
     '--quiet',
   ];
 
   if (useFraggleRock) {
+    args.push('--fraggle-rock');
     configJson = convertToFraggleRockConfig(configJson);
-  } else {
-    args.push('--legacy-navigation');
   }
 
   // Config can be optionally provided.

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

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 /**
  * @fileoverview A runner that launches Chrome and executes Lighthouse via DevTools.
@@ -18,51 +19,45 @@ const devtoolsDir =
   process.env.DEVTOOLS_PATH || `${LH_ROOT}/.tmp/chromium-web-tests/devtools/devtools-frontend`;
 
 /**
- * @param {string[]} logs
  * @param {string} command
  * @param {string[]} args
  */
-async function spawnAndLog(logs, command, args) {
+async function spawnAndLog(command, args) {
+  let log = '';
+
   /** @type {Promise<void>} */
-  const promise = new Promise((resolve) => {
+  const promise = new Promise((resolve, reject) => {
     const spawnHandle = spawn(command, args);
     spawnHandle.on('close', code => {
-      if (code) {
-        logs.push(`[FAILURE] Command exited with code: ${code}\n`);
-      } else {
-        logs.push('[SUCCESS] Command exited with code: 0\n');
-      }
-      resolve();
-    });
-    spawnHandle.on('error', (error) => {
-      logs.push(`ERROR: ${error.toString()}`);
+      if (code === 0) resolve();
+      else reject(new Error(`Command exited with code ${code}`));
     });
-    spawnHandle.stdout.setEncoding('utf8');
+    spawnHandle.on('error', reject);
     spawnHandle.stdout.on('data', data => {
-      process.stdout.write(data);
-      logs.push(`STDOUT: ${data}`);
+      console.log(data.toString());
+      log += `STDOUT: ${data.toString()}`;
     });
-    spawnHandle.stderr.setEncoding('utf8');
     spawnHandle.stderr.on('data', data => {
-      process.stderr.write(data);
-      logs.push(`STDERR: ${data}`);
+      console.log(data.toString());
+      log += `STDERR: ${data.toString()}`;
     });
   });
   await promise;
+
+  return log;
 }
 
 /** @type {Promise<void>} */
 let buildDevtoolsPromise;
 /**
- * @param {string[]} logs
  * Download/pull latest DevTools, build Lighthouse for DevTools, roll to DevTools, and build DevTools.
  */
-async function buildDevtools(logs) {
+async function buildDevtools() {
   if (process.env.CI) return;
 
   process.env.DEVTOOLS_PATH = devtoolsDir;
-  await spawnAndLog(logs, 'bash', ['lighthouse-core/test/chromium-web-tests/download-devtools.sh']);
-  await spawnAndLog(logs, 'bash', ['lighthouse-core/test/chromium-web-tests/roll-devtools.sh']);
+  await spawnAndLog('bash', ['lighthouse-core/test/chromium-web-tests/download-devtools.sh']);
+  await spawnAndLog('bash', ['lighthouse-core/test/chromium-web-tests/roll-devtools.sh']);
 }
 
 /**
@@ -76,10 +71,7 @@ async function buildDevtools(logs) {
  * @return {Promise<{lhr: LH.Result, artifacts: LH.Artifacts, log: string}>}
  */
 async function runLighthouse(url, configJson, testRunnerOptions = {}) {
-  /** @type {string[]} */
-  const logs = [];
-
-  if (!buildDevtoolsPromise) buildDevtoolsPromise = buildDevtools(logs);
+  if (!buildDevtoolsPromise) buildDevtoolsPromise = buildDevtools();
   await buildDevtoolsPromise;
 
   const outputDir = fs.mkdtempSync(os.tmpdir() + '/lh-smoke-cdt-runner-');
@@ -96,7 +88,7 @@ async function runLighthouse(url, configJson, testRunnerOptions = {}) {
     args.push('--config', JSON.stringify(configJson));
   }
 
-  await spawnAndLog(logs, 'yarn', args);
+  const log = await spawnAndLog('yarn', args);
   const lhr = JSON.parse(fs.readFileSync(`${outputDir}/lhr-0.json`, 'utf-8'));
   const artifacts = JSON.parse(fs.readFileSync(`${outputDir}/artifacts-0.json`, 'utf-8'));
 
@@ -106,7 +98,6 @@ async function runLighthouse(url, configJson, testRunnerOptions = {}) {
     fs.rmSync(outputDir, {recursive: true, force: true});
   }
 
-  const log = logs.join('') + '\n';
   return {lhr, artifacts, log};
 }
 

package/lighthouse-cli/test/smokehouse/report-assert.js

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 /**
  * @fileoverview An assertion library for comparing smoke-test expectations
@@ -218,10 +219,10 @@ function makeComparison(name, actualResult, expectedResult) {
  * @param {LocalConsole} localConsole
  * @param {LH.Result} lhr
  * @param {Smokehouse.ExpectedRunnerResult} expected
- * @param {{runner?: string, isBundled?: boolean, useFraggleRock?: boolean}=} reportOptions
+ * @param {{runner?: string, isBundled?: boolean}=} reportOptions
  */
 function pruneExpectations(localConsole, lhr, expected, reportOptions) {
-  const isFraggleRock = reportOptions?.useFraggleRock;
+  const isFraggleRock = lhr.configSettings.channel === 'fraggle-rock-cli';
   const isBundled = reportOptions?.isBundled;
 
   /**
@@ -458,7 +459,7 @@ function reportAssertion(localConsole, assertion) {
  * summary. Returns count of passed and failed tests.
  * @param {{lhr: LH.Result, artifacts: LH.Artifacts, networkRequests?: string[]}} actual
  * @param {Smokehouse.ExpectedRunnerResult} expected
- * @param {{runner?: string, isDebug?: boolean, isBundled?: boolean, useFraggleRock?: boolean}=} reportOptions
+ * @param {{runner?: string, isDebug?: boolean, isBundled?: boolean}=} reportOptions
  * @return {{passed: number, failed: number, log: string}}
  */
 function getAssertionReport(actual, expected, reportOptions = {}) {

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

@@ -3,6 +3,7 @@
  * 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.
  */
+'use strict';
 
 /**
  * @fileoverview An end-to-end test runner for Lighthouse. Takes a set of smoke
@@ -161,7 +162,6 @@ async function runSmokeTest(smokeTestDefn, testOptions) {
     report = getAssertionReport(result, expectations, {
       runner: lighthouseRunner.runnerName,
       isDebug,
-      useFraggleRock,
     });
 
     runs.push({

package/lighthouse-cli/test/smokehouse/version-check-test.js

@@ -3,9 +3,12 @@
  * 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.
  */
+'use strict';
 
 import {chromiumVersionCheck, compareVersions} from './version-check.js';
 
+/* eslint-env jest */
+
 describe('version check', () => {
   it('compareVersions', async () => {
     expect(compareVersions([100, 0, 0, 0], [100, 0, 0, 0])).toBe(0);