Skip to content

Commit 50030c9

Browse files
authored
Merge branch 'main' into feat/support-importing-non-evm-tokens
2 parents 28f9108 + ed18a2b commit 50030c9

File tree

66 files changed

+238
-59
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+238
-59
lines changed

.prettierrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ module.exports = {
88
singleQuote: true,
99
tabWidth: 2,
1010
trailingComma: 'all',
11+
plugins: ['prettier-plugin-packagejson'],
1112
};

.yarnrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ npmPreapprovedPackages:
2626
- "@metamask/*"
2727
- "@metamask-previews/*"
2828
- "@lavamoat/*"
29+
- "@ts-bridge/*"

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"scripts": {
1616
"build": "yarn ts-bridge --project tsconfig.build.json --verbose",
1717
"build:clean": "yarn build:only-clean && yarn build",
18-
"build:only-clean": "rimraf -g 'packages/*/dist'",
1918
"build:docs": "yarn workspaces foreach --all --no-private --parallel --interlaced --verbose run build:docs",
19+
"build:only-clean": "rimraf -g 'packages/*/dist'",
2020
"build:types": "tsc --build tsconfig.build.json --verbose",
2121
"changelog:update": "yarn workspaces foreach --all --no-private --parallel --interlaced --verbose run changelog:update",
2222
"changelog:validate": "yarn workspaces foreach --all --no-private --parallel --interlaced --verbose run changelog:validate",
@@ -64,7 +64,7 @@
6464
"@metamask/eth-json-rpc-provider": "^5.0.1",
6565
"@metamask/json-rpc-engine": "^10.1.1",
6666
"@metamask/utils": "^11.8.1",
67-
"@ts-bridge/cli": "^0.6.1",
67+
"@ts-bridge/cli": "^0.6.4",
6868
"@types/jest": "^27.4.1",
6969
"@types/lodash": "^4.14.191",
7070
"@types/node": "^16.18.54",

packages/account-tree-controller/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
],
3737
"scripts": {
3838
"build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
39+
"build:all": "ts-bridge --project tsconfig.build.json --verbose --clean",
3940
"build:docs": "typedoc",
4041
"changelog:update": "../../scripts/update-changelog.sh @metamask/account-tree-controller",
4142
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/account-tree-controller",
@@ -66,6 +67,7 @@
6667
"@metamask/profile-sync-controller": "^26.0.0",
6768
"@metamask/providers": "^22.1.0",
6869
"@metamask/snaps-controllers": "^14.0.1",
70+
"@ts-bridge/cli": "^0.6.4",
6971
"@types/jest": "^27.4.1",
7072
"deepmerge": "^4.2.2",
7173
"jest": "^27.5.1",

packages/accounts-controller/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
],
3737
"scripts": {
3838
"build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
39+
"build:all": "ts-bridge --project tsconfig.build.json --verbose --clean",
3940
"build:docs": "typedoc",
4041
"changelog:update": "../../scripts/update-changelog.sh @metamask/accounts-controller",
4142
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/accounts-controller",
@@ -71,6 +72,7 @@
7172
"@metamask/network-controller": "^25.0.0",
7273
"@metamask/providers": "^22.1.0",
7374
"@metamask/snaps-controllers": "^14.0.1",
75+
"@ts-bridge/cli": "^0.6.4",
7476
"@types/jest": "^27.4.1",
7577
"@types/readable-stream": "^2.3.0",
7678
"jest": "^27.5.1",

packages/address-book-controller/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
],
3737
"scripts": {
3838
"build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
39+
"build:all": "ts-bridge --project tsconfig.build.json --verbose --clean",
3940
"build:docs": "typedoc",
4041
"changelog:update": "../../scripts/update-changelog.sh @metamask/address-book-controller",
4142
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/address-book-controller",
@@ -54,6 +55,7 @@
5455
},
5556
"devDependencies": {
5657
"@metamask/auto-changelog": "^3.4.4",
58+
"@ts-bridge/cli": "^0.6.4",
5759
"@types/jest": "^27.4.1",
5860
"deepmerge": "^4.2.2",
5961
"jest": "^27.5.1",

packages/announcement-controller/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
],
3737
"scripts": {
3838
"build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
39+
"build:all": "ts-bridge --project tsconfig.build.json --verbose --clean",
3940
"build:docs": "typedoc",
4041
"changelog:update": "../../scripts/update-changelog.sh @metamask/announcement-controller",
4142
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/announcement-controller",
@@ -52,6 +53,7 @@
5253
},
5354
"devDependencies": {
5455
"@metamask/auto-changelog": "^3.4.4",
56+
"@ts-bridge/cli": "^0.6.4",
5557
"@types/jest": "^27.4.1",
5658
"deepmerge": "^4.2.2",
5759
"jest": "^27.5.1",

packages/app-metadata-controller/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
],
3737
"scripts": {
3838
"build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
39+
"build:all": "ts-bridge --project tsconfig.build.json --verbose --clean",
3940
"build:docs": "typedoc",
4041
"changelog:update": "../../scripts/update-changelog.sh @metamask/app-metadata-controller",
4142
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/app-metadata-controller",
@@ -52,6 +53,7 @@
5253
},
5354
"devDependencies": {
5455
"@metamask/auto-changelog": "^3.4.4",
56+
"@ts-bridge/cli": "^0.6.4",
5557
"@types/jest": "^27.4.1",
5658
"deepmerge": "^4.2.2",
5759
"jest": "^27.5.1",

packages/approval-controller/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
],
3737
"scripts": {
3838
"build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
39+
"build:all": "ts-bridge --project tsconfig.build.json --verbose --clean",
3940
"build:docs": "typedoc",
4041
"changelog:update": "../../scripts/update-changelog.sh @metamask/approval-controller",
4142
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/approval-controller",
@@ -55,6 +56,7 @@
5556
},
5657
"devDependencies": {
5758
"@metamask/auto-changelog": "^3.4.4",
59+
"@ts-bridge/cli": "^0.6.4",
5860
"@types/jest": "^27.4.1",
5961
"deepmerge": "^4.2.2",
6062
"jest": "^27.5.1",

packages/assets-controllers/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
],
3737
"scripts": {
3838
"build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
39+
"build:all": "ts-bridge --project tsconfig.build.json --verbose --clean",
3940
"build:docs": "typedoc",
4041
"changelog:update": "../../scripts/update-changelog.sh @metamask/assets-controllers",
4142
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/assets-controllers",
@@ -98,6 +99,7 @@
9899
"@metamask/providers": "^22.1.0",
99100
"@metamask/snaps-controllers": "^14.0.1",
100101
"@metamask/transaction-controller": "^61.1.0",
102+
"@ts-bridge/cli": "^0.6.4",
101103
"@types/jest": "^27.4.1",
102104
"@types/lodash": "^4.14.191",
103105
"@types/node": "^16.18.54",

0 commit comments

Comments
 (0)