chore: resolve merge conflicts and update to Jest 30

- Resolved conflicts in package.json and all workspace packages
- Regenerated yarn.lock
- Updated all workspace packages to use Jest 30
- Fixed test failure in eth-json-rpc-middleware related to Jest 30 error matching

Author: cryptodev-2s

package.json

@@ -67,14 +67,14 @@
     "@metamask/network-controller": "^25.0.0",
     "@metamask/utils": "^11.8.1",
     "@ts-bridge/cli": "^0.6.4",
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^30.0.0",
     "@types/lodash": "^4.14.191",
     "@types/node": "^16.18.54",
     "@types/semver": "^7",
     "@typescript-eslint/eslint-plugin": "^8.7.0",
     "@typescript-eslint/parser": "^8.7.0",
     "@yarnpkg/types": "^4.0.0",
-    "babel-jest": "^29.7.0",
+    "babel-jest": "^30.0.0",
     "depcheck": "^1.4.7",
     "eslint": "^9.39.1",
     "eslint-config-prettier": "^9.1.0",
@@ -87,8 +87,8 @@
     "eslint-plugin-promise": "^7.1.0",
     "execa": "^5.0.0",
     "isomorphic-fetch": "^3.0.0",
-    "jest": "^29.5.0",
-    "jest-environment-node": "^29.0.0",
+    "jest": "^30.0.0",
+    "jest-environment-node": "^30.0.0",
     "jest-silent-reporter": "^0.5.0",
     "lodash": "^4.17.21",
     "nock": "^13.3.1",
@@ -114,7 +114,8 @@
       "@keystonehq/bc-ur-registry-eth>hdkey>secp256k1": true,
       "babel-runtime>core-js": false,
       "simple-git-hooks": false,
-      "tsx>esbuild": false
+      "tsx>esbuild": false,
+      "jest>@jest/core>jest-resolve>unrs-resolver": false
     }
   }
 }

packages/account-tree-controller/package.json

@@ -68,9 +68,9 @@
     "@metamask/providers": "^22.1.0",
     "@metamask/snaps-controllers": "^14.0.1",
     "@ts-bridge/cli": "^0.6.4",
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^30.0.0",
     "deepmerge": "^4.2.2",
-    "jest": "^29.5.0",
+    "jest": "^30.0.0",
     "ts-jest": "^29.4.0",
     "typedoc": "^0.24.8",
     "typedoc-plugin-missing-exports": "^2.0.0",

packages/accounts-controller/package.json

@@ -73,9 +73,9 @@
     "@metamask/providers": "^22.1.0",
     "@metamask/snaps-controllers": "^14.0.1",
     "@ts-bridge/cli": "^0.6.4",
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^30.0.0",
     "@types/readable-stream": "^2.3.0",
-    "jest": "^29.5.0",
+    "jest": "^30.0.0",
     "ts-jest": "^29.4.0",
     "typedoc": "^0.24.8",
     "typedoc-plugin-missing-exports": "^2.0.0",

packages/address-book-controller/package.json

@@ -56,9 +56,9 @@
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
     "@ts-bridge/cli": "^0.6.4",
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^30.0.0",
     "deepmerge": "^4.2.2",
-    "jest": "^29.5.0",
+    "jest": "^30.0.0",
     "ts-jest": "^29.4.0",
     "typedoc": "^0.24.8",
     "typedoc-plugin-missing-exports": "^2.0.0",

packages/analytics-controller/package.json

@@ -56,9 +56,9 @@
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
     "@ts-bridge/cli": "^0.6.4",
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^30.0.0",
     "deepmerge": "^4.2.2",
-    "jest": "^29.5.0",
+    "jest": "^30.0.0",
     "ts-jest": "^29.4.0",
     "typedoc": "^0.24.8",
     "typedoc-plugin-missing-exports": "^2.0.0",

packages/announcement-controller/package.json

@@ -54,9 +54,9 @@
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
     "@ts-bridge/cli": "^0.6.4",
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^30.0.0",
     "deepmerge": "^4.2.2",
-    "jest": "^29.5.0",
+    "jest": "^30.0.0",
     "ts-jest": "^29.4.0",
     "typedoc": "^0.24.8",
     "typedoc-plugin-missing-exports": "^2.0.0",

packages/app-metadata-controller/package.json

@@ -54,9 +54,9 @@
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
     "@ts-bridge/cli": "^0.6.4",
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^30.0.0",
     "deepmerge": "^4.2.2",
-    "jest": "^29.5.0",
+    "jest": "^30.0.0",
     "sinon": "^9.2.4",
     "ts-jest": "^29.4.0",
     "typedoc": "^0.24.8",

packages/approval-controller/package.json

@@ -57,9 +57,9 @@
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
     "@ts-bridge/cli": "^0.6.4",
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^30.0.0",
     "deepmerge": "^4.2.2",
-    "jest": "^29.5.0",
+    "jest": "^30.0.0",
     "sinon": "^9.2.4",
     "ts-jest": "^29.4.0",
     "typedoc": "^0.24.8",

packages/assets-controllers/package.json

@@ -100,12 +100,12 @@
     "@metamask/snaps-controllers": "^14.0.1",
     "@metamask/transaction-controller": "^61.3.0",
     "@ts-bridge/cli": "^0.6.4",
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^30.0.0",
     "@types/lodash": "^4.14.191",
     "@types/node": "^16.18.54",
     "deepmerge": "^4.2.2",
-    "jest": "^29.5.0",
-    "jest-environment-jsdom": "^29.5.0",
+    "jest": "^30.0.0",
+    "jest-environment-jsdom": "^30.0.0",
     "nock": "^13.3.1",
     "sinon": "^9.2.4",
     "ts-jest": "^29.4.0",

packages/base-controller/package.json

@@ -55,10 +55,10 @@
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/json-rpc-engine": "^10.1.1",
     "@ts-bridge/cli": "^0.6.4",
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^30.0.0",
     "@types/sinon": "^9.0.10",
     "deepmerge": "^4.2.2",
-    "jest": "^29.5.0",
+    "jest": "^30.0.0",
     "sinon": "^9.2.4",
     "ts-jest": "^29.4.0",
     "typedoc": "^0.24.8",