Merge branch 'main' into add-plugin-targets

# Conflicts:
#	nx.json
#	package-lock.json

Author: BioPhoton

.gitignore

@@ -51,3 +51,8 @@ Thumbs.db
 
 # Nx workspace cache
 .nx
+
+vite.config.*.timestamp*
+vitest.config.*.timestamp*
+.cursor/rules/nx-rules.mdc
+.github/instructions/nx.instructions.md

README.md

@@ -16,13 +16,13 @@
 
 ---
 
-![Type safety](https://api.staging.code-pushup.dev/badges/code-pushup/cli/type-safety?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
-![Bug prevention](https://api.staging.code-pushup.dev/badges/code-pushup/cli/bug-prevention?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
-![Code style](https://api.staging.code-pushup.dev/badges/code-pushup/cli/code-style?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
-![Code coverage](https://api.staging.code-pushup.dev/badges/code-pushup/cli/code-coverage?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
-![Security](https://api.staging.code-pushup.dev/badges/code-pushup/cli/security?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
-![Updates](https://api.staging.code-pushup.dev/badges/code-pushup/cli/updates?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
-![Documentation](https://api.staging.code-pushup.dev/badges/code-pushup/cli/docs?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
+![Type safety](https://api.staging.code-pushup.dev/badges/code-pushup/cli-workspace/type-safety?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
+![Bug prevention](https://api.staging.code-pushup.dev/badges/code-pushup/cli-workspace/bug-prevention?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
+![Code style](https://api.staging.code-pushup.dev/badges/code-pushup/cli-workspace/code-style?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
+![Code coverage](https://api.staging.code-pushup.dev/badges/code-pushup/cli-workspace/code-coverage?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
+![Security](https://api.staging.code-pushup.dev/badges/code-pushup/cli-workspace/security?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
+![Updates](https://api.staging.code-pushup.dev/badges/code-pushup/cli-workspace/updates?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
+![Documentation](https://api.staging.code-pushup.dev/badges/code-pushup/cli-workspace/docs?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
 
 ---
 

e2e/nx-plugin-e2e/tests/inline-plugin.ts e2e/nx-plugin-e2e/mocks/inline-plugin.tse2e/nx-plugin-e2e/tests/inline-plugin.ts renamed to e2e/nx-plugin-e2e/mocks/inline-plugin.ts

@@ -18,7 +18,7 @@ import {
   teardownTestFolder,
 } from '@code-pushup/test-utils';
 import { executeProcess, readJsonFile } from '@code-pushup/utils';
-import { INLINE_PLUGIN } from './inline-plugin.js';
+import { INLINE_PLUGIN } from '../mocks/inline-plugin.js';
 
 async function addTargetToWorkspace(
   tree: Tree,

e2e/nx-plugin-e2e/tests/executor-cli.e2e.test.ts

@@ -17,7 +17,7 @@ import {
   teardownTestFolder,
 } from '@code-pushup/test-utils';
 import { executeProcess, readTextFile } from '@code-pushup/utils';
-import { INLINE_PLUGIN } from './inline-plugin.js';
+import { INLINE_PLUGIN } from '../mocks/inline-plugin.js';
 
 describe('nx-plugin', () => {
   let tree: Tree;

e2e/nx-plugin-e2e/tests/plugin-create-nodes.e2e.test.ts

@@ -58,6 +58,26 @@ exports[`PLUGIN collect report with typescript-plugin NPM package > should run p
           "description": "Errors that occur during type checking and type inference",
           "details": {
             "issues": [
+              {
+                "message": "TS2694: Namespace ''./index'' has no exported member 'IOptions'.",
+                "severity": "error",
+                "source": {
+                  "file": "node_modules/@types/glob/index.d.ts",
+                  "position": {
+                    "startLine": 29,
+                  },
+                },
+              },
+              {
+                "message": "TS2724: ''./index'' has no exported member named 'IMinimatch'. Did you mean 'Minimatch'?",
+                "severity": "error",
+                "source": {
+                  "file": "node_modules/@types/glob/index.d.ts",
+                  "position": {
+                    "startLine": 74,
+                  },
+                },
+              },
               {
                 "message": "TS2683: 'this' implicitly has type 'any' because it does not have a type annotation.",
                 "severity": "error",
@@ -80,11 +100,11 @@ exports[`PLUGIN collect report with typescript-plugin NPM package > should run p
               },
             ],
           },
-          "displayValue": "2 errors",
+          "displayValue": "4 errors",
           "score": 0,
           "slug": "semantic-errors",
           "title": "Semantic errors",
-          "value": 2,
+          "value": 4,
         },
         {
           "description": "Errors that occur during TypeScript language service operations",

e2e/plugin-typescript-e2e/tests/__snapshots__/collect.e2e.test.ts.snap

@@ -327,7 +327,8 @@
     },
     "version": {
       "conventionalCommits": true,
-      "generatorOptions": {
+      "preserveLocalDependencyProtocols": false,
+      "versionActionsOptions": {
         "skipLockFileUpdate": true
       }
     },

nx.json

@@ -24,7 +24,7 @@
   "dependencies": {
     "@code-pushup/portal-client": "^0.15.0",
     "@isaacs/cliui": "^8.0.2",
-    "@nx/devkit": "19.8.13",
+    "@nx/devkit": "21.4.1",
     "@poppinss/cliui": "6.4.1",
     "@swc/helpers": "0.5.13",
     "ansis": "^3.3.2",
@@ -36,7 +36,7 @@
     "lighthouse": "^12.0.0",
     "lighthouse-logger": "2.0.1",
     "multi-progress-bars": "^5.0.3",
-    "nx": "19.8.13",
+    "nx": "21.4.1",
     "parse-lcov": "^1.0.4",
     "rimraf": "^6.0.1",
     "semver": "^7.6.3",
@@ -57,26 +57,26 @@
     "@commitlint/cz-commitlint": "^19.5.0",
     "@commitlint/types": "^19.5.0",
     "@nodelib/fs.walk": "^2.0.0",
-    "@nx/eslint-plugin": "19.8.13",
-    "@nx/js": "19.8.13",
-    "@nx/plugin": "19.8.13",
-    "@nx/react": "19.8.13",
-    "@nx/vite": "19.8.13",
-    "@nx/workspace": "19.8.13",
-    "@push-based/nx-verdaccio": "^0.0.0",
+    "@nx/eslint-plugin": "21.4.1",
+    "@nx/js": "21.4.1",
+    "@nx/plugin": "21.4.1",
+    "@nx/react": "21.4.1",
+    "@nx/vite": "21.4.1",
+    "@nx/workspace": "21.4.1",
+    "@push-based/nx-verdaccio": "0.0.6",
     "@swc-node/register": "1.9.2",
-    "@swc/cli": "0.3.14",
+    "@swc/cli": "0.6.0",
     "@swc/core": "1.5.7",
     "@testing-library/jest-dom": "^6.4.2",
-    "@testing-library/react": "15.0.6",
+    "@testing-library/react": "16.1.0",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@types/benchmark": "^2.1.5",
     "@types/debug": "^4.1.12",
     "@types/eslint": "^8.44.2",
     "@types/node": "^22.13.4",
     "@types/react": "18.3.1",
     "@types/react-dom": "18.3.0",
-    "@vitejs/plugin-react": "4.2.1",
+    "@vitejs/plugin-react": "^5.0.0",
     "@vitest/coverage-v8": "1.3.1",
     "@vitest/eslint-plugin": "^1.1.38",
     "@vitest/ui": "1.3.1",
@@ -88,19 +88,20 @@
     "dotenv": "^16.4.5",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-functional": "^7.1.0",
-    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-import": "2.31.0",
     "eslint-plugin-jest-extended": "^3.0.0",
     "eslint-plugin-jest-formatting": "^3.1.0",
     "eslint-plugin-n": "^17.15.0",
     "eslint-plugin-promise": "^7.2.1",
     "eslint-plugin-react": "^7.37.2",
-    "eslint-plugin-react-hooks": "^5.1.0",
+    "eslint-plugin-react-hooks": "5.0.0",
     "eslint-plugin-sonarjs": "^1.0.4",
     "eslint-plugin-unicorn": "^56.0.1",
     "globals": "^15.13.0",
     "husky": "^8.0.0",
     "inquirer": "^9.3.7",
     "jest-extended": "^6.0.0",
+    "jiti": "2.4.2",
     "jsdom": "~24.0.0",
     "jsonc-eslint-parser": "^2.4.0",
     "knip": "^5.33.3",
@@ -115,26 +116,26 @@
     "tsconfig-paths": "^4.2.0",
     "tsx": "^4.19.0",
     "type-fest": "^4.26.1",
-    "typescript": "5.5.4",
+    "typescript": "5.7.3",
     "typescript-eslint": "^8.18.0",
-    "verdaccio": "^5.32.2",
-    "vite": "^5.4.8",
+    "verdaccio": "6.1.6",
+    "vite": "6.3.5",
     "vitest": "1.3.1",
     "zod2md": "^0.2.4"
   },
   "optionalDependencies": {
-    "@esbuild/darwin-arm64": "^0.19.12",
-    "@nx/nx-darwin-arm64": "19.8.13",
-    "@nx/nx-darwin-x64": "19.8.13",
-    "@nx/nx-linux-x64-gnu": "19.8.13",
+    "@esbuild/darwin-arm64": "^0.25.9",
+    "@nx/nx-darwin-arm64": "^21.4.1",
+    "@nx/nx-darwin-x64": "^21.4.1",
+    "@nx/nx-linux-x64-gnu": "^21.4.1",
     "@rollup/rollup-darwin-arm64": "^4.0.0",
     "@rollup/rollup-darwin-x64": "^4.0.0",
     "@rollup/rollup-linux-x64-gnu": "^4.0.0",
     "@rollup/rollup-win32-x64-msvc": "^4.0.0"
   },
   "overrides": {
     "@beaussan/nx-knip": {
-      "@nx/devkit": "19 || 18"
+      "@nx/devkit": "21 || 19 || 18"
     }
   },
   "keywords": [

package.json

@@ -34,6 +34,7 @@ export { commitSchema, type Commit } from './lib/commit.js';
 export {
   artifactGenerationCommandSchema,
   pluginArtifactOptionsSchema,
+  type PluginArtifactOptions,
 } from './lib/configuration.js';
 export { coreConfigSchema, type CoreConfig } from './lib/core-config.js';
 export {
@@ -62,6 +63,7 @@ export {
 export {
   fileNameSchema,
   filePathSchema,
+  globPathSchema,
   materialIconSchema,
   scoreSchema,
   slugSchema,

packages/models/src/index.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { globPathSchema } from './implementation/schemas.js';
 
 /**
  * Generic schema for a tool command configuration, reusable across plugins.
@@ -13,7 +14,9 @@ export const artifactGenerationCommandSchema = z.union([
 
 export const pluginArtifactOptionsSchema = z.object({
   generateArtifactsCommand: artifactGenerationCommandSchema.optional(),
-  artifactsPaths: z.union([z.string(), z.array(z.string()).min(1)]),
+  artifactsPaths: z
+    .union([globPathSchema, z.array(globPathSchema).min(1)])
+    .describe('File paths or glob patterns for artifact files'),
 });
 
 export type PluginArtifactOptions = z.infer<typeof pluginArtifactOptionsSchema>;