Skip to content

Commit 4bd6477

Browse files
authored
feat(linter): support eslint-config-prettier v10 (#30480)
Add support for `eslint-config-prettier` v10. ## Current Behavior ## Expected Behavior ## Related Issue(s) Fixes #30145
1 parent 9dd4766 commit 4bd6477

File tree

11 files changed

+256
-217
lines changed

11 files changed

+256
-217
lines changed

docs/generated/manifests/nx-api.json

+10
Original file line numberDiff line numberDiff line change
@@ -1727,6 +1727,16 @@
17271727
}
17281728
},
17291729
"migrations": {
1730+
"/nx-api/eslint/migrations/20.7.0-package-updates": {
1731+
"description": "",
1732+
"file": "generated/packages/eslint/migrations/20.7.0-package-updates.json",
1733+
"hidden": false,
1734+
"name": "20.7.0-package-updates",
1735+
"version": "20.7.0-beta.4",
1736+
"originalFilePath": "/packages/eslint",
1737+
"path": "/nx-api/eslint/migrations/20.7.0-package-updates",
1738+
"type": "migration"
1739+
},
17301740
"/nx-api/eslint/migrations/20.4.0-typescript-eslint-package-updates": {
17311741
"description": "",
17321742
"file": "generated/packages/eslint/migrations/20.4.0-typescript-eslint-package-updates.json",

docs/generated/packages-metadata.json

+10
Original file line numberDiff line numberDiff line change
@@ -1715,6 +1715,16 @@
17151715
}
17161716
],
17171717
"migrations": [
1718+
{
1719+
"description": "",
1720+
"file": "generated/packages/eslint/migrations/20.7.0-package-updates.json",
1721+
"hidden": false,
1722+
"name": "20.7.0-package-updates",
1723+
"version": "20.7.0-beta.4",
1724+
"originalFilePath": "/packages/eslint",
1725+
"path": "eslint/migrations/20.7.0-package-updates",
1726+
"type": "migration"
1727+
},
17181728
{
17191729
"description": "",
17201730
"file": "generated/packages/eslint/migrations/20.4.0-typescript-eslint-package-updates.json",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"name": "20.7.0-package-updates",
3+
"version": "20.7.0-beta.4",
4+
"packages": { "eslint-config-prettier": { "version": "^10.0.0" } },
5+
"aliases": [],
6+
"description": "",
7+
"hidden": false,
8+
"implementation": "",
9+
"path": "/packages/eslint",
10+
"schema": null,
11+
"type": "migration"
12+
}

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
"esbuild": "0.25.0",
190190
"eslint": "8.57.0",
191191
"eslint-config-next": "14.2.16",
192-
"eslint-config-prettier": "9.1.0",
192+
"eslint-config-prettier": "^10.0.0",
193193
"eslint-plugin-cypress": "2.14.0",
194194
"eslint-plugin-import": "2.31.0",
195195
"eslint-plugin-jsx-a11y": "6.10.1",

packages/eslint-plugin/.eslintrc.json

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"typescript",
3737
// Installed to workspace by plugins
3838
"@typescript-eslint/parser",
39-
"eslint-config-prettier",
4039
"@angular-eslint/eslint-plugin",
4140
"angular-eslint",
4241
"typescript-eslint",

packages/eslint-plugin/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"homepage": "https://nx.dev",
2727
"peerDependencies": {
2828
"@typescript-eslint/parser": "^6.13.2 || ^7.0.0 || ^8.0.0",
29-
"eslint-config-prettier": "^9.0.0"
29+
"eslint-config-prettier": "^10.0.0"
3030
},
3131
"peerDependenciesMeta": {
3232
"eslint-config-prettier": {

packages/eslint/migrations.json

+8
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,14 @@
182182
"alwaysAddToPackageJson": false
183183
}
184184
}
185+
},
186+
"20.7.0": {
187+
"version": "20.7.0-beta.4",
188+
"packages": {
189+
"eslint-config-prettier": {
190+
"version": "^10.0.0"
191+
}
192+
}
185193
}
186194
}
187195
}

packages/eslint/src/generators/convert-to-flat-config/generator.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ describe('convert-to-flat-config generator', () => {
6969
"@nx/eslint": "0.0.1",
7070
"@nx/eslint-plugin": "0.0.1",
7171
"eslint": "^9.8.0",
72-
"eslint-config-prettier": "^9.0.0",
72+
"eslint-config-prettier": "^10.0.0",
7373
"typescript-eslint": "^8.19.0"
7474
}
7575
}
@@ -682,7 +682,7 @@ describe('convert-to-flat-config generator', () => {
682682
"@nx/eslint": "0.0.1",
683683
"@nx/eslint-plugin": "0.0.1",
684684
"eslint": "^9.8.0",
685-
"eslint-config-prettier": "^9.0.0",
685+
"eslint-config-prettier": "^10.0.0",
686686
"typescript-eslint": "^8.19.0"
687687
}
688688
}

packages/eslint/src/utils/versions.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export const nxVersion = require('../../package.json').version;
22

33
export const eslintVersion = '~8.57.0';
44
export const eslintrcVersion = '^2.1.1';
5-
export const eslintConfigPrettierVersion = '^9.0.0';
5+
export const eslintConfigPrettierVersion = '^10.0.0';
66
export const typescriptESLintVersion = '^7.16.0';
77
export const jsoncEslintParserVersion = '^2.1.0';
88

packages/vue/src/generators/library/__snapshots__/library.spec.ts.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ exports[`library should add vue, vite and vitest to package.json 1`] = `
181181
"@vue/eslint-config-typescript": "^11.0.3",
182182
"@vue/test-utils": "^2.4.1",
183183
"eslint": "~8.57.0",
184-
"eslint-config-prettier": "^9.0.0",
184+
"eslint-config-prettier": "^10.0.0",
185185
"eslint-plugin-vue": "^9.16.1",
186186
"jiti": "2.4.2",
187187
"jsdom": "~22.1.0",

pnpm-lock.yaml

+210-210
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)