chore: refactor unit-test and int-test targets

code-pushup.preset.ts

@@ -11,9 +11,8 @@ import eslintPlugin, {
   eslintConfigFromNxProject,
 } from './packages/plugin-eslint/src/index.js';
 import jsPackagesPlugin from './packages/plugin-js-packages/src/index.js';
-import jsDocsPlugin, {
-  JsDocsPluginConfig,
-} from './packages/plugin-jsdocs/src/index.js';
+import jsDocsPlugin from './packages/plugin-jsdocs/src/index.js';
+import type { JsDocsPluginTransformedConfig } from './packages/plugin-jsdocs/src/lib/config.js';
 import {
   PLUGIN_SLUG,
   groups,
@@ -98,7 +97,7 @@ export const eslintCategories: CategoryConfig[] = [
 ];
 
 export function getJsDocsCategories(
-  config: JsDocsPluginConfig,
+  config: JsDocsPluginTransformedConfig,
 ): CategoryConfig[] {
   return [
     {
@@ -147,7 +146,7 @@ export const lighthouseCoreConfig = async (
 };
 
 export const jsDocsCoreConfig = (
-  config: JsDocsPluginConfig | string[],
+  config: JsDocsPluginTransformedConfig | string[],
 ): CoreConfig => ({
   plugins: [
     jsDocsPlugin(Array.isArray(config) ? { patterns: config } : config),
@@ -180,9 +179,6 @@ export const typescriptPluginConfig = async (
 export const coverageCoreConfigNx = async (
   projectName?: string,
 ): Promise<CoreConfig> => {
-  if (projectName) {
-    throw new Error('coverageCoreConfigNx for single projects not implemented');
-  }
   const targetNames = ['unit-test', 'int-test'];
   const targetArgs = [
     '-t',
@@ -195,13 +191,18 @@ export const coverageCoreConfigNx = async (
       await coveragePlugin({
         coverageToolCommand: {
           command: 'npx',
-          args: [
-            'nx',
-            projectName ? `run --project ${projectName}` : 'run-many',
-            ...targetArgs,
-          ],
+          args: projectName
+            ? ['nx', 'run-many', '-p', projectName, ...targetArgs]
+            : ['nx', 'run-many', ...targetArgs],
         },
-        reports: await getNxCoveragePaths(targetNames),
+        reports: projectName
+          ? [
+              {
+                pathToProject: `packages/${projectName}`,
+                resultsPath: `packages/${projectName}/coverage/lcov.info`,
+              },
+            ]
+          : await getNxCoveragePaths(targetNames),
       }),
     ],
     categories: coverageCategories,

e2e/ci-e2e/project.json

@@ -8,7 +8,7 @@
     "e2e": {
       "executor": "@nx/vite:test",
       "options": {
-        "configFile": "e2e/ci-e2e/vitest.e2e.config.ts"
+        "configFile": "{projectRoot}/vitest.e2e.config.ts"
       }
     }
   },

e2e/cli-e2e/project.json

@@ -8,7 +8,7 @@
     "e2e": {
       "executor": "@nx/vite:test",
       "options": {
-        "configFile": "e2e/cli-e2e/vitest.e2e.config.ts"
+        "configFile": "{projectRoot}/vitest.e2e.config.ts"
       }
     }
   },

e2e/create-cli-e2e/project.json

@@ -9,7 +9,7 @@
       "executor": "@nx/vite:test",
       "options": {
         "keepServerRunning": true,
-        "configFile": "e2e/create-cli-e2e/vitest.e2e.config.ts"
+        "configFile": "{projectRoot}/vitest.e2e.config.ts"
       }
     }
   },

e2e/nx-plugin-e2e/project.json

@@ -8,7 +8,7 @@
     "e2e": {
       "executor": "@nx/vite:test",
       "options": {
-        "configFile": "e2e/nx-plugin-e2e/vitest.e2e.config.ts"
+        "configFile": "{projectRoot}/vitest.e2e.config.ts"
       }
     }
   },

e2e/plugin-coverage-e2e/project.json

@@ -8,7 +8,7 @@
     "e2e": {
       "executor": "@nx/vite:test",
       "options": {
-        "configFile": "e2e/plugin-coverage-e2e/vitest.e2e.config.ts"
+        "configFile": "{projectRoot}/vitest.e2e.config.ts"
       }
     }
   },

e2e/plugin-eslint-e2e/project.json

@@ -8,7 +8,7 @@
     "e2e": {
       "executor": "@nx/vite:test",
       "options": {
-        "configFile": "e2e/plugin-eslint-e2e/vitest.e2e.config.ts"
+        "configFile": "{projectRoot}/vitest.e2e.config.ts"
       }
     }
   },

e2e/plugin-js-packages-e2e/project.json

@@ -9,7 +9,7 @@
     "e2e": {
       "executor": "@nx/vite:test",
       "options": {
-        "configFile": "e2e/plugin-eslint-e2e/vitest.e2e.config.ts"
+        "configFile": "{projectRoot}/vitest.e2e.config.ts"
       }
     }
   },

e2e/plugin-lighthouse-e2e/project.json

@@ -8,7 +8,7 @@
     "e2e": {
       "executor": "@nx/vite:test",
       "options": {
-        "configFile": "e2e/plugin-lighthouse-e2e/vitest.e2e.config.ts"
+        "configFile": "{projectRoot}/vitest.e2e.config.ts"
       }
     }
   },

examples/plugins/project.json

@@ -4,37 +4,18 @@
   "sourceRoot": "examples/plugins/src",
   "projectType": "library",
   "targets": {
-    "build": {
-      "executor": "@nx/js:tsc",
-      "outputs": ["{options.outputPath}"],
-      "options": {
-        "outputPath": "dist/examples/plugins",
-        "main": "examples/plugins/src/index.ts",
-        "tsConfig": "examples/plugins/tsconfig.lib.json",
-        "assets": ["examples/plugins/*.md"]
-      }
-    },
-    "lint": {
-      "executor": "@nx/linter:eslint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["examples/plugins/**/*.ts"]
-      }
-    },
-    "unit-test": {
-      "executor": "@nx/vite:test",
-      "outputs": ["{options.reportsDirectory}"],
-      "options": {
-        "configFile": "examples/plugins/vitest.unit.config.ts",
-        "reportsDirectory": "../../coverage/examples-plugins/unit-tests"
-      }
-    },
+    "build": {},
+    "lint": {},
+    "unit-test": {},
     "int-test": {
+      "cache": true,
+      "outputs": ["{workspaceRoot}/coverage/{projectName}/int-tests/lcov.info"],
       "executor": "@nx/vite:test",
-      "outputs": ["{options.reportsDirectory}"],
       "options": {
-        "configFile": "examples/plugins/vitest.int.config.ts",
-        "reportsDirectory": "../../coverage/examples-plugins/int-tests"
+        "configFile": "{projectRoot}/vitest.int.config.ts",
+        "coverage": {
+          "enabled": true
+        }
       }
     },
     "run-collect": {

nx.json

@@ -14,6 +14,33 @@
         "assets": ["{projectRoot}/*.md"]
       }
     },
