Skip to content

Commit 88b6766

Browse files
committed
Merge branch 'main' into feat/core/pass-config-to-plugin-runner
2 parents ac53831 + 7aab96e commit 88b6766

File tree

29 files changed

+17204
-13842
lines changed

29 files changed

+17204
-13842
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,8 @@ Thumbs.db
5151

5252
# Nx workspace cache
5353
.nx
54+
55+
vite.config.*.timestamp*
56+
vitest.config.*.timestamp*
57+
.cursor/rules/nx-rules.mdc
58+
.github/instructions/nx.instructions.md

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
---
1818

19-
![Type safety](https://api.staging.code-pushup.dev/badges/code-pushup/cli/type-safety?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
20-
![Bug prevention](https://api.staging.code-pushup.dev/badges/code-pushup/cli/bug-prevention?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
21-
![Code style](https://api.staging.code-pushup.dev/badges/code-pushup/cli/code-style?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
22-
![Code coverage](https://api.staging.code-pushup.dev/badges/code-pushup/cli/code-coverage?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
23-
![Security](https://api.staging.code-pushup.dev/badges/code-pushup/cli/security?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
24-
![Updates](https://api.staging.code-pushup.dev/badges/code-pushup/cli/updates?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
25-
![Documentation](https://api.staging.code-pushup.dev/badges/code-pushup/cli/docs?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
19+
![Type safety](https://api.staging.code-pushup.dev/badges/code-pushup/cli-workspace/type-safety?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
20+
![Bug prevention](https://api.staging.code-pushup.dev/badges/code-pushup/cli-workspace/bug-prevention?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
21+
![Code style](https://api.staging.code-pushup.dev/badges/code-pushup/cli-workspace/code-style?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
22+
![Code coverage](https://api.staging.code-pushup.dev/badges/code-pushup/cli-workspace/code-coverage?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
23+
![Security](https://api.staging.code-pushup.dev/badges/code-pushup/cli-workspace/security?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
24+
![Updates](https://api.staging.code-pushup.dev/badges/code-pushup/cli-workspace/updates?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
25+
![Documentation](https://api.staging.code-pushup.dev/badges/code-pushup/cli-workspace/docs?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
2626

2727
---
2828

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
teardownTestFolder,
1919
} from '@code-pushup/test-utils';
2020
import { executeProcess, readJsonFile } from '@code-pushup/utils';
21-
import { INLINE_PLUGIN } from './inline-plugin.js';
21+
import { INLINE_PLUGIN } from '../mocks/inline-plugin.js';
2222

2323
async function addTargetToWorkspace(
2424
tree: Tree,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
teardownTestFolder,
1818
} from '@code-pushup/test-utils';
1919
import { executeProcess, readTextFile } from '@code-pushup/utils';
20-
import { INLINE_PLUGIN } from './inline-plugin.js';
20+
import { INLINE_PLUGIN } from '../mocks/inline-plugin.js';
2121

2222
describe('nx-plugin', () => {
2323
let tree: Tree;

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

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,26 @@ exports[`PLUGIN collect report with typescript-plugin NPM package > should run p
5858
"description": "Errors that occur during type checking and type inference",
5959
"details": {
6060
"issues": [
61+
{
62+
"message": "TS2694: Namespace ''./index'' has no exported member 'IOptions'.",
63+
"severity": "error",
64+
"source": {
65+
"file": "node_modules/@types/glob/index.d.ts",
66+
"position": {
67+
"startLine": 29,
68+
},
69+
},
70+
},
71+
{
72+
"message": "TS2724: ''./index'' has no exported member named 'IMinimatch'. Did you mean 'Minimatch'?",
73+
"severity": "error",
74+
"source": {
75+
"file": "node_modules/@types/glob/index.d.ts",
76+
"position": {
77+
"startLine": 74,
78+
},
79+
},
80+
},
6181
{
6282
"message": "TS2683: 'this' implicitly has type 'any' because it does not have a type annotation.",
6383
"severity": "error",
@@ -80,11 +100,11 @@ exports[`PLUGIN collect report with typescript-plugin NPM package > should run p
80100
},
81101
],
82102
},
83-
"displayValue": "2 errors",
103+
"displayValue": "4 errors",
84104
"score": 0,
85105
"slug": "semantic-errors",
86106
"title": "Semantic errors",
87-
"value": 2,
107+
"value": 4,
88108
},
89109
{
90110
"description": "Errors that occur during TypeScript language service operations",

nx.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,11 @@
4040
}
4141
}
4242
},
43-
"e2e": {
44-
"dependsOn": ["^build"]
45-
},
43+
"e2e": { "dependsOn": ["^build"] },
4644
"lint": {
4745
"inputs": ["default", "{workspaceRoot}/eslint.config.?(c)js"],
48-
"executor": "@nx/linter:eslint",
46+
"executor": "@nx/eslint:lint",
47+
"outputs": ["{options.outputFile}"],
4948
"cache": true,
5049
"options": {
5150
"errorOnUnmatchedPattern": false,
@@ -143,7 +142,8 @@
143142
},
144143
"version": {
145144
"conventionalCommits": true,
146-
"generatorOptions": {
145+
"preserveLocalDependencyProtocols": false,
146+
"versionActionsOptions": {
147147
"skipLockFileUpdate": true
148148
}
149149
},

0 commit comments

Comments
 (0)