Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 8e5037c

Browse files
ccharlyccharly
committedDec 10, 2024·
refactor: move deps to devDeps for types + use peerDep for keyring-api
1 parent 29e1524 commit 8e5037c

File tree

10 files changed

+45
-56
lines changed

10 files changed

+45
-56
lines changed
 

‎.depcheckrc.yml

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ ignores:
99
- 'tsd'
1010
# Ignore dependencies imported implicitly by TypeScript
1111
- '@types/*'
12-
# Ignore peer dependencies that appears unused, but are required
13-
- 'webextension-polyfill'
1412
# Ignore tools (packages which we use as executables and not libraries)
1513
- 'rimraf'
1614
- '@lavamoat/allow-scripts'

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@ linkStyle default opacity:0.5
4646
keyring_snap_sdk(["@metamask/keyring-snap-sdk"]);
4747
keyring_utils(["@metamask/keyring-utils"]);
4848
keyring_api --> keyring_utils;
49-
keyring_internal_api --> keyring_api;
5049
keyring_internal_api --> keyring_utils;
51-
keyring_internal_snap_client --> keyring_api;
50+
keyring_internal_api --> keyring_api;
5251
keyring_internal_snap_client --> keyring_snap_client;
5352
keyring_internal_snap_client --> keyring_utils;
53+
keyring_internal_snap_client --> keyring_api;
5454
eth_snap_keyring --> keyring_api;
5555
eth_snap_keyring --> keyring_internal_api;
5656
eth_snap_keyring --> keyring_internal_snap_client;
57-
keyring_snap_client --> keyring_api;
5857
keyring_snap_client --> keyring_utils;
58+
keyring_snap_client --> keyring_api;
5959
keyring_snap_sdk --> keyring_utils;
6060
keyring_snap_sdk --> keyring_api;
6161
```

‎packages/keyring-api/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
"@ts-bridge/cli": "^0.6.1",
6060
"@types/jest": "^29.5.12",
6161
"@types/node": "^20.12.12",
62-
"@types/webextension-polyfill": "^0.12.1",
6362
"deepmerge": "^4.2.2",
6463
"depcheck": "^1.4.7",
6564
"jest": "^29.5.0",

‎packages/keyring-eth-trezor/package.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
"@metamask/eth-sig-util": "^8.0.0",
5353
"@trezor/connect-plugin-ethereum": "^9.0.3",
5454
"@trezor/connect-web": "^9.1.11",
55-
"hdkey": "^2.1.0",
56-
"tslib": "^2.6.2"
55+
"hdkey": "^2.1.0"
5756
},
5857
"devDependencies": {
5958
"@ethereumjs/common": "^3.2.0",
@@ -76,9 +75,13 @@
7675
"sinon": "^19.0.2",
7776
"ts-jest": "^29.0.5",
7877
"ts-node": "^10.9.2",
78+
"tslib": "^2.6.2",
7979
"typedoc": "^0.25.13",
8080
"typescript": "~5.6.3"
8181
},
82+
"peerDependencies": {
83+
"tslib": "^2.6.2"
84+
},
8285
"engines": {
8386
"node": "^18.18 || >=20"
8487
},

‎packages/keyring-internal-api/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
"test:watch": "jest --watch"
4646
},
4747
"dependencies": {
48-
"@metamask/keyring-api": "workspace:^",
4948
"@metamask/keyring-utils": "workspace:^",
5049
"@metamask/superstruct": "^3.1.0",
5150
"@metamask/utils": "^9.3.0"
@@ -54,6 +53,7 @@
5453
"@lavamoat/allow-scripts": "^3.2.1",
5554
"@lavamoat/preinstall-always-fail": "^2.1.0",
5655
"@metamask/auto-changelog": "^3.4.4",
56+
"@metamask/keyring-api": "workspace:^",
5757
"@ts-bridge/cli": "^0.6.1",
5858
"@types/jest": "^29.5.12",
5959
"@types/node": "^20.12.12",
@@ -68,6 +68,9 @@
6868
"typedoc": "^0.25.13",
6969
"typescript": "~5.6.3"
7070
},
71+
"peerDependencies": {
72+
"@metamask/keyring-api": "workspace:^"
73+
},
7174
"engines": {
7275
"node": "^18.18 || >=20"
7376
},

‎packages/keyring-internal-snap-client/package.json

+6-8
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,17 @@
4545
"test:watch": "jest --watch"
4646
},
4747
"dependencies": {
48-
"@metamask/keyring-api": "workspace:^",
4948
"@metamask/keyring-snap-client": "workspace:^",
50-
"@metamask/keyring-utils": "workspace:^",
51-
"@metamask/snaps-controllers": "^9.10.0",
52-
"@metamask/snaps-sdk": "^6.7.0",
53-
"@metamask/snaps-utils": "^8.3.0",
54-
"webextension-polyfill": "^0.12.0"
49+
"@metamask/keyring-utils": "workspace:^"
5550
},
5651
"devDependencies": {
5752
"@lavamoat/allow-scripts": "^3.2.1",
5853
"@lavamoat/preinstall-always-fail": "^2.1.0",
5954
"@metamask/auto-changelog": "^3.4.4",
60-
"@metamask/providers": "^18.1.0",
55+
"@metamask/keyring-api": "workspace:^",
56+
"@metamask/snaps-controllers": "^9.10.0",
57+
"@metamask/snaps-sdk": "^6.7.0",
58+
"@metamask/snaps-utils": "^8.3.0",
6159
"@metamask/utils": "^9.3.0",
6260
"@ts-bridge/cli": "^0.6.1",
6361
"@types/jest": "^29.5.12",
@@ -74,7 +72,7 @@
7472
"typescript": "~5.6.3"
7573
},
7674
"peerDependencies": {
77-
"@metamask/providers": "^18.1.0"
75+
"@metamask/keyring-api": "workspace:^"
7876
},
7977
"engines": {
8078
"node": "^18.18 || >=20"

‎packages/keyring-snap-bridge/package.json

+10-11
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,24 @@
3939
"dependencies": {
4040
"@ethereumjs/tx": "^4.2.0",
4141
"@metamask/eth-sig-util": "^8.0.0",
42-
"@metamask/keyring-api": "workspace:^",
43-
"@metamask/keyring-internal-api": "workspace:^",
44-
"@metamask/keyring-internal-snap-client": "workspace:^",
45-
"@metamask/snaps-controllers": "^9.10.0",
46-
"@metamask/snaps-sdk": "^6.7.0",
47-
"@metamask/snaps-utils": "^8.3.0",
4842
"@metamask/superstruct": "^3.1.0",
4943
"@metamask/utils": "^9.3.0",
50-
"@types/uuid": "^9.0.8",
51-
"uuid": "^9.0.1",
52-
"webextension-polyfill": "^0.12.0"
44+
"uuid": "^9.0.1"
5345
},
5446
"devDependencies": {
5547
"@lavamoat/allow-scripts": "^3.2.1",
5648
"@lavamoat/preinstall-always-fail": "^2.1.0",
5749
"@metamask/auto-changelog": "^3.4.4",
58-
"@metamask/providers": "^18.1.0",
50+
"@metamask/keyring-api": "workspace:^",
51+
"@metamask/keyring-internal-api": "workspace:^",
52+
"@metamask/keyring-internal-snap-client": "workspace:^",
53+
"@metamask/snaps-controllers": "^9.10.0",
54+
"@metamask/snaps-sdk": "^6.7.0",
55+
"@metamask/snaps-utils": "^8.3.0",
5956
"@ts-bridge/cli": "^0.6.1",
6057
"@types/jest": "^29.5.12",
6158
"@types/node": "^20.12.12",
59+
"@types/uuid": "^9.0.8",
6260
"deepmerge": "^4.2.2",
6361
"depcheck": "^1.4.7",
6462
"jest": "^29.5.0",
@@ -71,7 +69,8 @@
7169
},
7270
"peerDependencies": {
7371
"@metamask/keyring-api": "workspace:^",
74-
"@metamask/providers": "^18.1.0"
72+
"@metamask/keyring-internal-api": "workspace:^",
73+
"@metamask/keyring-internal-snap-client": "workspace:^"
7574
},
7675
"engines": {
7776
"node": "^18.18 || >=20"

‎packages/keyring-snap-client/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,16 @@
4545
"test:watch": "jest --watch"
4646
},
4747
"dependencies": {
48-
"@metamask/keyring-api": "workspace:^",
4948
"@metamask/keyring-utils": "workspace:^",
5049
"@metamask/superstruct": "^3.1.0",
5150
"@types/uuid": "^9.0.8",
52-
"uuid": "^9.0.1",
53-
"webextension-polyfill": "^0.12.0"
51+
"uuid": "^9.0.1"
5452
},
5553
"devDependencies": {
5654
"@lavamoat/allow-scripts": "^3.2.1",
5755
"@lavamoat/preinstall-always-fail": "^2.1.0",
5856
"@metamask/auto-changelog": "^3.4.4",
57+
"@metamask/keyring-api": "workspace:^",
5958
"@metamask/providers": "^18.1.0",
6059
"@metamask/utils": "^9.3.0",
6160
"@ts-bridge/cli": "^0.6.1",
@@ -70,10 +69,11 @@
7069
"ts-node": "^10.9.2",
7170
"tsd": "^0.31.0",
7271
"typedoc": "^0.25.13",
73-
"typescript": "~5.6.3"
72+
"typescript": "~5.6.3",
73+
"webextension-polyfill": "^0.12.0"
7474
},
7575
"peerDependencies": {
76-
"@metamask/providers": "^18.1.0"
76+
"@metamask/keyring-api": "workspace:^"
7777
},
7878
"engines": {
7979
"node": "^18.18 || >=20"

‎packages/keyring-snap-sdk/package.json

+3-5
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,15 @@
4646
},
4747
"dependencies": {
4848
"@metamask/keyring-utils": "workspace:^",
49-
"@metamask/snaps-sdk": "^6.7.0",
5049
"@metamask/superstruct": "^3.1.0",
51-
"@metamask/utils": "^9.3.0",
52-
"webextension-polyfill": "^0.12.0"
50+
"@metamask/utils": "^9.3.0"
5351
},
5452
"devDependencies": {
5553
"@lavamoat/allow-scripts": "^3.2.1",
5654
"@lavamoat/preinstall-always-fail": "^2.1.0",
5755
"@metamask/auto-changelog": "^3.4.4",
5856
"@metamask/keyring-api": "workspace:^",
59-
"@metamask/providers": "^18.1.0",
57+
"@metamask/snaps-sdk": "^6.7.0",
6058
"@ts-bridge/cli": "^0.6.1",
6159
"@types/jest": "^29.5.12",
6260
"@types/node": "^20.12.12",
@@ -72,7 +70,7 @@
7270
"typescript": "~5.6.3"
7371
},
7472
"peerDependencies": {
75-
"@metamask/providers": "^18.1.0"
73+
"@metamask/keyring-api": "workspace:^"
7674
},
7775
"engines": {
7876
"node": "^18.18 || >=20"

‎yarn.lock

+9-18
Original file line numberDiff line numberDiff line change
@@ -2001,7 +2001,6 @@ __metadata:
20012001
"@metamask/keyring-api": "workspace:^"
20022002
"@metamask/keyring-internal-api": "workspace:^"
20032003
"@metamask/keyring-internal-snap-client": "workspace:^"
2004-
"@metamask/providers": "npm:^18.1.0"
20052004
"@metamask/snaps-controllers": "npm:^9.10.0"
20062005
"@metamask/snaps-sdk": "npm:^6.7.0"
20072006
"@metamask/snaps-utils": "npm:^8.3.0"
@@ -2021,10 +2020,10 @@ __metadata:
20212020
typedoc: "npm:^0.25.13"
20222021
typescript: "npm:~5.6.3"
20232022
uuid: "npm:^9.0.1"
2024-
webextension-polyfill: "npm:^0.12.0"
20252023
peerDependencies:
20262024
"@metamask/keyring-api": "workspace:^"
2027-
"@metamask/providers": ^18.1.0
2025+
"@metamask/keyring-internal-api": "workspace:^"
2026+
"@metamask/keyring-internal-snap-client": "workspace:^"
20282027
languageName: unknown
20292028
linkType: soft
20302029

@@ -2061,6 +2060,8 @@ __metadata:
20612060
tslib: "npm:^2.6.2"
20622061
typedoc: "npm:^0.25.13"
20632062
typescript: "npm:~5.6.3"
2063+
peerDependencies:
2064+
tslib: ^2.6.2
20642065
languageName: unknown
20652066
linkType: soft
20662067

@@ -2149,7 +2150,6 @@ __metadata:
21492150
"@ts-bridge/cli": "npm:^0.6.1"
21502151
"@types/jest": "npm:^29.5.12"
21512152
"@types/node": "npm:^20.12.12"
2152-
"@types/webextension-polyfill": "npm:^0.12.1"
21532153
bech32: "npm:^2.0.0"
21542154
deepmerge: "npm:^4.2.2"
21552155
depcheck: "npm:^1.4.7"
@@ -2187,6 +2187,8 @@ __metadata:
21872187
tsd: "npm:^0.31.0"
21882188
typedoc: "npm:^0.25.13"
21892189
typescript: "npm:~5.6.3"
2190+
peerDependencies:
2191+
"@metamask/keyring-api": "workspace:^"
21902192
languageName: unknown
21912193
linkType: soft
21922194

@@ -2200,7 +2202,6 @@ __metadata:
22002202
"@metamask/keyring-api": "workspace:^"
22012203
"@metamask/keyring-snap-client": "workspace:^"
22022204
"@metamask/keyring-utils": "workspace:^"
2203-
"@metamask/providers": "npm:^18.1.0"
22042205
"@metamask/snaps-controllers": "npm:^9.10.0"
22052206
"@metamask/snaps-sdk": "npm:^6.7.0"
22062207
"@metamask/snaps-utils": "npm:^8.3.0"
@@ -2218,9 +2219,8 @@ __metadata:
22182219
tsd: "npm:^0.31.0"
22192220
typedoc: "npm:^0.25.13"
22202221
typescript: "npm:~5.6.3"
2221-
webextension-polyfill: "npm:^0.12.0"
22222222
peerDependencies:
2223-
"@metamask/providers": ^18.1.0
2223+
"@metamask/keyring-api": "workspace:^"
22242224
languageName: unknown
22252225
linkType: soft
22262226

@@ -2253,7 +2253,7 @@ __metadata:
22532253
uuid: "npm:^9.0.1"
22542254
webextension-polyfill: "npm:^0.12.0"
22552255
peerDependencies:
2256-
"@metamask/providers": ^18.1.0
2256+
"@metamask/keyring-api": "workspace:^"
22572257
languageName: unknown
22582258
linkType: soft
22592259

@@ -2266,7 +2266,6 @@ __metadata:
22662266
"@metamask/auto-changelog": "npm:^3.4.4"
22672267
"@metamask/keyring-api": "workspace:^"
22682268
"@metamask/keyring-utils": "workspace:^"
2269-
"@metamask/providers": "npm:^18.1.0"
22702269
"@metamask/snaps-sdk": "npm:^6.7.0"
22712270
"@metamask/superstruct": "npm:^3.1.0"
22722271
"@metamask/utils": "npm:^9.3.0"
@@ -2283,9 +2282,8 @@ __metadata:
22832282
tsd: "npm:^0.31.0"
22842283
typedoc: "npm:^0.25.13"
22852284
typescript: "npm:~5.6.3"
2286-
webextension-polyfill: "npm:^0.12.0"
22872285
peerDependencies:
2288-
"@metamask/providers": ^18.1.0
2286+
"@metamask/keyring-api": "workspace:^"
22892287
languageName: unknown
22902288
linkType: soft
22912289

@@ -3676,13 +3674,6 @@ __metadata:
36763674
languageName: node
36773675
linkType: hard
36783676

3679-
"@types/webextension-polyfill@npm:^0.12.1":
3680-
version: 0.12.1
3681-
resolution: "@types/webextension-polyfill@npm:0.12.1"
3682-
checksum: 10/80c1f81af272d378098474a41e0941bf9375261423ea289cd8250efc9a628cec4fa6083cb9cd5c62ff0f828ac235a044c0b95543c0606e894dfd485cea55b0aa
3683-
languageName: node
3684-
linkType: hard
3685-
36863677
"@types/ws@npm:^7.2.0, @types/ws@npm:^7.4.4":
36873678
version: 7.4.7
36883679
resolution: "@types/ws@npm:7.4.7"

0 commit comments

Comments
 (0)
Please sign in to comment.