lighthouse 9.5.0-dev.20220728 → 9.5.0-dev.20220729

package/{lighthouse-core → core}/lib/minify-trace.js

@@ -10,9 +10,9 @@
 /**
  * @fileoverview Minifies a trace by removing unnecessary events, throttling screenshots, etc.
  *  See the following files for necessary events:
- *    - lighthouse-core/computed/page-dependency-graph.js
- *    - lighthouse-core/lib/dependency-graph/cpu-node.js
- *    - lighthouse-core/lib/tracehouse/trace-processor.js
+ *    - core/computed/page-dependency-graph.js
+ *    - core/lib/dependency-graph/cpu-node.js
+ *    - core/lib/tracehouse/trace-processor.js
  */
 
 import {TraceProcessor} from './tracehouse/trace-processor.js';

package/{lighthouse-core → core}/scripts/manual-chrome-launcher.js

@@ -4,7 +4,7 @@
 /**
  * @fileoverview Script to launch a clean Chrome instance on-demand.
  *
- * node lighthouse-core/scripts/manual-chrome-launcher.js
+ * node core/scripts/manual-chrome-launcher.js
  *
  * Assuming Lighthouse is installed globally or `npm link`ed, use via:
  *     chrome-debug

package/{lighthouse-core → core}/util.cjs

@@ -1,5 +1,5 @@
 // @ts-nocheck
-// Auto-generated by lighthouse-core/scripts/copy-util-commonjs.sh
+// Auto-generated by core/scripts/copy-util-commonjs.sh
 // Temporary solution until all our code uses esmodules
 'use strict';
 /**

package/eslint-local-rules.cjs

@@ -86,7 +86,7 @@ const requireFileExtension = {
 
             // Usually `fixedPath.startsWith(requiredPath)` and this will just add
             // a suffix to the existing path, but sometimes humans write confusing
-            // paths, e.g. './lighthouse-core/lib/../lib/lh-error.js'. To cover both
+            // paths, e.g. './core/lib/../lib/lh-error.js'. To cover both
             // cases, double check that the paths resolve to the same file.
             const resolvedFixedPath = requireResolveOrNull(fixedPath, contextDirname);
 

package/flow-report/test/common-test.tsx

@@ -7,7 +7,7 @@
 import jestMock from 'jest-mock';
 import {act, render} from '@testing-library/preact';
 
-import {timers} from '../../lighthouse-core/test/test-env/fake-timers.js';
+import {timers} from '../../core/test/test-env/fake-timers.js';
 import {FlowStepThumbnail} from '../src/common';
 
 let lhr: LH.Result;

package/flow-report/test/run-flow-report-tests.sh

@@ -17,4 +17,4 @@ ARGS=(
 )
 
 cd "$LH_ROOT"
-node --loader=@esbuild-kit/esm-loader lighthouse-core/test/scripts/run-mocha-tests.js ${ARGS[*]} "$@"
+node --loader=@esbuild-kit/esm-loader core/test/scripts/run-mocha-tests.js ${ARGS[*]} "$@"

package/flow-report/test/sample-flow.ts

@@ -11,7 +11,7 @@ import {fileURLToPath} from 'url';
 export const flowResult: LH.FlowResult = JSON.parse(
   fs.readFileSync(
     // eslint-disable-next-line max-len
-    `${dirname(fileURLToPath(import.meta.url))}/../../lighthouse-core/test/fixtures/fraggle-rock/reports/sample-flow-result.json`,
+    `${dirname(fileURLToPath(import.meta.url))}/../../core/test/fixtures/fraggle-rock/reports/sample-flow-result.json`,
     'utf-8'
   )
 );

package/flow-report/tsconfig.json

@@ -22,6 +22,6 @@
     "../types/test.d.ts",
     "../root.js",
     "../esm-utils.js",
-    "../lighthouse-core/test/test-env/fake-timers.js",
+    "../core/test/test-env/fake-timers.js",
   ],
 }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "lighthouse",
   "type": "module",
-  "version": "9.5.0-dev.20220728",
+  "version": "9.5.0-dev.20220729",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
-  "main": "./lighthouse-core/index.js",
+  "main": "./core/index.js",
   "bin": {
-    "lighthouse": "./lighthouse-cli/index.js",
-    "chrome-debug": "./lighthouse-core/scripts/manual-chrome-launcher.js",
-    "smokehouse": "./lighthouse-cli/test/smokehouse/frontends/smokehouse-bin.js"
+    "lighthouse": "./cli/index.js",
+    "chrome-debug": "./core/scripts/manual-chrome-launcher.js",
+    "smokehouse": "./cli/test/smokehouse/frontends/smokehouse-bin.js"
   },
   "engines": {
     "node": ">=14.15"
@@ -25,29 +25,29 @@
     "build-smokehouse-bundle": "node ./build/build-smokehouse-bundle.js",
     "build-lr": "yarn reset-link && node ./build/build-lightrider-bundles.js",
     "build-pack": "bash build/build-pack.sh",
-    "build-report": "node build/build-report-components.js && bash lighthouse-core/scripts/copy-util-commonjs.sh && node build/build-report.js",
+    "build-report": "node build/build-report-components.js && bash core/scripts/copy-util-commonjs.sh && node build/build-report.js",
     "build-sample-reports": "yarn build-report && node build/build-sample-reports.js",
     "build-treemap": "node ./build/build-treemap.js",
     "build-viewer": "node ./build/build-viewer.js",
     "reset-link": "(yarn unlink || true) && yarn link && yarn link lighthouse",
-    "c8": "bash lighthouse-core/scripts/c8.sh",
+    "c8": "bash core/scripts/c8.sh",
     "clean": "rm -r dist proto/scripts/*.json proto/scripts/*_pb2.* proto/scripts/*_pb.* proto/scripts/__pycache__ proto/scripts/*.pyc *.report.html *.report.dom.html *.report.json *.devtoolslog.json *.trace.json shared/localization/locales/*.ctc.json || true",
     "lint": "[ \"$CI\" = true ] && eslint --quiet -f codeframe . || eslint .",
-    "smoke": "node lighthouse-cli/test/smokehouse/frontends/smokehouse-bin.js",
-    "debug": "node --inspect-brk ./lighthouse-cli/index.js",
-    "start": "yarn build-report --standalone && node ./lighthouse-cli/index.js",
-    "mocha": "node --loader=testdouble lighthouse-core/test/scripts/run-mocha-tests.js",
+    "smoke": "node cli/test/smokehouse/frontends/smokehouse-bin.js",
+    "debug": "node --inspect-brk ./cli/index.js",
+    "start": "yarn build-report --standalone && node ./cli/index.js",
+    "mocha": "node --loader=testdouble core/test/scripts/run-mocha-tests.js",
     "test": "yarn diff:sample-json && yarn lint --quiet && yarn unit && yarn type-check",
     "test-bundle": "yarn smoke --runner bundle --retries=2",
     "test-clients": "yarn mocha --testMatch clients/**/*-test.js && yarn mocha --testMatch clients/**/*-test-pptr.js",
     "test-viewer": "yarn unit-viewer && yarn mocha --testMatch viewer/**/*-test-pptr.js --timeout 35000",
     "test-treemap": "yarn unit-treemap && yarn mocha --testMatch treemap/**/*-test-pptr.js --timeout 35000",
