diff --git a/apps/dep-graph-client/src/graphs/medium.ts b/apps/dep-graph-client/src/graphs/medium.ts index 53edb93121..050535981d 100644 --- a/apps/dep-graph-client/src/graphs/medium.ts +++ b/apps/dep-graph-client/src/graphs/medium.ts @@ -25468,7 +25468,7 @@ export const mediumGraph: ProjectGraphCache = { type: 'npm', name: 'npm:eslint-config-prettier', data: { - version: '6.0.0', + version: '8.1.0', packageName: 'eslint-config-prettier', files: [], }, diff --git a/apps/dep-graph-client/src/graphs/small.ts b/apps/dep-graph-client/src/graphs/small.ts index 81df796f13..9774b87f25 100644 --- a/apps/dep-graph-client/src/graphs/small.ts +++ b/apps/dep-graph-client/src/graphs/small.ts @@ -9945,7 +9945,7 @@ export const smallGraph: ProjectGraphCache = { type: 'npm', name: 'npm:eslint-config-prettier', data: { - version: '6.0.0', + version: '8.1.0', packageName: 'eslint-config-prettier', files: [], }, diff --git a/package.json b/package.json index b4702ca664..036ce0b4f3 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "dotenv": "6.2.0", "ejs": "^3.1.5", "eslint": "7.10.0", - "eslint-config-prettier": "^7.1.0", + "eslint-config-prettier": "^8.1.0", "eslint-plugin-cypress": "^2.10.3", "express": "4.17.1", "file-loader": "4.2.0", diff --git a/packages/eslint-plugin-nx/package.json b/packages/eslint-plugin-nx/package.json index 5eb5151e97..b0b261224d 100644 --- a/packages/eslint-plugin-nx/package.json +++ b/packages/eslint-plugin-nx/package.json @@ -28,7 +28,8 @@ }, "homepage": "https://nx.dev", "peerDependencies": { - "@typescript-eslint/parser": "^4.3.0" + "@typescript-eslint/parser": "^4.3.0", + "eslint-config-prettier": "^8.1.0" }, "dependencies": { "@nrwl/devkit": "*", diff --git a/packages/eslint-plugin-nx/src/configs/javascript.ts b/packages/eslint-plugin-nx/src/configs/javascript.ts index e736cdec2b..3b02eb07fd 100644 --- a/packages/eslint-plugin-nx/src/configs/javascript.ts +++ b/packages/eslint-plugin-nx/src/configs/javascript.ts @@ -30,7 +30,6 @@ export default { 'plugin:@typescript-eslint/eslint-recommended', 'plugin:@typescript-eslint/recommended', 'prettier', - 'prettier/@typescript-eslint', ], rules: { '@typescript-eslint/explicit-member-accessibility': 'off', diff --git a/packages/eslint-plugin-nx/src/configs/typescript.ts b/packages/eslint-plugin-nx/src/configs/typescript.ts index a7a382f320..f802413163 100644 --- a/packages/eslint-plugin-nx/src/configs/typescript.ts +++ b/packages/eslint-plugin-nx/src/configs/typescript.ts @@ -25,7 +25,6 @@ export default { 'plugin:@typescript-eslint/eslint-recommended', 'plugin:@typescript-eslint/recommended', 'prettier', - 'prettier/@typescript-eslint', ], rules: { '@typescript-eslint/explicit-member-accessibility': 'off', diff --git a/packages/linter/migrations.json b/packages/linter/migrations.json index 122c7b823e..419f83d713 100644 --- a/packages/linter/migrations.json +++ b/packages/linter/migrations.json @@ -58,6 +58,15 @@ "alwaysAddToPackageJson": false } } + }, + "11.5.0": { + "version": "11.5.0-beta.0", + "packages": { + "eslint-config-prettier": { + "version": "8.1.0", + "alwaysAddToPackageJson": false + } + } } } } diff --git a/packages/linter/src/migrations/update-10-3-0/update-eslint-builder-and-config.spec.ts b/packages/linter/src/migrations/update-10-3-0/update-eslint-builder-and-config.spec.ts index 00f80ef5bb..5f8fad3485 100644 --- a/packages/linter/src/migrations/update-10-3-0/update-eslint-builder-and-config.spec.ts +++ b/packages/linter/src/migrations/update-10-3-0/update-eslint-builder-and-config.spec.ts @@ -1,6 +1,5 @@ import { Tree } from '@angular-devkit/schematics'; import { - readJsonInTree, readWorkspace, updateJsonInTree, updateWorkspace, diff --git a/packages/linter/src/migrations/update-10-4-0/update-eslint-configs-to-use-nx-presets.spec.ts b/packages/linter/src/migrations/update-10-4-0/update-eslint-configs-to-use-nx-presets.spec.ts index eaeddb20a9..176669ada2 100644 --- a/packages/linter/src/migrations/update-10-4-0/update-eslint-configs-to-use-nx-presets.spec.ts +++ b/packages/linter/src/migrations/update-10-4-0/update-eslint-configs-to-use-nx-presets.spec.ts @@ -5,10 +5,10 @@ import type { Linter } from 'eslint'; import { runMigration } from '../../utils/testing'; import { updateExtendsAndRemoveDuplication, + updateObjPropAndRemoveDuplication, updateOverridesAndRemoveDuplication, updateParserOptionsAndRemoveDuplication, updatePluginsAndRemoveDuplication, - updateObjPropAndRemoveDuplication, } from './update-eslint-configs-to-use-nx-presets'; describe('Update ESLint config files to use preset configs which eslint-plugin-nx exports', () => { diff --git a/packages/linter/src/utils/versions.ts b/packages/linter/src/utils/versions.ts index 47cd64ccb5..3d0252dcfd 100644 --- a/packages/linter/src/utils/versions.ts +++ b/packages/linter/src/utils/versions.ts @@ -5,4 +5,4 @@ export const buildAngularVersion = '~0.1102.0'; export const typescriptESLintVersion = '4.3.0'; export const eslintVersion = '7.10.0'; -export const eslintConfigPrettierVersion = '6.0.0'; +export const eslintConfigPrettierVersion = '8.1.0'; diff --git a/packages/workspace/src/utils/versions.ts b/packages/workspace/src/utils/versions.ts index c7c0235476..c734752b24 100644 --- a/packages/workspace/src/utils/versions.ts +++ b/packages/workspace/src/utils/versions.ts @@ -7,4 +7,4 @@ export const prettierVersion = '2.2.1'; export const typescriptESLintVersion = '4.3.0'; export const tslintVersion = '~6.1.0'; export const eslintVersion = '7.10.0'; -export const eslintConfigPrettierVersion = '6.0.0'; +export const eslintConfigPrettierVersion = '8.1.0'; diff --git a/yarn.lock b/yarn.lock index efc3dcd876..f388c6428b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10868,10 +10868,10 @@ escodegen@^1.11.1, escodegen@^1.14.1: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.1.0.tgz#5402eb559aa94b894effd6bddfa0b1ca051c858f" - integrity sha512-9sm5/PxaFG7qNJvJzTROMM1Bk1ozXVTKI0buKOyb0Bsr1hrwi0H/TzxF/COtf1uxikIK8SwhX7K6zg78jAzbeA== +eslint-config-prettier@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz#4ef1eaf97afe5176e6a75ddfb57c335121abc5a6" + integrity sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw== eslint-plugin-cypress@^2.10.3: version "2.11.2"