+    "unit-test": {
+      "cache": true,
+      "outputs": [
+        "{workspaceRoot}/coverage/{projectName}/unit-tests/lcov.info"
+      ],
+      "executor": "@nx/vite:test",
+      "options": {
+        "configFile": "{projectRoot}/vitest.unit.config.ts",
+        "coverage": {
+          "enabled": true
+        }
+      }
+    },
+    "int-test": {
+      "cache": true,
+      "outputs": ["{workspaceRoot}/coverage/{projectName}/int-tests/lcov.info"],
+      "executor": "@nx/vite:test",
+      "options": {
+        "configFile": "{projectRoot}/vitest.int.config.ts",
+        "coverage": {
+          "enabled": true
+        }
+      }
+    },
+    "e2e": {
+      "dependsOn": ["^build"]
+    },
     "lint": {
       "inputs": ["default", "{workspaceRoot}/eslint.config.?(c)js"],
       "executor": "@nx/linter:eslint",
@@ -27,9 +54,6 @@
         ]
       }
     },
-    "e2e": {
-      "dependsOn": ["^build"]
-    },
     "nxv-pkg-install": {
       "parallelism": false
     },

packages/ci/project.json

@@ -6,16 +6,16 @@
   "targets": {
     "build": {},
     "lint": {},
-    "unit-test": {
-      "executor": "@nx/vite:test",
-      "options": {
-        "configFile": "packages/ci/vitest.unit.config.ts"
-      }
-    },
+    "unit-test": {},
     "int-test": {
+      "cache": true,
+      "outputs": ["{workspaceRoot}/coverage/{projectName}/int-tests/lcov.info"],
       "executor": "@nx/vite:test",
       "options": {
-        "configFile": "packages/ci/vitest.int.config.ts"
+        "configFile": "{projectRoot}/vitest.int.config.ts",
+        "coverage": {
+          "enabled": true
+        }
       }
     }
   },

