fix: refactor after core package intro (#83)

Co-authored-by: Matěj Chalk <34691111+matejchalk@users.noreply.github.com>

Author: BioPhoton

packages/cli/package.json

@@ -1,15 +1,15 @@
 {
-  "name": "@quality-metrics/cli",
+  "name": "@code-pushup/cli",
   "version": "0.0.1",
   "bin": {
     "code-pushup": "src/bin.js"
   },
   "dependencies": {
-    "bundle-require": "^4.0.1",
     "chalk": "^5.3.0",
     "yargs": "^17.7.2",
-    "@quality-metrics/models": "*",
     "zod": "^3.22.1",
-    "@quality-metrics-cli/core": "*"
+    "@code-pushup/models": "*",
+    "@code-pushup/core": "*",
+    "@code-pushup/utils": "*"
   }
 }

packages/cli/src/lib/collect/command-object.ts

@@ -1,5 +1,5 @@
 import { CommandModule } from 'yargs';
-import { collectAndPersistReports } from '../implementation/collect-and-persist';
+import { collectAndPersistReports } from '@quality-metrics/core';
 
 export function yargsCollectCommandObject() {
   return {

packages/cli/src/lib/implementation/read-code-pushup-config.ts

@@ -1,6 +1,6 @@
 import { CoreConfig, coreConfigSchema } from '@quality-metrics/models';
 import { stat } from 'fs/promises';
-import { importModule } from './load-file';
+import { importModule } from '@quality-metrics/utils';
 import { ConfigParseError } from './config-middleware';
 
 // @TODO [73] move into core

packages/core/package.json

@@ -1,10 +1,10 @@
 {
-  "name": "@quality-metrics-cli/core",
+  "name": "@code-pushup/core",
   "version": "0.0.1",
   "dependencies": {
-    "@quality-metrics/models": "*",
-    "@quality-metrics/utils": "*",
-    "chalk": "^5.3.0"
+    "chalk": "^5.3.0",
+    "@code-pushup/models": "*",
+    "@code-pushup/utils": "*"
   },
   "type": "commonjs",
   "main": "./index.cjs"

packages/core/src/index.ts

@@ -1,3 +1,4 @@
 export { logPersistedResults, persistReport } from './lib/persist';
 export { executePlugins } from './lib/execute-plugin';
 export { collect, CollectOptions } from './lib/collect';
+export { collectAndPersistReports } from './lib/collect-and-persist';

packages/cli/src/lib/implementation/collect-and-persist.ts renamed to packages/core/src/lib/collect-and-persist.ts

@@ -1,21 +1,17 @@
-import {
-  collect,
-  CollectOptions,
-  logPersistedResults,
-  persistReport,
-} from '@quality-metrics/core';
+import { collect, CollectOptions } from './collect';
+import { name, version } from '../../package.json';
+
 import { pluginOutputSchema, Report } from '@quality-metrics/models';
-import * as packageJson from '../../../package.json';
+import { logPersistedResults, persistReport } from './persist';
 
-// @TODO [73] move into core
 export async function collectAndPersistReports(
   config: CollectOptions,
 ): Promise<void> {
   const collectReport = await collect(config);
   const report: Report = {
     ...collectReport,
-    packageName: packageJson.name,
-    version: packageJson.version,
+    packageName: name,
+    version: version,
   };
 
   const persistResults = await persistReport(report, config);

packages/models/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@quality-metrics/models",
+  "name": "@code-pushup/models",
   "version": "0.0.1",
   "dependencies": {
     "@code-pushup/portal-client": "^0.1.2",

packages/nx-plugin/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@quality-metrics/nx-plugin",
+  "name": "@code-pushup/nx-plugin",
   "version": "0.0.1",
   "dependencies": {
     "@nx/devkit": "^16.8.1",

packages/plugin-eslint/package.json

@@ -1,9 +1,9 @@
 {
-  "name": "@quality-metrics/eslint-plugin",
+  "name": "@code-pushup/eslint-plugin",
   "version": "0.0.1",
   "dependencies": {
-    "@quality-metrics/models": "*",
-    "@quality-metrics/utils": "*",
-    "eslint": "~8.46.0"
+    "eslint": "~8.46.0",
+    "@code-pushup/models": "*",
+    "@code-pushup/utils": "*"
   }
 }

packages/plugin-lighthouse/package.json

@@ -1,9 +1,9 @@
 {
-  "name": "@quality-metrics/lighthouse-plugin",
+  "name": "@code-pushup/lighthouse-plugin",
   "version": "0.0.1",
   "dependencies": {
-    "@quality-metrics/models": "*",
-    "@quality-metrics/utils": "*",
-    "lighthouse": "^11.0.0"
+    "lighthouse": "^11.0.0",
+    "@code-pushup/models": "*",
+    "@code-pushup/utils": "*"
   }
 }