refactor: move deps to devDeps for types + use peerDep for keyring-api

MetaMask · Dec 10, 2024 · 4685a87 · 4685a87
1 parent 29e1524
commit 4685a87
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 36 deletions.
diff --git a/packages/keyring-eth-trezor/package.json b/packages/keyring-eth-trezor/package.json
@@ -52,8 +52,7 @@
     "@metamask/eth-sig-util": "^8.0.0",
     "@trezor/connect-plugin-ethereum": "^9.0.3",
     "@trezor/connect-web": "^9.1.11",
-    "hdkey": "^2.1.0",
-    "tslib": "^2.6.2"
+    "hdkey": "^2.1.0"
   },
   "devDependencies": {
     "@ethereumjs/common": "^3.2.0",
@@ -76,9 +75,13 @@
     "sinon": "^19.0.2",
     "ts-jest": "^29.0.5",
     "ts-node": "^10.9.2",
+    "tslib": "^2.6.2",
     "typedoc": "^0.25.13",
     "typescript": "~5.6.3"
   },
+  "peerDependencies": {
+    "tslib": "^2.6.2"
+  },
   "engines": {
     "node": "^18.18 || >=20"
   },

diff --git a/packages/keyring-internal-api/package.json b/packages/keyring-internal-api/package.json
@@ -45,7 +45,6 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@metamask/keyring-api": "workspace:^",
     "@metamask/keyring-utils": "workspace:^",
     "@metamask/superstruct": "^3.1.0",
     "@metamask/utils": "^9.3.0"
@@ -68,6 +67,9 @@
     "typedoc": "^0.25.13",
     "typescript": "~5.6.3"
   },
+  "peerDependencies": {
+    "@metamask/keyring-api": "workspace:^"
+  },
   "engines": {
     "node": "^18.18 || >=20"
   },

diff --git a/packages/keyring-internal-snap-client/package.json b/packages/keyring-internal-snap-client/package.json
@@ -45,19 +45,19 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@metamask/keyring-api": "workspace:^",
     "@metamask/keyring-snap-client": "workspace:^",
     "@metamask/keyring-utils": "workspace:^",
