From d53000ae671246c9121a62e54fe43eb704b8cef2 Mon Sep 17 00:00:00 2001 From: Phillip Barta Date: Fri, 3 Jun 2022 17:18:28 +0200 Subject: [PATCH] feat(core): migrate to prettier ^2.6.2 (#10499) --- package.json | 4 ++-- packages/nx/src/utils/versions.ts | 2 +- packages/workspace/migrations.json | 4 ++++ packages/workspace/package.json | 2 +- .../new/__snapshots__/new.spec.ts.snap | 6 +++--- packages/workspace/src/utils/versions.ts | 2 +- yarn.lock | 20 +++++++++---------- 7 files changed, 22 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index ddba648b78a36..be868257247cd 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "@types/jest": "27.4.1", "@types/marked": "^2.0.0", "@types/node": "16.11.7", - "@types/prettier": "2.4.3", + "@types/prettier": "^2.6.2", "@types/react": "18.0.8", "@types/react-dom": "18.0.3", "@types/react-router-dom": "5.1.7", @@ -196,7 +196,7 @@ "postcss-import": "~14.1.0", "postcss-preset-env": "~7.5.0", "postcss-url": "~10.1.3", - "prettier": "2.5.1", + "prettier": "^2.6.2", "prettier-plugin-tailwindcss": "^0.1.5", "pretty-quick": "^3.1.0", "protractor": "5.4.3", diff --git a/packages/nx/src/utils/versions.ts b/packages/nx/src/utils/versions.ts index 71d5ee23882ef..4557cde4206e6 100644 --- a/packages/nx/src/utils/versions.ts +++ b/packages/nx/src/utils/versions.ts @@ -2,7 +2,7 @@ export const nxVersion = require('../../package.json').version; export const angularCliVersion = '~14.0.0'; export const typescriptVersion = '~4.7.2'; -export const prettierVersion = '^2.5.1'; +export const prettierVersion = '^2.6.2'; export const tslintVersion = '~6.1.0'; export const typescriptESLintVersion = '~5.24.0'; export const eslintVersion = '~8.15.0'; diff --git a/packages/workspace/migrations.json b/packages/workspace/migrations.json index 1f4178a01506e..398da9b0cdd66 100644 --- a/packages/workspace/migrations.json +++ b/packages/workspace/migrations.json @@ -108,6 +108,10 @@ "typescript": { "version": "~4.7.2", "alwaysAddToPackageJson": false + }, + "prettier": { + "version": "^2.6.2", + "alwaysAddToPackageJson": false } } } diff --git a/packages/workspace/package.json b/packages/workspace/package.json index d9934c5ee4511..ef48748011c85 100644 --- a/packages/workspace/package.json +++ b/packages/workspace/package.json @@ -56,7 +56,7 @@ } }, "peerDependencies": { - "prettier": "^2.5.1" + "prettier": "^2.6.2" }, "peerDependenciesMeta": { "prettier": { diff --git a/packages/workspace/src/generators/new/__snapshots__/new.spec.ts.snap b/packages/workspace/src/generators/new/__snapshots__/new.spec.ts.snap index fb838045763cc..1815a409fc9c5 100644 --- a/packages/workspace/src/generators/new/__snapshots__/new.spec.ts.snap +++ b/packages/workspace/src/generators/new/__snapshots__/new.spec.ts.snap @@ -9,7 +9,7 @@ Object { "@nrwl/cli": "0.0.1", "@nrwl/workspace": "0.0.1", "nx": "0.0.1", - "prettier": "^2.5.1", + "prettier": "^2.6.2", "typescript": "~4.7.2", }, "license": "MIT", @@ -31,7 +31,7 @@ Object { "@nrwl/cli": "0.0.1", "@nrwl/workspace": "0.0.1", "nx": "0.0.1", - "prettier": "^2.5.1", + "prettier": "^2.6.2", "typescript": "~4.7.2", }, "license": "MIT", @@ -54,7 +54,7 @@ Object { "@nrwl/react": "0.0.1", "@nrwl/workspace": "0.0.1", "nx": "0.0.1", - "prettier": "^2.5.1", + "prettier": "^2.6.2", "typescript": "~4.7.2", }, "license": "MIT", diff --git a/packages/workspace/src/utils/versions.ts b/packages/workspace/src/utils/versions.ts index 86ecc7d351591..2cf0c3820f2c4 100644 --- a/packages/workspace/src/utils/versions.ts +++ b/packages/workspace/src/utils/versions.ts @@ -2,7 +2,7 @@ export const nxVersion = require('../../package.json').version; export const angularCliVersion = '~14.0.0'; export const typescriptVersion = '~4.7.2'; -export const prettierVersion = '^2.5.1'; +export const prettierVersion = '^2.6.2'; export const tslintVersion = '~6.1.0'; export const typescriptESLintVersion = '~5.24.0'; export const eslintVersion = '~8.15.0'; diff --git a/yarn.lock b/yarn.lock index 10b1a4262899f..363f6893049f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5840,16 +5840,16 @@ resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109" integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw== -"@types/prettier@2.4.3": - version "2.4.3" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.3.tgz#a3c65525b91fca7da00ab1a3ac2b5a2a4afbffbf" - integrity sha512-QzSuZMBuG5u8HqYz01qtMdg/Jfctlnvj1z/lYnIDXs/golxw0fxtRAHd9KrzjR7Yxz1qVeI00o0kiO3PmVdJ9w== - "@types/prettier@^2.1.5": version "2.4.4" resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.4.tgz#5d9b63132df54d8909fce1c3f8ca260fdd693e17" integrity sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA== +"@types/prettier@^2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.2.tgz#b6df4f04f5dab9befe2cb74ed1461a0231e23cb7" + integrity sha512-dOW37mq8TBPPI8YIkmN/EDJFWBgvjEmQP8OmODSl26B4fud0sa3ohpTSi5AuhwSfkaY4kYBptSilmS6cBO0DVw== + "@types/pretty-hrtime@^1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/@types/pretty-hrtime/-/pretty-hrtime-1.0.1.tgz#72a26101dc567b0d68fd956cf42314556e42d601" @@ -19611,11 +19611,6 @@ prettier-plugin-tailwindcss@^0.1.5: resolved "https://registry.yarnpkg.com/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.1.8.tgz#ba0f606ed91959ede670303d905b99106e9e6293" integrity sha512-hwarSBCswAXa+kqYtaAkFr3Vop9o04WOyZs0qo3NyvW8L7f1rif61wRyq0+ArmVThOuRBcJF5hjGXYk86cwemg== -prettier@2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a" - integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg== - "prettier@>=2.2.1 <=2.3.0": version "2.3.0" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.0.tgz#b6a5bf1284026ae640f17f7ff5658a7567fc0d18" @@ -19626,6 +19621,11 @@ prettier@^2.2.0: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.0.tgz#12f8f504c4d8ddb76475f441337542fa799207d4" integrity sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A== +prettier@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032" + integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew== + pretty-bytes@^5.3.0, pretty-bytes@^5.6.0: version "5.6.0" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"