From 0a962bc091c292c8ce3cb7a833a4dad9c600af75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=ADcholas=20Oliveira?= Date: Fri, 20 Jun 2025 10:22:52 -0300 Subject: [PATCH 1/5] fix: typescript eslint plugin dep issue --- .changeset/tidy-coins-wave.md | 5 +++++ package-lock.json | 35 ++++++++++++++++++----------------- packages/toolkit/package.json | 1 + 3 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 .changeset/tidy-coins-wave.md diff --git a/.changeset/tidy-coins-wave.md b/.changeset/tidy-coins-wave.md new file mode 100644 index 00000000..502fa5e0 --- /dev/null +++ b/.changeset/tidy-coins-wave.md @@ -0,0 +1,5 @@ +--- +"10up-toolkit": patch +--- + +Pin eslint-plugin-jest to v28 to fix conflict with the `@typescript/eslint-plugin` dep. diff --git a/package-lock.json b/package-lock.json index e48e64f7..30788c4f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13046,10 +13046,10 @@ } }, "node_modules/eslint-plugin-jest": { - "version": "28.8.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.3.tgz", - "integrity": "sha512-HIQ3t9hASLKm2IhIOqnu+ifw7uLZkIlR7RYNv7fMcEi/p0CIiJmfriStQS2LDkgtY4nyLbIZAD+JL347Yc2ETQ==", - "peer": true, + "version": "28.14.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.14.0.tgz", + "integrity": "sha512-P9s/qXSMTpRTerE2FQ0qJet2gKbcGyFTPAJipoKxmWqR6uuFqIqk8FuEfg5yBieOezVrEfAMZrEwJ6yEp+1MFQ==", + "license": "MIT", "dependencies": { "@typescript-eslint/utils": "^6.0.0 || ^7.0.0 || ^8.0.0" }, @@ -28399,7 +28399,7 @@ }, "packages/babel-preset-default": { "name": "@10up/babel-preset-default", - "version": "2.1.1", + "version": "2.1.2", "dependencies": { "@babel/core": "^7.23.7", "@babel/helper-plugin-utils": "^7.22.5", @@ -28413,7 +28413,7 @@ "core-js": "^3.35.0" }, "devDependencies": { - "@10up/eslint-config": "^4.1.1", + "@10up/eslint-config": "^4.1.2", "@wordpress/element": "^4.20.0", "babel-jest": "^27.5.1", "eslint": "^8.40.0", @@ -28422,10 +28422,10 @@ }, "packages/eslint-config": { "name": "@10up/eslint-config", - "version": "4.1.1", + "version": "4.1.2", "license": "GPL-2.0-or-later", "dependencies": { - "@10up/babel-preset-default": "^2.1.1" + "@10up/babel-preset-default": "^2.1.2" }, "devDependencies": { "@wordpress/eslint-plugin": "^17.5.0", @@ -28460,7 +28460,7 @@ }, "packages/stylelint-config": { "name": "@10up/stylelint-config", - "version": "3.0.0", + "version": "3.0.1", "license": "GPL-2.0-or-later", "dependencies": { "stylelint-config-recommended": "^13.0.0", @@ -28469,7 +28469,7 @@ "stylelint-stylistic": "^0.4.3" }, "devDependencies": { - "@10up/eslint-config": "^4.1.1", + "@10up/eslint-config": "^4.1.2", "jest": "^29.7.0" }, "engines": { @@ -28481,7 +28481,7 @@ }, "packages/toolkit": { "name": "10up-toolkit", - "version": "6.4.0", + "version": "6.4.1", "license": "GPL-2.0-or-later", "dependencies": { "@babel/eslint-parser": "^7.23.3", @@ -28505,6 +28505,7 @@ "css-loader": "^6.8.1", "cssnano": "^6.0.3", "error-stack-parser": "^2.1.4", + "eslint-plugin-jest": "^28.14.0", "eslint-webpack-plugin": "^4.0.1", "fast-glob": "^3.3.2", "html-webpack-plugin": "^5.6.0", @@ -28543,9 +28544,9 @@ "10up-toolkit": "bin/10up-toolkit.js" }, "devDependencies": { - "@10up/babel-preset-default": ">=2.1.1", - "@10up/eslint-config": ">=4.1.1", - "@10up/stylelint-config": ">=3.0.0" + "@10up/babel-preset-default": ">=2.1.2", + "@10up/eslint-config": ">=4.1.2", + "@10up/stylelint-config": ">=3.0.1" }, "engines": { "node": ">=16", @@ -29107,7 +29108,7 @@ "@linaria/babel-preset": "^5.0.3", "@linaria/webpack-loader": "^5.0.3", "@wordpress/env": "^10.10.0", - "10up-toolkit": "^6.4.0" + "10up-toolkit": "^6.4.1" }, "engines": { "node": ">=12.0.0" @@ -29124,7 +29125,7 @@ "@testing-library/dom": "9.3.3", "@testing-library/jest-dom": "^6.2.0", "@testing-library/user-event": "^14.5.2", - "10up-toolkit": "^6.4.0", + "10up-toolkit": "^6.4.1", "jest-axe": "^8.0.0", "jest-environment-jsdom": "~29.7.0" } @@ -29137,7 +29138,7 @@ "xss": "^1.0.11" }, "devDependencies": { - "10up-toolkit": "^6.4.0" + "10up-toolkit": "^6.4.1" } }, "projects/library/node_modules/@jest/types": { diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index 2fd72136..ea3ea84d 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -40,6 +40,7 @@ "cssnano": "^6.0.3", "error-stack-parser": "^2.1.4", "eslint-webpack-plugin": "^4.0.1", + "eslint-plugin-jest": "^28.14.0", "fast-glob": "^3.3.2", "html-webpack-plugin": "^5.6.0", "ignore-emit-webpack-plugin": "^2.0.6", From b0d5440200b92d5d8e98ec8c3da78285f4a53976 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 20 Jun 2025 14:25:58 +0000 Subject: [PATCH 2/5] chore: version packages (next) (next) --- .changeset/pre.json | 16 ++++++++++++++++ packages/toolkit/CHANGELOG.md | 6 ++++++ packages/toolkit/package.json | 2 +- projects/10up-theme/package.json | 2 +- projects/library-ts/package.json | 2 +- projects/library/package.json | 2 +- 6 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 .changeset/pre.json diff --git a/.changeset/pre.json b/.changeset/pre.json new file mode 100644 index 00000000..45a1e8b2 --- /dev/null +++ b/.changeset/pre.json @@ -0,0 +1,16 @@ +{ + "mode": "pre", + "tag": "next", + "initialVersions": { + "@10up/babel-preset-default": "2.1.2", + "@10up/eslint-config": "4.1.2", + "@10up/stylelint-config": "3.0.1", + "10up-toolkit": "6.4.1", + "tenup-theme": "1.1.5-next.7", + "@10up/component-accordion": "2.1.5", + "@10up/library-ts-test": "2.1.5" + }, + "changesets": [ + "tidy-coins-wave" + ] +} diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md index bf7d53ff..807a9ffc 100644 --- a/packages/toolkit/CHANGELOG.md +++ b/packages/toolkit/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 6.4.2-next.0 + +### Patch Changes + +- 0a962bc: Pin eslint-plugin-jest to v28 to fix conflict with the `@typescript/eslint-plugin` dep. + ## 6.4.1 ### Patch Changes diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index ea3ea84d..76e7c8d1 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -13,7 +13,7 @@ "url": "git+https://github.com/10up/10up-toolkit.git", "directory": "packages/toolkit" }, - "version": "6.4.1", + "version": "6.4.2-next.0", "bin": { "10up-toolkit": "bin/10up-toolkit.js" }, diff --git a/projects/10up-theme/package.json b/projects/10up-theme/package.json index d9c43c30..d7a9531e 100644 --- a/projects/10up-theme/package.json +++ b/projects/10up-theme/package.json @@ -20,7 +20,7 @@ "@linaria/babel-preset": "^5.0.3", "@linaria/webpack-loader": "^5.0.3", "@wordpress/env": "^10.10.0", - "10up-toolkit": "^6.4.1" + "10up-toolkit": "^6.4.2-next.0" }, "dependencies": { "@10up/block-components": "^1.18.0", diff --git a/projects/library-ts/package.json b/projects/library-ts/package.json index 5dd4c219..76d4291c 100644 --- a/projects/library-ts/package.json +++ b/projects/library-ts/package.json @@ -39,7 +39,7 @@ }, "homepage": "https://github.com/10up/component-accordion#readme", "devDependencies": { - "10up-toolkit": "^6.4.1" + "10up-toolkit": "^6.4.2-next.0" }, "dependencies": { "xss": "^1.0.11" diff --git a/projects/library/package.json b/projects/library/package.json index e187fcb4..7cc68949 100644 --- a/projects/library/package.json +++ b/projects/library/package.json @@ -26,7 +26,7 @@ }, "homepage": "https://github.com/10up/component-accordion#readme", "devDependencies": { - "10up-toolkit": "^6.4.1", + "10up-toolkit": "^6.4.2-next.0", "@testing-library/dom": "9.3.3", "@testing-library/jest-dom": "^6.2.0", "@testing-library/user-event": "^14.5.2", From be6517de90beb71e766faf9142762433454eb661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=ADcholas=20Andr=C3=A9?= Date: Thu, 3 Jul 2025 15:41:52 -0300 Subject: [PATCH 3/5] Merge pull request #448 from 10up/fix/typescript-plugin Fix/typescript plugin --- .changeset/polite-suits-rush.md | 5 +++++ package-lock.json | 2 +- packages/eslint-config/package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changeset/polite-suits-rush.md diff --git a/.changeset/polite-suits-rush.md b/.changeset/polite-suits-rush.md new file mode 100644 index 00000000..c7ab4e9e --- /dev/null +++ b/.changeset/polite-suits-rush.md @@ -0,0 +1,5 @@ +--- +"@10up/eslint-config": patch +--- + +restrict eslint-plugin-jest to =27.6.1", + "eslint-plugin-jest": ">=27.6.1 && <29", "eslint-plugin-jsdoc": "^48.0.2", "eslint-plugin-jsx-a11y": "^6.8.0", "eslint-plugin-prettier": "^5.1.2", diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index 3f0278ee..60da695b 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -57,7 +57,7 @@ "eslint-config-airbnb-base": "^15.0.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.29.1", - "eslint-plugin-jest": ">=27.6.1", + "eslint-plugin-jest": ">=27.6.1 && <29", "eslint-plugin-jsdoc": "^48.0.2", "eslint-plugin-jsx-a11y": "^6.8.0", "eslint-plugin-prettier": "^5.1.2", From 4d7bc0ddc154ecc02be25efe7907cdbaf8dcfb44 Mon Sep 17 00:00:00 2001 From: Ethan May Date: Thu, 3 Jul 2025 14:53:20 -0400 Subject: [PATCH 4/5] Add callback to `server.close()` (#444) --- .changeset/nasty-drinks-talk.md | 5 +++++ packages/toolkit/scripts/start.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/nasty-drinks-talk.md diff --git a/.changeset/nasty-drinks-talk.md b/.changeset/nasty-drinks-talk.md new file mode 100644 index 00000000..0b40a176 --- /dev/null +++ b/.changeset/nasty-drinks-talk.md @@ -0,0 +1,5 @@ +--- +"10up-toolkit": minor +--- + +Added callback to webpack server.close diff --git a/packages/toolkit/scripts/start.js b/packages/toolkit/scripts/start.js index 3708805d..d5c9d469 100644 --- a/packages/toolkit/scripts/start.js +++ b/packages/toolkit/scripts/start.js @@ -77,7 +77,7 @@ if (hot) { process.on('SIGINT', () => { if (server) { - server.close(); + server.close(() => {}); } compiler.close(); From fa72b7ded2f22286a76f9eff97bb2d2dad0329da Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Jul 2025 18:54:02 +0000 Subject: [PATCH 5/5] chore: version packages (next) (next) --- .changeset/pre.json | 2 ++ packages/babel-preset-default/package.json | 2 +- packages/eslint-config/CHANGELOG.md | 6 ++++++ packages/eslint-config/package.json | 2 +- packages/stylelint-config/package.json | 2 +- packages/toolkit/CHANGELOG.md | 11 +++++++++++ packages/toolkit/package.json | 6 +++--- projects/10up-theme/package.json | 2 +- projects/library-ts/package.json | 2 +- projects/library/package.json | 2 +- 10 files changed, 28 insertions(+), 9 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index 45a1e8b2..48fcdc86 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -11,6 +11,8 @@ "@10up/library-ts-test": "2.1.5" }, "changesets": [ + "nasty-drinks-talk", + "polite-suits-rush", "tidy-coins-wave" ] } diff --git a/packages/babel-preset-default/package.json b/packages/babel-preset-default/package.json index 64af8abb..30ee7907 100644 --- a/packages/babel-preset-default/package.json +++ b/packages/babel-preset-default/package.json @@ -38,7 +38,7 @@ "core-js": "^3.35.0" }, "devDependencies": { - "@10up/eslint-config": "^4.1.2", + "@10up/eslint-config": "^4.1.3-next.0", "@wordpress/element": "^4.20.0", "babel-jest": "^27.5.1", "eslint": "^8.40.0", diff --git a/packages/eslint-config/CHANGELOG.md b/packages/eslint-config/CHANGELOG.md index 72811a06..bb4a881a 100644 --- a/packages/eslint-config/CHANGELOG.md +++ b/packages/eslint-config/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 4.1.3-next.0 + +### Patch Changes + +- be6517d: restrict eslint-plugin-jest to =16" }, "devDependencies": { - "@10up/eslint-config": "^4.1.2", + "@10up/eslint-config": "^4.1.3-next.0", "jest": "^29.7.0" }, "peerDependencies": { diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md index 807a9ffc..4c22a23f 100644 --- a/packages/toolkit/CHANGELOG.md +++ b/packages/toolkit/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## 6.5.0-next.1 + +### Minor Changes + +- 4d7bc0d: Added callback to webpack server.close + +### Patch Changes + +- Updated dependencies [be6517d] + - @10up/eslint-config@4.1.3-next.0 + ## 6.4.2-next.0 ### Patch Changes diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index 76e7c8d1..1eb03fd3 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -13,7 +13,7 @@ "url": "git+https://github.com/10up/10up-toolkit.git", "directory": "packages/toolkit" }, - "version": "6.4.2-next.0", + "version": "6.5.0-next.1", "bin": { "10up-toolkit": "bin/10up-toolkit.js" }, @@ -76,12 +76,12 @@ }, "devDependencies": { "@10up/babel-preset-default": ">=2.1.2", - "@10up/eslint-config": ">=4.1.2", + "@10up/eslint-config": ">=4.1.3-next.0", "@10up/stylelint-config": ">=3.0.1" }, "peerDependencies": { "@10up/babel-preset-default": ">=2.1.1", - "@10up/eslint-config": ">=4.1.1", + "@10up/eslint-config": ">=4.1.3-next.0", "@10up/stylelint-config": ">=3.0.0", "@linaria/babel-preset": ">=4.3.3", "@linaria/webpack-loader": ">=4.1.11", diff --git a/projects/10up-theme/package.json b/projects/10up-theme/package.json index d7a9531e..656469fb 100644 --- a/projects/10up-theme/package.json +++ b/projects/10up-theme/package.json @@ -20,7 +20,7 @@ "@linaria/babel-preset": "^5.0.3", "@linaria/webpack-loader": "^5.0.3", "@wordpress/env": "^10.10.0", - "10up-toolkit": "^6.4.2-next.0" + "10up-toolkit": "^6.5.0-next.1" }, "dependencies": { "@10up/block-components": "^1.18.0", diff --git a/projects/library-ts/package.json b/projects/library-ts/package.json index 76d4291c..1b508726 100644 --- a/projects/library-ts/package.json +++ b/projects/library-ts/package.json @@ -39,7 +39,7 @@ }, "homepage": "https://github.com/10up/component-accordion#readme", "devDependencies": { - "10up-toolkit": "^6.4.2-next.0" + "10up-toolkit": "^6.5.0-next.1" }, "dependencies": { "xss": "^1.0.11" diff --git a/projects/library/package.json b/projects/library/package.json index 7cc68949..854ec0e5 100644 --- a/projects/library/package.json +++ b/projects/library/package.json @@ -26,7 +26,7 @@ }, "homepage": "https://github.com/10up/component-accordion#readme", "devDependencies": { - "10up-toolkit": "^6.4.2-next.0", + "10up-toolkit": "^6.5.0-next.1", "@testing-library/dom": "9.3.3", "@testing-library/jest-dom": "^6.2.0", "@testing-library/user-event": "^14.5.2",