chore: adjust old targets

Author: John Doe

.prettierignore

@@ -3,3 +3,6 @@
 /coverage
 /.nx
 __snapshots__
+
+/.nx/cache
+/.nx/workspace-data

code-pushup.config.ts

@@ -1,55 +1,37 @@
 import 'dotenv/config';
-import { z } from 'zod';
 import {
   coverageCoreConfigNx,
   eslintCoreConfigNx,
   jsDocsCoreConfig,
+  jsDocsExclusionPatterns,
   jsPackagesCoreConfig,
   lighthouseCoreConfig,
+  loadEnv,
+  mergeConfigs,
   typescriptPluginConfig,
 } from './code-pushup.preset.js';
 import type { CoreConfig } from './packages/models/src/index.js';
-import { mergeConfigs } from './packages/utils/src/index.js';
 
-// load upload configuration from environment
-const envSchema = z.object({
-  CP_SERVER: z.string().url(),
-  CP_API_KEY: z.string().min(1),
-  CP_ORGANIZATION: z.string().min(1),
-  CP_PROJECT: z.string().min(1),
-});
-const { data: env } = await envSchema.safeParseAsync(process.env);
+const projectName = 'cli';
 
 const config: CoreConfig = {
-  ...(env && {
-    upload: {
-      server: env.CP_SERVER,
-      apiKey: env.CP_API_KEY,
-      organization: env.CP_ORGANIZATION,
-      project: env.CP_PROJECT,
-    },
-  }),
-
+  ...(await loadEnv(projectName)),
   plugins: [],
 };
 
 export default mergeConfigs(
   config,
-  await coverageCoreConfigNx(),
   await jsPackagesCoreConfig(),
+  await coverageCoreConfigNx(projectName),
   await lighthouseCoreConfig(
     'https://github.com/code-pushup/cli?tab=readme-ov-file#code-pushup-cli/',
   ),
-  await typescriptPluginConfig({
-    tsconfig: 'packages/cli/tsconfig.lib.json',
-  }),
-  await eslintCoreConfigNx(),
+  await eslintCoreConfigNx(projectName),
   jsDocsCoreConfig([
-    'packages/**/src/**/*.ts',
-    '!packages/**/node_modules',
-    '!packages/**/{mocks,mock}',
-    '!**/*.{spec,test}.ts',
-    '!**/implementation/**',
-    '!**/internal/**',
+    `packages/${projectName}/src/**/*.ts`,
+    ...jsDocsExclusionPatterns,
   ]),
+  await typescriptPluginConfig({
+    tsconfig: `packages/${projectName}/tsconfig.lib.json`,
+  }),
 );

code-pushup.new.config.ts

@@ -0,0 +1,45 @@
+import 'dotenv/config';
+import {
+  coverageCoreConfigNx,
+  eslintCoreConfigNx,
+  jsDocsCoreConfig,
+  jsPackagesCoreConfig,
+  lighthouseCoreConfig,
+  loadEnv,
+  typescriptPluginConfig,
+} from './code-pushup.preset.js';
+import type { CoreConfig } from './packages/models/src/index.js';
+import { mergeConfigs } from './packages/utils/src/index.js';
+
+const config: CoreConfig = {
+  ...(await loadEnv()),
+  plugins: [],
+};
+
+const merged = mergeConfigs(
+  config,
+  await coverageCoreConfigNx('cli'),
+  await jsPackagesCoreConfig(),
+  await lighthouseCoreConfig(
+    'https://github.com/code-pushup/cli?tab=readme-ov-file#code-pushup-cli/',
+  ),
+  await typescriptPluginConfig({
+    tsconfig: 'packages/cli/tsconfig.lib.json',
+  }),
+  await eslintCoreConfigNx(),
+  jsDocsCoreConfig([
+    'packages/**/src/**/*.ts',
+    '!packages/**/node_modules',
+    '!packages/**/{mocks,mock}',
+    '!**/*.{spec,test}.ts',
+    '!**/implementation/**',
+    '!**/internal/**',
+  ]),
+);
+
+export default {
+  ...merged,
+  categories: merged.categories?.filter(
+    c => c.slug !== 'bug-prevention' && c.slug !== 'code-style',
+  ),
+} satisfies CoreConfig;

