Skip to content

Commit 8fa1fa2

Browse files
mcmiremcmire
committed
Merge branch 'main' into fix-to-checksum-hex-address
2 parents 3eae5bf + 304d19b commit 8fa1fa2

File tree

82 files changed

+1015
-362
lines changed

Some content is hidden

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

82 files changed

+1015
-362
lines changed

‎constraints.pro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ gen_enforced_field(WorkspaceCwd, 'main', null) :-
238238
workspace_field(WorkspaceCwd, 'private', true).
239239

240240
% The type definitions entrypoint for all publishable packages must be the same.
241-
gen_enforced_field(WorkspaceCwd, 'types', './dist/index.d.ts') :-
241+
gen_enforced_field(WorkspaceCwd, 'types', './dist/types/index.d.ts') :-
242242
\+ workspace_field(WorkspaceCwd, 'private', true).
243243
% Non-published packages must not specify a type definitions entrypoint.
244244
gen_enforced_field(WorkspaceCwd, 'types', null) :-

‎docs/contributing.md‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,11 @@ If you're developing your project locally and want to test changes to a package,
7272
7373
> **Example:**
7474
>
75-
> - If you're a member of MetaMask, your project uses Yarn, `@metamask/controller-utils` is listed in dependencies at `^1.1.4`, and your clone of the `core` repo is at the same level as your project, add the following to `resolutions`:
75+
> - If your project uses Yarn, `@metamask/controller-utils` is listed in dependencies at `^1.1.4`, and your clone of the `core` repo is at the same level as your project, add the following to `resolutions`:
7676
>
7777
> ```
7878
> "@metamask/controller-utils@^1.1.4": "file:../core/packages/controller-utils"
7979
> ```
80-
>
81-
> - If you are an individual contributor, your project uses NPM, `@metamask/assets-controllers` is listed in dependencies at `^3.4.7`, and your fork of the `core` repo is at the same level as your project, add the following to `overrides`:
82-
>
83-
> ```
84-
> "@metamask/assets-controllers@^3.4.7": "file:../core/packages/assets-controllers"
85-
> ```
8680
8781
4. Run `yarn install`.
8882
@@ -145,17 +139,11 @@ To use a preview build for a package within a project, you need to override the
145139
146140
> **Example:**
147141
>
148-
> - If you're a member of MetaMask, your project uses Yarn, `@metamask/controller-utils` is listed in dependencies at `^1.1.4`, and you want to use the preview version `1.2.3-preview-e2df9b4`, add the following to `resolutions`:
142+
> - If your project uses Yarn, `@metamask/controller-utils` is listed in dependencies at `^1.1.4`, and you want to use the preview version `1.2.3-preview-e2df9b4`, add the following to `resolutions`:
149143
>
150144
> ```
151145
> "@metamask/controller-utils@^1.1.4": "npm:@metamask-previews/controller-utils@1.2.3-preview-e2df9b4"
152146
> ```
153-
>
154-
> - If you are an individual contributor, your project uses NPM, `@metamask/assets-controllers` is listed in dependencies at `^3.4.7`, and you want to use the preview version `4.5.6-preview-bc2a997` published under `@foo`, add the following to `overrides`:
155-
>
156-
> ```
157-
> "@metamask/assets-controllers@^3.4.7": "npm:@foo/assets-controllers@4.5.6-preview-bc2a997"
158-
> ```
159147
160148
4. Run `yarn install`.
161149

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/core-monorepo",
3-
"version": "124.0.0",
3+
"version": "125.0.0",
44
"private": true,
55
"description": "Monorepo for packages shared between MetaMask clients",
66
"repository": {
@@ -55,8 +55,8 @@
5555
"@metamask/eslint-config-jest": "^12.1.0",
5656
"@metamask/eslint-config-nodejs": "^12.1.0",
5757
"@metamask/eslint-config-typescript": "^12.1.0",
58-
"@metamask/eth-json-rpc-provider": "^3.0.0",
59-
"@metamask/json-rpc-engine": "^8.0.0",
58+
"@metamask/eth-json-rpc-provider": "^3.0.1",
59+
"@metamask/json-rpc-engine": "^8.0.1",
6060
"@metamask/utils": "^8.3.0",
6161
"@types/jest": "^27.4.1",
6262
"@types/node": "^16.18.54",

‎packages/accounts-controller/CHANGELOG.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [12.0.1]
11+
12+
### Fixed
13+
14+
- Fix `types` field in `package.json` ([#4047](https://github.com/MetaMask/core/pull/4047))
15+
1016
## [12.0.0]
1117

1218
### Added
@@ -149,7 +155,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
149155

150156
- Initial release ([#1637](https://github.com/MetaMask/core/pull/1637))
151157

152-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@12.0.0...HEAD
158+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@12.0.1...HEAD
159+
[12.0.1]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@12.0.0...@metamask/accounts-controller@12.0.1
153160
[12.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@11.0.0...@metamask/accounts-controller@12.0.0
154161
[11.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@10.0.0...@metamask/accounts-controller@11.0.0
155162
[10.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@9.0.0...@metamask/accounts-controller@10.0.0

‎packages/accounts-controller/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/accounts-controller",
3-
"version": "12.0.0",
3+
"version": "12.0.1",
44
"description": "Manages internal accounts",
55
"keywords": [
66
"MetaMask",
@@ -25,7 +25,7 @@
2525
"./package.json": "./package.json"
2626
},
2727
"main": "./dist/index.js",
28-
"types": "./dist/index.d.ts",
28+
"types": "./dist/types/index.d.ts",
2929
"files": [
3030
"dist/"
3131
],
@@ -42,7 +42,7 @@
4242
},
4343
"dependencies": {
4444
"@ethereumjs/util": "^8.1.0",
45-
"@metamask/base-controller": "^5.0.0",
45+
"@metamask/base-controller": "^5.0.1",
4646
"@metamask/eth-snap-keyring": "^2.1.1",
4747
"@metamask/keyring-api": "^3.0.0",
4848
"@metamask/snaps-sdk": "^1.3.2",
@@ -55,7 +55,7 @@
5555
},
5656
"devDependencies": {
5757
"@metamask/auto-changelog": "^3.4.4",
58-
"@metamask/keyring-controller": "^14.0.0",
58+
"@metamask/keyring-controller": "^14.0.1",
5959
"@metamask/snaps-controllers": "^4.0.0",
6060
"@types/jest": "^27.4.1",
6161
"@types/readable-stream": "^2.3.0",

‎packages/address-book-controller/CHANGELOG.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [4.0.1]
11+
12+
### Fixed
13+
14+
- Fix `types` field in `package.json` ([#4047](https://github.com/MetaMask/core/pull/4047))
15+
1016
## [4.0.0]
1117

1218
### Added
@@ -121,7 +127,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
121127

122128
All changes listed after this point were applied to this package following the monorepo conversion.
123129

124-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/address-book-controller@4.0.0...HEAD
130+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/address-book-controller@4.0.1...HEAD
131+
[4.0.1]: https://github.com/MetaMask/core/compare/@metamask/address-book-controller@4.0.0...@metamask/address-book-controller@4.0.1
125132
[4.0.0]: https://github.com/MetaMask/core/compare/@metamask/address-book-controller@3.1.7...@metamask/address-book-controller@4.0.0
126133
[3.1.7]: https://github.com/MetaMask/core/compare/@metamask/address-book-controller@3.1.6...@metamask/address-book-controller@3.1.7
127134
[3.1.6]: https://github.com/MetaMask/core/compare/@metamask/address-book-controller@3.1.5...@metamask/address-book-controller@3.1.6

‎packages/address-book-controller/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/address-book-controller",
3-
"version": "4.0.0",
3+
"version": "4.0.1",
44
"description": "Manages a list of recipient addresses associated with nicknames",
55
"keywords": [
66
"MetaMask",
@@ -25,7 +25,7 @@
2525
"./package.json": "./package.json"
2626
},
2727
"main": "./dist/index.js",
28-
"types": "./dist/index.d.ts",
28+
"types": "./dist/types/index.d.ts",
2929
"files": [
3030
"dist/"
3131
],
@@ -41,8 +41,8 @@
4141
"test:watch": "jest --watch"
4242
},
4343
"dependencies": {
44-
"@metamask/base-controller": "^5.0.0",
45-
"@metamask/controller-utils": "^9.0.0",
44+
"@metamask/base-controller": "^5.0.1",
45+
"@metamask/controller-utils": "^9.0.1",
4646
"@metamask/utils": "^8.3.0"
4747
},
4848
"devDependencies": {

‎packages/announcement-controller/CHANGELOG.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [6.0.1]
11+
12+
### Fixed
13+
14+
- Fix `types` field in `package.json` ([#4047](https://github.com/MetaMask/core/pull/4047))
15+
1016
## [6.0.0]
1117

1218
### Added
@@ -117,7 +123,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
117123

118124
All changes listed after this point were applied to this package following the monorepo conversion.
119125

120-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/announcement-controller@6.0.0...HEAD
126+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/announcement-controller@6.0.1...HEAD
127+
[6.0.1]: https://github.com/MetaMask/core/compare/@metamask/announcement-controller@6.0.0...@metamask/announcement-controller@6.0.1
121128
[6.0.0]: https://github.com/MetaMask/core/compare/@metamask/announcement-controller@5.0.2...@metamask/announcement-controller@6.0.0
122129
[5.0.2]: https://github.com/MetaMask/core/compare/@metamask/announcement-controller@5.0.1...@metamask/announcement-controller@5.0.2
123130
[5.0.1]: https://github.com/MetaMask/core/compare/@metamask/announcement-controller@5.0.0...@metamask/announcement-controller@5.0.1

‎packages/announcement-controller/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/announcement-controller",
3-
"version": "6.0.0",
3+
"version": "6.0.1",
44
"description": "Manages in-app announcements",
55
"keywords": [
66
"MetaMask",
@@ -25,7 +25,7 @@
2525
"./package.json": "./package.json"
2626
},
2727
"main": "./dist/index.js",
28-
"types": "./dist/index.d.ts",
28+
"types": "./dist/types/index.d.ts",
2929
"files": [
3030
"dist/"
3131
],
@@ -41,7 +41,7 @@
4141
"test:watch": "jest --watch"
4242
},
4343
"dependencies": {
44-
"@metamask/base-controller": "^5.0.0"
44+
"@metamask/base-controller": "^5.0.1"
4545
},
4646
"devDependencies": {
4747
"@metamask/auto-changelog": "^3.4.4",

‎packages/approval-controller/CHANGELOG.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [6.0.1]
11+
12+
### Fixed
13+
14+
- Fix `types` field in `package.json` ([#4047](https://github.com/MetaMask/core/pull/4047))
15+
1016
## [6.0.0]
1117

1218
### Added
@@ -180,7 +186,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
180186

181187
All changes listed after this point were applied to this package following the monorepo conversion.
182188

183-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/approval-controller@6.0.0...HEAD
189+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/approval-controller@6.0.1...HEAD
190+
[6.0.1]: https://github.com/MetaMask/core/compare/@metamask/approval-controller@6.0.0...@metamask/approval-controller@6.0.1
184191
[6.0.0]: https://github.com/MetaMask/core/compare/@metamask/approval-controller@5.1.3...@metamask/approval-controller@6.0.0
185192
[5.1.3]: https://github.com/MetaMask/core/compare/@metamask/approval-controller@5.1.2...@metamask/approval-controller@5.1.3
186193
[5.1.2]: https://github.com/MetaMask/core/compare/@metamask/approval-controller@5.1.1...@metamask/approval-controller@5.1.2

0 commit comments

Comments
 (0)