diff --git a/packages/cli/package.json b/packages/cli/package.json index 0730e2728..204c52d65 100644 --- 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 index 24d028e78..d35b99848 100644 --- 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 index 60fa41483..abec849f9 100644 --- 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 index 60f0d023a..a29372644 100644 --- 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 index 813f9f6cd..e2b73326a 100644 --- 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/packages/cli/src/lib/implementation/collect-and-persist.ts b/packages/core/src/lib/collect-and-persist.ts similarity index 72% rename from packages/cli/src/lib/implementation/collect-and-persist.ts rename to packages/core/src/lib/collect-and-persist.ts index 186df9139..535de868e 100644 --- a/packages/cli/src/lib/implementation/collect-and-persist.ts +++ b/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 { 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 index 9fc47c7b3..fdc400ea7 100644 --- 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 index a6b215409..aeea8f713 100644 --- 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 index 894086121..502315aab 100644 --- 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 index e50c72ba5..fcc3b759c 100644 --- 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 index 8561ac5cf..fa9308f15 100644 --- 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 index b0abacf0f..27b290171 100644 --- 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/packages/utils/src/lib/collect/implementation/execute-process.spec.ts b/packages/utils/src/lib/execute-process.spec.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/execute-process.spec.ts rename to packages/utils/src/lib/execute-process.spec.ts diff --git a/packages/utils/src/lib/collect/implementation/execute-process.ts b/packages/utils/src/lib/execute-process.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/execute-process.ts rename to packages/utils/src/lib/execute-process.ts diff --git a/packages/cli/src/lib/implementation/load-file.ts b/packages/utils/src/lib/load-file.ts similarity index 91% rename from packages/cli/src/lib/implementation/load-file.ts rename to packages/utils/src/lib/load-file.ts index 3f93abad6..a158fea35 100644 --- a/packages/cli/src/lib/implementation/load-file.ts +++ b/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( options: Options, parse?: (d: unknown) => T, diff --git a/packages/utils/src/lib/collect/implementation/md/constants.ts b/packages/utils/src/lib/md/constants.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/md/constants.ts rename to packages/utils/src/lib/md/constants.ts diff --git a/packages/utils/src/lib/collect/implementation/md/details.ts b/packages/utils/src/lib/md/details.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/md/details.ts rename to packages/utils/src/lib/md/details.ts diff --git a/packages/utils/src/lib/collect/implementation/md/font-style.spec.ts b/packages/utils/src/lib/md/font-style.spec.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/md/font-style.spec.ts rename to packages/utils/src/lib/md/font-style.spec.ts diff --git a/packages/utils/src/lib/collect/implementation/md/font-style.ts b/packages/utils/src/lib/md/font-style.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/md/font-style.ts rename to packages/utils/src/lib/md/font-style.ts diff --git a/packages/utils/src/lib/collect/implementation/md/headline.spec.ts b/packages/utils/src/lib/md/headline.spec.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/md/headline.spec.ts rename to packages/utils/src/lib/md/headline.spec.ts diff --git a/packages/utils/src/lib/collect/implementation/md/headline.ts b/packages/utils/src/lib/md/headline.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/md/headline.ts rename to packages/utils/src/lib/md/headline.ts diff --git a/packages/utils/src/lib/collect/implementation/md/index.ts b/packages/utils/src/lib/md/index.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/md/index.ts rename to packages/utils/src/lib/md/index.ts diff --git a/packages/utils/src/lib/collect/implementation/md/link.spec.ts b/packages/utils/src/lib/md/link.spec.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/md/link.spec.ts rename to packages/utils/src/lib/md/link.spec.ts diff --git a/packages/utils/src/lib/collect/implementation/md/link.ts b/packages/utils/src/lib/md/link.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/md/link.ts rename to packages/utils/src/lib/md/link.ts diff --git a/packages/utils/src/lib/collect/implementation/md/list.spec.ts b/packages/utils/src/lib/md/list.spec.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/md/list.spec.ts rename to packages/utils/src/lib/md/list.spec.ts diff --git a/packages/utils/src/lib/collect/implementation/md/list.ts b/packages/utils/src/lib/md/list.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/md/list.ts rename to packages/utils/src/lib/md/list.ts diff --git a/packages/utils/src/lib/collect/implementation/md/table.spec.ts b/packages/utils/src/lib/md/table.spec.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/md/table.spec.ts rename to packages/utils/src/lib/md/table.spec.ts diff --git a/packages/utils/src/lib/collect/implementation/md/table.ts b/packages/utils/src/lib/md/table.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/md/table.ts rename to packages/utils/src/lib/md/table.ts diff --git a/packages/utils/src/lib/collect/implementation/mock/execute-process.mock.mjs b/packages/utils/src/lib/mock/execute-process.mock.mjs similarity index 100% rename from packages/utils/src/lib/collect/implementation/mock/execute-process.mock.mjs rename to packages/utils/src/lib/mock/execute-process.mock.mjs diff --git a/packages/utils/src/lib/collect/implementation/mock/helper.mock.ts b/packages/utils/src/lib/mock/helper.mock.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/mock/helper.mock.ts rename to packages/utils/src/lib/mock/helper.mock.ts diff --git a/packages/utils/src/lib/collect/implementation/mock/process-helper.mock.ts b/packages/utils/src/lib/mock/process-helper.mock.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/mock/process-helper.mock.ts rename to packages/utils/src/lib/mock/process-helper.mock.ts diff --git a/packages/utils/src/lib/collect/implementation/mock/schema-helper.mock.ts b/packages/utils/src/lib/mock/schema-helper.mock.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/mock/schema-helper.mock.ts rename to packages/utils/src/lib/mock/schema-helper.mock.ts diff --git a/packages/utils/src/lib/collect/implementation/report-to-md.spec.ts b/packages/utils/src/lib/report-to-md.spec.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/report-to-md.spec.ts rename to packages/utils/src/lib/report-to-md.spec.ts diff --git a/packages/utils/src/lib/collect/implementation/report-to-md.ts b/packages/utils/src/lib/report-to-md.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/report-to-md.ts rename to packages/utils/src/lib/report-to-md.ts diff --git a/packages/utils/src/lib/collect/implementation/report-to-stdout.spec.ts b/packages/utils/src/lib/report-to-stdout.spec.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/report-to-stdout.spec.ts rename to packages/utils/src/lib/report-to-stdout.spec.ts diff --git a/packages/utils/src/lib/collect/implementation/report-to-stdout.ts b/packages/utils/src/lib/report-to-stdout.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/report-to-stdout.ts rename to packages/utils/src/lib/report-to-stdout.ts diff --git a/packages/utils/src/lib/collect/implementation/utils.spec.ts b/packages/utils/src/lib/utils.spec.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/utils.spec.ts rename to packages/utils/src/lib/utils.spec.ts diff --git a/packages/utils/src/lib/collect/implementation/utils.ts b/packages/utils/src/lib/utils.ts similarity index 100% rename from packages/utils/src/lib/collect/implementation/utils.ts rename to packages/utils/src/lib/utils.ts