fix: refactor after core package intro (#83)

Co-authored-by: Matěj Chalk <34691111+matejchalk@users.noreply.github.com>
code-pushup · Oct 3, 2023 · aa39d09 · aa39d09
1 parent 8b16a35
commit aa39d09
Show file tree

Hide file tree

Showing 38 changed files with 36 additions and 38 deletions.
diff --git a/packages/cli/package.json b/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": "*"
   }
 }
diff --git a/packages/cli/src/lib/collect/command-object.ts b/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 {

diff --git a/packages/cli/src/lib/implementation/read-code-pushup-config.ts b/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

diff --git a/packages/core/package.json b/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"

diff --git a/packages/core/src/index.ts b/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';
diff --git a/...lib/implementation/collect-and-persist.ts → packages/core/src/lib/collect-and-persist.ts b/...lib/implementation/collect-and-persist.ts → 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);

diff --git a/packages/models/package.json b/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",

diff --git a/packages/nx-plugin/package.json b/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",

diff --git a/packages/plugin-eslint/package.json b/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": "*"
   }
 }
diff --git a/packages/plugin-lighthouse/package.json b/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": "*"
   }
 }
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,9 +1,10 @@
 {
-  "name": "@quality-metrics/utils",
+  "name": "@code-pushup/utils",
   "version": "0.0.1",
   "dependencies": {
-    "@quality-metrics/models": "*",
     "chalk": "^5.3.0",
-    "cliui": "^8.0.1"
+    "cliui": "^8.0.1",
+    "bundle-require": "^4.0.1",
+    "@code-pushup/models": "*"
   }
 }
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -5,7 +5,8 @@ export {
   ProcessObserver,
   ProcessError,
   objectToCliArgs,
-} from './lib/collect/implementation/execute-process';
-export { calcDuration, formatBytes } from './lib/collect/implementation/utils';
-export { reportToStdout } from './lib/collect/implementation/report-to-stdout';
-export { reportToMd } from './lib/collect/implementation/report-to-md';
+} from './lib/execute-process';
+export { calcDuration, formatBytes } from './lib/utils';
+export { reportToStdout } from './lib/report-to-stdout';
+export { reportToMd } from './lib/report-to-md';
+export { importModule } from './lib/load-file';
diff --git a/...ct/implementation/execute-process.spec.ts → ...ges/utils/src/lib/execute-process.spec.ts b/...ct/implementation/execute-process.spec.ts → ...ges/utils/src/lib/execute-process.spec.ts
diff --git a/...collect/implementation/execute-process.ts → packages/utils/src/lib/execute-process.ts b/...collect/implementation/execute-process.ts → packages/utils/src/lib/execute-process.ts
diff --git a/...s/cli/src/lib/implementation/load-file.ts → packages/utils/src/lib/load-file.ts b/...s/cli/src/lib/implementation/load-file.ts → packages/utils/src/lib/load-file.ts
@@ -1,6 +1,5 @@
 import { bundleRequire, Options } from 'bundle-require';
 
