Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .depcheckrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
```
Expand Down
1 change: 0 additions & 1 deletion packages/keyring-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion packages/keyring-eth-hd/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@
"@ts-bridge/cli": "^0.6.1",
"@types/jest": "^29.5.12",
"deepmerge": "^4.2.2",
"jest": "^29.5.0"
"jest": "^29.5.0",
"typescript": "~5.6.3"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed as of now, but since this package has already been "future-proof" for ts-bridge we might wanna add typescript as well.

},
"engines": {
"node": "^18.18 || >=20"
Expand Down
7 changes: 5 additions & 2 deletions packages/keyring-eth-trezor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should have been a peerDependencies since the introduction of @trezor/connect-web.

},
"engines": {
"node": "^18.18 || >=20"
},
Expand Down
5 changes: 4 additions & 1 deletion packages/keyring-internal-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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",
Expand All @@ -68,6 +68,9 @@
"typedoc": "^0.25.13",
"typescript": "~5.6.3"
},
"peerDependencies": {
"@metamask/keyring-api": "workspace:^"
},
"engines": {
"node": "^18.18 || >=20"
},
Expand Down
17 changes: 9 additions & 8 deletions packages/keyring-internal-snap-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -74,7 +72,10 @@
"typescript": "~5.6.3"
},
"peerDependencies": {
"@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"
},
"engines": {
"node": "^18.18 || >=20"
Expand Down
21 changes: 10 additions & 11 deletions packages/keyring-snap-bridge/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
9 changes: 5 additions & 4 deletions packages/keyring-snap-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -70,9 +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/keyring-api": "workspace:^",
"@metamask/providers": "^18.1.0"
},
"engines": {
Expand Down
9 changes: 4 additions & 5 deletions packages/keyring-snap-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -72,7 +70,8 @@
"typescript": "~5.6.3"
},
"peerDependencies": {
"@metamask/providers": "^18.1.0"
"@metamask/keyring-api": "workspace:^",
"@metamask/snaps-sdk": "^6.7.0"
},
"engines": {
"node": "^18.18 || >=20"
Expand Down
31 changes: 14 additions & 17 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1883,6 +1883,7 @@ __metadata:
deepmerge: "npm:^4.2.2"
ethereum-cryptography: "npm:^2.1.2"
jest: "npm:^29.5.0"
typescript: "npm:~5.6.3"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -2001,7 +2002,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"
Expand All @@ -2021,10 +2021,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

Expand Down Expand Up @@ -2061,6 +2061,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

Expand Down Expand Up @@ -2149,7 +2151,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"
Expand Down Expand Up @@ -2187,6 +2188,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

Expand All @@ -2200,7 +2203,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"
Expand All @@ -2218,9 +2220,11 @@ __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:^"
"@metamask/snaps-controllers": ^9.10.0
"@metamask/snaps-sdk": ^6.7.0
"@metamask/snaps-utils": ^8.3.0
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -2253,6 +2257,7 @@ __metadata:
uuid: "npm:^9.0.1"
webextension-polyfill: "npm:^0.12.0"
peerDependencies:
"@metamask/keyring-api": "workspace:^"
"@metamask/providers": ^18.1.0
languageName: unknown
linkType: soft
Expand All @@ -2266,7 +2271,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"
Expand All @@ -2283,9 +2287,9 @@ __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:^"
"@metamask/snaps-sdk": ^6.7.0
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -3676,13 +3680,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"
Expand Down
Loading