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

MetaMask · Dec 10, 2024 · 8e5037c · 8e5037c
1 parent 29e1524
commit 8e5037c
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 56 deletions.
diff --git a/.depcheckrc.yml b/.depcheckrc.yml
@@ -9,8 +9,6 @@ ignores:
   - 'tsd'
   # Ignore dependencies imported implicitly by TypeScript
   - '@types/*'
-  # Ignore peer dependencies that appears unused, but are required
-  - 'webextension-polyfill'
   # Ignore tools (packages which we use as executables and not libraries)
   - 'rimraf'
   - '@lavamoat/allow-scripts'

diff --git a/README.md b/README.md
@@ -46,16 +46,16 @@ linkStyle default opacity:0.5
   keyring_snap_sdk(["@metamask/keyring-snap-sdk"]);
   keyring_utils(["@metamask/keyring-utils"]);
   keyring_api --> keyring_utils;
-  keyring_internal_api --> keyring_api;
   keyring_internal_api --> keyring_utils;
-  keyring_internal_snap_client --> keyring_api;
+  keyring_internal_api --> keyring_api;
   keyring_internal_snap_client --> keyring_snap_client;
   keyring_internal_snap_client --> keyring_utils;
+  keyring_internal_snap_client --> keyring_api;
   eth_snap_keyring --> keyring_api;
   eth_snap_keyring --> keyring_internal_api;
   eth_snap_keyring --> keyring_internal_snap_client;
-  keyring_snap_client --> keyring_api;
   keyring_snap_client --> keyring_utils;
+  keyring_snap_client --> keyring_api;
   keyring_snap_sdk --> keyring_utils;
   keyring_snap_sdk --> keyring_api;
 ```

diff --git a/packages/keyring-api/package.json b/packages/keyring-api/package.json
@@ -59,7 +59,6 @@
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.12",
-    "@types/webextension-polyfill": "^0.12.1",
     "deepmerge": "^4.2.2",
     "depcheck": "^1.4.7",
     "jest": "^29.5.0",

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"
@@ -54,6 +53,7 @@
     "@lavamoat/allow-scripts": "^3.2.1",
     "@lavamoat/preinstall-always-fail": "^2.1.0",
     "@metamask/auto-changelog": "^3.4.4",
+    "@metamask/keyring-api": "workspace:^",
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.12",
@@ -68,6 +68,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,17 @@
     "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"
+    "@metamask/keyring-utils": "workspace:^"
   },
   "devDependencies": {
     "@lavamoat/allow-scripts": "^3.2.1",
     "@lavamoat/preinstall-always-fail": "^2.1.0",
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/providers": "^18.1.0",
+    "@metamask/keyring-api": "workspace:^",
+    "@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 +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-bridge/package.json b/packages/keyring-snap-bridge/package.json
@@ -39,26 +39,24 @@
   "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"
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@lavamoat/allow-scripts": "^3.2.1",
     "@lavamoat/preinstall-always-fail": "^2.1.0",
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/providers": "^18.1.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",
     "@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 +69,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,17 +45,16 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@metamask/keyring-api": "workspace:^",
     "@metamask/keyring-utils": "workspace:^",
     "@metamask/superstruct": "^3.1.0",
     "@types/uuid": "^9.0.8",
-    "uuid": "^9.0.1",
-    "webextension-polyfill": "^0.12.0"
+    "uuid": "^9.0.1"
   },
   "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/utils": "^9.3.0",
     "@ts-bridge/cli": "^0.6.1",
@@ -70,10 +69,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/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",
@@ -72,7 +70,7 @@
     "typescript": "~5.6.3"
   },
   "peerDependencies": {
-    "@metamask/providers": "^18.1.0"
+    "@metamask/keyring-api": "workspace:^"
   },
   "engines": {
     "node": "^18.18 || >=20"

diff --git a/yarn.lock b/yarn.lock
@@ -2001,7 +2001,6 @@ __metadata:
     "@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"
     "@metamask/snaps-utils": "npm:^8.3.0"
@@ -2021,10 +2020,10 @@ __metadata:
     typedoc: "npm:^0.25.13"
     typescript: "npm:~5.6.3"
     uuid: "npm:^9.0.1"
-    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 +2060,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
 
@@ -2149,7 +2150,6 @@ __metadata:
     "@ts-bridge/cli": "npm:^0.6.1"
     "@types/jest": "npm:^29.5.12"
     "@types/node": "npm:^20.12.12"
-    "@types/webextension-polyfill": "npm:^0.12.1"
     bech32: "npm:^2.0.0"
     deepmerge: "npm:^4.2.2"
     depcheck: "npm:^1.4.7"
@@ -2187,6 +2187,8 @@ __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
 
@@ -2200,7 +2202,6 @@ __metadata:
     "@metamask/keyring-api": "workspace:^"
     "@metamask/keyring-snap-client": "workspace:^"
     "@metamask/keyring-utils": "workspace:^"
-    "@metamask/providers": "npm:^18.1.0"
     "@metamask/snaps-controllers": "npm:^9.10.0"
     "@metamask/snaps-sdk": "npm:^6.7.0"
     "@metamask/snaps-utils": "npm:^8.3.0"
@@ -2218,9 +2219,8 @@ __metadata:
     tsd: "npm:^0.31.0"
     typedoc: "npm:^0.25.13"
     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
 
@@ -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
 
@@ -2266,7 +2266,6 @@ __metadata:
     "@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"
     "@metamask/superstruct": "npm:^3.1.0"
     "@metamask/utils": "npm:^9.3.0"
@@ -2283,9 +2282,8 @@ __metadata:
     tsd: "npm:^0.31.0"
     typedoc: "npm:^0.25.13"
     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
 
@@ -3676,13 +3674,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/webextension-polyfill@npm:^0.12.1":
-  version: 0.12.1
-  resolution: "@types/webextension-polyfill@npm:0.12.1"
-  checksum: 10/80c1f81af272d378098474a41e0941bf9375261423ea289cd8250efc9a628cec4fa6083cb9cd5c62ff0f828ac235a044c0b95543c0606e894dfd485cea55b0aa
-  languageName: node
-  linkType: hard
-
 "@types/ws@npm:^7.2.0, @types/ws@npm:^7.4.4":
   version: 7.4.7
   resolution: "@types/ws@npm:7.4.7"