code-pushup.old.config.ts

@@ -237,10 +237,23 @@ export const typescriptPluginConfig = async (
  * Generates coverage configuration for Nx projects. Supports both single projects and all projects.
  */
 export const coverageCoreConfigNx = async (
-  projectName?: string,
+  projectArg?:
+    | string
+    | {
+        projectName?: string;
+        targetNames?: string | string[];
+      },
 ): Promise<CoreConfig> => {
-  const targetNames = ['unit-test', 'int-test'];
-  const targetArgs = ['-t', ...targetNames];
+  const { projectName, targetNames } =
+    typeof projectArg === 'string'
+      ? { projectName: projectArg }
+      : (projectArg ?? {});
+  const parsedTargetNames = Array.isArray(targetNames)
+    ? targetNames
+    : targetNames != null
+      ? [targetNames]
+      : ['unit-test', 'int-test'];
+  const targetArgs = ['-t', parsedTargetNames.join(',')];
   return {
     plugins: [
       await coveragePlugin({
@@ -251,11 +264,11 @@ export const coverageCoreConfigNx = async (
             : ['nx', 'run-many', ...targetArgs],
         },
         reports: projectName
-          ? targetNames.map(target => ({
+          ? parsedTargetNames.map(target => ({
               pathToProject: `packages/${projectName}`,
               resultsPath: `coverage/${projectName}/${target}s/lcov.info`,
             }))
-          : await getNxCoveragePaths({ targets: targetNames }),
+          : await getNxCoveragePaths({ targets: parsedTargetNames }),
       }),
     ],
     categories: coverageCategories,
@@ -356,7 +369,7 @@ function mergePersist(
   }
 
   if (a) {
-    return b ? { persist: { ...a, ...b } } : {};
+    return b ? { persist: { ...a, ...b } } : { persist: a };
   } else {
     return { persist: b };
   }
@@ -401,7 +414,7 @@ function mergeUpload(
   }
 
   if (a) {
-    return b ? { upload: { ...a, ...b } } : {};
+    return b ? { upload: { ...a, ...b } } : { upload: a };
   } else {
     return { upload: b };
   }

code-pushup.preset.ts

@@ -20,7 +20,7 @@ const config: CoreConfig = {
 export default mergeConfigs(
   config,
   await eslintCoreConfigNx(projectName),
-  await coverageCoreConfigNx(projectName),
+  await coverageCoreConfigNx({ projectName, targetNames: ['unit-test'] }),
   await typescriptPluginConfig({
     tsconfig: `packages/${projectName}/tsconfig.lib.json`,
   }),

packages/plugin-lighthouse/code-pushup.config.ts

@@ -3,9 +3,24 @@
   "$schema": "node_modules/nx/schemas/project-schema.json",
   "targets": {
     "code-pushup-old": {
+      "dependsOn": [
+        "code-pushup-eslint",
+        "code-pushup-coverage",
+        "code-pushup-typescript",
+        "code-pushup-jsdocs",
+        "code-pushup-js-packages",
+        "code-pushup-lighthouse"
+      ],
       "executor": "nx:run-commands",
       "options": {
-        "command": "node packages/cli/src/index.ts --no-progress --verbose",
+        "command": "node packages/cli/src/index.ts",
+        "args": [
+          "--no-progress",
+          "--verbose",
+          "--config={projectRoot}/code-pushup.old.config.ts",
+          "--cache.read",
+          "--persist.outputDir={projectRoot}/.code-pushup"
+        ],
         "env": {
           "NODE_OPTIONS": "--import tsx",
           "TSX_TSCONFIG_PATH": "tsconfig.base.json"
@@ -25,6 +40,10 @@
         ]
       }
     },
+    "code-pushup-eslint": {},
+    "code-pushup-coverage": {},
+    "code-pushup-jsdocs": {},
+    "code-pushup-typescript": {},
     "code-pushup-js-packages": {},
     "code-pushup-lighthouse": {}
   }