Merge pull request #450 from 10up/develop

nicholasio · web-flow · commit 48d241bda72a · 2025-07-03T15:58:02.000-03:00
Release new version
diff --git a/.changeset/nasty-drinks-talk.md b/.changeset/nasty-drinks-talk.md
@@ -0,0 +1,5 @@
+---
+"10up-toolkit": minor
+---
+
+Added callback to webpack server.close
diff --git a/.changeset/polite-suits-rush.md b/.changeset/polite-suits-rush.md
@@ -0,0 +1,5 @@
+---
+"@10up/eslint-config": patch
+---
+
+restrict eslint-plugin-jest to <v29
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -0,0 +1,18 @@
+{
+  "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": [
+    "nasty-drinks-talk",
+    "polite-suits-rush",
+    "tidy-coins-wave"
+  ]
+}
diff --git a/.changeset/tidy-coins-wave.md 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
diff --git 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
@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.1.3-next.0
+
+### Patch Changes
+
+- be6517d: restrict eslint-plugin-jest to <v29
+
 ## 4.1.2
 
 ### Patch Changes
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@10up/eslint-config",
-	"version": "4.1.2",
+	"version": "4.1.3-next.0",
 	"description": "A shareable ESLint configuration",
 	"publishConfig": {
 		"access": "public"
@@ -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",
diff --git a/packages/stylelint-config/package.json b/packages/stylelint-config/package.json
@@ -43,7 +43,7 @@
 		"node": ">=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
@@ -1,5 +1,22 @@
 # 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
+
+- 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
@@ -13,7 +13,7 @@
 		"url": "git+https://github.com/10up/10up-toolkit.git",
 		"directory": "packages/toolkit"
 	},
-	"version": "6.4.1",
+	"version": "6.5.0-next.1",
 	"bin": {
 		"10up-toolkit": "bin/10up-toolkit.js"
 	},
@@ -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",
@@ -75,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/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();
diff --git 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.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
@@ -39,7 +39,7 @@
   },
   "homepage": "https://github.com/10up/component-accordion#readme",
   "devDependencies": {
-    "10up-toolkit": "^6.4.1"
+    "10up-toolkit": "^6.5.0-next.1"
   },
   "dependencies": {
     "xss": "^1.0.11"
diff --git 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.5.0-next.1",
     "@testing-library/dom": "9.3.3",
     "@testing-library/jest-dom": "^6.2.0",
     "@testing-library/user-event": "^14.5.2",

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"10up-toolkit": minor
 +---
++
 +Added callback to webpack server.close