-    "test-lantern": "bash lighthouse-core/scripts/test-lantern.sh",
-    "test-legacy-javascript": "bash lighthouse-core/scripts/test-legacy-javascript.sh",
+    "test-lantern": "bash core/scripts/test-lantern.sh",
+    "test-legacy-javascript": "bash core/scripts/test-legacy-javascript.sh",
     "test-docs": "yarn --cwd docs/recipes/ test",
     "test-proto": "yarn compile-proto && yarn build-proto-roundtrip",
-    "unit-core": "yarn mocha lighthouse-core",
-    "unit-cli": "yarn mocha --testMatch lighthouse-cli/**/*-test.js",
+    "unit-core": "yarn mocha core",
+    "unit-cli": "yarn mocha --testMatch cli/**/*-test.js",
     "unit-report": "yarn mocha --testMatch report/**/*-test.js",
     "unit-treemap": "yarn mocha --testMatch treemap/**/*-test.js",
     "unit-viewer": "yarn mocha --testMatch viewer/**/*-test.js",
@@ -61,38 +61,38 @@
     "unit:cicoverage": "yarn c8 --all yarn unit:ci",
     "coverage": "yarn unit:cicoverage && c8 report --reporter html",
     "coverage:smoke": "yarn c8 yarn smoke -j=1 && c8 report --reporter html",
