Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
/packages/controller-utils @MetaMask/core-platform
/packages/eth-json-rpc-middleware @MetaMask/core-platform
/packages/messenger @MetaMask/core-platform
/packages/messenger-cli @MetaMask/core-platform
/packages/sample-controllers @MetaMask/core-platform
/packages/polling-controller @MetaMask/core-platform
/packages/preferences-controller @MetaMask/core-platform
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- constraints
- lint:dependencies
- lint:teams
- generate-method-action-types:check
- messenger-action-types:check
- readme-content:check
steps:
- name: Checkout and setup environment
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ Each package in this repository has its own README where you can find installati
- [`@metamask/logging-controller`](packages/logging-controller)
- [`@metamask/message-manager`](packages/message-manager)
- [`@metamask/messenger`](packages/messenger)
- [`@metamask/messenger-cli`](packages/messenger-cli)
- [`@metamask/money-account-controller`](packages/money-account-controller)
- [`@metamask/multichain-account-service`](packages/multichain-account-service)
- [`@metamask/multichain-api-middleware`](packages/multichain-api-middleware)
Expand Down Expand Up @@ -149,6 +150,7 @@ linkStyle default opacity:0.5
logging_controller(["@metamask/logging-controller"]);
message_manager(["@metamask/message-manager"]);
messenger(["@metamask/messenger"]);
messenger_cli(["@metamask/messenger-cli"]);
money_account_controller(["@metamask/money-account-controller"]);
multichain_account_service(["@metamask/multichain-account-service"]);
multichain_api_middleware(["@metamask/multichain-api-middleware"]);
Expand Down
2 changes: 1 addition & 1 deletion docs/code-guidelines/controller-guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ Instead, you can follow this process:

1. Define a constant in your controller file called `MESSENGER_EXPOSED_METHODS`, listing the methods you want to expose.
2. Remove manual action registrations; instead, call `registerMethodActionHandlers` and pass `MESSENGER_EXPOSED_METHODS`.
3. Remove messenger action types; instead, run `yarn generate-method-action-types`. This will create a file called `${ControllerName}-method-action-types.ts`, which exports a type called `${ControllerName}MethodActions`.
3. Remove messenger action types; instead, run `yarn messenger-action-types:generate`. This will create a file called `${ControllerName}-method-action-types.ts`, which exports a type called `${ControllerName}MethodActions`.
4. Import `${ControllerName}-method-action-types.ts` in your controller file, and add `${ControllerName}MethodActions` to `${ControllerName}Actions`.
5. Export the action types from `${ControllerName}-method-action-types.ts` in your package's `index.ts` file. Do **not** export the `${ControllerName}MethodActions` type.