-// @TODO [73] move into utils
 export async function importModule<T = unknown>(
   options: Options,
   parse?: (d: unknown) => T,

diff --git a/...ib/collect/implementation/md/constants.ts → packages/utils/src/lib/md/constants.ts b/...ib/collect/implementation/md/constants.ts → packages/utils/src/lib/md/constants.ts
diff --git a/.../lib/collect/implementation/md/details.ts → packages/utils/src/lib/md/details.ts b/.../lib/collect/implementation/md/details.ts → packages/utils/src/lib/md/details.ts
diff --git a/...lect/implementation/md/font-style.spec.ts → packages/utils/src/lib/md/font-style.spec.ts b/...lect/implementation/md/font-style.spec.ts → packages/utils/src/lib/md/font-style.spec.ts
diff --git a/...b/collect/implementation/md/font-style.ts → packages/utils/src/lib/md/font-style.ts b/...b/collect/implementation/md/font-style.ts → packages/utils/src/lib/md/font-style.ts
diff --git a/...ollect/implementation/md/headline.spec.ts → packages/utils/src/lib/md/headline.spec.ts b/...ollect/implementation/md/headline.spec.ts → packages/utils/src/lib/md/headline.spec.ts
diff --git a/...lib/collect/implementation/md/headline.ts → packages/utils/src/lib/md/headline.ts b/...lib/collect/implementation/md/headline.ts → packages/utils/src/lib/md/headline.ts
diff --git a/...rc/lib/collect/implementation/md/index.ts → packages/utils/src/lib/md/index.ts b/...rc/lib/collect/implementation/md/index.ts → packages/utils/src/lib/md/index.ts
diff --git a/...ib/collect/implementation/md/link.spec.ts → packages/utils/src/lib/md/link.spec.ts b/...ib/collect/implementation/md/link.spec.ts → packages/utils/src/lib/md/link.spec.ts
diff --git a/...src/lib/collect/implementation/md/link.ts → packages/utils/src/lib/md/link.ts b/...src/lib/collect/implementation/md/link.ts → packages/utils/src/lib/md/link.ts
diff --git a/...ib/collect/implementation/md/list.spec.ts → packages/utils/src/lib/md/list.spec.ts b/...ib/collect/implementation/md/list.spec.ts → packages/utils/src/lib/md/list.spec.ts
diff --git a/...src/lib/collect/implementation/md/list.ts → packages/utils/src/lib/md/list.ts b/...src/lib/collect/implementation/md/list.ts → packages/utils/src/lib/md/list.ts
diff --git a/...b/collect/implementation/md/table.spec.ts → packages/utils/src/lib/md/table.spec.ts b/...b/collect/implementation/md/table.spec.ts → packages/utils/src/lib/md/table.spec.ts
diff --git a/...rc/lib/collect/implementation/md/table.ts → packages/utils/src/lib/md/table.ts b/...rc/lib/collect/implementation/md/table.ts → packages/utils/src/lib/md/table.ts
diff --git a/...lementation/mock/execute-process.mock.mjs → ...ils/src/lib/mock/execute-process.mock.mjs b/...lementation/mock/execute-process.mock.mjs → ...ils/src/lib/mock/execute-process.mock.mjs
diff --git a/...ollect/implementation/mock/helper.mock.ts → packages/utils/src/lib/mock/helper.mock.ts b/...ollect/implementation/mock/helper.mock.ts → packages/utils/src/lib/mock/helper.mock.ts
diff --git a/...mplementation/mock/process-helper.mock.ts → ...utils/src/lib/mock/process-helper.mock.ts b/...mplementation/mock/process-helper.mock.ts → ...utils/src/lib/mock/process-helper.mock.ts
diff --git a/...implementation/mock/schema-helper.mock.ts → .../utils/src/lib/mock/schema-helper.mock.ts b/...implementation/mock/schema-helper.mock.ts → .../utils/src/lib/mock/schema-helper.mock.ts
diff --git a/...llect/implementation/report-to-md.spec.ts → packages/utils/src/lib/report-to-md.spec.ts b/...llect/implementation/report-to-md.spec.ts → packages/utils/src/lib/report-to-md.spec.ts
diff --git a/...ib/collect/implementation/report-to-md.ts → packages/utils/src/lib/report-to-md.ts b/...ib/collect/implementation/report-to-md.ts → packages/utils/src/lib/report-to-md.ts
diff --git a/...t/implementation/report-to-stdout.spec.ts → ...es/utils/src/lib/report-to-stdout.spec.ts b/...t/implementation/report-to-stdout.spec.ts → ...es/utils/src/lib/report-to-stdout.spec.ts
diff --git a/...ollect/implementation/report-to-stdout.ts → packages/utils/src/lib/report-to-stdout.ts b/...ollect/implementation/report-to-stdout.ts → packages/utils/src/lib/report-to-stdout.ts
diff --git a/.../lib/collect/implementation/utils.spec.ts → packages/utils/src/lib/utils.spec.ts b/.../lib/collect/implementation/utils.spec.ts → packages/utils/src/lib/utils.spec.ts
diff --git a/...s/src/lib/collect/implementation/utils.ts → packages/utils/src/lib/utils.ts b/...s/src/lib/collect/implementation/utils.ts → packages/utils/src/lib/utils.ts