-    "@metamask/snaps-controllers": "^9.10.0",
-    "@metamask/snaps-sdk": "^6.7.0",
-    "@metamask/snaps-utils": "^8.3.0",
     "webextension-polyfill": "^0.12.0"
   },
   "devDependencies": {
     "@lavamoat/allow-scripts": "^3.2.1",
     "@lavamoat/preinstall-always-fail": "^2.1.0",
     "@metamask/auto-changelog": "^3.4.4",
+    "@metamask/keyring-api": "workspace:^",
     "@metamask/providers": "^18.1.0",
+    "@metamask/snaps-controllers": "^9.10.0",
+    "@metamask/snaps-sdk": "^6.7.0",
+    "@metamask/snaps-utils": "^8.3.0",
     "@metamask/utils": "^9.3.0",
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^29.5.12",
@@ -74,7 +74,7 @@
     "typescript": "~5.6.3"
   },
   "peerDependencies": {
-    "@metamask/providers": "^18.1.0"
+    "@metamask/keyring-api": "workspace:^"
   },
   "engines": {
     "node": "^18.18 || >=20"

diff --git a/packages/keyring-snap-bridge/package.json b/packages/keyring-snap-bridge/package.json
@@ -39,15 +39,8 @@
   "dependencies": {
     "@ethereumjs/tx": "^4.2.0",
     "@metamask/eth-sig-util": "^8.0.0",
-    "@metamask/keyring-api": "workspace:^",
-    "@metamask/keyring-internal-api": "workspace:^",
-    "@metamask/keyring-internal-snap-client": "workspace:^",
-    "@metamask/snaps-controllers": "^9.10.0",
-    "@metamask/snaps-sdk": "^6.7.0",
-    "@metamask/snaps-utils": "^8.3.0",
     "@metamask/superstruct": "^3.1.0",
     "@metamask/utils": "^9.3.0",
-    "@types/uuid": "^9.0.8",
     "uuid": "^9.0.1",
     "webextension-polyfill": "^0.12.0"
   },
@@ -56,9 +49,13 @@
     "@lavamoat/preinstall-always-fail": "^2.1.0",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/providers": "^18.1.0",
+    "@metamask/snaps-controllers": "^9.10.0",
+    "@metamask/snaps-sdk": "^6.7.0",
+    "@metamask/snaps-utils": "^8.3.0",
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.12",
+    "@types/uuid": "^9.0.8",
     "deepmerge": "^4.2.2",
     "depcheck": "^1.4.7",
     "jest": "^29.5.0",
@@ -71,7 +68,8 @@
   },
   "peerDependencies": {
     "@metamask/keyring-api": "workspace:^",
-    "@metamask/providers": "^18.1.0"
+    "@metamask/keyring-internal-api": "workspace:^",
+    "@metamask/keyring-internal-snap-client": "workspace:^"
   },
   "engines": {
     "node": "^18.18 || >=20"

diff --git a/packages/keyring-snap-client/package.json b/packages/keyring-snap-client/package.json
@@ -45,7 +45,6 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@metamask/keyring-api": "workspace:^",
     "@metamask/keyring-utils": "workspace:^",
     "@metamask/superstruct": "^3.1.0",
     "@types/uuid": "^9.0.8",
@@ -73,7 +72,7 @@
     "typescript": "~5.6.3"
   },
   "peerDependencies": {
-    "@metamask/providers": "^18.1.0"
+    "@metamask/keyring-api": "workspace:^"
   },
   "engines": {
     "node": "^18.18 || >=20"

diff --git a/packages/keyring-snap-sdk/package.json b/packages/keyring-snap-sdk/package.json
@@ -46,17 +46,15 @@
   },
   "dependencies": {
     "@metamask/keyring-utils": "workspace:^",
-    "@metamask/snaps-sdk": "^6.7.0",
     "@metamask/superstruct": "^3.1.0",
-    "@metamask/utils": "^9.3.0",
-    "webextension-polyfill": "^0.12.0"
+    "@metamask/utils": "^9.3.0"
   },
   "devDependencies": {
     "@lavamoat/allow-scripts": "^3.2.1",
     "@lavamoat/preinstall-always-fail": "^2.1.0",
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/keyring-api": "workspace:^",
     "@metamask/providers": "^18.1.0",
+    "@metamask/snaps-sdk": "^6.7.0",
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.12",
@@ -69,10 +67,11 @@
     "ts-node": "^10.9.2",
     "tsd": "^0.31.0",
     "typedoc": "^0.25.13",
-    "typescript": "~5.6.3"
+    "typescript": "~5.6.3",
+    "webextension-polyfill": "^0.12.0"
   },
   "peerDependencies": {
-    "@metamask/providers": "^18.1.0"
+    "@metamask/keyring-api": "workspace:^"
   },
   "engines": {
     "node": "^18.18 || >=20"

diff --git a/yarn.lock b/yarn.lock
@@ -1998,9 +1998,6 @@ __metadata:
     "@lavamoat/preinstall-always-fail": "npm:^2.1.0"
     "@metamask/auto-changelog": "npm:^3.4.4"
     "@metamask/eth-sig-util": "npm:^8.0.0"
-    "@metamask/keyring-api": "workspace:^"
-    "@metamask/keyring-internal-api": "workspace:^"
-    "@metamask/keyring-internal-snap-client": "workspace:^"
     "@metamask/providers": "npm:^18.1.0"
     "@metamask/snaps-controllers": "npm:^9.10.0"
     "@metamask/snaps-sdk": "npm:^6.7.0"
@@ -2024,7 +2021,8 @@ __metadata:
     webextension-polyfill: "npm:^0.12.0"
   peerDependencies:
     "@metamask/keyring-api": "workspace:^"
-    "@metamask/providers": ^18.1.0
+    "@metamask/keyring-internal-api": "workspace:^"
+    "@metamask/keyring-internal-snap-client": "workspace:^"
   languageName: unknown
   linkType: soft
 
@@ -2061,6 +2059,8 @@ __metadata:
     tslib: "npm:^2.6.2"
     typedoc: "npm:^0.25.13"
     typescript: "npm:~5.6.3"
+  peerDependencies:
+    tslib: ^2.6.2
   languageName: unknown
   linkType: soft
 
@@ -2163,14 +2163,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@metamask/keyring-internal-api@workspace:^, @metamask/keyring-internal-api@workspace:packages/keyring-internal-api":
+"@metamask/keyring-internal-api@workspace:packages/keyring-internal-api":
   version: 0.0.0-use.local
   resolution: "@metamask/keyring-internal-api@workspace:packages/keyring-internal-api"
   dependencies:
     "@lavamoat/allow-scripts": "npm:^3.2.1"
     "@lavamoat/preinstall-always-fail": "npm:^2.1.0"
     "@metamask/auto-changelog": "npm:^3.4.4"
-    "@metamask/keyring-api": "workspace:^"
     "@metamask/keyring-utils": "workspace:^"
     "@metamask/superstruct": "npm:^3.1.0"
     "@metamask/utils": "npm:^9.3.0"
@@ -2187,10 +2186,12 @@ __metadata:
     tsd: "npm:^0.31.0"
     typedoc: "npm:^0.25.13"
     typescript: "npm:~5.6.3"
+  peerDependencies:
+    "@metamask/keyring-api": "workspace:^"
   languageName: unknown
   linkType: soft
 
-"@metamask/keyring-internal-snap-client@workspace:^, @metamask/keyring-internal-snap-client@workspace:packages/keyring-internal-snap-client":
+"@metamask/keyring-internal-snap-client@workspace:packages/keyring-internal-snap-client":
   version: 0.0.0-use.local
   resolution: "@metamask/keyring-internal-snap-client@workspace:packages/keyring-internal-snap-client"
   dependencies:
@@ -2220,7 +2221,7 @@ __metadata:
     typescript: "npm:~5.6.3"
     webextension-polyfill: "npm:^0.12.0"
   peerDependencies:
-    "@metamask/providers": ^18.1.0
+    "@metamask/keyring-api": "workspace:^"
   languageName: unknown
   linkType: soft
 
@@ -2231,7 +2232,6 @@ __metadata:
     "@lavamoat/allow-scripts": "npm:^3.2.1"
     "@lavamoat/preinstall-always-fail": "npm:^2.1.0"
     "@metamask/auto-changelog": "npm:^3.4.4"
-    "@metamask/keyring-api": "workspace:^"
     "@metamask/keyring-utils": "workspace:^"
     "@metamask/providers": "npm:^18.1.0"
     "@metamask/superstruct": "npm:^3.1.0"
@@ -2253,7 +2253,7 @@ __metadata:
     uuid: "npm:^9.0.1"
     webextension-polyfill: "npm:^0.12.0"
   peerDependencies:
-    "@metamask/providers": ^18.1.0
+    "@metamask/keyring-api": "workspace:^"
   languageName: unknown
   linkType: soft
 
@@ -2264,7 +2264,6 @@ __metadata:
     "@lavamoat/allow-scripts": "npm:^3.2.1"
     "@lavamoat/preinstall-always-fail": "npm:^2.1.0"
     "@metamask/auto-changelog": "npm:^3.4.4"
-    "@metamask/keyring-api": "workspace:^"
     "@metamask/keyring-utils": "workspace:^"
     "@metamask/providers": "npm:^18.1.0"
     "@metamask/snaps-sdk": "npm:^6.7.0"
@@ -2285,7 +2284,7 @@ __metadata:
     typescript: "npm:~5.6.3"
     webextension-polyfill: "npm:^0.12.0"
   peerDependencies:
-    "@metamask/providers": ^18.1.0
+    "@metamask/keyring-api": "workspace:^"
   languageName: unknown
   linkType: soft