Expand Down
6 changes: 6 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,12 @@ const config = createConfig([
'import-x/no-nodejs-modules': 'off',
},
},
{
files: ['packages/messenger-cli/src/**/*.{js,ts}'],
rules: {
'import-x/no-nodejs-modules': 'off',
},
},
{
files: [
'packages/notification-services-controller/src/NotificationServicesPushController/services/push/*-web.ts',
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
"changelog:update": "yarn workspaces foreach --all --no-private --parallel --interlaced --verbose run changelog:update",
"changelog:validate": "yarn workspaces foreach --all --no-private --parallel --interlaced --verbose run changelog:validate",
"create-package": "tsx scripts/create-package",
"generate-method-action-types": "yarn workspaces foreach --all --parallel --interlaced --verbose run generate-method-action-types",
"generate-method-action-types:check": "yarn generate-method-action-types --check",
"lint": "yarn lint:eslint && echo && yarn lint:misc --check && yarn constraints && yarn lint:dependencies && yarn lint:teams && yarn generate-method-action-types --check && yarn readme-content:check",
"lint": "yarn lint:eslint && echo && yarn lint:misc --check && yarn constraints && yarn lint:dependencies && yarn lint:teams && yarn messenger-action-types:check && yarn readme-content:check",
"lint:dependencies": "depcheck && yarn dedupe --check",
"lint:dependencies:fix": "depcheck && yarn dedupe",
"lint:eslint": "yarn build:only-clean && NODE_OPTIONS='--max-old-space-size=6144' yarn eslint",
"lint:fix": "yarn lint:eslint --fix --prune-suppressions && echo && yarn lint:misc --write && yarn constraints --fix && yarn lint:dependencies:fix && yarn generate-method-action-types --fix && yarn readme-content:update",
"lint:fix": "yarn lint:eslint --fix --prune-suppressions && echo && yarn lint:misc --write && yarn constraints --fix && yarn lint:dependencies:fix && yarn messenger-action-types:generate && yarn readme-content:update",
"lint:misc": "prettier --no-error-on-unmatched-pattern '**/*.json' '**/*.md' '**/*.yml' '!.yarnrc.yml' '!merged-packages/**' --ignore-path .gitignore",
"lint:misc:check": "yarn lint:misc --check",
"lint:teams": "tsx scripts/lint-teams-json.ts",
"messenger-action-types:check": "yarn workspaces foreach --all --no-private --parallel --interlaced --verbose run messenger-action-types:check",
"messenger-action-types:generate": "yarn workspaces foreach --all --no-private --parallel --interlaced --verbose run messenger-action-types:generate",
"prepack": "./scripts/prepack.sh",
"prepare-preview-builds": "./scripts/prepare-preview-builds.sh",
"readme-content:check": "tsx scripts/update-readme-content.ts --check",
Expand Down
3 changes: 2 additions & 1 deletion packages/account-tree-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/account-tree-controller",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/account-tree-controller",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
3 changes: 2 additions & 1 deletion packages/accounts-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/accounts-controller",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/accounts-controller",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
3 changes: 2 additions & 1 deletion packages/address-book-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/address-book-controller",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/address-book-controller",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
3 changes: 2 additions & 1 deletion packages/analytics-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/analytics-controller",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/analytics-controller",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/analytics-data-regulation-controller",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/analytics-data-regulation-controller",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
3 changes: 2 additions & 1 deletion packages/announcement-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/announcement-controller",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/announcement-controller",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
3 changes: 2 additions & 1 deletion packages/approval-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/approval-controller",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/approval-controller",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
3 changes: 2 additions & 1 deletion packages/assets-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/assets-controller",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/assets-controller",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
3 changes: 2 additions & 1 deletion packages/assets-controllers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/assets-controllers",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/assets-controllers",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
3 changes: 2 additions & 1 deletion packages/base-data-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/base-data-service",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/base-data-service",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"publish:preview": "yarn npm publish --tag preview",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
Expand Down
3 changes: 2 additions & 1 deletion packages/claims-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/claims-controller",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/claims-controller",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
3 changes: 2 additions & 1 deletion packages/client-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/client-controller",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/client-controller",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
3 changes: 2 additions & 1 deletion packages/compliance-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/compliance-controller",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/compliance-controller",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
3 changes: 2 additions & 1 deletion packages/config-registry-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/config-registry-controller",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/config-registry-controller",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"publish:preview": "yarn npm publish --tag preview",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
Expand Down
3 changes: 2 additions & 1 deletion packages/connectivity-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/connectivity-controller",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/connectivity-controller",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
3 changes: 2 additions & 1 deletion packages/core-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/core-backend",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/core-backend",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
3 changes: 2 additions & 1 deletion packages/delegation-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/delegation-controller",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/delegation-controller",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
3 changes: 2 additions & 1 deletion packages/earn-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/earn-controller",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/earn-controller",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
3 changes: 2 additions & 1 deletion packages/ens-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"build:docs": "typedoc",
"changelog:update": "../../scripts/update-changelog.sh @metamask/ens-controller",
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/ens-controller",
"generate-method-action-types": "tsx ../../packages/messenger/src/generate-action-types/cli.ts",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
Loading
Loading