From aad0380a12665943cd637b653b8d11ad6edcd72d Mon Sep 17 00:00:00 2001 From: Jarda Snajdr Date: Mon, 25 Sep 2023 10:12:44 +0200 Subject: [PATCH 1/3] Upgrade wp-prettier to v3.0.3 (final) --- package-lock.json | 18 +++++++++--------- package.json | 2 +- packages/scripts/package.json | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index f83b02469fab0c..13eeb5d582f7a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -214,7 +214,7 @@ "patch-package": "6.2.2", "postcss": "8.4.16", "postcss-loader": "6.2.1", - "prettier": "npm:wp-prettier@3.0.3-beta-3", + "prettier": "npm:wp-prettier@3.0.3", "progress": "2.0.3", "react": "18.2.0", "react-dom": "18.2.0", @@ -46439,9 +46439,9 @@ }, "node_modules/prettier": { "name": "wp-prettier", - "version": "3.0.3-beta-3", - "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-3.0.3-beta-3.tgz", - "integrity": "sha512-R3+TD7j0rnqEpMgylrUrHdi1W6ypwh4QGeFOZQ9YjP9WvNnZzBAS71yry1h7xIcG/bVaNKBCoWNqbqJY6vkOKQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-3.0.3.tgz", + "integrity": "sha512-X4UlrxDTH8oom9qXlcjnydsjAOD2BmB6yFmvS4Z2zdTzqqpRWb+fbqrH412+l+OUXmbzJlSXjlMFYPgYG12IAA==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -57837,7 +57837,7 @@ "playwright-core": "1.32.0", "postcss": "^8.4.5", "postcss-loader": "^6.2.1", - "prettier": "npm:wp-prettier@3.0.3-beta-3", + "prettier": "npm:wp-prettier@3.0.3", "puppeteer-core": "^13.2.0", "react-refresh": "^0.14.0", "read-pkg-up": "^7.0.1", @@ -70579,7 +70579,7 @@ "playwright-core": "1.32.0", "postcss": "^8.4.5", "postcss-loader": "^6.2.1", - "prettier": "npm:wp-prettier@3.0.3-beta-3", + "prettier": "npm:wp-prettier@3.0.3", "puppeteer-core": "^13.2.0", "react-refresh": "^0.14.0", "read-pkg-up": "^7.0.1", @@ -95595,9 +95595,9 @@ "dev": true }, "prettier": { - "version": "npm:wp-prettier@3.0.3-beta-3", - "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-3.0.3-beta-3.tgz", - "integrity": "sha512-R3+TD7j0rnqEpMgylrUrHdi1W6ypwh4QGeFOZQ9YjP9WvNnZzBAS71yry1h7xIcG/bVaNKBCoWNqbqJY6vkOKQ==", + "version": "npm:wp-prettier@3.0.3", + "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-3.0.3.tgz", + "integrity": "sha512-X4UlrxDTH8oom9qXlcjnydsjAOD2BmB6yFmvS4Z2zdTzqqpRWb+fbqrH412+l+OUXmbzJlSXjlMFYPgYG12IAA==", "dev": true }, "prettier-linter-helpers": { diff --git a/package.json b/package.json index ac6aef5b903d5b..7e95574557be30 100644 --- a/package.json +++ b/package.json @@ -226,7 +226,7 @@ "patch-package": "6.2.2", "postcss": "8.4.16", "postcss-loader": "6.2.1", - "prettier": "npm:wp-prettier@3.0.3-beta-3", + "prettier": "npm:wp-prettier@3.0.3", "progress": "2.0.3", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/packages/scripts/package.json b/packages/scripts/package.json index 2afa9522c86405..05b57a22f81869 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -75,7 +75,7 @@ "playwright-core": "1.32.0", "postcss": "^8.4.5", "postcss-loader": "^6.2.1", - "prettier": "npm:wp-prettier@3.0.3-beta-3", + "prettier": "npm:wp-prettier@3.0.3", "puppeteer-core": "^13.2.0", "react-refresh": "^0.14.0", "read-pkg-up": "^7.0.1", From cb5a25fa496d296cf8f1c46f37b19124f8b5b370 Mon Sep 17 00:00:00 2001 From: Jarda Snajdr Date: Mon, 25 Sep 2023 10:16:53 +0200 Subject: [PATCH 2/3] Add Prettier upgrade reformats to .git-blame-ignore-revs --- .git-blame-ignore-revs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 6e5072a91b0018..f6a641a5af9bbe 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -6,3 +6,9 @@ f63053cace3c02e284f00918e1854284c85b9132 # Prettier upgrade to 2.6.2. 33d84b036592a5bf31af05b7710f3b2b14163dc4 + +# Prettier upgrade to 2.8.5. +c56e8a1910ed74f405b74bbb12fe81dea974e5c3 + +# Prettier upgrade to 3.0.3. +0bee15148fe4330c20cf372cb46a33693e45cb5f From 8d81651c9e9a787a6283740dca9a2b528b6583f6 Mon Sep 17 00:00:00 2001 From: Jarda Snajdr Date: Mon, 25 Sep 2023 12:46:21 +0200 Subject: [PATCH 3/3] Change Prettier peer dependencies from v2 to v3 --- package-lock.json | 4 ++-- packages/eslint-plugin/CHANGELOG.md | 4 ++++ packages/eslint-plugin/package.json | 2 +- packages/prettier-config/CHANGELOG.md | 4 ++++ packages/prettier-config/package.json | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 13eeb5d582f7a4..53e5ae3ac57cbf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -57067,7 +57067,7 @@ "peerDependencies": { "@babel/core": ">=7", "eslint": ">=8", - "prettier": ">=2", + "prettier": ">=3", "typescript": ">=4" }, "peerDependenciesMeta": { @@ -57519,7 +57519,7 @@ "node": ">=14" }, "peerDependencies": { - "prettier": ">=2" + "prettier": ">=3" } }, "packages/primitives": { diff --git a/packages/eslint-plugin/CHANGELOG.md b/packages/eslint-plugin/CHANGELOG.md index 585337a068c722..97a29a87ef2046 100644 --- a/packages/eslint-plugin/CHANGELOG.md +++ b/packages/eslint-plugin/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### Breaking Changes + +- Change the required major version of Prettier from v2 to v3 ([#54775](https://github.com/WordPress/gutenberg/pull/54775)). + ## 16.0.0 (2023-09-20) ### Breaking Changes diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json index 2805c9a1e18d28..771b918298df28 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -52,7 +52,7 @@ "peerDependencies": { "@babel/core": ">=7", "eslint": ">=8", - "prettier": ">=2", + "prettier": ">=3", "typescript": ">=4" }, "peerDependenciesMeta": { diff --git a/packages/prettier-config/CHANGELOG.md b/packages/prettier-config/CHANGELOG.md index 8ed832c883a7ad..09d60e39ee72b9 100644 --- a/packages/prettier-config/CHANGELOG.md +++ b/packages/prettier-config/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### Breaking Change + +- Change the required major version of Prettier from v2 to v3 ([#54775](https://github.com/WordPress/gutenberg/pull/54775)). + ## 2.25.0 (2023-09-20) ## 2.24.0 (2023-08-31) diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json index e16eb823bb8883..7ea2bca4df2efd 100644 --- a/packages/prettier-config/package.json +++ b/packages/prettier-config/package.json @@ -28,7 +28,7 @@ "main": "lib/index.js", "types": "build-types", "peerDependencies": { - "prettier": ">=2" + "prettier": ">=3" }, "publishConfig": { "access": "public"