lighthouse 11.0.0-dev.20230904 → 11.0.0-dev.20230905

package/cli/bin.js

@@ -28,7 +28,7 @@ import * as Printer from './printer.js';
 import {getFlags} from './cli-flags.js';
 import {runLighthouse} from './run.js';
 import {askPermission} from './sentry-prompt.js';
-import {LH_ROOT} from '../root.js';
+import {LH_ROOT} from '../shared/root.js';
 import {Sentry} from '../core/lib/sentry.js';
 
 const pkg = JSON.parse(fs.readFileSync(LH_ROOT + '/package.json', 'utf-8'));

package/cli/cli-flags.js

@@ -12,7 +12,7 @@ import path from 'path';
 import yargs from 'yargs';
 import * as yargsHelpers from 'yargs/helpers';
 
-import {LH_ROOT} from '../root.js';
+import {LH_ROOT} from '../shared/root.js';
 import {isObjectOfUnknownValues} from '../shared/type-verifiers.js';
 
 /**

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

@@ -23,7 +23,7 @@ import log from 'lighthouse-logger';
 
 import {runSmokehouse, getShardedDefinitions} from '../smokehouse.js';
 import {updateTestDefnFormat} from './back-compat-util.js';
-import {LH_ROOT} from '../../../../root.js';
+import {LH_ROOT} from '../../../../shared/root.js';
 import exclusions from '../config/exclusions.js';
 import {saveArtifacts} from '../../../../core/lib/asset-saver.js';
 import {saveLhr} from '../../../../core/lib/asset-saver.js';

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

@@ -19,7 +19,7 @@ import {once} from 'events';
 import puppeteer from 'puppeteer-core';
 import * as ChromeLauncher from 'chrome-launcher';
 
-import {LH_ROOT} from '../../../../root.js';
+import {LH_ROOT} from '../../../../shared/root.js';
 import {loadArtifacts, saveArtifacts} from '../../../../core/lib/asset-saver.js';
 
 // This runs only in the worker. The rest runs on the main thread.

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

@@ -20,7 +20,7 @@ import log from 'lighthouse-logger';
 import * as assetSaver from '../../../../core/lib/asset-saver.js';
 import {LocalConsole} from '../lib/local-console.js';
 import {ChildProcessError} from '../lib/child-process-error.js';
-import {LH_ROOT} from '../../../../root.js';
+import {LH_ROOT} from '../../../../shared/root.js';
 
 const execFileAsync = promisify(execFile);
 

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

@@ -10,7 +10,7 @@
 
 import {execFileSync} from 'child_process';
 
-import {LH_ROOT} from '../../../../root.js';
+import {LH_ROOT} from '../../../../shared/root.js';
 import {testUrlFromDevtools} from '../../../../core/scripts/pptr-run-devtools.js';
 
 const devtoolsDir =

package/core/audits/byte-efficiency/legacy-javascript.js

@@ -25,7 +25,7 @@ import {EntityClassification} from '../../computed/entity-classification.js';
 import {JSBundles} from '../../computed/js-bundles.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 import {getRequestForScript} from '../../lib/script-helpers.js';
-import {LH_ROOT} from '../../../root.js';
+import {LH_ROOT} from '../../../shared/root.js';
 
 const graphJson = fs.readFileSync(
   `${LH_ROOT}/core/audits/byte-efficiency/polyfill-graph-data.json`, 'utf-8');

package/core/lib/asset-saver.js

@@ -17,7 +17,7 @@ import {MetricTraceEvents} from './traces/metric-trace-events.js';
 import {NetworkAnalysis} from '../computed/network-analysis.js';
 import {LoadSimulator} from '../computed/load-simulator.js';
 import {LighthouseError} from '../lib/lh-error.js';
-import {LH_ROOT} from '../../root.js';
+import {LH_ROOT} from '../../shared/root.js';
 
 const optionsFilename = 'options.json';
 const artifactsFilename = 'artifacts.json';

package/core/lib/emulation.js

@@ -4,7 +4,7 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 
-import {lighthouseVersion} from '../../root.js';
+import {lighthouseVersion} from '../../shared/root.js';
 
 const NO_THROTTLING_METRICS = {
   latency: 0,

package/core/lib/i18n/i18n.js

@@ -13,7 +13,7 @@ import lookupClosestLocale from 'lookup-closest-locale';
 import log from 'lighthouse-logger';
 
 import {getAvailableLocales} from '../../../shared/localization/format.js';
-import {LH_ROOT} from '../../../root.js';
+import {LH_ROOT} from '../../../shared/root.js';
 import {isIcuMessage, formatMessage, DEFAULT_LOCALE} from '../../../shared/localization/format.js';
 import {getModulePath} from '../../../shared/esm-utils.js';
 

package/core/runner.js

@@ -19,7 +19,7 @@ import * as assetSaver from './lib/asset-saver.js';
 import {Sentry} from './lib/sentry.js';
 import {ReportGenerator} from '../report/generator/report-generator.js';
 import {LighthouseError} from './lib/lh-error.js';
-import {lighthouseVersion} from '../root.js';
+import {lighthouseVersion} from '../shared/root.js';
 import {getModuleDirectory} from '../shared/esm-utils.js';
 import {EntityClassification} from './computed/entity-classification.js';
 import UrlUtils from './lib/url-utils.js';

package/flow-report/tsconfig.json

@@ -20,7 +20,6 @@
     "**/*.tsx",
     "./types",
     "../types/internal/test.d.ts",
-    "../root.js",
     "../core/test/test-env/fake-timers.js",
   ],
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lighthouse",
   "type": "module",
-  "version": "11.0.0-dev.20230904",
+  "version": "11.0.0-dev.20230905",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./core/index.js",
   "bin": {

package/{root.js → shared/root.js}

@@ -5,10 +5,11 @@
  */
 
 import fs from 'fs';
+import path from 'path';
 
-import {getModuleDirectory} from './shared/esm-utils.js';
+import {getModuleDirectory} from './esm-utils.js';
 
-const LH_ROOT = getModuleDirectory(import.meta);
+const LH_ROOT = path.dirname(getModuleDirectory(import.meta));
 const pkg = JSON.parse(fs.readFileSync(`${LH_ROOT}/package.json`, 'utf-8'));
 const lighthouseVersion = pkg.version;
 

package/third-party/chromium-synchronization/inspector-issueAdded-types-test.js

@@ -7,7 +7,7 @@
 
 import fs from 'fs';
 import fetch from 'node-fetch';
-import { LH_ROOT } from '../../root.js';
+import { LH_ROOT } from '../../shared/root.js';
 
 const inspectorIssuesGathererPath = LH_ROOT +
   '/core/gather/gatherers/inspector-issues.js';

package/third-party/download-content-shell/download-content-shell.js

@@ -12,7 +12,7 @@ import fs from 'fs';
 import path from 'path';
 import { execSync as shell } from 'child_process';
 import * as utils from './utils.js';
-import { LH_ROOT } from '../../root.js';
+import { LH_ROOT } from '../../shared/root.js';
 
 const TARGET = 'Release';
 const CONTENT_SHELL_ZIP = 'content-shell.zip';

package/tsconfig.json

@@ -11,7 +11,6 @@
     {"path": "./treemap/"},
   ],
   "include": [
-    "root.js",
     "cli/**/*.js",
     "core/**/*.js",
     "core/index.cjs",