-    "devtools": "bash lighthouse-core/scripts/roll-to-devtools.sh",
-    "chrome": "node lighthouse-core/scripts/manual-chrome-launcher.js",
-    "fast": "node ./lighthouse-cli/index.js --preset=desktop --throttlingMethod=provided",
+    "devtools": "bash core/scripts/roll-to-devtools.sh",
+    "chrome": "node core/scripts/manual-chrome-launcher.js",
+    "fast": "node ./cli/index.js --preset=desktop --throttlingMethod=provided",
     "deploy-treemap": "yarn build-treemap --deploy",
     "deploy-viewer": "yarn build-viewer --deploy",
     "vercel-build": "yarn build-sample-reports && yarn build-viewer && yarn build-treemap",
-    "dogfood-lhci": "./lighthouse-core/scripts/dogfood-lhci.sh",
-    "timing-trace": "node lighthouse-core/scripts/generate-timing-trace.js",
+    "dogfood-lhci": "./core/scripts/dogfood-lhci.sh",
+    "timing-trace": "node core/scripts/generate-timing-trace.js",
     "changelog": "conventional-changelog --config ./build/changelog-generator/index.cjs --infile changelog.md --same-file",
     "type-check": "tsc --build ./tsconfig-all.json",
-    "i18n:checks": "./lighthouse-core/scripts/i18n/assert-strings-collected.sh",
-    "i18n:collect-strings": "node lighthouse-core/scripts/i18n/collect-strings.js",
-    "update:lantern-baseline": "node lighthouse-core/scripts/lantern/update-baseline-lantern-values.js",
-    "update:sample-artifacts": "node lighthouse-core/scripts/update-report-fixtures.js",
-    "update:sample-json": "yarn i18n:collect-strings && node ./lighthouse-cli -A=./lighthouse-core/test/results/artifacts --config-path=./lighthouse-core/test/results/sample-config.js --output=json --output-path=./lighthouse-core/test/results/sample_v2.json && node lighthouse-core/scripts/cleanup-LHR-for-diff.js ./lighthouse-core/test/results/sample_v2.json --only-remove-timing && node ./lighthouse-core/scripts/update-flow-fixtures.js",
-    "update:flow-sample-json": "yarn i18n:collect-strings && node ./lighthouse-core/scripts/update-flow-fixtures.js",
-    "test-devtools": "bash lighthouse-core/test/devtools-tests/test-locally.sh",
-    "open-devtools": "bash lighthouse-core/scripts/open-devtools.sh",
-    "run-devtools": "node lighthouse-core/scripts/pptr-run-devtools.js",
-    "diff:sample-json": "yarn i18n:checks && bash lighthouse-core/scripts/assert-golden-lhr-unchanged.sh",
-    "diff:flow-sample-json": "yarn i18n:collect-strings && bash lighthouse-core/scripts/assert-baseline-flow-result-unchanged.sh",
-    "computeBenchmarkIndex": "./lighthouse-core/scripts/benchmark.js",
-    "minify-latest-run": "./lighthouse-core/scripts/lantern/minify-trace.js ./latest-run/defaultPass.trace.json ./latest-run/defaultPass.trace.min.json && ./lighthouse-core/scripts/lantern/minify-devtoolslog.js ./latest-run/defaultPass.devtoolslog.json ./latest-run/defaultPass.devtoolslog.min.json",
-    "save-latest-run": "./lighthouse-core/scripts/save-latest-run.sh",
+    "i18n:checks": "./core/scripts/i18n/assert-strings-collected.sh",
+    "i18n:collect-strings": "node core/scripts/i18n/collect-strings.js",
+    "update:lantern-baseline": "node core/scripts/lantern/update-baseline-lantern-values.js",
+    "update:sample-artifacts": "node core/scripts/update-report-fixtures.js",
+    "update:sample-json": "yarn i18n:collect-strings && node ./cli -A=./core/test/results/artifacts --config-path=./core/test/results/sample-config.js --output=json --output-path=./core/test/results/sample_v2.json && node core/scripts/cleanup-LHR-for-diff.js ./core/test/results/sample_v2.json --only-remove-timing && node ./core/scripts/update-flow-fixtures.js",
+    "update:flow-sample-json": "yarn i18n:collect-strings && node ./core/scripts/update-flow-fixtures.js",
+    "test-devtools": "bash core/test/devtools-tests/test-locally.sh",
+    "open-devtools": "bash core/scripts/open-devtools.sh",
+    "run-devtools": "node core/scripts/pptr-run-devtools.js",
+    "diff:sample-json": "yarn i18n:checks && bash core/scripts/assert-golden-lhr-unchanged.sh",
+    "diff:flow-sample-json": "yarn i18n:collect-strings && bash core/scripts/assert-baseline-flow-result-unchanged.sh",
+    "computeBenchmarkIndex": "./core/scripts/benchmark.js",
+    "minify-latest-run": "./core/scripts/lantern/minify-trace.js ./latest-run/defaultPass.trace.json ./latest-run/defaultPass.trace.min.json && ./core/scripts/lantern/minify-devtoolslog.js ./latest-run/defaultPass.devtoolslog.json ./latest-run/defaultPass.devtoolslog.min.json",
+    "save-latest-run": "./core/scripts/save-latest-run.sh",
     "compile-proto": "protoc --python_out=./ ./proto/lighthouse-result.proto && mv ./proto/*_pb2.py ./proto/scripts || (echo \"❌ Install protobuf ≥ 3.7.1 to compile the proto file.\" && false)",
     "build-proto-roundtrip": "mkdir -p .tmp && cross-env PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2 python proto/scripts/json_roundtrip_via_proto.py",