packages/cli/project.json

@@ -6,16 +6,16 @@
   "targets": {
     "build": {},
     "lint": {},
-    "unit-test": {
-      "executor": "@nx/vite:test",
-      "options": {
-        "configFile": "packages/cli/vitest.unit.config.ts"
-      }
-    },
+    "unit-test": {},
     "int-test": {
+      "cache": true,
+      "outputs": ["{workspaceRoot}/coverage/{projectName}/int-tests/lcov.info"],
       "executor": "@nx/vite:test",
       "options": {
-        "configFile": "packages/cli/vitest.int.config.ts"
+        "configFile": "{projectRoot}/vitest.int.config.ts",
+        "coverage": {
+          "enabled": true
+        }
       }
     },
     "run-help": {

packages/core/project.json

@@ -6,16 +6,16 @@
   "targets": {
     "build": {},
     "lint": {},
-    "unit-test": {
-      "executor": "@nx/vite:test",
-      "options": {
-        "configFile": "packages/core/vitest.unit.config.ts"
-      }
-    },
+    "unit-test": {},
     "int-test": {
+      "cache": true,
+      "outputs": ["{workspaceRoot}/coverage/{projectName}/int-tests/lcov.info"],
       "executor": "@nx/vite:test",
       "options": {
-        "configFile": "packages/core/vitest.int.config.ts"
+        "configFile": "{projectRoot}/vitest.int.config.ts",
+        "coverage": {
+          "enabled": true
+        }
       }
     }
   },

packages/create-cli/project.json

@@ -6,16 +6,16 @@
   "targets": {
     "build": {},
     "lint": {},
-    "unit-test": {
-      "executor": "@nx/vite:test",
-      "options": {
-        "configFile": "packages/create-cli/vitest.unit.config.ts"
-      }
-    },
+    "unit-test": {},
     "int-test": {
+      "cache": true,
+      "outputs": ["{workspaceRoot}/coverage/{projectName}/int-tests/lcov.info"],
       "executor": "@nx/vite:test",
       "options": {
-        "configFile": "packages/create-cli/vitest.int.config.ts"
+        "configFile": "{projectRoot}/vitest.int.config.ts",
+        "coverage": {
+          "enabled": true
+        }
       }
     },
     "exec-node": {

packages/models/project.json

@@ -18,16 +18,14 @@
       ]
     },
     "lint": {},
-    "unit-test": {
-      "executor": "@nx/vite:test",
-      "options": {
-        "configFile": "packages/models/vitest.unit.config.ts"
-      }
-    },
+    "unit-test": {},
     "int-test": {
       "executor": "@nx/vite:test",
       "options": {
-        "configFile": "packages/models/vitest.int.config.ts"
+        "configFile": "{projectRoot}/vitest.int.config.ts",
+        "coverage": {
+          "enabled": true
+        }
       }
     }
   },

packages/nx-plugin/project.json

@@ -41,16 +41,16 @@
         ]
       }
     },
-    "unit-test": {
-      "executor": "@nx/vite:test",
-      "options": {
-        "configFile": "packages/nx-plugin/vitest.unit.config.ts"
-      }
-    },
+    "unit-test": {},
     "int-test": {
+      "cache": true,
+      "outputs": ["{workspaceRoot}/coverage/{projectName}/int-tests/lcov.info"],
       "executor": "@nx/vite:test",
       "options": {
-        "configFile": "packages/nx-plugin/vitest.int.config.ts"
+        "configFile": "{projectRoot}/vitest.int.config.ts",
+        "coverage": {
+          "enabled": true
+        }
       }
     }
   },

packages/plugin-coverage/project.json

@@ -6,16 +6,16 @@
   "targets": {
     "build": {},
     "lint": {},
-    "unit-test": {
-      "executor": "@nx/vite:test",
-      "options": {
-        "configFile": "packages/plugin-coverage/vitest.unit.config.ts"
-      }
-    },
+    "unit-test": {},
     "int-test": {
+      "cache": true,
+      "outputs": ["{workspaceRoot}/coverage/{projectName}/int-tests/lcov.info"],
       "executor": "@nx/vite:test",
       "options": {
-        "configFile": "packages/plugin-coverage/vitest.int.config.ts"
+        "configFile": "{projectRoot}/vitest.int.config.ts",
+        "coverage": {
+          "enabled": true
+        }
       }
     }
   },