chore: Remove redundant dependencies (#4556)

Gudahtt · AugmentedMode · commit 41ff05bd3a3d · 2024-07-30T12:58:54.000-04:00
## Explanation

In various packages, we have a package listed as both a peer dependency
and as a dependency. This was done by mistake, the dependency entries
aren't actually used in practice, as we require the package to be
installed as a "peer" package anyway. It's also incorrect to list other
controllers as a dependency in this case because we don't know which
version we need. In these cases we need it to match the version setup
with the global messenger, which we don't know.

## References

None

## Changelog

Changelogs updated in diff

## Checklist

- [x] I've updated the test suite for new or updated code as appropriate
- [x] I've updated documentation (JSDoc, Markdown, etc.) for new or
updated code as appropriate
- [x] I've highlighted breaking changes using the "BREAKING" category
above as appropriate
diff --git a/packages/accounts-controller/CHANGELOG.md b/packages/accounts-controller/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Remove `@metamask/keyring-controller` dependency [#4556](https://github.com/MetaMask/core/pull/4556)
+  - This was listed under `peerDependencies` already, so it was redundant as a dependency.
+
 ## [17.2.0]
 
 ### Added
diff --git a/packages/accounts-controller/package.json b/packages/accounts-controller/package.json
@@ -45,7 +45,6 @@
     "@metamask/base-controller": "^6.0.2",
     "@metamask/eth-snap-keyring": "^4.3.1",
     "@metamask/keyring-api": "^8.0.1",
-    "@metamask/keyring-controller": "^17.1.1",
     "@metamask/snaps-sdk": "^6.1.1",
     "@metamask/snaps-utils": "^7.8.1",
     "@metamask/utils": "^9.1.0",
@@ -56,6 +55,7 @@
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
+    "@metamask/keyring-controller": "^17.1.1",
     "@metamask/snaps-controllers": "^9.3.1",
     "@types/jest": "^27.4.1",
     "@types/readable-stream": "^2.3.0",
diff --git a/packages/assets-controllers/CHANGELOG.md b/packages/assets-controllers/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Remove `@metamask/accounts-controller`, `@metamask/approval-controller`, `@metamask/keyring-controller`, and `@metamask/preferences-controller` dependencies [#4556](https://github.com/MetaMask/core/pull/4556)
+  - These were listed under `peerDependencies` already, so they were redundant as dependencies.
+
 ## [36.0.0]
 
 ### Added
diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json
@@ -47,17 +47,12 @@
     "@ethersproject/contracts": "^5.7.0",
     "@ethersproject/providers": "^5.7.0",
     "@metamask/abi-utils": "^2.0.3",
-    "@metamask/accounts-controller": "^17.2.0",
-    "@metamask/approval-controller": "^7.0.2",
     "@metamask/base-controller": "^6.0.2",
     "@metamask/contract-metadata": "^2.4.0",
     "@metamask/controller-utils": "^11.0.2",
     "@metamask/eth-query": "^4.0.0",
-    "@metamask/keyring-controller": "^17.1.1",
     "@metamask/metamask-eth-abis": "^3.1.1",
-    "@metamask/network-controller": "^20.0.0",
     "@metamask/polling-controller": "^9.0.0",
-    "@metamask/preferences-controller": "^13.0.0",
     "@metamask/rpc-errors": "^6.3.1",
     "@metamask/utils": "^9.1.0",
     "@types/bn.js": "^5.1.5",
@@ -72,9 +67,14 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
+    "@metamask/accounts-controller": "^17.2.0",
+    "@metamask/approval-controller": "^7.0.2",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/ethjs-provider-http": "^0.3.0",
     "@metamask/keyring-api": "^8.0.1",
+    "@metamask/keyring-controller": "^17.1.1",
+    "@metamask/network-controller": "^20.0.0",
+    "@metamask/preferences-controller": "^13.0.0",
     "@types/jest": "^27.4.1",
     "@types/lodash": "^4.14.191",
     "@types/node": "^16.18.54",
diff --git a/packages/gas-fee-controller/CHANGELOG.md b/packages/gas-fee-controller/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Remove `@metamask/network-controller` dependency [#4556](https://github.com/MetaMask/core/pull/4556)
+  - This was listed under `peerDependencies` already, so it was redundant as a dependency.
+
 ## [19.0.0]
 
 ### Changed
diff --git a/packages/gas-fee-controller/package.json b/packages/gas-fee-controller/package.json
@@ -45,7 +45,6 @@
     "@metamask/controller-utils": "^11.0.2",
     "@metamask/eth-query": "^4.0.0",
     "@metamask/ethjs-unit": "^0.3.0",
-    "@metamask/network-controller": "^20.0.0",
     "@metamask/polling-controller": "^9.0.0",
     "@metamask/utils": "^9.1.0",
     "@types/bn.js": "^5.1.5",
@@ -55,6 +54,7 @@
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
+    "@metamask/network-controller": "^20.0.0",
     "@types/jest": "^27.4.1",
     "@types/jest-when": "^2.7.3",
     "deepmerge": "^4.2.2",
diff --git a/packages/notification-services-controller/CHANGELOG.md b/packages/notification-services-controller/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Remove `@metamask/keyring-controller` and `@metamask/profile-sync-controller` dependencies [#4556](https://github.com/MetaMask/core/pull/4556)
+  - These were listed under `peerDependencies` already, so they were redundant as dependencies.
+
 ## [0.1.2]
 
 ### Added
diff --git a/packages/notification-services-controller/package.json b/packages/notification-services-controller/package.json
@@ -44,8 +44,6 @@
     "@contentful/rich-text-html-renderer": "^16.5.2",
     "@metamask/base-controller": "^6.0.2",
     "@metamask/controller-utils": "^11.0.2",
-    "@metamask/keyring-controller": "^17.1.1",
-    "@metamask/profile-sync-controller": "^0.1.4",
     "bignumber.js": "^4.1.0",
     "contentful": "^10.3.6",
     "firebase": "^10.11.0",
@@ -55,6 +53,8 @@
   "devDependencies": {
     "@lavamoat/allow-scripts": "^3.0.4",
     "@metamask/auto-changelog": "^3.4.4",
+    "@metamask/keyring-controller": "^17.1.1",
+    "@metamask/profile-sync-controller": "^0.1.4",
     "@types/jest": "^27.4.1",
     "@types/readable-stream": "^2.3.0",
     "deepmerge": "^4.2.2",
diff --git a/packages/polling-controller/CHANGELOG.md b/packages/polling-controller/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Remove `@metamask/network-controller` dependency [#4556](https://github.com/MetaMask/core/pull/4556)
+  - This was listed under `peerDependencies` already, so it was redundant as a dependency.
+
 ## [9.0.0]
 
 ### Changed
diff --git a/packages/polling-controller/package.json b/packages/polling-controller/package.json
@@ -43,14 +43,14 @@
   "dependencies": {
     "@metamask/base-controller": "^6.0.2",
     "@metamask/controller-utils": "^11.0.2",
-    "@metamask/network-controller": "^20.0.0",
     "@metamask/utils": "^9.1.0",
     "@types/uuid": "^8.3.0",
     "fast-json-stable-stringify": "^2.1.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
+    "@metamask/network-controller": "^20.0.0",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
     "jest": "^27.5.1",
diff --git a/packages/profile-sync-controller/CHANGELOG.md b/packages/profile-sync-controller/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Remove `@metamask/snaps-controllers` dependency [#4556](https://github.com/MetaMask/core/pull/4556)
+  - This was listed under `peerDependencies` already, so it was redundant as a dependency.
+
 ## [0.1.4]
 
 ### Added
diff --git a/packages/profile-sync-controller/package.json b/packages/profile-sync-controller/package.json
@@ -42,7 +42,6 @@
   },
   "dependencies": {
     "@metamask/base-controller": "^6.0.2",
-    "@metamask/snaps-controllers": "^9.3.1",
     "@metamask/snaps-sdk": "^6.1.1",
     "@metamask/snaps-utils": "^7.8.1",
     "@noble/ciphers": "^0.5.2",
@@ -54,6 +53,7 @@
   "devDependencies": {
     "@lavamoat/allow-scripts": "^3.0.4",
     "@metamask/auto-changelog": "^3.4.4",
+    "@metamask/snaps-controllers": "^9.3.1",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
     "ethers": "^6.12.0",
diff --git a/packages/selected-network-controller/CHANGELOG.md b/packages/selected-network-controller/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Remove `@metamask/network-controller` and `@metamask/permission-controller` dependencies [#4556](https://github.com/MetaMask/core/pull/4556)
+  - These were listed under `peerDependencies` already, so they were redundant as dependencies.
+
 ## [16.0.0]
 
 ### Changed
diff --git a/packages/selected-network-controller/package.json b/packages/selected-network-controller/package.json
@@ -43,13 +43,13 @@
   "dependencies": {
     "@metamask/base-controller": "^6.0.2",
     "@metamask/json-rpc-engine": "^9.0.2",
-    "@metamask/network-controller": "^20.0.0",
-    "@metamask/permission-controller": "^11.0.0",
     "@metamask/swappable-obj-proxy": "^2.2.0",
     "@metamask/utils": "^9.1.0"
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
+    "@metamask/network-controller": "^20.0.0",
+    "@metamask/permission-controller": "^11.0.0",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
     "immer": "^9.0.6",
diff --git a/packages/signature-controller/CHANGELOG.md b/packages/signature-controller/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Remove `@metamask/approval-controller`, `@metamask/keyring-controller`, and `@metamask/logging-controller` dependencies [#4556](https://github.com/MetaMask/core/pull/4556)
+  - These were listed under `peerDependencies` already, so they were redundant as dependencies.
+
 ## [18.0.0]
 
 ### Changed
diff --git a/packages/signature-controller/package.json b/packages/signature-controller/package.json
@@ -41,18 +41,18 @@
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   },
   "dependencies": {
-    "@metamask/approval-controller": "^7.0.2",
     "@metamask/base-controller": "^6.0.2",
     "@metamask/controller-utils": "^11.0.2",
-    "@metamask/keyring-controller": "^17.1.1",
-    "@metamask/logging-controller": "^5.0.0",
     "@metamask/message-manager": "^10.0.1",
     "@metamask/rpc-errors": "^6.3.1",
     "@metamask/utils": "^9.1.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
+    "@metamask/approval-controller": "^7.0.2",
     "@metamask/auto-changelog": "^3.4.4",
+    "@metamask/keyring-controller": "^17.1.1",
+    "@metamask/logging-controller": "^5.0.0",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
     "jest": "^27.5.1",
diff --git a/packages/transaction-controller/CHANGELOG.md b/packages/transaction-controller/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Remove `@metamask/accounts-controller`, `@metamask/approval-controller`, `@metamask/gas-fee-controller`, and `@metamask/network-controller` dependencies [#4556](https://github.com/MetaMask/core/pull/4556)
+  - These were listed under `peerDependencies` already, so they were redundant as dependencies.
+
 ## [35.0.0]
 
 ### Changed
diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json
@@ -47,14 +47,10 @@
     "@ethersproject/abi": "^5.7.0",
     "@ethersproject/contracts": "^5.7.0",
     "@ethersproject/providers": "^5.7.0",
-    "@metamask/accounts-controller": "^17.2.0",
-    "@metamask/approval-controller": "^7.0.2",
     "@metamask/base-controller": "^6.0.2",
     "@metamask/controller-utils": "^11.0.2",
     "@metamask/eth-query": "^4.0.0",
-    "@metamask/gas-fee-controller": "^19.0.0",
     "@metamask/metamask-eth-abis": "^3.1.1",
-    "@metamask/network-controller": "^20.0.0",
     "@metamask/nonce-tracker": "^5.0.0",
     "@metamask/rpc-errors": "^6.3.1",
     "@metamask/utils": "^9.1.0",
@@ -67,10 +63,14 @@
   },
   "devDependencies": {
     "@babel/runtime": "^7.23.9",
+    "@metamask/accounts-controller": "^17.2.0",
+    "@metamask/approval-controller": "^7.0.2",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/eth-json-rpc-provider": "^4.1.1",
     "@metamask/ethjs-provider-http": "^0.3.0",
+    "@metamask/gas-fee-controller": "^19.0.0",
     "@metamask/keyring-api": "^8.0.1",
+    "@metamask/network-controller": "^20.0.0",
     "@types/bn.js": "^5.1.5",
     "@types/jest": "^27.4.1",
     "@types/node": "^16.18.54",
diff --git a/packages/user-operation-controller/CHANGELOG.md b/packages/user-operation-controller/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Remove `@metamask/approval-controller`, `@metamask/gas-fee-controller`, `@metamask/keyring-controller`, `@metamask/network-controller`, and `@metamask/transaction-controller` dependencies [#4556](https://github.com/MetaMask/core/pull/4556)
+  - These were listed under `peerDependencies` already, so they were redundant as dependencies.
+
 ## [14.0.0]
 
 ### Changed
diff --git a/packages/user-operation-controller/package.json b/packages/user-operation-controller/package.json
@@ -42,25 +42,25 @@
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   },
   "dependencies": {
-    "@metamask/approval-controller": "^7.0.2",
     "@metamask/base-controller": "^6.0.2",
     "@metamask/controller-utils": "^11.0.2",
     "@metamask/eth-query": "^4.0.0",
-    "@metamask/gas-fee-controller": "^19.0.0",
-    "@metamask/keyring-controller": "^17.1.1",
-    "@metamask/network-controller": "^20.0.0",
     "@metamask/polling-controller": "^9.0.0",
     "@metamask/rpc-errors": "^6.3.1",
     "@metamask/superstruct": "^3.1.0",
-    "@metamask/transaction-controller": "^35.0.0",
     "@metamask/utils": "^9.1.0",
     "bn.js": "^5.2.1",
     "immer": "^9.0.6",
     "lodash": "^4.17.21",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
+    "@metamask/approval-controller": "^7.0.2",
     "@metamask/auto-changelog": "^3.4.4",
+    "@metamask/gas-fee-controller": "^19.0.0",
+    "@metamask/keyring-controller": "^17.1.1",
+    "@metamask/network-controller": "^20.0.0",
+    "@metamask/transaction-controller": "^35.0.0",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
     "jest": "^27.5.1",
