diff --git a/eslint.config.js b/eslint.config.js index ba97c26ba..5421adebe 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -5,7 +5,6 @@ module.exports = [ ...nx.configs['flat/base'], ...nx.configs['flat/typescript'], ...nx.configs['flat/javascript'], - eslintConfigPrettier, { ignores: ['**/dist'], }, @@ -29,13 +28,6 @@ module.exports = [ // }, { files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'], - // Override or add rules here - rules: { - 'prettier/prettier': 'error', - }, - plugins: { - prettier: require('eslint-plugin-prettier'), - }, }, { files: ['**/*.json'], @@ -51,4 +43,5 @@ module.exports = [ parser: require('jsonc-eslint-parser'), }, }, + eslintConfigPrettier, ]; diff --git a/eslint.config.mjs b/eslint.config.mjs index 7ebaca374..628a554fe 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,13 +1,11 @@ import nx from '@nx/eslint-plugin'; import eslintConfigPrettier from 'eslint-config-prettier/flat'; -import prettierPlugin from 'eslint-plugin-prettier'; import jsoncEslintParser from 'jsonc-eslint-parser'; export default [ ...nx.configs['flat/base'], ...nx.configs['flat/typescript'], ...nx.configs['flat/javascript'], - eslintConfigPrettier, { ignores: ['**/dist', '**/generated'], }, @@ -40,12 +38,7 @@ export default [ '**/*.mjs', ], // Override or add rules here - plugins: { - prettier: prettierPlugin, - }, - rules: { - 'prettier/prettier': 'error', - }, + rules: {}, }, { files: ['**/*.json'], @@ -61,4 +54,5 @@ export default [ parser: jsoncEslintParser, }, }, + eslintConfigPrettier, ]; diff --git a/package-lock.json b/package-lock.json index c938c2294..019e8178e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -85,7 +85,6 @@ "autoprefixer": "^10.4.20", "eslint": "^9.8.0", "eslint-config-prettier": "^10.1.5", - "eslint-plugin-prettier": "^5.2.3", "husky": "^9.1.7", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", @@ -9477,19 +9476,6 @@ "node": ">=14" } }, - "node_modules/@pkgr/core": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.7.tgz", - "integrity": "sha512-YLT9Zo3oNPJoBjBc4q8G2mjU4tqIbf5CEOORbUUr48dCD9q3umJ3IPlVqOqDakPfd2HuwccBaqlGhN4Gmr5OWg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/pkgr" - } - }, "node_modules/@polka/url": { "version": "1.0.0-next.29", "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz", @@ -16119,37 +16105,6 @@ "eslint": ">=7.0.0" } }, - "node_modules/eslint-plugin-prettier": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.4.1.tgz", - "integrity": "sha512-9dF+KuU/Ilkq27A8idRP7N2DH8iUR6qXcjF3FR2wETY21PZdBrIjwCau8oboyGj9b7etWmTGEeM8e7oOed6ZWg==", - "dev": true, - "license": "MIT", - "dependencies": { - "prettier-linter-helpers": "^1.0.0", - "synckit": "^0.11.7" - }, - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint-plugin-prettier" - }, - "peerDependencies": { - "@types/eslint": ">=8.0.0", - "eslint": ">=8.0.0", - "eslint-config-prettier": ">= 7.0.0 <10.0.0 || >=10.1.0", - "prettier": ">=3.0.0" - }, - "peerDependenciesMeta": { - "@types/eslint": { - "optional": true - }, - "eslint-config-prettier": { - "optional": true - } - } - }, "node_modules/eslint-scope": { "version": "8.4.0", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", @@ -16600,13 +16555,6 @@ "dev": true, "license": "MIT" }, - "node_modules/fast-diff": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz", - "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==", - "dev": true, - "license": "Apache-2.0" - }, "node_modules/fast-glob": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", @@ -25454,19 +25402,6 @@ "url": "https://github.com/prettier/prettier?sponsor=1" } }, - "node_modules/prettier-linter-helpers": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", - "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-diff": "^1.1.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/pretty-error": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz", @@ -28274,22 +28209,6 @@ "dev": true, "license": "MIT" }, - "node_modules/synckit": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.8.tgz", - "integrity": "sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@pkgr/core": "^0.2.4" - }, - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/synckit" - } - }, "node_modules/tailwindcss": { "version": "3.4.17", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz", diff --git a/package.json b/package.json index 875dd5bfd..8f9b3ace5 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,6 @@ "autoprefixer": "^10.4.20", "eslint": "^9.8.0", "eslint-config-prettier": "^10.1.5", - "eslint-plugin-prettier": "^5.2.3", "husky": "^9.1.7", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0",