Skip to content

Commit 7194c09

Browse files
authored
Merge branch 'main' into test-custom-matcher-paths-os-agnostic
2 parents b81df43 + 9099514 commit 7194c09

File tree

625 files changed

+13633
-14907
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

625 files changed

+13633
-14907
lines changed

.eslintrc.json

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"root": true,
3-
"ignorePatterns": ["**/*"],
3+
"ignorePatterns": ["**/*", "*.config*"],
44
"plugins": ["@nx"],
55
"overrides": [
66
{
@@ -91,14 +91,21 @@
9191
"rules": {
9292
"vitest/consistent-test-filename": [
9393
"warn",
94-
{ "pattern": ".*\\.(unit|integration|e2e)\\.test\\.[tj]sx?$" }
95-
]
94+
{
95+
"pattern": ".*\\.(unit|integration|e2e)\\.test\\.[tj]sx?$"
96+
}
97+
],
98+
"@typescript-eslint/no-extra-semi": "error",
99+
"no-extra-semi": "off"
96100
}
97101
},
98102
{
99103
"files": ["*.js", "*.jsx"],
100104
"extends": ["plugin:@nx/javascript", "@code-pushup"],
101-
"rules": {}
105+
"rules": {
106+
"@typescript-eslint/no-extra-semi": "error",
107+
"no-extra-semi": "off"
108+
}
102109
},
103110
{
104111
"files": "*.json",

.github/labeler.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
- 'nx.json'
7474
- '.nvmrc'
7575
- '.prettierrc'
76-
- 'esbuild.config.js'
7776
- '.github/ISSUE_TEMPLATE/**'
7877
- '.husky/**'
7978
- 'commitlint.config.mjs'

.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,7 @@ jobs:
120120
- name: Install dependencies
121121
run: npm ci
122122
- name: E2E test affected projects
123-
run: npx nx affected -t nxv-e2e --exclude cli-e2e --parallel=1
124-
- name: E2E test cli-e2e project (due to bugs in the setup it has to run last :( )
125-
run: npx nx run cli-e2e:e2e-old
123+
run: npx nx affected -t nxv-e2e --parallel=1
126124

127125
build:
128126
runs-on: ubuntu-latest

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ Thumbs.db
4747
**/.code-pushup
4848

4949
# Nx workspace cache
50-
.nx/cache
50+
.nx

.prettierignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Add files here to ignore them from prettier formatting
22
/dist
33
/coverage
4-
/.nx/cache
4+
/.nx
55
__snapshots__

CHANGELOG.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
## 0.56.0 (2024-11-29)
2+
3+
### 🚀 Features
4+
5+
- **ci:** add nxProjectsFilter option, forwards custom filters to Nx CLI ([93a6a428](https://github.com/code-pushup/cli/commit/93a6a428))
6+
- **plugin-eslint:** support new config format in nx helpers ([effd5d26](https://github.com/code-pushup/cli/commit/effd5d26))
7+
8+
### ❤️ Thank You
9+
10+
- Matěj Chalk
11+
12+
## 0.55.0 (2024-11-25)
13+
14+
### 🚀 Features
15+
16+
- **ci:** accept custom output directory, with project name interpolation ([db3fcced](https://github.com/code-pushup/cli/commit/db3fcced))
17+
- **plugin-eslint:** drop inline object support for eslintrc (incompatible with flat config) ([ead1c0ad](https://github.com/code-pushup/cli/commit/ead1c0ad))
18+
- **plugin-eslint:** implement rules loader for flat config ([e9edf0c0](https://github.com/code-pushup/cli/commit/e9edf0c0))
19+
- **plugin-eslint:** detect version of config format ([a618bf29](https://github.com/code-pushup/cli/commit/a618bf29))
20+
- **plugin-eslint:** search for flat config files in parent directories ([3e45ac07](https://github.com/code-pushup/cli/commit/3e45ac07))
21+
- **plugin-eslint:** move eslint to peer deps, add v9 to supported range ([953e3c76](https://github.com/code-pushup/cli/commit/953e3c76))
22+
- **utils:** implement and test helper function to find nearest file ([2acdb2d8](https://github.com/code-pushup/cli/commit/2acdb2d8))
23+
24+
### 🩹 Fixes
25+
26+
- **plugin-eslint:** remove unsupported parameter for ESLint 9+ ([4b889d66](https://github.com/code-pushup/cli/commit/4b889d66))
27+
- **plugin-eslint:** use LegacyESLint if ESLINT_USE_FLAT_CONFIG=false in v9 ([e9352808](https://github.com/code-pushup/cli/commit/e9352808))
28+
- **plugin-eslint:** ensure file url scheme needed for dynamic imports on Windows ([91c7678c](https://github.com/code-pushup/cli/commit/91c7678c))
29+
- **plugin-js-packages:** add ignoreExitCode option for yarn v2 package manager ([#878](https://github.com/code-pushup/cli/pull/878))
30+
31+
### ❤️ Thank You
32+
33+
- Edouard Maleix
34+
- Matěj Chalk
35+
136
## 0.54.0 (2024-11-08)
237

338
### 🚀 Features

code-pushup.config.ts

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,9 @@ import {
55
eslintCoreConfigNx,
66
jsPackagesCoreConfig,
77
lighthouseCoreConfig,
8-
} from './code-pushup.preset';
9-
import {
10-
fileSizePlugin,
11-
fileSizeRecommendedRefs,
12-
packageJsonDocumentationGroupRef,
13-
packageJsonPerformanceGroupRef,
14-
packageJsonPlugin,
15-
} from './dist/examples/plugins';
16-
import { mergeConfigs } from './dist/packages/utils';
17-
import type { CoreConfig } from './packages/models/src';
8+
} from './code-pushup.preset.js';
9+
import type { CoreConfig } from './packages/models/src/index.js';
10+
import { mergeConfigs } from './packages/utils/src/index.js';
1811

1912
// load upload configuration from environment
2013
const envSchema = z.object({
@@ -35,31 +28,7 @@ const config: CoreConfig = {
3528
},
3629
}),
3730

38-
plugins: [
39-
fileSizePlugin({
40-
directory: './dist/examples/react-todos-app',
41-
pattern: /\.js$/,
42-
budget: 174_080, // 170 kB
43-
}),
44-
45-
packageJsonPlugin({
46-
directory: './dist/packages',
47-
license: 'MIT',
48-
type: 'module',
49-
}),
50-
],
51-
52-
categories: [
53-
{
54-
slug: 'custom-checks',
55-
title: 'Custom checks',
56-
refs: [
57-
...fileSizeRecommendedRefs,
58-
packageJsonPerformanceGroupRef,
59-
packageJsonDocumentationGroupRef,
60-
],
61-
},
62-
],
31+
plugins: [],
6332
};
6433

6534
export default mergeConfigs(

code-pushup.preset.ts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1+
import type {
2+
CategoryConfig,
3+
CoreConfig,
4+
} from './packages/models/src/index.js';
15
import coveragePlugin, {
26
getNxCoveragePaths,
3-
} from './dist/packages/plugin-coverage';
7+
} from './packages/plugin-coverage/src/index.js';
48
import eslintPlugin, {
59
eslintConfigFromAllNxProjects,
610
eslintConfigFromNxProject,
7-
} from './dist/packages/plugin-eslint';
8-
import jsPackagesPlugin from './dist/packages/plugin-js-packages';
11+
} from './packages/plugin-eslint/src/index.js';
12+
import jsPackagesPlugin from './packages/plugin-js-packages/src/index.js';
913
import lighthousePlugin, {
1014
lighthouseGroupRef,
11-
} from './dist/packages/plugin-lighthouse';
12-
import type { CategoryConfig, CoreConfig } from './packages/models/src';
15+
} from './packages/plugin-lighthouse/src/index.js';
1316

1417
export const jsPackagesCategories: CategoryConfig[] = [
1518
{

e2e/ci-e2e/.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": ["../../.eslintrc.json"],
3-
"ignorePatterns": ["!**/*", "code-pushup.config*.ts"],
3+
"ignorePatterns": ["!**/*", "*.config*"],
44
"overrides": [
55
{
66
"files": ["*.ts", "*.tsx"],

e2e/ci-e2e/mocks/fixtures/code-pushup.config.ts renamed to e2e/ci-e2e/mocks/fixtures/ci-test-repo/code-pushup.config.ts

File renamed without changes.

0 commit comments

Comments
 (0)