From 7585f27df561489add5eb306d97d1cd0c5790fd7 Mon Sep 17 00:00:00 2001 From: Ankit Kumar Shah Date: Tue, 11 Feb 2025 15:46:37 +0530 Subject: [PATCH 1/3] Update wp-prettier to 3.0.3 and refine ESLint ignore patterns --- .eslintignore | 9 ++++++--- package-lock.json | 36 +++++++++++++++--------------------- package.json | 2 +- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/.eslintignore b/.eslintignore index 07f72581a9f4c..b215c97bd0ca0 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,6 +1,8 @@ # Files and folders related to build/test tools -/build -/node_modules +build +build-module +build-types +node_modules /tests /vendor /tools @@ -9,7 +11,8 @@ /src/js/_enqueues/vendor # Webpack built files -/src/wp-includes/js/media-* +/src/wp-includes/js/ +*.min.js # Themes src/wp-content/themes/ diff --git a/package-lock.json b/package-lock.json index d60ff5497138a..ed3d0150fb9c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -142,7 +142,7 @@ "install-changed": "1.1.0", "matchdep": "~2.0.0", "postcss": "8.4.49", - "prettier": "npm:wp-prettier@2.6.2", + "prettier": "npm:wp-prettier@3.0.3", "qunit": "~2.23.1", "react-refresh": "0.14.0", "sass": "1.83.4", @@ -9450,22 +9450,6 @@ "postcss": "^8.4.31" } }, - "node_modules/@wordpress/scripts/node_modules/prettier": { - "name": "wp-prettier", - "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" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, "node_modules/@wordpress/scripts/node_modules/read-pkg-up": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", @@ -28903,10 +28887,20 @@ }, "node_modules/prettier": { "name": "wp-prettier", - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.6.2.tgz", - "integrity": "sha512-AV33EzqiFJ3fj+mPlKABN59YFPReLkDxQnj067Z3uEOeRQf3g05WprL0RDuqM7UBhSRo9W1rMSC2KvZmjE5UOA==", - "dev": true + "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, + "license": "MIT", + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } }, "node_modules/prettier-linter-helpers": { "version": "1.0.0", diff --git a/package.json b/package.json index 3dfc9bd5e92e9..f3f03bcc4ad7d 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "install-changed": "1.1.0", "matchdep": "~2.0.0", "postcss": "8.4.49", - "prettier": "npm:wp-prettier@2.6.2", + "prettier": "npm:wp-prettier@3.0.3", "qunit": "~2.23.1", "react-refresh": "0.14.0", "sass": "1.83.4", From 64e716229dfa7f384cf26561f2821f0bed70eaaa Mon Sep 17 00:00:00 2001 From: Ankit Kumar Shah Date: Wed, 19 Feb 2025 11:15:52 +0530 Subject: [PATCH 2/3] Update `.eslintignore` patterns --- .eslintignore | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.eslintignore b/.eslintignore index b215c97bd0ca0..55221a645f8b1 100644 --- a/.eslintignore +++ b/.eslintignore @@ -6,13 +6,26 @@ node_modules /tests /vendor /tools +/jsdoc +/artifacts +/coverage +/.cache +/src/wp-includes/blocks/**/*.js +/src/wp-includes/blocks/**/*.js.map +/src/wp-admin/js # Excluded files and folders based on `jsdoc.conf.json` exclusions /src/js/_enqueues/vendor # Webpack built files -/src/wp-includes/js/ +/src/wp-includes/js *.min.js # Themes -src/wp-content/themes/ +src/wp-content/themes + +# Files and folders that get created in wp-content +/src/wp-content/plugins +/src/wp-content/mu-plugins +/src/wp-content/upgrade +/src/wp-content/uploads From e58ff49ef4be75835fb18862a3911db141bc1c07 Mon Sep 17 00:00:00 2001 From: Ankit Kumar Shah Date: Thu, 20 Feb 2025 13:28:03 +0530 Subject: [PATCH 3/3] Update ESLint ignore patterns to align with `.gitignore` --- .eslintignore | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.eslintignore b/.eslintignore index 55221a645f8b1..4c8aec9e16192 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,15 +1,13 @@ # Files and folders related to build/test tools -build -build-module -build-types -node_modules +/build +/node_modules /tests /vendor /tools /jsdoc /artifacts /coverage -/.cache +.cache/* /src/wp-includes/blocks/**/*.js /src/wp-includes/blocks/**/*.js.map /src/wp-admin/js @@ -19,7 +17,6 @@ node_modules # Webpack built files /src/wp-includes/js -*.min.js # Themes src/wp-content/themes