Skip to content

Commit b89cdd3

Browse files
committed
Merge remote-tracking branch 'origin/mikesposito/messenger/composable-controller' into messenger-preview-v2
* origin/mikesposito/messenger/composable-controller: Fix broken delegation in unit test Fix changelog update changelog and readme update changelog update tsconfig and README files remove .vscode folder add test case for child state change subscription failure fix: `Messenger` type errors in `ComposableController` (#6904) update metadata tests rename `anonymous` to `includeInDebugSnapshot` revert rename `name` to `controllerName` refactor: migrate `ComposableController` to `@metamask/messenger`
2 parents c3188f7 + 17e9041 commit b89cdd3

File tree

9 files changed

+389
-277
lines changed

9 files changed

+389
-277
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ linkStyle default opacity:0.5
205205
chain_agnostic_permission --> network_controller;
206206
chain_agnostic_permission --> permission_controller;
207207
composable_controller --> base_controller;
208+
composable_controller --> messenger;
208209
composable_controller --> json_rpc_engine;
209210
core_backend --> base_controller;
210211
core_backend --> controller_utils;

eslint-warning-thresholds.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@
107107
"packages/composable-controller/src/ComposableController.test.ts": {
108108
"import-x/namespace": 3
109109
},
110-
"packages/composable-controller/src/ComposableController.ts": {
111-
"@typescript-eslint/no-unused-vars": 1
112-
},
113110
"packages/controller-utils/jest.environment.js": {
114111
"n/prefer-global/text-encoder": 1,
115112
"n/prefer-global/text-decoder": 1,

packages/composable-controller/CHANGELOG.md

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

88
## [Unreleased]
99

10+
### Changed
11+
12+
- **BREAKING:** Migrate `ComposableController` to new `Messenger` from `@metamask/messenger` ([#6710](https://github.com/MetaMask/core/pull/6710))
13+
- Previously, the controller accepted a `RestrictedMessenger` instance from `@metamask/base-controller`.
14+
- **BREAKING:** Metadata property `anonymous` renamed to `includeInDebugSnapshot` ([#6710](https://github.com/MetaMask/core/pull/6710))
15+
16+
### Fixed
17+
18+
- Resolve incompatibility of `ChildControllerStateChangeEvents` type with `BaseController` (when used in the `Events` type argument of `ComposableControllerMessenger`) by removing unnecessary nested logic from definition ([#6904](https://github.com/MetaMask/core/pull/6904))
19+
- Also update generic parameter names `ControllerName` and `ControllerState` to `ChildControllerName`, `ChildControllerState` for reduced ambiguity.
20+
1021
## [11.1.1]
1122

1223
### Changed

packages/composable-controller/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
"test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
4848
},
4949
"dependencies": {
50-
"@metamask/base-controller": "^8.4.2"
50+
"@metamask/base-controller": "^8.4.2",
51+
"@metamask/messenger": "^0.3.0"
5152
},
5253
"devDependencies": {
5354
"@metamask/auto-changelog": "^3.4.4",

0 commit comments

Comments
 (0)