-    "static-server": "node lighthouse-cli/test/fixtures/static-server.js",
+    "static-server": "node cli/test/fixtures/static-server.js",
     "serve-dist": "cd dist && python3 -m http.server",
     "serve-gh-pages": "cd dist/gh-pages && python3 -m http.server",
     "serve-treemap": "yarn serve-gh-pages",
     "serve-viewer": "yarn serve-gh-pages",
-    "flow-report": "yarn build-report --flow && node ./lighthouse-core/scripts/build-test-flow-report.js"
+    "flow-report": "yarn build-report --flow && node ./core/scripts/build-test-flow-report.js"
   },
   "devDependencies": {
     "@build-tracker/cli": "^1.0.0-beta.15",

package/readme.md

@@ -69,7 +69,7 @@ By default, Lighthouse writes the report to an HTML file. You can control the ou
 ### CLI options
 
 <!-- To update the help output:
-  node lighthouse-cli --help | pbcopy
+  node cli --help | pbcopy
 -->
 
 ```
@@ -88,7 +88,7 @@ Configuration:
   --print-config                 Print the normalized config for the given config and options, then exit.  [boolean] [default: false]
   --additional-trace-categories  Additional categories to capture with the trace (comma-delimited).  [string]
   --config-path                  The path to the config JSON.
-                                 An example config file: lighthouse-core/config/lr-desktop-config.js  [string]
+                                 An example config file: core/config/lr-desktop-config.js  [string]
   --preset                       Use a built-in configuration.
                                  WARNING: If the --config-path flag is provided, this preset will be ignored.  [string] [choices: "perf", "experimental", "desktop"]
   --chrome-flags                 Custom flags to pass to Chrome (space-delimited). For a full list of flags, see https://bit.ly/chrome-flags
@@ -282,11 +282,11 @@ yarn build-all
 ### Run
 
 ```sh
-node lighthouse-cli http://example.com
+node cli http://example.com
 # append --chrome-flags="--no-sandbox --headless --disable-gpu" if you run into problems connecting to Chrome
 ```
 
-> **Getting started tip**: `node --inspect-brk lighthouse-cli http://example.com` to open up Chrome DevTools and step
+> **Getting started tip**: `node --inspect-brk cli http://example.com` to open up Chrome DevTools and step
 through the entire app. See [Debugging Node.js with Chrome
 DevTools](https://medium.com/@paul_irish/debugging-node-js-nightlies-with-chrome-devtools-7c4a1b95ae27#.59rma3ukm)
 for more info.

package/report/clients/bundle.js

@@ -10,7 +10,7 @@
 // until we work out a common rendering interface.
 // See: https://github.com/GoogleChrome/lighthouse/pull/12623
 
-// Modify lighthouse-core/scripts/roll-to-devtools.sh if exports change.
+// Modify core/scripts/roll-to-devtools.sh if exports change.
 export {DOM} from '../renderer/dom.js';
 export {ReportRenderer} from '../renderer/report-renderer.js';
 export {ReportUIFeatures} from '../renderer/report-ui-features.js';

package/report/test/clients/bundle-test.js

@@ -13,7 +13,7 @@ import * as lighthouseRenderer from '../../clients/bundle.js';
 import {LH_ROOT} from '../../../root.js';
 
 const sampleResultsStr =
-  fs.readFileSync(LH_ROOT + '/lighthouse-core/test/results/sample_v2.json', 'utf-8');
+  fs.readFileSync(LH_ROOT + '/core/test/results/sample_v2.json', 'utf-8');
 
 describe('lighthouseRenderer bundle', () => {
   let document;

package/report/test/generator/report-generator-test.js

@@ -15,8 +15,8 @@ const csvValidator = require('csv-validator');
 const ReportGenerator = require('../../generator/report-generator.js');
 // const {readJson} = require('../../../root.js');
 // TODO(esmodules): remove when this folder is esm
-// const sampleResults = readJson('lighthouse-core/test/results/sample_v2.json');
-const sampleResults = require('../../../lighthouse-core/test/results/sample_v2.json');
+// const sampleResults = readJson('core/test/results/sample_v2.json');
+const sampleResults = require('../../../core/test/results/sample_v2.json');
 
 describe('ReportGenerator', () => {
   describe('#replaceStrings', () => {

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

@@ -13,9 +13,9 @@ import {I18n} from '../../renderer/i18n.js';
 import {DOM} from '../../renderer/dom.js';
 import {DetailsRenderer} from '../../renderer/details-renderer.js';
 import {CategoryRenderer} from '../../renderer/category-renderer.js';
-import {readJson} from '../../../lighthouse-core/test/test-utils.js';
+import {readJson} from '../../../core/test/test-utils.js';
 
-const sampleResultsOrig = readJson('../../../lighthouse-core/test/results/sample_v2.json', import.meta);
+const sampleResultsOrig = readJson('../../../core/test/results/sample_v2.json', import.meta);
 
 describe('CategoryRenderer', () => {
   let renderer;

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

@@ -12,7 +12,7 @@ import {I18n} from '../../renderer/i18n.js';
 // Require i18n to make sure Intl is polyfilled in Node without full-icu for testing.
 // When Util is run in a browser, Intl will be supplied natively (IE11+).
 // eslint-disable-next-line no-unused-vars
-import '../../../lighthouse-core/lib/i18n/i18n.js';
+import '../../../core/lib/i18n/i18n.js';
 
 const NBSP = '\xa0';
 

package/report/test/renderer/performance-category-renderer-test.js

@@ -10,13 +10,13 @@ import jsdom from 'jsdom';
 
 import {Util} from '../../renderer/util.js';
 import {I18n} from '../../renderer/i18n.js';
-import URL from '../../../lighthouse-core/lib/url-shim.js';
+import URL from '../../../core/lib/url-shim.js';
 import {DOM} from '../../renderer/dom.js';
 import {DetailsRenderer} from '../../renderer/details-renderer.js';
 import {PerformanceCategoryRenderer} from '../../renderer/performance-category-renderer.js';
-import {readJson} from '../../../lighthouse-core/test/test-utils.js';
+import {readJson} from '../../../core/test/test-utils.js';
 
-const sampleResultsOrig = readJson('../../../lighthouse-core/test/results/sample_v2.json', import.meta);
+const sampleResultsOrig = readJson('../../../core/test/results/sample_v2.json', import.meta);
 
 describe('PerfCategoryRenderer', () => {
   let category;

package/report/test/renderer/pwa-category-renderer-test.js

@@ -13,9 +13,9 @@ import {I18n} from '../../renderer/i18n.js';
 import {DOM} from '../../renderer/dom.js';
 import {DetailsRenderer} from '../../renderer/details-renderer.js';
 import {PwaCategoryRenderer} from '../../renderer/pwa-category-renderer.js';
-import {readJson} from '../../../lighthouse-core/test/test-utils.js';
+import {readJson} from '../../../core/test/test-utils.js';
 
-const sampleResultsOrig = readJson('../../../lighthouse-core/test/results/sample_v2.json', import.meta);
+const sampleResultsOrig = readJson('../../../core/test/results/sample_v2.json', import.meta);
 
 describe('PwaCategoryRenderer', () => {
   let category;

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

@@ -7,10 +7,10 @@
 import puppeteer from 'puppeteer';
 
 import reportGenerator from '../../generator/report-generator.js';
-import {axeSource} from '../../../lighthouse-core/lib/axe.js';
-import {readJson} from '../../../lighthouse-core/test/test-utils.js';
+import {axeSource} from '../../../core/lib/axe.js';
+import {readJson} from '../../../core/test/test-utils.js';
 
-const sampleResults = readJson('../../../lighthouse-core/test/results/sample_v2.json', import.meta);
+const sampleResults = readJson('../../../core/test/results/sample_v2.json', import.meta);
 
 describe('ReportRendererAxe', () => {
   describe('with aXe', () => {

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

@@ -10,14 +10,14 @@ import jsdom from 'jsdom';
 import jestMock from 'jest-mock';
 
 import {Util} from '../../renderer/util.js';
-import URL from '../../../lighthouse-core/lib/url-shim.js';
+import URL from '../../../core/lib/url-shim.js';
 import {DOM} from '../../renderer/dom.js';
 import {DetailsRenderer} from '../../renderer/details-renderer.js';
 import {CategoryRenderer} from '../../renderer/category-renderer.js';
 import {ReportRenderer} from '../../renderer/report-renderer.js';
-import {readJson} from '../../../lighthouse-core/test/test-utils.js';
+import {readJson} from '../../../core/test/test-utils.js';
 
-const sampleResultsOrig = readJson('../../../lighthouse-core/test/results/sample_v2.json', import.meta);
+const sampleResultsOrig = readJson('../../../core/test/results/sample_v2.json', import.meta);
 
 const TIMESTAMP_REGEX = /\d+, \d{4}.*\d+:\d+/;
 

package/report/test/renderer/report-ui-features-test.js

@@ -16,9 +16,9 @@ import {DetailsRenderer} from '../../renderer/details-renderer.js';
 import {ReportUIFeatures} from '../../renderer/report-ui-features.js';
 import {CategoryRenderer} from '../../renderer/category-renderer.js';
 import {ReportRenderer} from '../../renderer/report-renderer.js';
-import {readJson} from '../../../lighthouse-core/test/test-utils.js';
+import {readJson} from '../../../core/test/test-utils.js';
 
-const sampleResultsOrig = readJson('../../../lighthouse-core/test/results/sample_v2.json', import.meta);
+const sampleResultsOrig = readJson('../../../core/test/results/sample_v2.json', import.meta);
 
 describe('ReportUIFeatures', () => {
   let sampleResults;

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

@@ -8,9 +8,9 @@ import {strict as assert} from 'assert';
 
 import {Util} from '../../renderer/util.js';
 import {I18n} from '../../renderer/i18n.js';
-import {readJson} from '../../../lighthouse-core/test/test-utils.js';
+import {readJson} from '../../../core/test/test-utils.js';
 
-const sampleResult = readJson('../../../lighthouse-core/test/results/sample_v2.json', import.meta);
+const sampleResult = readJson('../../../core/test/results/sample_v2.json', import.meta);
 
 describe('util helpers', () => {
   beforeEach(() => {