From cbec8085421bb71f4919e587d8dce48a5e317512 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Thu, 16 Jul 2026 12:43:48 +0200 Subject: [PATCH 01/17] Replace `ts-bridge` with `tsc` for building packages Switch from `@ts-bridge/cli` to standard `tsc` with TypeScript project references for building all packages. --- .yarnrc.yml | 1 - docs/processes/building.md | 2 - package.json | 3 +- packages/account-tree-controller/package.json | 5 +- packages/accounts-controller/package.json | 5 +- packages/address-book-controller/package.json | 5 +- packages/ai-controllers/package.json | 5 +- packages/analytics-controller/package.json | 5 +- .../package.json | 5 +- packages/announcement-controller/package.json | 5 +- packages/app-metadata-controller/package.json | 5 +- packages/approval-controller/package.json | 5 +- packages/assets-controller/package.json | 5 +- packages/assets-controllers/package.json | 5 +- .../authenticated-user-storage/package.json | 5 +- packages/base-controller/package.json | 5 +- packages/base-data-service/package.json | 5 +- packages/bitcoin-regtest-up/package.json | 5 +- packages/bridge-controller/package.json | 5 +- .../bridge-status-controller/package.json | 5 +- packages/build-utils/package.json | 5 +- .../chain-agnostic-permission/package.json | 5 +- packages/chomp-api-service/package.json | 5 +- packages/claims-controller/package.json | 5 +- packages/client-controller/package.json | 5 +- packages/client-utils/package.json | 5 +- packages/compliance-controller/package.json | 5 +- packages/composable-controller/package.json | 5 +- .../config-registry-controller/package.json | 5 +- packages/connectivity-controller/package.json | 5 +- packages/controller-utils/package.json | 5 +- packages/core-backend/package.json | 5 +- packages/delegation-controller/package.json | 5 +- packages/earn-controller/package.json | 5 +- packages/eip-5792-middleware/package.json | 5 +- .../package.json | 5 +- .../package.json | 5 +- packages/eth-block-tracker/package.json | 5 +- packages/eth-json-rpc-middleware/package.json | 5 +- packages/eth-json-rpc-provider/package.json | 5 +- packages/foundryup/package.json | 5 +- packages/gas-fee-controller/package.json | 5 +- .../gator-permissions-controller/package.json | 5 +- packages/geolocation-controller/package.json | 5 +- packages/java-tron-up/package.json | 5 +- packages/json-rpc-engine/package.json | 5 +- .../json-rpc-middleware-stream/package.json | 5 +- packages/keyring-controller/package.json | 5 +- packages/kyc-controller/package.json | 7 +- packages/local-node-utils/package.json | 5 +- packages/logging-controller/package.json | 5 +- packages/message-manager/package.json | 5 +- packages/messenger-cli/package.json | 5 +- packages/messenger/package.json | 5 +- .../package.json | 5 +- .../package.json | 5 +- .../money-account-controller/package.json | 5 +- .../package.json | 5 +- packages/money-account-utils/package.json | 5 +- .../multichain-account-service/package.json | 5 +- .../multichain-api-middleware/package.json | 5 +- .../package.json | 5 +- .../package.json | 5 +- packages/name-controller/package.json | 5 +- .../package.json | 5 +- packages/network-controller/package.json | 5 +- .../package.json | 5 +- .../package.json | 5 +- packages/passkey-controller/package.json | 5 +- packages/permission-controller/package.json | 5 +- .../permission-log-controller/package.json | 5 +- packages/perps-controller/package.json | 5 +- packages/phishing-controller/package.json | 5 +- packages/platform-api-docs/package.json | 5 +- packages/polling-controller/package.json | 5 +- packages/preferences-controller/package.json | 5 +- .../profile-metrics-controller/package.json | 5 +- packages/profile-sync-controller/package.json | 5 +- packages/ramps-controller/package.json | 5 +- packages/rate-limit-controller/package.json | 5 +- packages/react-data-query/package.json | 5 +- .../package.json | 5 +- packages/sample-controllers/package.json | 5 +- .../package.json | 5 +- .../selected-network-controller/package.json | 5 +- packages/sentinel-api-service/package.json | 5 +- packages/shield-controller/package.json | 5 +- packages/signature-controller/package.json | 5 +- .../package.json | 5 +- packages/snap-account-service/package.json | 5 +- packages/social-controllers/package.json | 5 +- .../solana-test-validator-up/package.json | 5 +- packages/stellar-quickstart-up/package.json | 5 +- packages/storage-service/package.json | 5 +- packages/subscription-controller/package.json | 5 +- packages/transaction-controller/package.json | 5 +- .../transaction-pay-controller/package.json | 5 +- .../user-operation-controller/package.json | 5 +- packages/wallet-cli/package.json | 5 +- packages/wallet/package.json | 5 +- .../package-template/package.json | 5 +- tsconfig.packages.build.json | 1 - yarn.config.cjs | 6 +- yarn.lock | 129 ------------------ 104 files changed, 201 insertions(+), 433 deletions(-) diff --git a/.yarnrc.yml b/.yarnrc.yml index 03ae3081348..4c0e4f39a5a 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -27,7 +27,6 @@ npmPreapprovedPackages: - "@metamask/*" - "@metamask-previews/*" - "@lavamoat/*" - - "@ts-bridge/*" plugins: - path: .yarn/plugins/@yarnpkg/plugin-allow-scripts.cjs diff --git a/docs/processes/building.md b/docs/processes/building.md index a4f1629331d..6618b6fe18f 100644 --- a/docs/processes/building.md +++ b/docs/processes/building.md @@ -1,7 +1,5 @@ # Building packages -[`ts-bridge`](https://github.com/ts-bridge/ts-bridge) is used to build packages in both CommonJS- and ESM-compatible formats. - Built files show up in the `dist/` directory in each package. These are the files which will ultimately be published to NPM. - Run `yarn build` to build all packages in the monorepo. diff --git a/package.json b/package.json index 9d07df28b4e..57a4ce528fc 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ ], "files": [], "scripts": { - "build": "yarn ts-bridge --project tsconfig.build.json --verbose", + "build": "yarn tsc --build tsconfig.build.json --verbose", "build:clean": "yarn build:only-clean && yarn build", "build:docs": "yarn workspaces foreach --all --no-private --parallel --interlaced --verbose run build:docs", "build:only-clean": "rimraf -g 'packages/*/dist'", @@ -74,7 +74,6 @@ "@metamask/network-controller": "^36.0.0", "@metamask/skills": "^0.1.0", "@metamask/utils": "^11.11.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "@types/lodash": "^4.14.191", "@types/node": "^22.13.14", diff --git a/packages/account-tree-controller/package.json b/packages/account-tree-controller/package.json index a2c96eee63f..1a784eb55c6 100644 --- a/packages/account-tree-controller/package.json +++ b/packages/account-tree-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/account-tree-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/account-tree-controller", @@ -75,7 +75,6 @@ "@metamask/auto-changelog": "^6.1.0", "@metamask/eth-hd-keyring": "^15.0.0", "@metamask/providers": "^22.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/accounts-controller/package.json b/packages/accounts-controller/package.json index ad168c3ccb6..f0ce6127781 100644 --- a/packages/accounts-controller/package.json +++ b/packages/accounts-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/accounts-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/accounts-controller", @@ -77,7 +77,6 @@ "@metamask/auto-changelog": "^6.1.0", "@metamask/controller-utils": "^12.3.0", "@metamask/providers": "^22.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "@types/readable-stream": "^2.3.0", "jest": "^30.4.2", diff --git a/packages/address-book-controller/package.json b/packages/address-book-controller/package.json index 5db5207ecb7..da169a0b374 100644 --- a/packages/address-book-controller/package.json +++ b/packages/address-book-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/address-book-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/address-book-controller", @@ -62,7 +62,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/ai-controllers/package.json b/packages/ai-controllers/package.json index 2a6526fb30f..44c2a36914d 100644 --- a/packages/ai-controllers/package.json +++ b/packages/ai-controllers/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/ai-controllers", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/ai-controllers", @@ -62,7 +62,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/analytics-controller/package.json b/packages/analytics-controller/package.json index 4b885de8219..758eea83c55 100644 --- a/packages/analytics-controller/package.json +++ b/packages/analytics-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/analytics-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/analytics-controller", @@ -64,7 +64,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "@types/uuid": "^8.3.0", "deepmerge": "^4.2.2", diff --git a/packages/analytics-data-regulation-controller/package.json b/packages/analytics-data-regulation-controller/package.json index fcc0951d69d..7dfc3afbc9a 100644 --- a/packages/analytics-data-regulation-controller/package.json +++ b/packages/analytics-data-regulation-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "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", @@ -62,7 +62,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/announcement-controller/package.json b/packages/announcement-controller/package.json index 1d23381c2f2..b43a239bc55 100644 --- a/packages/announcement-controller/package.json +++ b/packages/announcement-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/announcement-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/announcement-controller", @@ -60,7 +60,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/app-metadata-controller/package.json b/packages/app-metadata-controller/package.json index d0e875757ee..86e5994f40d 100644 --- a/packages/app-metadata-controller/package.json +++ b/packages/app-metadata-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/app-metadata-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/app-metadata-controller", @@ -58,7 +58,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/approval-controller/package.json b/packages/approval-controller/package.json index 1d800dfc6e3..510d873e519 100644 --- a/packages/approval-controller/package.json +++ b/packages/approval-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/approval-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/approval-controller", @@ -63,7 +63,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/assets-controller/package.json b/packages/assets-controller/package.json index fb7ee0bc042..97953b55813 100644 --- a/packages/assets-controller/package.json +++ b/packages/assets-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/assets-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/assets-controller", @@ -89,7 +89,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "@types/lodash": "^4.14.191", "deepmerge": "^4.2.2", diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json index 767d569c17b..a614f048f63 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/assets-controllers", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/assets-controllers", @@ -111,7 +111,6 @@ "@metamask/keyring-internal-api": "^12.0.0", "@metamask/keyring-snap-client": "^10.0.0", "@metamask/providers": "^22.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "@types/lodash": "^4.14.191", "@types/node": "^22.13.14", diff --git a/packages/authenticated-user-storage/package.json b/packages/authenticated-user-storage/package.json index 3026c22fa49..f1c657b7681 100644 --- a/packages/authenticated-user-storage/package.json +++ b/packages/authenticated-user-storage/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/authenticated-user-storage", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/authenticated-user-storage", @@ -63,7 +63,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/base-controller/package.json b/packages/base-controller/package.json index cc884eadb5f..0656d80bfbf 100644 --- a/packages/base-controller/package.json +++ b/packages/base-controller/package.json @@ -38,8 +38,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/base-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/base-controller", @@ -58,7 +58,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/base-data-service/package.json b/packages/base-data-service/package.json index 5874d9bf3bc..bc895f8cffe 100644 --- a/packages/base-data-service/package.json +++ b/packages/base-data-service/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/base-data-service", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/base-data-service", @@ -67,7 +67,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "@types/lodash": "^4.14.191", "deepmerge": "^4.2.2", diff --git a/packages/bitcoin-regtest-up/package.json b/packages/bitcoin-regtest-up/package.json index eb587cef1df..3a29ffaed47 100644 --- a/packages/bitcoin-regtest-up/package.json +++ b/packages/bitcoin-regtest-up/package.json @@ -40,8 +40,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/bitcoin-regtest-up", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/bitcoin-regtest-up", @@ -60,7 +60,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/bridge-controller/package.json b/packages/bridge-controller/package.json index 179c87b33d4..cbcdb02fc29 100644 --- a/packages/bridge-controller/package.json +++ b/packages/bridge-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/bridge-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/bridge-controller", @@ -84,7 +84,6 @@ "@metamask/auto-changelog": "^6.1.0", "@metamask/eth-json-rpc-provider": "^6.0.1", "@metamask/superstruct": "^3.4.1", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/bridge-status-controller/package.json b/packages/bridge-status-controller/package.json index 0937e1d7afa..4e85d0577e5 100644 --- a/packages/bridge-status-controller/package.json +++ b/packages/bridge-status-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/bridge-status-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/bridge-status-controller", @@ -73,7 +73,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/build-utils/package.json b/packages/build-utils/package.json index e0c387162b8..2976e202582 100644 --- a/packages/build-utils/package.json +++ b/packages/build-utils/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/build-utils", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/build-utils", @@ -58,7 +58,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/chain-agnostic-permission/package.json b/packages/chain-agnostic-permission/package.json index 05e0c3cfa7d..c86338b993a 100644 --- a/packages/chain-agnostic-permission/package.json +++ b/packages/chain-agnostic-permission/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/chain-agnostic-permission", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/chain-agnostic-permission", @@ -63,7 +63,6 @@ "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@metamask/keyring-internal-api": "^12.0.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/chomp-api-service/package.json b/packages/chomp-api-service/package.json index 2b19311dbbb..fb260be6468 100644 --- a/packages/chomp-api-service/package.json +++ b/packages/chomp-api-service/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/chomp-api-service", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/chomp-api-service", @@ -62,7 +62,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/claims-controller/package.json b/packages/claims-controller/package.json index 679884fed13..11567648f3d 100644 --- a/packages/claims-controller/package.json +++ b/packages/claims-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/claims-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/claims-controller", @@ -67,7 +67,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/client-controller/package.json b/packages/client-controller/package.json index f176f128595..86dd7a973f7 100644 --- a/packages/client-controller/package.json +++ b/packages/client-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/client-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/client-controller", @@ -60,7 +60,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/client-utils/package.json b/packages/client-utils/package.json index c6949bdb92e..2e6f411881c 100644 --- a/packages/client-utils/package.json +++ b/packages/client-utils/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/client-utils", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/client-utils", @@ -67,7 +67,6 @@ "devDependencies": { "@ethersproject/abi": "^5.7.0", "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/compliance-controller/package.json b/packages/compliance-controller/package.json index 5b1f69a2eb1..bc95d605123 100644 --- a/packages/compliance-controller/package.json +++ b/packages/compliance-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/compliance-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/compliance-controller", @@ -64,7 +64,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/composable-controller/package.json b/packages/composable-controller/package.json index 3ebeef552e1..dd06908eb4a 100644 --- a/packages/composable-controller/package.json +++ b/packages/composable-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/composable-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/composable-controller", @@ -59,7 +59,6 @@ "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@metamask/json-rpc-engine": "^10.5.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "immer": "^9.0.6", diff --git a/packages/config-registry-controller/package.json b/packages/config-registry-controller/package.json index 16ad2cafd10..4cc3bc1e16c 100644 --- a/packages/config-registry-controller/package.json +++ b/packages/config-registry-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/config-registry-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/config-registry-controller", @@ -69,7 +69,6 @@ "devDependencies": { "@lavamoat/allow-scripts": "^3.0.4", "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/connectivity-controller/package.json b/packages/connectivity-controller/package.json index 392d5ff49b1..9653ec96f96 100644 --- a/packages/connectivity-controller/package.json +++ b/packages/connectivity-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/connectivity-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/connectivity-controller", @@ -61,7 +61,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/controller-utils/package.json b/packages/controller-utils/package.json index acb60f5c930..75f2ef447f6 100644 --- a/packages/controller-utils/package.json +++ b/packages/controller-utils/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/controller-utils", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/controller-utils", @@ -69,7 +69,6 @@ "devDependencies": { "@babel/runtime": "^7.23.9", "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "@types/lodash": "^4.14.191", "deepmerge": "^4.2.2", diff --git a/packages/core-backend/package.json b/packages/core-backend/package.json index fc99a5a3c3c..57f0d683697 100644 --- a/packages/core-backend/package.json +++ b/packages/core-backend/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/core-backend", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/core-backend", @@ -69,7 +69,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/delegation-controller/package.json b/packages/delegation-controller/package.json index da9ce375607..758b9832fb2 100644 --- a/packages/delegation-controller/package.json +++ b/packages/delegation-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/delegation-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/delegation-controller", @@ -62,7 +62,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/earn-controller/package.json b/packages/earn-controller/package.json index ca7042f6c0c..b74c0f4f0d6 100644 --- a/packages/earn-controller/package.json +++ b/packages/earn-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/earn-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/earn-controller", @@ -69,7 +69,6 @@ "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@metamask/transaction-controller": "^69.6.1", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/eip-5792-middleware/package.json b/packages/eip-5792-middleware/package.json index b8beeac56df..c3d86636033 100644 --- a/packages/eip-5792-middleware/package.json +++ b/packages/eip-5792-middleware/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/eip-5792-middleware", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/eip-5792-middleware", @@ -65,7 +65,6 @@ "@metamask/auto-changelog": "^6.1.0", "@metamask/keyring-controller": "^27.1.1", "@metamask/rpc-errors": "^7.0.2", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/eip-7702-internal-rpc-middleware/package.json b/packages/eip-7702-internal-rpc-middleware/package.json index 82eb9d33744..1c3c8f850df 100644 --- a/packages/eip-7702-internal-rpc-middleware/package.json +++ b/packages/eip-7702-internal-rpc-middleware/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/eip-7702-internal-rpc-middleware", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/eip-7702-internal-rpc-middleware", @@ -60,7 +60,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/eip1193-permission-middleware/package.json b/packages/eip1193-permission-middleware/package.json index 8c7f881b624..57cd8fa96cd 100644 --- a/packages/eip1193-permission-middleware/package.json +++ b/packages/eip1193-permission-middleware/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/eip1193-permission-middleware", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/eip1193-permission-middleware", @@ -63,7 +63,6 @@ "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@metamask/rpc-errors": "^7.0.2", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/eth-block-tracker/package.json b/packages/eth-block-tracker/package.json index c2609b07c8b..72689bae664 100644 --- a/packages/eth-block-tracker/package.json +++ b/packages/eth-block-tracker/package.json @@ -41,8 +41,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/eth-block-tracker", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/eth-block-tracker", @@ -63,7 +63,6 @@ "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@metamask/json-rpc-engine": "^10.5.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "@types/json-rpc-random-id": "^1.0.1", "deepmerge": "^4.2.2", diff --git a/packages/eth-json-rpc-middleware/package.json b/packages/eth-json-rpc-middleware/package.json index 31e29bacc8d..9fe997d9112 100644 --- a/packages/eth-json-rpc-middleware/package.json +++ b/packages/eth-json-rpc-middleware/package.json @@ -40,8 +40,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/eth-json-rpc-middleware --tag-prefix-before-package-rename eth-json-rpc-middleware@ --version-before-package-rename 6.1.0", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/eth-json-rpc-middleware --tag-prefix-before-package-rename eth-json-rpc-middleware@ --version-before-package-rename 6.1.0", @@ -67,7 +67,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/deep-freeze-strict": "^1.1.0", "@types/jest": "^30.0.0", "deep-freeze-strict": "^1.1.1", diff --git a/packages/eth-json-rpc-provider/package.json b/packages/eth-json-rpc-provider/package.json index 4ffbc7e5c98..695ebbee54c 100644 --- a/packages/eth-json-rpc-provider/package.json +++ b/packages/eth-json-rpc-provider/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/eth-json-rpc-provider", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/eth-json-rpc-provider", @@ -63,7 +63,6 @@ "@metamask/auto-changelog": "^6.1.0", "@metamask/eth-query": "^4.0.0", "@metamask/ethjs-query": "^0.5.3", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "ethers": "^6.12.0", diff --git a/packages/foundryup/package.json b/packages/foundryup/package.json index a465a17ad2f..3af58ef766b 100644 --- a/packages/foundryup/package.json +++ b/packages/foundryup/package.json @@ -33,8 +33,8 @@ }, "scripts": { "anvil": "node_modules/.bin/anvil", - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/foundryup", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/foundryup", @@ -55,7 +55,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "@types/unzipper": "^0.10.10", "@types/yargs": "^17.0.32", diff --git a/packages/gas-fee-controller/package.json b/packages/gas-fee-controller/package.json index 368fd5e95c4..84d030d221c 100644 --- a/packages/gas-fee-controller/package.json +++ b/packages/gas-fee-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/gas-fee-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/gas-fee-controller", @@ -71,7 +71,6 @@ "devDependencies": { "@babel/runtime": "^7.23.9", "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "@types/jest-when": "^2.7.3", "deepmerge": "^4.2.2", diff --git a/packages/gator-permissions-controller/package.json b/packages/gator-permissions-controller/package.json index d17235c3108..ac18aa95a79 100644 --- a/packages/gator-permissions-controller/package.json +++ b/packages/gator-permissions-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/gator-permissions-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/gator-permissions-controller", @@ -72,7 +72,6 @@ "@lavamoat/allow-scripts": "^3.0.4", "@lavamoat/preinstall-always-fail": "^2.1.0", "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/geolocation-controller/package.json b/packages/geolocation-controller/package.json index e5e5b13b11a..f959d452e39 100644 --- a/packages/geolocation-controller/package.json +++ b/packages/geolocation-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/geolocation-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/geolocation-controller", @@ -61,7 +61,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/java-tron-up/package.json b/packages/java-tron-up/package.json index f0346a45e65..028907527c0 100644 --- a/packages/java-tron-up/package.json +++ b/packages/java-tron-up/package.json @@ -40,8 +40,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/java-tron-up", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/java-tron-up", @@ -60,7 +60,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/json-rpc-engine/package.json b/packages/json-rpc-engine/package.json index d05209a8fbc..206b98fb678 100644 --- a/packages/json-rpc-engine/package.json +++ b/packages/json-rpc-engine/package.json @@ -53,8 +53,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/json-rpc-engine --tag-prefix-before-package-rename json-rpc-engine@ --version-before-package-rename 6.1.0", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/json-rpc-engine --tag-prefix-before-package-rename json-rpc-engine@ --version-before-package-rename 6.1.0", @@ -79,7 +79,6 @@ "@lavamoat/allow-scripts": "^3.0.4", "@lavamoat/preinstall-always-fail": "^2.1.0", "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/json-rpc-middleware-stream/package.json b/packages/json-rpc-middleware-stream/package.json index b5cde3461ac..1bf9d89303d 100644 --- a/packages/json-rpc-middleware-stream/package.json +++ b/packages/json-rpc-middleware-stream/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/json-rpc-middleware-stream --tag-prefix-before-package-rename json-rpc-middleware-stream@ --version-before-package-rename 5.0.1", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/json-rpc-middleware-stream --tag-prefix-before-package-rename json-rpc-middleware-stream@ --version-before-package-rename 5.0.1", @@ -60,7 +60,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "@types/readable-stream": "^2.3.0", "deepmerge": "^4.2.2", diff --git a/packages/keyring-controller/package.json b/packages/keyring-controller/package.json index fff5659bdac..ed6e94a6ad4 100644 --- a/packages/keyring-controller/package.json +++ b/packages/keyring-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/keyring-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/keyring-controller", @@ -80,7 +80,6 @@ "@metamask/auto-changelog": "^6.1.0", "@metamask/keyring-utils": "^5.0.0", "@metamask/scure-bip39": "^2.1.1", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/kyc-controller/package.json b/packages/kyc-controller/package.json index 1a278f32bc6..81fe06646eb 100644 --- a/packages/kyc-controller/package.json +++ b/packages/kyc-controller/package.json @@ -39,10 +39,10 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", - "build:watch": "yarn build && chokidar 'src/**/*.ts' -c 'ts-bridge --project tsconfig.build.json --verbose --no-references' --initial", + "build:watch": "yarn build && chokidar 'src/**/*.ts' -c 'tsc --project tsconfig.build.json' --initial", "changelog:update": "../../scripts/update-changelog.sh @metamask/kyc-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/kyc-controller", "lint:tsconfigs": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts", @@ -75,7 +75,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "chokidar-cli": "^3.0.0", "deepmerge": "^4.2.2", diff --git a/packages/local-node-utils/package.json b/packages/local-node-utils/package.json index 32d7d0c8375..316e5474174 100644 --- a/packages/local-node-utils/package.json +++ b/packages/local-node-utils/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/local-node-utils", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/local-node-utils", @@ -59,7 +59,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/logging-controller/package.json b/packages/logging-controller/package.json index c54972da06d..893e0af7e95 100644 --- a/packages/logging-controller/package.json +++ b/packages/logging-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/logging-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/logging-controller", @@ -62,7 +62,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/message-manager/package.json b/packages/message-manager/package.json index ff91fd2cd15..fe858764393 100644 --- a/packages/message-manager/package.json +++ b/packages/message-manager/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/message-manager", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/message-manager", @@ -64,7 +64,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/messenger-cli/package.json b/packages/messenger-cli/package.json index 4f9903d9363..0b9d6572400 100644 --- a/packages/messenger-cli/package.json +++ b/packages/messenger-cli/package.json @@ -27,8 +27,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "changelog:update": "../../scripts/update-changelog.sh @metamask/messenger-cli", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/messenger-cli", "lint:tsconfigs": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts", @@ -45,7 +45,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "@types/yargs": "^17.0.32", "deepmerge": "^4.2.2", diff --git a/packages/messenger/package.json b/packages/messenger/package.json index 3d2fbdfc37e..779b21d2969 100644 --- a/packages/messenger/package.json +++ b/packages/messenger/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/messenger", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/messenger", @@ -61,7 +61,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "immer": "^9.0.6", diff --git a/packages/money-account-api-data-service/package.json b/packages/money-account-api-data-service/package.json index 8f4ff289a9e..4203c978ce3 100644 --- a/packages/money-account-api-data-service/package.json +++ b/packages/money-account-api-data-service/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/money-account-api-data-service", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/money-account-api-data-service", @@ -64,7 +64,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/money-account-balance-service/package.json b/packages/money-account-balance-service/package.json index 65217703bef..97b21b3e9ef 100644 --- a/packages/money-account-balance-service/package.json +++ b/packages/money-account-balance-service/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/money-account-balance-service", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/money-account-balance-service", @@ -69,7 +69,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/money-account-controller/package.json b/packages/money-account-controller/package.json index 80d6df651ae..8bb8060e6ec 100644 --- a/packages/money-account-controller/package.json +++ b/packages/money-account-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/money-account-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/money-account-controller", @@ -67,7 +67,6 @@ "@metamask/auto-changelog": "^6.1.0", "@metamask/keyring-utils": "^5.0.0", "@metamask/utils": "^11.11.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/money-account-upgrade-controller/package.json b/packages/money-account-upgrade-controller/package.json index b26d808c7b6..f73ecfb7b2c 100644 --- a/packages/money-account-upgrade-controller/package.json +++ b/packages/money-account-upgrade-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/money-account-upgrade-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/money-account-upgrade-controller", @@ -68,7 +68,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/money-account-utils/package.json b/packages/money-account-utils/package.json index 768ea7bd960..d11a97bf313 100644 --- a/packages/money-account-utils/package.json +++ b/packages/money-account-utils/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/money-account-utils", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/money-account-utils", @@ -63,7 +63,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/multichain-account-service/package.json b/packages/multichain-account-service/package.json index 7da2a6cada2..18651140dae 100644 --- a/packages/multichain-account-service/package.json +++ b/packages/multichain-account-service/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/multichain-account-service", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/multichain-account-service", @@ -81,7 +81,6 @@ "@metamask/controller-utils": "^12.3.0", "@metamask/eth-hd-keyring": "^15.0.0", "@metamask/providers": "^22.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "@types/uuid": "^8.3.0", "deepmerge": "^4.2.2", diff --git a/packages/multichain-api-middleware/package.json b/packages/multichain-api-middleware/package.json index a40007a7b0e..e387bc7a804 100644 --- a/packages/multichain-api-middleware/package.json +++ b/packages/multichain-api-middleware/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/multichain-api-middleware", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/multichain-api-middleware", @@ -72,7 +72,6 @@ "@metamask/eth-json-rpc-filters": "^9.0.0", "@metamask/multichain-transactions-controller": "^7.1.2", "@metamask/safe-event-emitter": "^3.0.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/multichain-network-controller/package.json b/packages/multichain-network-controller/package.json index ba096228c44..bc7ccabab9a 100644 --- a/packages/multichain-network-controller/package.json +++ b/packages/multichain-network-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/multichain-network-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/multichain-network-controller", @@ -70,7 +70,6 @@ "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@metamask/keyring-controller": "^27.1.1", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "@types/lodash": "^4.14.191", "@types/uuid": "^8.3.0", diff --git a/packages/multichain-transactions-controller/package.json b/packages/multichain-transactions-controller/package.json index 1ecdd9a0a8a..b42a74a6df1 100644 --- a/packages/multichain-transactions-controller/package.json +++ b/packages/multichain-transactions-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/multichain-transactions-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/multichain-transactions-controller", @@ -73,7 +73,6 @@ "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@metamask/keyring-controller": "^27.1.1", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/name-controller/package.json b/packages/name-controller/package.json index ef317c5e75d..b385ff966f1 100644 --- a/packages/name-controller/package.json +++ b/packages/name-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/name-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/name-controller", @@ -64,7 +64,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/network-connection-banner-controller/package.json b/packages/network-connection-banner-controller/package.json index 7572da5634f..41712fe8208 100644 --- a/packages/network-connection-banner-controller/package.json +++ b/packages/network-connection-banner-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/network-connection-banner-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/network-connection-banner-controller", @@ -67,7 +67,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/network-controller/package.json b/packages/network-controller/package.json index 59510e7539e..8f7a967b4b6 100644 --- a/packages/network-controller/package.json +++ b/packages/network-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/network-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/network-controller", @@ -81,7 +81,6 @@ "devDependencies": { "@json-rpc-specification/meta-schema": "^1.0.6", "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/deep-freeze-strict": "^1.1.0", "@types/jest": "^30.0.0", "@types/jest-when": "^2.7.3", diff --git a/packages/network-enablement-controller/package.json b/packages/network-enablement-controller/package.json index 3fa2d4ec8ce..29d7e5da4cf 100644 --- a/packages/network-enablement-controller/package.json +++ b/packages/network-enablement-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/network-enablement-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/network-enablement-controller", @@ -69,7 +69,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/notification-services-controller/package.json b/packages/notification-services-controller/package.json index 82466bd7211..971f60e1ef7 100644 --- a/packages/notification-services-controller/package.json +++ b/packages/notification-services-controller/package.json @@ -91,8 +91,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/notification-services-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/notification-services-controller", @@ -126,7 +126,6 @@ "@lavamoat/allow-scripts": "^3.0.4", "@lavamoat/preinstall-always-fail": "^2.1.0", "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "@types/lodash": "^4.14.191", "@types/readable-stream": "^2.3.0", diff --git a/packages/passkey-controller/package.json b/packages/passkey-controller/package.json index a23de9de2c0..c54af83dbaa 100644 --- a/packages/passkey-controller/package.json +++ b/packages/passkey-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/passkey-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/passkey-controller", @@ -68,7 +68,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/permission-controller/package.json b/packages/permission-controller/package.json index 75b17a65fe6..ac42abaf5d4 100644 --- a/packages/permission-controller/package.json +++ b/packages/permission-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/permission-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/permission-controller", @@ -69,7 +69,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/permission-log-controller/package.json b/packages/permission-log-controller/package.json index f38f9c39c5f..df330764ba0 100644 --- a/packages/permission-log-controller/package.json +++ b/packages/permission-log-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/permission-log-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/permission-log-controller", @@ -62,7 +62,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/deep-freeze-strict": "^1.1.0", "@types/jest": "^30.0.0", "deep-freeze-strict": "^1.1.1", diff --git a/packages/perps-controller/package.json b/packages/perps-controller/package.json index d9eb9493ac0..6dea0c98cc6 100644 --- a/packages/perps-controller/package.json +++ b/packages/perps-controller/package.json @@ -82,8 +82,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/perps-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/perps-controller", @@ -120,7 +120,6 @@ "@metamask/profile-sync-controller": "^29.0.0", "@metamask/remote-feature-flag-controller": "^6.0.0", "@metamask/transaction-controller": "^69.6.1", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "@types/uuid": "^8.3.0", "deepmerge": "^4.2.2", diff --git a/packages/phishing-controller/package.json b/packages/phishing-controller/package.json index 22f7f5f6ae5..2efd52e7bb9 100644 --- a/packages/phishing-controller/package.json +++ b/packages/phishing-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/phishing-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/phishing-controller", @@ -68,7 +68,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/platform-api-docs/package.json b/packages/platform-api-docs/package.json index 83e96544f62..9d80a5aca03 100644 --- a/packages/platform-api-docs/package.json +++ b/packages/platform-api-docs/package.json @@ -26,8 +26,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "changelog:update": "../../scripts/update-changelog.sh @metamask/platform-api-docs", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/platform-api-docs", "cli": "tsx src/cli.ts", @@ -59,7 +59,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "@types/node": "^22.13.14", "@types/npm-which": "^3", diff --git a/packages/polling-controller/package.json b/packages/polling-controller/package.json index a95a93b3458..4c61659d218 100644 --- a/packages/polling-controller/package.json +++ b/packages/polling-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/polling-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/polling-controller", @@ -62,7 +62,6 @@ "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@metamask/messenger": "^2.0.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/preferences-controller/package.json b/packages/preferences-controller/package.json index 12e52054845..db9ddeb44e5 100644 --- a/packages/preferences-controller/package.json +++ b/packages/preferences-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/preferences-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/preferences-controller", @@ -61,7 +61,6 @@ "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@metamask/utils": "^11.11.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/profile-metrics-controller/package.json b/packages/profile-metrics-controller/package.json index 543df69d771..786f4272aad 100644 --- a/packages/profile-metrics-controller/package.json +++ b/packages/profile-metrics-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/profile-metrics-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/profile-metrics-controller", @@ -74,7 +74,6 @@ "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@metamask/keyring-internal-api": "^12.0.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/profile-sync-controller/package.json b/packages/profile-sync-controller/package.json index f1c9fb04add..f988e227f1f 100644 --- a/packages/profile-sync-controller/package.json +++ b/packages/profile-sync-controller/package.json @@ -92,8 +92,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/profile-sync-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/profile-sync-controller", @@ -130,7 +130,6 @@ "@metamask/keyring-api": "^24.0.0", "@metamask/keyring-internal-api": "^12.0.0", "@metamask/providers": "^22.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "ethers": "^6.12.0", diff --git a/packages/ramps-controller/package.json b/packages/ramps-controller/package.json index d83643c78e3..d3f74d4f142 100644 --- a/packages/ramps-controller/package.json +++ b/packages/ramps-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/ramps-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/ramps-controller", @@ -64,7 +64,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/rate-limit-controller/package.json b/packages/rate-limit-controller/package.json index 4c104d81404..8bc5818c3b8 100644 --- a/packages/rate-limit-controller/package.json +++ b/packages/rate-limit-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/rate-limit-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/rate-limit-controller", @@ -60,7 +60,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/react-data-query/package.json b/packages/react-data-query/package.json index 114f1070cc9..aaf951a366f 100644 --- a/packages/react-data-query/package.json +++ b/packages/react-data-query/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/react-data-query", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/react-data-query", @@ -65,7 +65,6 @@ "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@metamask/messenger": "^2.0.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/remote-feature-flag-controller/package.json b/packages/remote-feature-flag-controller/package.json index 76ef8bdf332..88f1df43f19 100644 --- a/packages/remote-feature-flag-controller/package.json +++ b/packages/remote-feature-flag-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/remote-feature-flag-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/remote-feature-flag-controller", @@ -64,7 +64,6 @@ "devDependencies": { "@lavamoat/allow-scripts": "^3.0.4", "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/sample-controllers/package.json b/packages/sample-controllers/package.json index e1b0b31b0e8..d566c7aa8f2 100644 --- a/packages/sample-controllers/package.json +++ b/packages/sample-controllers/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/sample-controllers", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/sample-controllers", @@ -66,7 +66,6 @@ "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@metamask/controller-utils": "^12.3.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/seedless-onboarding-controller/package.json b/packages/seedless-onboarding-controller/package.json index eaf4c89d762..904d925fa51 100644 --- a/packages/seedless-onboarding-controller/package.json +++ b/packages/seedless-onboarding-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/seedless-onboarding-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/seedless-onboarding-controller", @@ -71,7 +71,6 @@ "@lavamoat/allow-scripts": "^3.0.4", "@lavamoat/preinstall-always-fail": "^2.1.0", "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/elliptic": "^6", "@types/jest": "^30.0.0", "@types/json-stable-stringify-without-jsonify": "^1.0.2", diff --git a/packages/selected-network-controller/package.json b/packages/selected-network-controller/package.json index 4b3eeee0e5b..8b6db0d9423 100644 --- a/packages/selected-network-controller/package.json +++ b/packages/selected-network-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/selected-network-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/selected-network-controller", @@ -65,7 +65,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "immer": "^9.0.6", diff --git a/packages/sentinel-api-service/package.json b/packages/sentinel-api-service/package.json index 67c8dcaaa63..8f5cf4be969 100644 --- a/packages/sentinel-api-service/package.json +++ b/packages/sentinel-api-service/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/sentinel-api-service", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/sentinel-api-service", @@ -64,7 +64,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/shield-controller/package.json b/packages/shield-controller/package.json index 86c00c14ced..c0a1073cc7a 100644 --- a/packages/shield-controller/package.json +++ b/packages/shield-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/shield-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/shield-controller", @@ -71,7 +71,6 @@ "@lavamoat/allow-scripts": "^3.0.4", "@lavamoat/preinstall-always-fail": "^2.1.0", "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/signature-controller/package.json b/packages/signature-controller/package.json index 3720c02bc2c..ea29289c55b 100644 --- a/packages/signature-controller/package.json +++ b/packages/signature-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/signature-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/signature-controller", @@ -72,7 +72,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/smart-transactions-controller/package.json b/packages/smart-transactions-controller/package.json index 11421f58df9..02a7de10a13 100644 --- a/packages/smart-transactions-controller/package.json +++ b/packages/smart-transactions-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/smart-transactions-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/smart-transactions-controller", @@ -78,7 +78,6 @@ "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@metamask/json-rpc-engine": "^10.5.0", - "@ts-bridge/cli": "^0.6.4", "deepmerge": "^4.2.2", "jest": "^30.4.2", "nock": "^13.3.1", diff --git a/packages/snap-account-service/package.json b/packages/snap-account-service/package.json index 5ab3ebcf2e8..7ca4f4fc045 100644 --- a/packages/snap-account-service/package.json +++ b/packages/snap-account-service/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/snap-account-service", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/snap-account-service", @@ -70,7 +70,6 @@ "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@metamask/keyring-utils": "^5.0.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/social-controllers/package.json b/packages/social-controllers/package.json index 4c0e0dff245..ffda30f2875 100644 --- a/packages/social-controllers/package.json +++ b/packages/social-controllers/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/social-controllers", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/social-controllers", @@ -64,7 +64,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/solana-test-validator-up/package.json b/packages/solana-test-validator-up/package.json index 3e0cee63644..75d8ba5ef67 100644 --- a/packages/solana-test-validator-up/package.json +++ b/packages/solana-test-validator-up/package.json @@ -40,8 +40,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/solana-test-validator-up", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/solana-test-validator-up", @@ -60,7 +60,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/stellar-quickstart-up/package.json b/packages/stellar-quickstart-up/package.json index 33a3c170510..72a30b324f5 100644 --- a/packages/stellar-quickstart-up/package.json +++ b/packages/stellar-quickstart-up/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/stellar-quickstart-up", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/stellar-quickstart-up", @@ -56,7 +56,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/storage-service/package.json b/packages/storage-service/package.json index 1823b6a641d..8ce3367f0a3 100644 --- a/packages/storage-service/package.json +++ b/packages/storage-service/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/storage-service", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/storage-service", @@ -60,7 +60,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/subscription-controller/package.json b/packages/subscription-controller/package.json index 37c5127cdda..82f665966bd 100644 --- a/packages/subscription-controller/package.json +++ b/packages/subscription-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/subscription-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/subscription-controller", @@ -69,7 +69,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index da9b9f02ba0..caff1aeefcf 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/transaction-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/transaction-controller", @@ -91,7 +91,6 @@ "@metamask/eth-block-tracker": "^15.0.0", "@metamask/eth-json-rpc-provider": "^6.0.1", "@metamask/ethjs-provider-http": "^0.3.0", - "@ts-bridge/cli": "^0.6.4", "@types/bn.js": "^5.1.5", "@types/jest": "^30.0.0", "@types/node": "^22.13.14", diff --git a/packages/transaction-pay-controller/package.json b/packages/transaction-pay-controller/package.json index 8fc07e0eda9..1aae92c780e 100644 --- a/packages/transaction-pay-controller/package.json +++ b/packages/transaction-pay-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/transaction-pay-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/transaction-pay-controller", @@ -80,7 +80,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/user-operation-controller/package.json b/packages/user-operation-controller/package.json index e784852f8ba..a7b6a0be24e 100644 --- a/packages/user-operation-controller/package.json +++ b/packages/user-operation-controller/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/user-operation-controller", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/user-operation-controller", @@ -77,7 +77,6 @@ "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@metamask/eth-block-tracker": "^15.0.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/wallet-cli/package.json b/packages/wallet-cli/package.json index 135ec3d3ce9..08a82e85234 100644 --- a/packages/wallet-cli/package.json +++ b/packages/wallet-cli/package.json @@ -31,8 +31,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "changelog:update": "../../scripts/update-changelog.sh @metamask/wallet-cli", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/wallet-cli", "lint:tsconfigs": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts", @@ -67,7 +67,6 @@ "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@metamask/foundryup": "^1.0.1", - "@ts-bridge/cli": "^0.6.4", "@types/better-sqlite3": "^7.6.13", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", diff --git a/packages/wallet/package.json b/packages/wallet/package.json index 81360eefb71..818b0a2bf2a 100644 --- a/packages/wallet/package.json +++ b/packages/wallet/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh @metamask/wallet", "changelog:validate": "../../scripts/validate-changelog.sh @metamask/wallet", @@ -80,7 +80,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/scripts/create-package/package-template/package.json b/scripts/create-package/package-template/package.json index 50a66badadd..72b58e5abf7 100644 --- a/scripts/create-package/package-template/package.json +++ b/scripts/create-package/package-template/package.json @@ -39,8 +39,8 @@ "registry": "https://registry.npmjs.org/" }, "scripts": { - "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references", - "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean", + "build": "tsc --project tsconfig.build.json", + "build:all": "tsc --build tsconfig.build.json --verbose", "build:docs": "typedoc", "changelog:update": "../../scripts/update-changelog.sh PACKAGE_NAME", "changelog:validate": "../../scripts/validate-changelog.sh PACKAGE_NAME", @@ -54,7 +54,6 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", - "@ts-bridge/cli": "^0.6.4", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/tsconfig.packages.build.json b/tsconfig.packages.build.json index e971538b76e..8bdb779bcef 100644 --- a/tsconfig.packages.build.json +++ b/tsconfig.packages.build.json @@ -6,7 +6,6 @@ "compilerOptions": { "declaration": true, "declarationMap": true, - "emitDeclarationOnly": true, "inlineSources": true, "sourceMap": true, "skipLibCheck": true diff --git a/yarn.config.cjs b/yarn.config.cjs index fd44537397a..51b95ab3892 100644 --- a/yarn.config.cjs +++ b/yarn.config.cjs @@ -145,21 +145,21 @@ module.exports = defineConfig({ } // All non-root packages must have a "build" script. All packages that - // do not exclusively deploy documentation sites must use `ts-bridge`. + // do not exclusively deploy documentation sites must use `tsc`. if (DOCSITE_PACKAGES.includes(workspace.ident)) { expectWorkspaceField(workspace, 'scripts.build'); } else { expectWorkspaceField( workspace, 'scripts.build', - 'ts-bridge --project tsconfig.build.json --verbose --clean --no-references', + 'tsc --project tsconfig.build.json', ); // All non-root packages must have the same "build:all" script. expectWorkspaceField( workspace, 'scripts.build:all', - 'ts-bridge --project tsconfig.build.json --verbose --clean', + 'tsc --build tsconfig.build.json --verbose', ); } diff --git a/yarn.lock b/yarn.lock index 8a76b97d344..22b8644ed3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5755,7 +5755,6 @@ __metadata: "@metamask/snaps-utils": "npm:^12.1.2" "@metamask/superstruct": "npm:^3.4.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" fast-deep-equal: "npm:^3.1.3" @@ -5792,7 +5791,6 @@ __metadata: "@metamask/providers": "npm:^22.1.0" "@metamask/superstruct": "npm:^3.4.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/readable-stream": "npm:^2.3.0" deepmerge: "npm:^4.2.2" @@ -5833,7 +5831,6 @@ __metadata: "@metamask/controller-utils": "npm:^12.3.0" "@metamask/messenger": "npm:^2.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -5854,7 +5851,6 @@ __metadata: "@metamask/messenger": "npm:^2.0.0" "@metamask/superstruct": "npm:^3.4.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -5875,7 +5871,6 @@ __metadata: "@metamask/geolocation-controller": "npm:^1.0.0" "@metamask/messenger": "npm:^2.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/uuid": "npm:^8.3.0" deepmerge: "npm:^4.2.2" @@ -5899,7 +5894,6 @@ __metadata: "@metamask/controller-utils": "npm:^12.3.0" "@metamask/messenger": "npm:^2.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -5919,7 +5913,6 @@ __metadata: "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/base-controller": "npm:^9.1.0" "@metamask/messenger": "npm:^2.0.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -5945,7 +5938,6 @@ __metadata: "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/base-controller": "npm:^9.1.0" "@metamask/messenger": "npm:^2.0.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -5966,7 +5958,6 @@ __metadata: "@metamask/messenger": "npm:^2.0.0" "@metamask/rpc-errors": "npm:^7.0.2" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -6011,7 +6002,6 @@ __metadata: "@metamask/snaps-utils": "npm:^12.1.2" "@metamask/transaction-controller": "npm:^69.6.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/lodash": "npm:^4.14.191" async-mutex: "npm:^0.5.0" @@ -6075,7 +6065,6 @@ __metadata: "@metamask/transaction-controller": "npm:^69.6.1" "@metamask/utils": "npm:^11.11.0" "@tanstack/query-core": "npm:^5.62.16" - "@ts-bridge/cli": "npm:^0.6.4" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^30.0.0" "@types/lodash": "npm:^4.14.191" @@ -6150,7 +6139,6 @@ __metadata: "@metamask/messenger": "npm:^2.0.0" "@metamask/superstruct": "npm:^3.4.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -6193,7 +6181,6 @@ __metadata: "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/messenger": "npm:^2.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" immer: "npm:^9.0.6" @@ -6216,7 +6203,6 @@ __metadata: "@metamask/superstruct": "npm:^3.4.1" "@metamask/utils": "npm:^11.11.0" "@tanstack/query-core": "npm:^5.62.16" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/lodash": "npm:^4.14.191" cockatiel: "npm:^3.1.2" @@ -6239,7 +6225,6 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/local-node-utils": "npm:^1.0.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -6282,7 +6267,6 @@ __metadata: "@metamask/superstruct": "npm:^3.4.1" "@metamask/transaction-controller": "npm:^69.6.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" bignumber.js: "npm:^9.1.2" deepmerge: "npm:^4.2.2" @@ -6319,7 +6303,6 @@ __metadata: "@metamask/superstruct": "npm:^3.4.1" "@metamask/transaction-controller": "npm:^69.6.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" bignumber.js: "npm:^9.1.2" deepmerge: "npm:^4.2.2" @@ -6351,7 +6334,6 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/eslint": "npm:^8.44.7" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" @@ -6375,7 +6357,6 @@ __metadata: "@metamask/permission-controller": "npm:^13.1.1" "@metamask/rpc-errors": "npm:^7.0.2" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -6399,7 +6380,6 @@ __metadata: "@metamask/superstruct": "npm:^3.4.1" "@metamask/utils": "npm:^11.11.0" "@tanstack/query-core": "npm:^5.62.16" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -6426,7 +6406,6 @@ __metadata: "@metamask/superstruct": "npm:^3.4.1" "@metamask/utils": "npm:^11.11.0" "@tanstack/query-core": "npm:^5.62.16" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -6445,7 +6424,6 @@ __metadata: "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/base-controller": "npm:^9.1.0" "@metamask/messenger": "npm:^2.0.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -6471,7 +6449,6 @@ __metadata: "@metamask/slip44": "npm:^4.3.0" "@metamask/transaction-controller": "npm:^69.6.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" eth-chainlist: "npm:^0.0.795" @@ -6494,7 +6471,6 @@ __metadata: "@metamask/messenger": "npm:^2.0.0" "@metamask/superstruct": "npm:^3.4.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -6516,7 +6492,6 @@ __metadata: "@metamask/base-controller": "npm:^9.1.0" "@metamask/json-rpc-engine": "npm:^10.5.0" "@metamask/messenger": "npm:^2.0.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" immer: "npm:^9.0.6" @@ -6543,7 +6518,6 @@ __metadata: "@metamask/remote-feature-flag-controller": "npm:^6.0.0" "@metamask/superstruct": "npm:^3.4.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -6564,7 +6538,6 @@ __metadata: "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/base-controller": "npm:^9.1.0" "@metamask/messenger": "npm:^2.0.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -6616,7 +6589,6 @@ __metadata: "@metamask/ethjs-unit": "npm:^0.3.0" "@metamask/utils": "npm:^11.11.0" "@spruceid/siwe-parser": "npm:2.1.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^30.0.0" "@types/lodash": "npm:^4.14.191" @@ -6653,7 +6625,6 @@ __metadata: "@metamask/remote-feature-flag-controller": "npm:^6.0.0" "@metamask/utils": "npm:^11.11.0" "@tanstack/query-core": "npm:^5.62.16" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" async-mutex: "npm:^0.5.0" cockatiel: "npm:^3.1.2" @@ -6688,7 +6659,6 @@ __metadata: "@metamask/network-controller": "npm:^36.0.0" "@metamask/skills": "npm:^0.1.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/lodash": "npm:^4.14.191" "@types/node": "npm:^22.13.14" @@ -6771,7 +6741,6 @@ __metadata: "@metamask/keyring-controller": "npm:^27.1.1" "@metamask/messenger": "npm:^2.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -6816,7 +6785,6 @@ __metadata: "@metamask/network-controller": "npm:^36.0.0" "@metamask/stake-sdk": "npm:^3.2.1" "@metamask/transaction-controller": "npm:^69.6.1" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -6841,7 +6809,6 @@ __metadata: "@metamask/superstruct": "npm:^3.4.1" "@metamask/transaction-controller": "npm:^69.6.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -6865,7 +6832,6 @@ __metadata: "@metamask/rpc-errors": "npm:^7.0.2" "@metamask/superstruct": "npm:^3.4.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -6888,7 +6854,6 @@ __metadata: "@metamask/permission-controller": "npm:^13.1.1" "@metamask/rpc-errors": "npm:^7.0.2" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -6973,7 +6938,6 @@ __metadata: "@metamask/json-rpc-engine": "npm:^10.5.0" "@metamask/safe-event-emitter": "npm:^3.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/json-rpc-random-id": "npm:^1.0.1" deepmerge: "npm:^4.2.2" @@ -7044,7 +7008,6 @@ __metadata: "@metamask/rpc-errors": "npm:^7.0.2" "@metamask/superstruct": "npm:^3.4.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/deep-freeze-strict": "npm:^1.1.0" "@types/jest": "npm:^30.0.0" deep-freeze-strict: "npm:^1.1.1" @@ -7082,7 +7045,6 @@ __metadata: "@metamask/json-rpc-engine": "npm:^10.5.0" "@metamask/rpc-errors": "npm:^7.0.2" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" ethers: "npm:^6.12.0" @@ -7324,7 +7286,6 @@ __metadata: resolution: "@metamask/foundryup@workspace:packages/foundryup" dependencies: "@metamask/auto-changelog": "npm:^6.1.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/unzipper": "npm:^0.10.10" "@types/yargs": "npm:^17.0.32" @@ -7362,7 +7323,6 @@ __metadata: "@metamask/network-controller": "npm:^36.0.0" "@metamask/polling-controller": "npm:^16.0.9" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^30.0.0" "@types/jest-when": "npm:^2.7.3" @@ -7402,7 +7362,6 @@ __metadata: "@metamask/snaps-utils": "npm:^12.1.2" "@metamask/transaction-controller": "npm:^69.6.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -7422,7 +7381,6 @@ __metadata: "@metamask/base-controller": "npm:^9.1.0" "@metamask/controller-utils": "npm:^12.3.0" "@metamask/messenger": "npm:^2.0.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -7440,7 +7398,6 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/local-node-utils": "npm:^1.0.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -7465,7 +7422,6 @@ __metadata: "@metamask/rpc-errors": "npm:^7.0.2" "@metamask/safe-event-emitter": "npm:^3.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/deep-freeze-strict": "npm:^1.1.0" "@types/jest": "npm:^30.0.0" deep-freeze-strict: "npm:^1.1.1" @@ -7487,7 +7443,6 @@ __metadata: "@metamask/json-rpc-engine": "npm:^10.5.0" "@metamask/safe-event-emitter": "npm:^3.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/readable-stream": "npm:^2.3.0" deepmerge: "npm:^4.2.2" @@ -7550,7 +7505,6 @@ __metadata: "@metamask/messenger": "npm:^2.0.0" "@metamask/scure-bip39": "npm:^2.1.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" async-mutex: "npm:^0.5.0" deepmerge: "npm:^4.2.2" @@ -7673,7 +7627,6 @@ __metadata: "@noble/hashes": "npm:^1.8.0" "@scure/base": "npm:^1.2.6" "@tanstack/query-core": "npm:^5.62.16" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" chokidar-cli: "npm:^3.0.0" deepmerge: "npm:^4.2.2" @@ -7694,7 +7647,6 @@ __metadata: resolution: "@metamask/local-node-utils@workspace:packages/local-node-utils" dependencies: "@metamask/auto-changelog": "npm:^6.1.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -7716,7 +7668,6 @@ __metadata: "@metamask/base-controller": "npm:^9.1.0" "@metamask/messenger": "npm:^2.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -7739,7 +7690,6 @@ __metadata: "@metamask/eth-sig-util": "npm:^8.2.0" "@metamask/messenger": "npm:^2.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/uuid": "npm:^8.3.0" deepmerge: "npm:^4.2.2" @@ -7760,7 +7710,6 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/yargs": "npm:^17.0.32" deepmerge: "npm:^4.2.2" @@ -7806,7 +7755,6 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" immer: "npm:^9.0.6" @@ -7840,7 +7788,6 @@ __metadata: "@metamask/superstruct": "npm:^3.4.1" "@metamask/utils": "npm:^11.11.0" "@tanstack/query-core": "npm:^5.62.16" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -7869,7 +7816,6 @@ __metadata: "@metamask/remote-feature-flag-controller": "npm:^6.0.0" "@metamask/superstruct": "npm:^3.4.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -7895,7 +7841,6 @@ __metadata: "@metamask/keyring-utils": "npm:^5.0.0" "@metamask/messenger": "npm:^2.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" async-mutex: "npm:^0.5.0" deepmerge: "npm:^4.2.2" @@ -7923,7 +7868,6 @@ __metadata: "@metamask/messenger": "npm:^2.0.0" "@metamask/network-controller": "npm:^36.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -7945,7 +7889,6 @@ __metadata: "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/transaction-controller": "npm:^69.6.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -7983,7 +7926,6 @@ __metadata: "@metamask/snaps-utils": "npm:^12.1.2" "@metamask/superstruct": "npm:^3.4.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/uuid": "npm:^8.3.0" async-mutex: "npm:^0.5.0" @@ -8023,7 +7965,6 @@ __metadata: "@metamask/utils": "npm:^11.11.0" "@open-rpc/meta-schema": "npm:^1.14.6" "@open-rpc/schema-utils-js": "npm:^2.0.5" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -8052,7 +7993,6 @@ __metadata: "@metamask/superstruct": "npm:^3.4.1" "@metamask/utils": "npm:^11.11.0" "@solana/addresses": "npm:^2.0.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/lodash": "npm:^4.14.191" "@types/uuid": "npm:^8.3.0" @@ -8086,7 +8026,6 @@ __metadata: "@metamask/snaps-sdk": "npm:^11.0.0" "@metamask/snaps-utils": "npm:^12.1.2" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/uuid": "npm:^8.3.0" deepmerge: "npm:^4.2.2" @@ -8110,7 +8049,6 @@ __metadata: "@metamask/controller-utils": "npm:^12.3.0" "@metamask/messenger": "npm:^2.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" async-mutex: "npm:^0.5.0" deepmerge: "npm:^4.2.2" @@ -8136,7 +8074,6 @@ __metadata: "@metamask/network-controller": "npm:^36.0.0" "@metamask/network-enablement-controller": "npm:^6.0.5" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -8171,7 +8108,6 @@ __metadata: "@metamask/rpc-errors": "npm:^7.0.2" "@metamask/swappable-obj-proxy": "npm:^2.3.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/deep-freeze-strict": "npm:^1.1.0" "@types/jest": "npm:^30.0.0" "@types/jest-when": "npm:^2.7.3" @@ -8215,7 +8151,6 @@ __metadata: "@metamask/slip44": "npm:^4.3.0" "@metamask/transaction-controller": "npm:^69.6.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -8255,7 +8190,6 @@ __metadata: "@metamask/messenger": "npm:^2.0.0" "@metamask/profile-sync-controller": "npm:^29.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/lodash": "npm:^4.14.191" "@types/readable-stream": "npm:^2.3.0" @@ -8312,7 +8246,6 @@ __metadata: "@noble/ciphers": "npm:^1.3.0" "@noble/curves": "npm:^1.9.2" "@noble/hashes": "npm:^1.8.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" async-mutex: "npm:^0.5.0" deepmerge: "npm:^4.2.2" @@ -8356,7 +8289,6 @@ __metadata: "@metamask/messenger": "npm:^2.0.0" "@metamask/rpc-errors": "npm:^7.0.2" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/deep-freeze-strict": "npm:^1.1.0" "@types/jest": "npm:^30.0.0" deep-freeze-strict: "npm:^1.1.1" @@ -8381,7 +8313,6 @@ __metadata: "@metamask/json-rpc-engine": "npm:^10.5.0" "@metamask/messenger": "npm:^2.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/deep-freeze-strict": "npm:^1.1.0" "@types/jest": "npm:^30.0.0" deep-freeze-strict: "npm:^1.1.1" @@ -8418,7 +8349,6 @@ __metadata: "@metamask/utils": "npm:^11.11.0" "@myx-trade/sdk": "npm:^0.1.265" "@nktkas/hyperliquid": "npm:^0.33.1" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/uuid": "npm:^8.3.0" bignumber.js: "npm:^9.1.2" @@ -8449,7 +8379,6 @@ __metadata: "@metamask/messenger": "npm:^2.0.0" "@metamask/transaction-controller": "npm:^69.6.1" "@noble/hashes": "npm:^1.8.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/punycode": "npm:^2.1.0" deepmerge: "npm:^4.2.2" @@ -8479,7 +8408,6 @@ __metadata: "@mdx-js/react": "npm:^3.1.1" "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/node": "npm:^22.13.14" "@types/npm-which": "npm:^3" @@ -8511,7 +8439,6 @@ __metadata: "@metamask/base-controller": "npm:^9.1.0" "@metamask/messenger": "npm:^2.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" "@types/uuid": "npm:^8.3.0" deepmerge: "npm:^4.2.2" @@ -8544,7 +8471,6 @@ __metadata: "@metamask/base-controller": "npm:^9.1.0" "@metamask/messenger": "npm:^2.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -8575,7 +8501,6 @@ __metadata: "@metamask/superstruct": "npm:^3.4.1" "@metamask/transaction-controller": "npm:^69.6.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" async-mutex: "npm:^0.5.0" deepmerge: "npm:^4.2.2" @@ -8611,7 +8536,6 @@ __metadata: "@noble/ciphers": "npm:^1.3.0" "@noble/curves": "npm:^1.9.2" "@noble/hashes": "npm:^1.8.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" ethers: "npm:^6.12.0" @@ -8664,7 +8588,6 @@ __metadata: "@metamask/messenger": "npm:^2.0.0" "@metamask/profile-sync-controller": "npm:^29.0.0" "@metamask/remote-feature-flag-controller": "npm:^6.0.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -8686,7 +8609,6 @@ __metadata: "@metamask/messenger": "npm:^2.0.0" "@metamask/rpc-errors": "npm:^7.0.2" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -8708,7 +8630,6 @@ __metadata: "@metamask/utils": "npm:^11.11.0" "@tanstack/query-core": "npm:^5.62.16" "@tanstack/react-query": "npm:^5.62.16" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -8740,7 +8661,6 @@ __metadata: "@metamask/controller-utils": "npm:^12.3.0" "@metamask/messenger": "npm:^2.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -8784,7 +8704,6 @@ __metadata: "@metamask/superstruct": "npm:^3.4.1" "@metamask/utils": "npm:^11.11.0" "@tanstack/query-core": "npm:^5.62.16" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -8824,7 +8743,6 @@ __metadata: "@noble/ciphers": "npm:^1.3.0" "@noble/curves": "npm:^1.9.2" "@noble/hashes": "npm:^1.8.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/elliptic": "npm:^6" "@types/jest": "npm:^30.0.0" "@types/json-stable-stringify-without-jsonify": "npm:^1.0.2" @@ -8852,7 +8770,6 @@ __metadata: "@metamask/permission-controller": "npm:^13.1.1" "@metamask/swappable-obj-proxy": "npm:^2.3.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" immer: "npm:^9.0.6" @@ -8879,7 +8796,6 @@ __metadata: "@metamask/superstruct": "npm:^3.4.1" "@metamask/utils": "npm:^11.11.0" "@tanstack/query-core": "npm:^5.62.16" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -8909,7 +8825,6 @@ __metadata: "@metamask/transaction-controller": "npm:^69.6.1" "@metamask/utils": "npm:^11.11.0" "@tanstack/query-core": "npm:^5.62.16" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" cockatiel: "npm:^3.1.2" deepmerge: "npm:^4.2.2" @@ -8940,7 +8855,6 @@ __metadata: "@metamask/messenger": "npm:^2.0.0" "@metamask/network-controller": "npm:^36.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -8993,7 +8907,6 @@ __metadata: "@metamask/superstruct": "npm:^3.4.1" "@metamask/transaction-controller": "npm:^69.6.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" bignumber.js: "npm:^9.1.2" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -9024,7 +8937,6 @@ __metadata: "@metamask/snaps-controllers": "npm:^19.0.0" "@metamask/snaps-sdk": "npm:^11.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -9165,7 +9077,6 @@ __metadata: "@metamask/messenger": "npm:^2.0.0" "@metamask/profile-sync-controller": "npm:^29.0.0" "@metamask/superstruct": "npm:^3.4.1" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -9183,7 +9094,6 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/local-node-utils": "npm:^1.0.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -9209,7 +9119,6 @@ __metadata: resolution: "@metamask/stellar-quickstart-up@workspace:packages/stellar-quickstart-up" dependencies: "@metamask/auto-changelog": "npm:^6.1.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -9228,7 +9137,6 @@ __metadata: "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/messenger": "npm:^2.0.0" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -9255,7 +9163,6 @@ __metadata: "@metamask/transaction-controller": "npm:^69.6.1" "@metamask/utils": "npm:^11.11.0" "@tanstack/query-core": "npm:^5.62.16" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" bignumber.js: "npm:^9.1.2" deepmerge: "npm:^4.2.2" @@ -9330,7 +9237,6 @@ __metadata: "@metamask/remote-feature-flag-controller": "npm:^6.0.0" "@metamask/rpc-errors": "npm:^7.0.2" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^30.0.0" "@types/node": "npm:^22.13.14" @@ -9380,7 +9286,6 @@ __metadata: "@metamask/sentinel-api-service": "npm:^1.0.1" "@metamask/transaction-controller": "npm:^69.6.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" bignumber.js: "npm:^9.1.2" bn.js: "npm:^5.2.1" @@ -9415,7 +9320,6 @@ __metadata: "@metamask/superstruct": "npm:^3.4.1" "@metamask/transaction-controller": "npm:^69.6.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" bn.js: "npm:^5.2.1" deepmerge: "npm:^4.2.2" @@ -9489,7 +9393,6 @@ __metadata: "@metamask/utils": "npm:^11.11.0" "@metamask/wallet": "npm:^12.0.2" "@oclif/core": "npm:^4.10.5" - "@ts-bridge/cli": "npm:^0.6.4" "@types/better-sqlite3": "npm:^7.6.13" "@types/jest": "npm:^30.0.0" better-sqlite3: "npm:^12.9.0" @@ -9566,7 +9469,6 @@ __metadata: "@metamask/subscription-controller": "npm:^8.0.1" "@metamask/transaction-controller": "npm:^69.6.1" "@metamask/utils": "npm:^11.11.0" - "@ts-bridge/cli": "npm:^0.6.4" "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" @@ -11600,30 +11502,6 @@ __metadata: languageName: node linkType: hard -"@ts-bridge/cli@npm:^0.6.4": - version: 0.6.4 - resolution: "@ts-bridge/cli@npm:0.6.4" - dependencies: - "@ts-bridge/resolver": "npm:^0.2.0" - chalk: "npm:^5.3.0" - cjs-module-lexer: "npm:^1.3.1" - yargs: "npm:^17.7.2" - peerDependencies: - typescript: ">=4.8.0" - bin: - ts-bridge: ./dist/index.js - tsbridge: ./dist/index.js - checksum: 10/257ee0cacec71c1b3cc018825088e06b4bd554ba5fe95bdb98c4c82edd6cd4bcff1054d351e6c7cdfdd3bd2145a055b5d14fa453a6ece761645e42b48b88e9a0 - languageName: node - linkType: hard - -"@ts-bridge/resolver@npm:^0.2.0": - version: 0.2.0 - resolution: "@ts-bridge/resolver@npm:0.2.0" - checksum: 10/d4cfd1f47e9648a5f9c893b1b076adabde3a57cbe81ef823bcbbcc77a122fb6f06d99f40ff48198f8dc766bfc4b3b351d4e87cfcf2db64f7e6db924eb82a5db1 - languageName: node - linkType: hard - "@ts-morph/common@npm:~0.29.0": version: 0.29.0 resolution: "@ts-morph/common@npm:0.29.0" @@ -14976,13 +14854,6 @@ __metadata: languageName: node linkType: hard -"cjs-module-lexer@npm:^1.3.1": - version: 1.4.0 - resolution: "cjs-module-lexer@npm:1.4.0" - checksum: 10/b041096749792526120d8b8756929f8ef5dd4596502a0e1013f857e3027acd6091915fea77037921d70ee1a99988a100d994d3d3c2e323b04dd4c5ffd516cf13 - languageName: node - linkType: hard - "cjs-module-lexer@npm:^2.1.0": version: 2.2.0 resolution: "cjs-module-lexer@npm:2.2.0" From 8ad84972a4034c57fc124f18cdd99a1d5d4167a6 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Thu, 16 Jul 2026 13:35:31 +0200 Subject: [PATCH 02/17] Update package exports to ESM-only Remove CJS entry points (`main`, `types`, `require`) from all package manifests and simplify `exports` to a single `import` condition. This drops the dual CJS/ESM output in favour of ESM-only distribution. --- ...e-event-emitter-npm-3.1.1-a7872b1f5a.patch | 24 +++++++ package.json | 2 + packages/account-tree-controller/package.json | 12 +--- packages/accounts-controller/package.json | 12 +--- packages/address-book-controller/package.json | 12 +--- packages/ai-controllers/package.json | 12 +--- packages/analytics-controller/package.json | 12 +--- .../package.json | 12 +--- packages/announcement-controller/package.json | 12 +--- packages/app-metadata-controller/package.json | 12 +--- packages/approval-controller/package.json | 12 +--- packages/assets-controller/package.json | 12 +--- packages/assets-controllers/package.json | 12 +--- .../authenticated-user-storage/package.json | 12 +--- packages/base-controller/package.json | 12 +--- packages/base-data-service/package.json | 12 +--- packages/bitcoin-regtest-up/package.json | 14 +--- packages/bridge-controller/package.json | 12 +--- .../bridge-status-controller/package.json | 12 +--- packages/build-utils/package.json | 12 +--- .../chain-agnostic-permission/package.json | 12 +--- packages/chomp-api-service/package.json | 12 +--- packages/claims-controller/package.json | 12 +--- packages/client-controller/package.json | 12 +--- packages/client-utils/package.json | 12 +--- packages/compliance-controller/package.json | 12 +--- packages/composable-controller/package.json | 12 +--- .../config-registry-controller/package.json | 12 +--- packages/connectivity-controller/package.json | 12 +--- packages/controller-utils/package.json | 12 +--- packages/core-backend/package.json | 12 +--- packages/delegation-controller/package.json | 12 +--- packages/earn-controller/package.json | 12 +--- packages/eip-5792-middleware/package.json | 12 +--- .../package.json | 12 +--- .../package.json | 12 +--- packages/eth-block-tracker/package.json | 13 +--- packages/eth-json-rpc-middleware/package.json | 13 +--- packages/eth-json-rpc-provider/package.json | 12 +--- packages/foundryup/package.json | 4 +- packages/gas-fee-controller/package.json | 12 +--- .../gator-permissions-controller/package.json | 12 +--- packages/geolocation-controller/package.json | 12 +--- packages/java-tron-up/package.json | 14 +--- packages/json-rpc-engine/package.json | 22 ++----- .../json-rpc-middleware-stream/package.json | 12 +--- packages/keyring-controller/package.json | 12 +--- packages/kyc-controller/package.json | 12 +--- packages/local-node-utils/package.json | 12 +--- packages/logging-controller/package.json | 12 +--- packages/message-manager/package.json | 12 +--- packages/messenger-cli/package.json | 2 +- packages/messenger/package.json | 12 +--- .../package.json | 12 +--- .../package.json | 12 +--- .../money-account-controller/package.json | 12 +--- .../package.json | 12 +--- packages/money-account-utils/package.json | 12 +--- .../multichain-account-service/package.json | 12 +--- .../multichain-api-middleware/package.json | 12 +--- .../package.json | 12 +--- .../package.json | 12 +--- packages/name-controller/package.json | 12 +--- .../package.json | 12 +--- packages/network-controller/package.json | 12 +--- .../package.json | 12 +--- .../package.json | 62 ++++-------------- packages/passkey-controller/package.json | 12 +--- packages/permission-controller/package.json | 12 +--- .../permission-log-controller/package.json | 12 +--- packages/perps-controller/package.json | 52 +++------------ packages/phishing-controller/package.json | 12 +--- packages/platform-api-docs/package.json | 2 +- packages/polling-controller/package.json | 12 +--- packages/preferences-controller/package.json | 12 +--- .../profile-metrics-controller/package.json | 12 +--- packages/profile-sync-controller/package.json | 62 ++++-------------- packages/ramps-controller/package.json | 12 +--- packages/rate-limit-controller/package.json | 12 +--- packages/react-data-query/package.json | 12 +--- .../package.json | 12 +--- packages/sample-controllers/package.json | 12 +--- .../package.json | 12 +--- .../selected-network-controller/package.json | 12 +--- packages/sentinel-api-service/package.json | 12 +--- packages/shield-controller/package.json | 12 +--- packages/signature-controller/package.json | 12 +--- .../package.json | 12 +--- packages/snap-account-service/package.json | 12 +--- packages/social-controllers/package.json | 12 +--- .../solana-test-validator-up/package.json | 14 +--- packages/stellar-quickstart-up/package.json | 12 +--- packages/storage-service/package.json | 12 +--- packages/subscription-controller/package.json | 12 +--- packages/transaction-controller/package.json | 12 +--- .../transaction-pay-controller/package.json | 12 +--- .../user-operation-controller/package.json | 12 +--- packages/wallet/package.json | 12 +--- yarn.config.cjs | 65 +++++++++++-------- 99 files changed, 286 insertions(+), 1087 deletions(-) create mode 100644 .yarn/patches/@metamask-safe-event-emitter-npm-3.1.1-a7872b1f5a.patch diff --git a/.yarn/patches/@metamask-safe-event-emitter-npm-3.1.1-a7872b1f5a.patch b/.yarn/patches/@metamask-safe-event-emitter-npm-3.1.1-a7872b1f5a.patch new file mode 100644 index 00000000000..a5ef80d01f5 --- /dev/null +++ b/.yarn/patches/@metamask-safe-event-emitter-npm-3.1.1-a7872b1f5a.patch @@ -0,0 +1,24 @@ +diff --git a/dist/esm/index.d.mts b/dist/esm/index.d.mts +new file mode 100644 +index 0000000000000000000000000000000000000000..d48ab7ade4e48f566f3ca48c60636368919b1044 +--- /dev/null ++++ b/dist/esm/index.d.mts +@@ -0,0 +1,5 @@ ++/// ++import { EventEmitter } from 'events'; ++export default class SafeEventEmitter extends EventEmitter { ++ emit(type: string, ...args: any[]): boolean; ++} +diff --git a/package.json b/package.json +index 87ca2f6363c43d2f9d45be268e8ba03c1669c02c..72211f17fe3976ef8dac7d8512d60a6de1275fbd 100644 +--- a/package.json ++++ b/package.json +@@ -8,7 +8,7 @@ + "exports": { + ".": { + "import": { +- "types": "./dist/esm/index.d.ts", ++ "types": "./dist/esm/index.d.mts", + "default": "./dist/esm/index.mjs" + }, + "require": { diff --git a/package.json b/package.json index 57a4ce528fc..8a9059080d2 100644 --- a/package.json +++ b/package.json @@ -115,6 +115,8 @@ "yargs": "^17.7.2" }, "resolutions": { + "@metamask/safe-event-emitter@npm:^3.0.0": "patch:@metamask/safe-event-emitter@npm%3A3.1.1#~/.yarn/patches/@metamask-safe-event-emitter-npm-3.1.1-a7872b1f5a.patch", + "@metamask/safe-event-emitter@npm:^3.1.1": "patch:@metamask/safe-event-emitter@npm%3A3.1.1#~/.yarn/patches/@metamask-safe-event-emitter-npm-3.1.1-a7872b1f5a.patch", "@nktkas/hyperliquid@npm:^0.33.1": "patch:@nktkas/hyperliquid@npm%3A0.33.1#~/.yarn/patches/@nktkas-hyperliquid-npm-0.33.1-6a541fdd1d.patch", "elliptic@6.5.4": "^6.5.7", "fast-xml-parser@^4.3.4": "^4.4.1", diff --git a/packages/account-tree-controller/package.json b/packages/account-tree-controller/package.json index 1a784eb55c6..dfb546a7689 100644 --- a/packages/account-tree-controller/package.json +++ b/packages/account-tree-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/accounts-controller/package.json b/packages/accounts-controller/package.json index f0ce6127781..6e8d6decdbd 100644 --- a/packages/accounts-controller/package.json +++ b/packages/accounts-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/address-book-controller/package.json b/packages/address-book-controller/package.json index da169a0b374..82955d3a6af 100644 --- a/packages/address-book-controller/package.json +++ b/packages/address-book-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/ai-controllers/package.json b/packages/ai-controllers/package.json index 44c2a36914d..5aa31176732 100644 --- a/packages/ai-controllers/package.json +++ b/packages/ai-controllers/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/analytics-controller/package.json b/packages/analytics-controller/package.json index 758eea83c55..c53ddc5ecf8 100644 --- a/packages/analytics-controller/package.json +++ b/packages/analytics-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/analytics-data-regulation-controller/package.json b/packages/analytics-data-regulation-controller/package.json index 7dfc3afbc9a..0d83a5be02e 100644 --- a/packages/analytics-data-regulation-controller/package.json +++ b/packages/analytics-data-regulation-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/announcement-controller/package.json b/packages/announcement-controller/package.json index b43a239bc55..294b3f4249d 100644 --- a/packages/announcement-controller/package.json +++ b/packages/announcement-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/app-metadata-controller/package.json b/packages/app-metadata-controller/package.json index 86e5994f40d..04bc0e415c2 100644 --- a/packages/app-metadata-controller/package.json +++ b/packages/app-metadata-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/approval-controller/package.json b/packages/approval-controller/package.json index 510d873e519..4e40587cca5 100644 --- a/packages/approval-controller/package.json +++ b/packages/approval-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/assets-controller/package.json b/packages/assets-controller/package.json index 97953b55813..a0c29ab8948 100644 --- a/packages/assets-controller/package.json +++ b/packages/assets-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json index a614f048f63..7e000ae5425 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/authenticated-user-storage/package.json b/packages/authenticated-user-storage/package.json index f1c657b7681..6ab168b6ebd 100644 --- a/packages/authenticated-user-storage/package.json +++ b/packages/authenticated-user-storage/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/base-controller/package.json b/packages/base-controller/package.json index 0656d80bfbf..50c3590b2c2 100644 --- a/packages/base-controller/package.json +++ b/packages/base-controller/package.json @@ -18,18 +18,10 @@ "files": [ "dist/" ], - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/base-data-service/package.json b/packages/base-data-service/package.json index bc895f8cffe..e5e75e4581a 100644 --- a/packages/base-data-service/package.json +++ b/packages/base-data-service/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/bitcoin-regtest-up/package.json b/packages/bitcoin-regtest-up/package.json index 3a29ffaed47..21b786fea75 100644 --- a/packages/bitcoin-regtest-up/package.json +++ b/packages/bitcoin-regtest-up/package.json @@ -15,23 +15,15 @@ "type": "git", "url": "https://github.com/MetaMask/core.git" }, - "bin": "./dist/bin/bitcoin-regtest-up.mjs", + "bin": "./dist/bin/bitcoin-regtest-up.js", "files": [ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/bridge-controller/package.json b/packages/bridge-controller/package.json index cbcdb02fc29..aa4f1415d32 100644 --- a/packages/bridge-controller/package.json +++ b/packages/bridge-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/bridge-status-controller/package.json b/packages/bridge-status-controller/package.json index 4e85d0577e5..a5c76fd9d72 100644 --- a/packages/bridge-status-controller/package.json +++ b/packages/bridge-status-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/build-utils/package.json b/packages/build-utils/package.json index 2976e202582..cde2209fd1d 100644 --- a/packages/build-utils/package.json +++ b/packages/build-utils/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/chain-agnostic-permission/package.json b/packages/chain-agnostic-permission/package.json index c86338b993a..fe1be478680 100644 --- a/packages/chain-agnostic-permission/package.json +++ b/packages/chain-agnostic-permission/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/chomp-api-service/package.json b/packages/chomp-api-service/package.json index fb260be6468..5dcf8792e8e 100644 --- a/packages/chomp-api-service/package.json +++ b/packages/chomp-api-service/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/claims-controller/package.json b/packages/claims-controller/package.json index 11567648f3d..1d2c0e26c27 100644 --- a/packages/claims-controller/package.json +++ b/packages/claims-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/client-controller/package.json b/packages/client-controller/package.json index 86dd7a973f7..68f43f92175 100644 --- a/packages/client-controller/package.json +++ b/packages/client-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/client-utils/package.json b/packages/client-utils/package.json index 2e6f411881c..3cfd1904fb0 100644 --- a/packages/client-utils/package.json +++ b/packages/client-utils/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/compliance-controller/package.json b/packages/compliance-controller/package.json index bc95d605123..357c3778331 100644 --- a/packages/compliance-controller/package.json +++ b/packages/compliance-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/composable-controller/package.json b/packages/composable-controller/package.json index dd06908eb4a..a462a6eea5d 100644 --- a/packages/composable-controller/package.json +++ b/packages/composable-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/config-registry-controller/package.json b/packages/config-registry-controller/package.json index 4cc3bc1e16c..3fcc17a47de 100644 --- a/packages/config-registry-controller/package.json +++ b/packages/config-registry-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/connectivity-controller/package.json b/packages/connectivity-controller/package.json index 9653ec96f96..3fa962b7274 100644 --- a/packages/connectivity-controller/package.json +++ b/packages/connectivity-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/controller-utils/package.json b/packages/controller-utils/package.json index 75f2ef447f6..dfa2534a276 100644 --- a/packages/controller-utils/package.json +++ b/packages/controller-utils/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/core-backend/package.json b/packages/core-backend/package.json index 57f0d683697..e955b378668 100644 --- a/packages/core-backend/package.json +++ b/packages/core-backend/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/delegation-controller/package.json b/packages/delegation-controller/package.json index 758b9832fb2..11cbf04b8e6 100644 --- a/packages/delegation-controller/package.json +++ b/packages/delegation-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/earn-controller/package.json b/packages/earn-controller/package.json index b74c0f4f0d6..addf3f7a80e 100644 --- a/packages/earn-controller/package.json +++ b/packages/earn-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/eip-5792-middleware/package.json b/packages/eip-5792-middleware/package.json index c3d86636033..6d96e50a58c 100644 --- a/packages/eip-5792-middleware/package.json +++ b/packages/eip-5792-middleware/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/eip-7702-internal-rpc-middleware/package.json b/packages/eip-7702-internal-rpc-middleware/package.json index 1c3c8f850df..e9f095787af 100644 --- a/packages/eip-7702-internal-rpc-middleware/package.json +++ b/packages/eip-7702-internal-rpc-middleware/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/eip1193-permission-middleware/package.json b/packages/eip1193-permission-middleware/package.json index 57cd8fa96cd..6305333b272 100644 --- a/packages/eip1193-permission-middleware/package.json +++ b/packages/eip1193-permission-middleware/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/eth-block-tracker/package.json b/packages/eth-block-tracker/package.json index 72689bae664..1c63801ebd4 100644 --- a/packages/eth-block-tracker/package.json +++ b/packages/eth-block-tracker/package.json @@ -20,19 +20,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "module": "./dist/index.mjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/eth-json-rpc-middleware/package.json b/packages/eth-json-rpc-middleware/package.json index 9fe997d9112..2e924b023b2 100644 --- a/packages/eth-json-rpc-middleware/package.json +++ b/packages/eth-json-rpc-middleware/package.json @@ -19,19 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "module": "./dist/index.mjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/eth-json-rpc-provider/package.json b/packages/eth-json-rpc-provider/package.json index 695ebbee54c..699696dfcd3 100644 --- a/packages/eth-json-rpc-provider/package.json +++ b/packages/eth-json-rpc-provider/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/foundryup/package.json b/packages/foundryup/package.json index 3af58ef766b..16a3e5fba9c 100644 --- a/packages/foundryup/package.json +++ b/packages/foundryup/package.json @@ -16,14 +16,12 @@ "url": "https://github.com/MetaMask/core.git" }, "bin": { - "mm-foundryup": "./dist/cli.mjs" + "mm-foundryup": "./dist/cli.js" }, "files": [ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { "./package.json": "./package.json" }, diff --git a/packages/gas-fee-controller/package.json b/packages/gas-fee-controller/package.json index 84d030d221c..029c6cea3f2 100644 --- a/packages/gas-fee-controller/package.json +++ b/packages/gas-fee-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/gator-permissions-controller/package.json b/packages/gator-permissions-controller/package.json index ac18aa95a79..62d55573948 100644 --- a/packages/gator-permissions-controller/package.json +++ b/packages/gator-permissions-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/geolocation-controller/package.json b/packages/geolocation-controller/package.json index f959d452e39..8c96f239cc9 100644 --- a/packages/geolocation-controller/package.json +++ b/packages/geolocation-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/java-tron-up/package.json b/packages/java-tron-up/package.json index 028907527c0..a9556dd2a94 100644 --- a/packages/java-tron-up/package.json +++ b/packages/java-tron-up/package.json @@ -15,23 +15,15 @@ "type": "git", "url": "https://github.com/MetaMask/core.git" }, - "bin": "./dist/bin/java-tron-up.mjs", + "bin": "./dist/bin/java-tron-up.js", "files": [ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/json-rpc-engine/package.json b/packages/json-rpc-engine/package.json index 206b98fb678..58454c78cdd 100644 --- a/packages/json-rpc-engine/package.json +++ b/packages/json-rpc-engine/package.json @@ -23,28 +23,14 @@ "v2.js" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./v2": { - "import": { - "types": "./dist/v2/index.d.mts", - "default": "./dist/v2/index.mjs" - }, - "require": { - "types": "./dist/v2/index.d.cts", - "default": "./dist/v2/index.cjs" - } + "types": "./dist/v2/index.d.ts", + "default": "./dist/v2/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/json-rpc-middleware-stream/package.json b/packages/json-rpc-middleware-stream/package.json index 1bf9d89303d..374ede3ad6e 100644 --- a/packages/json-rpc-middleware-stream/package.json +++ b/packages/json-rpc-middleware-stream/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/keyring-controller/package.json b/packages/keyring-controller/package.json index ed6e94a6ad4..191829d7d99 100644 --- a/packages/keyring-controller/package.json +++ b/packages/keyring-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/kyc-controller/package.json b/packages/kyc-controller/package.json index 81fe06646eb..4a401adb362 100644 --- a/packages/kyc-controller/package.json +++ b/packages/kyc-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/local-node-utils/package.json b/packages/local-node-utils/package.json index 316e5474174..83021d051dc 100644 --- a/packages/local-node-utils/package.json +++ b/packages/local-node-utils/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/logging-controller/package.json b/packages/logging-controller/package.json index 893e0af7e95..9f7083ce848 100644 --- a/packages/logging-controller/package.json +++ b/packages/logging-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/message-manager/package.json b/packages/message-manager/package.json index fe858764393..3c44084b92e 100644 --- a/packages/message-manager/package.json +++ b/packages/message-manager/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/messenger-cli/package.json b/packages/messenger-cli/package.json index 0b9d6572400..b0bdd70da82 100644 --- a/packages/messenger-cli/package.json +++ b/packages/messenger-cli/package.json @@ -16,7 +16,7 @@ "url": "https://github.com/MetaMask/core.git" }, "bin": { - "messenger-action-types": "./dist/cli.mjs" + "messenger-action-types": "./dist/cli.js" }, "files": [ "dist/" diff --git a/packages/messenger/package.json b/packages/messenger/package.json index 779b21d2969..93e9235b5d4 100644 --- a/packages/messenger/package.json +++ b/packages/messenger/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/money-account-api-data-service/package.json b/packages/money-account-api-data-service/package.json index 4203c978ce3..92cc602cfba 100644 --- a/packages/money-account-api-data-service/package.json +++ b/packages/money-account-api-data-service/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/money-account-balance-service/package.json b/packages/money-account-balance-service/package.json index 97b21b3e9ef..3fbb05850d2 100644 --- a/packages/money-account-balance-service/package.json +++ b/packages/money-account-balance-service/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/money-account-controller/package.json b/packages/money-account-controller/package.json index 8bb8060e6ec..4ac040d9a18 100644 --- a/packages/money-account-controller/package.json +++ b/packages/money-account-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/money-account-upgrade-controller/package.json b/packages/money-account-upgrade-controller/package.json index f73ecfb7b2c..7c3a08c71d8 100644 --- a/packages/money-account-upgrade-controller/package.json +++ b/packages/money-account-upgrade-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/money-account-utils/package.json b/packages/money-account-utils/package.json index d11a97bf313..365957cf4cf 100644 --- a/packages/money-account-utils/package.json +++ b/packages/money-account-utils/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/multichain-account-service/package.json b/packages/multichain-account-service/package.json index 18651140dae..8cedf1c0f4a 100644 --- a/packages/multichain-account-service/package.json +++ b/packages/multichain-account-service/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/multichain-api-middleware/package.json b/packages/multichain-api-middleware/package.json index e387bc7a804..f2922217e11 100644 --- a/packages/multichain-api-middleware/package.json +++ b/packages/multichain-api-middleware/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/multichain-network-controller/package.json b/packages/multichain-network-controller/package.json index bc7ccabab9a..a2622985af2 100644 --- a/packages/multichain-network-controller/package.json +++ b/packages/multichain-network-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/multichain-transactions-controller/package.json b/packages/multichain-transactions-controller/package.json index b42a74a6df1..9f32d79dfc6 100644 --- a/packages/multichain-transactions-controller/package.json +++ b/packages/multichain-transactions-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/name-controller/package.json b/packages/name-controller/package.json index b385ff966f1..c69333701d2 100644 --- a/packages/name-controller/package.json +++ b/packages/name-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/network-connection-banner-controller/package.json b/packages/network-connection-banner-controller/package.json index 41712fe8208..b4fcd14a2f3 100644 --- a/packages/network-connection-banner-controller/package.json +++ b/packages/network-connection-banner-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/network-controller/package.json b/packages/network-controller/package.json index 8f7a967b4b6..4afe9e74167 100644 --- a/packages/network-controller/package.json +++ b/packages/network-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/network-enablement-controller/package.json b/packages/network-enablement-controller/package.json index 29d7e5da4cf..b5669c66ee9 100644 --- a/packages/network-enablement-controller/package.json +++ b/packages/network-enablement-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/notification-services-controller/package.json b/packages/notification-services-controller/package.json index 971f60e1ef7..755581fe9c3 100644 --- a/packages/notification-services-controller/package.json +++ b/packages/notification-services-controller/package.json @@ -21,68 +21,30 @@ "push-services/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./notification-services": { - "import": { - "types": "./dist/NotificationServicesController/index.d.mts", - "default": "./dist/NotificationServicesController/index.mjs" - }, - "require": { - "types": "./dist/NotificationServicesController/index.d.cts", - "default": "./dist/NotificationServicesController/index.cjs" - } + "types": "./dist/NotificationServicesController/index.d.ts", + "default": "./dist/NotificationServicesController/index.js" }, "./notification-services/mocks": { - "import": { - "types": "./dist/NotificationServicesController/mocks/index.d.mts", - "default": "./dist/NotificationServicesController/mocks/index.mjs" - }, - "require": { - "types": "./dist/NotificationServicesController/mocks/index.d.cts", - "default": "./dist/NotificationServicesController/mocks/index.cjs" - } + "types": "./dist/NotificationServicesController/mocks/index.d.ts", + "default": "./dist/NotificationServicesController/mocks/index.js" }, "./push-services": { - "import": { - "types": "./dist/NotificationServicesPushController/index.d.mts", - "default": "./dist/NotificationServicesPushController/index.mjs" - }, - "require": { - "types": "./dist/NotificationServicesPushController/index.d.cts", - "default": "./dist/NotificationServicesPushController/index.cjs" - } + "types": "./dist/NotificationServicesPushController/index.d.ts", + "default": "./dist/NotificationServicesPushController/index.js" }, "./push-services/web": { - "import": { - "types": "./dist/NotificationServicesPushController/web/index.d.mts", - "default": "./dist/NotificationServicesPushController/web/index.mjs" - }, - "require": { - "types": "./dist/NotificationServicesPushController/web/index.d.cts", - "default": "./dist/NotificationServicesPushController/web/index.cjs" - } + "types": "./dist/NotificationServicesPushController/web/index.d.ts", + "default": "./dist/NotificationServicesPushController/web/index.js" }, "./push-services/mocks": { - "import": { - "types": "./dist/NotificationServicesPushController/mocks/index.d.mts", - "default": "./dist/NotificationServicesPushController/mocks/index.mjs" - }, - "require": { - "types": "./dist/NotificationServicesPushController/mocks/index.d.cts", - "default": "./dist/NotificationServicesPushController/mocks/index.cjs" - } + "types": "./dist/NotificationServicesPushController/mocks/index.d.ts", + "default": "./dist/NotificationServicesPushController/mocks/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/passkey-controller/package.json b/packages/passkey-controller/package.json index c54af83dbaa..9a3df270b5f 100644 --- a/packages/passkey-controller/package.json +++ b/packages/passkey-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/permission-controller/package.json b/packages/permission-controller/package.json index ac42abaf5d4..70190b60b3b 100644 --- a/packages/permission-controller/package.json +++ b/packages/permission-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/permission-log-controller/package.json b/packages/permission-log-controller/package.json index df330764ba0..064e1f8e881 100644 --- a/packages/permission-log-controller/package.json +++ b/packages/permission-log-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/perps-controller/package.json b/packages/perps-controller/package.json index 6dea0c98cc6..4ae315fd965 100644 --- a/packages/perps-controller/package.json +++ b/packages/perps-controller/package.json @@ -22,58 +22,26 @@ "!dist/services/MYXWalletService*" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./constants": { - "import": { - "types": "./dist/constants/index.d.mts", - "default": "./dist/constants/index.mjs" - }, - "require": { - "types": "./dist/constants/index.d.cts", - "default": "./dist/constants/index.cjs" - } + "types": "./dist/constants/index.d.ts", + "default": "./dist/constants/index.js" }, "./constants/*": { - "import": { - "types": "./dist/constants/*.d.mts", - "default": "./dist/constants/*.mjs" - }, - "require": { - "types": "./dist/constants/*.d.cts", - "default": "./dist/constants/*.cjs" - } + "types": "./dist/constants/*.d.ts", + "default": "./dist/constants/*.js" }, "./types": { - "import": { - "types": "./dist/types/index.d.mts", - "default": "./dist/types/index.mjs" - }, - "require": { - "types": "./dist/types/index.d.cts", - "default": "./dist/types/index.cjs" - } + "types": "./dist/types/index.d.ts", + "default": "./dist/types/index.js" }, "./utils/*": { - "import": { - "types": "./dist/utils/*.d.mts", - "default": "./dist/utils/*.mjs" - }, - "require": { - "types": "./dist/utils/*.d.cts", - "default": "./dist/utils/*.cjs" - } + "types": "./dist/utils/*.d.ts", + "default": "./dist/utils/*.js" }, "./package.json": "./package.json" }, diff --git a/packages/phishing-controller/package.json b/packages/phishing-controller/package.json index 2efd52e7bb9..023d3467cac 100644 --- a/packages/phishing-controller/package.json +++ b/packages/phishing-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/platform-api-docs/package.json b/packages/platform-api-docs/package.json index 9d80a5aca03..6857935bebe 100644 --- a/packages/platform-api-docs/package.json +++ b/packages/platform-api-docs/package.json @@ -15,7 +15,7 @@ "type": "git", "url": "https://github.com/MetaMask/core.git" }, - "bin": "./dist/cli.mjs", + "bin": "./dist/cli.js", "files": [ "dist/", "site/" diff --git a/packages/polling-controller/package.json b/packages/polling-controller/package.json index 4c61659d218..eb91c8cb48a 100644 --- a/packages/polling-controller/package.json +++ b/packages/polling-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/preferences-controller/package.json b/packages/preferences-controller/package.json index db9ddeb44e5..858f553675b 100644 --- a/packages/preferences-controller/package.json +++ b/packages/preferences-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/profile-metrics-controller/package.json b/packages/profile-metrics-controller/package.json index 786f4272aad..99c26d0437a 100644 --- a/packages/profile-metrics-controller/package.json +++ b/packages/profile-metrics-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/profile-sync-controller/package.json b/packages/profile-sync-controller/package.json index f988e227f1f..7d23380006b 100644 --- a/packages/profile-sync-controller/package.json +++ b/packages/profile-sync-controller/package.json @@ -22,68 +22,30 @@ "sdk/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./sdk": { - "import": { - "types": "./dist/sdk/index.d.mts", - "default": "./dist/sdk/index.mjs" - }, - "require": { - "types": "./dist/sdk/index.d.cts", - "default": "./dist/sdk/index.cjs" - } + "types": "./dist/sdk/index.d.ts", + "default": "./dist/sdk/index.js" }, "./auth": { - "import": { - "types": "./dist/controllers/authentication/index.d.mts", - "default": "./dist/controllers/authentication/index.mjs" - }, - "require": { - "types": "./dist/controllers/authentication/index.d.cts", - "default": "./dist/controllers/authentication/index.cjs" - } + "types": "./dist/controllers/authentication/index.d.ts", + "default": "./dist/controllers/authentication/index.js" }, "./auth/mocks": { - "import": { - "types": "./dist/controllers/authentication/mocks/index.d.mts", - "default": "./dist/controllers/authentication/mocks/index.mjs" - }, - "require": { - "types": "./dist/controllers/authentication/mocks/index.d.cts", - "default": "./dist/controllers/authentication/mocks/index.cjs" - } + "types": "./dist/controllers/authentication/mocks/index.d.ts", + "default": "./dist/controllers/authentication/mocks/index.js" }, "./user-storage": { - "import": { - "types": "./dist/controllers/user-storage/index.d.mts", - "default": "./dist/controllers/user-storage/index.mjs" - }, - "require": { - "types": "./dist/controllers/user-storage/index.d.cts", - "default": "./dist/controllers/user-storage/index.cjs" - } + "types": "./dist/controllers/user-storage/index.d.ts", + "default": "./dist/controllers/user-storage/index.js" }, "./user-storage/mocks": { - "import": { - "types": "./dist/controllers/user-storage/mocks/index.d.mts", - "default": "./dist/controllers/user-storage/mocks/index.mjs" - }, - "require": { - "types": "./dist/controllers/user-storage/mocks/index.d.cts", - "default": "./dist/controllers/user-storage/mocks/index.cjs" - } + "types": "./dist/controllers/user-storage/mocks/index.d.ts", + "default": "./dist/controllers/user-storage/mocks/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/ramps-controller/package.json b/packages/ramps-controller/package.json index d3f74d4f142..57b404dadcf 100644 --- a/packages/ramps-controller/package.json +++ b/packages/ramps-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/rate-limit-controller/package.json b/packages/rate-limit-controller/package.json index 8bc5818c3b8..42312398c1c 100644 --- a/packages/rate-limit-controller/package.json +++ b/packages/rate-limit-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/react-data-query/package.json b/packages/react-data-query/package.json index aaf951a366f..839c213ba4f 100644 --- a/packages/react-data-query/package.json +++ b/packages/react-data-query/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/remote-feature-flag-controller/package.json b/packages/remote-feature-flag-controller/package.json index 88f1df43f19..4e0cff6a2da 100644 --- a/packages/remote-feature-flag-controller/package.json +++ b/packages/remote-feature-flag-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/sample-controllers/package.json b/packages/sample-controllers/package.json index d566c7aa8f2..f761bf58ead 100644 --- a/packages/sample-controllers/package.json +++ b/packages/sample-controllers/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/seedless-onboarding-controller/package.json b/packages/seedless-onboarding-controller/package.json index 904d925fa51..40360525438 100644 --- a/packages/seedless-onboarding-controller/package.json +++ b/packages/seedless-onboarding-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/selected-network-controller/package.json b/packages/selected-network-controller/package.json index 8b6db0d9423..8aff3e5210c 100644 --- a/packages/selected-network-controller/package.json +++ b/packages/selected-network-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/sentinel-api-service/package.json b/packages/sentinel-api-service/package.json index 8f5cf4be969..045ab8cf915 100644 --- a/packages/sentinel-api-service/package.json +++ b/packages/sentinel-api-service/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/shield-controller/package.json b/packages/shield-controller/package.json index c0a1073cc7a..2dcfdcdd21c 100644 --- a/packages/shield-controller/package.json +++ b/packages/shield-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/signature-controller/package.json b/packages/signature-controller/package.json index ea29289c55b..842497a349b 100644 --- a/packages/signature-controller/package.json +++ b/packages/signature-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/smart-transactions-controller/package.json b/packages/smart-transactions-controller/package.json index 02a7de10a13..e9e2e538f81 100644 --- a/packages/smart-transactions-controller/package.json +++ b/packages/smart-transactions-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/snap-account-service/package.json b/packages/snap-account-service/package.json index 7ca4f4fc045..885a3929c46 100644 --- a/packages/snap-account-service/package.json +++ b/packages/snap-account-service/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/social-controllers/package.json b/packages/social-controllers/package.json index ffda30f2875..94f481c201e 100644 --- a/packages/social-controllers/package.json +++ b/packages/social-controllers/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/solana-test-validator-up/package.json b/packages/solana-test-validator-up/package.json index 75d8ba5ef67..47dd2de8976 100644 --- a/packages/solana-test-validator-up/package.json +++ b/packages/solana-test-validator-up/package.json @@ -15,23 +15,15 @@ "type": "git", "url": "https://github.com/MetaMask/core.git" }, - "bin": "./dist/bin/solana-test-validator-up.mjs", + "bin": "./dist/bin/solana-test-validator-up.js", "files": [ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/stellar-quickstart-up/package.json b/packages/stellar-quickstart-up/package.json index 72a30b324f5..acd467b3ee5 100644 --- a/packages/stellar-quickstart-up/package.json +++ b/packages/stellar-quickstart-up/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/storage-service/package.json b/packages/storage-service/package.json index 8ce3367f0a3..56e75e294d5 100644 --- a/packages/storage-service/package.json +++ b/packages/storage-service/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/subscription-controller/package.json b/packages/subscription-controller/package.json index 82f665966bd..c0eb136801b 100644 --- a/packages/subscription-controller/package.json +++ b/packages/subscription-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index caff1aeefcf..a2dcc010120 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/transaction-pay-controller/package.json b/packages/transaction-pay-controller/package.json index 1aae92c780e..05228962de7 100644 --- a/packages/transaction-pay-controller/package.json +++ b/packages/transaction-pay-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/user-operation-controller/package.json b/packages/user-operation-controller/package.json index a7b6a0be24e..5bfce348e96 100644 --- a/packages/user-operation-controller/package.json +++ b/packages/user-operation-controller/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/wallet/package.json b/packages/wallet/package.json index 818b0a2bf2a..1bf25e60d5d 100644 --- a/packages/wallet/package.json +++ b/packages/wallet/package.json @@ -19,18 +19,10 @@ "dist/" ], "sideEffects": false, - "main": "./dist/index.cjs", - "types": "./dist/index.d.cts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./package.json": "./package.json" }, diff --git a/yarn.config.cjs b/yarn.config.cjs index 51b95ab3892..1ccf7cb84ba 100644 --- a/yarn.config.cjs +++ b/yarn.config.cjs @@ -550,35 +550,16 @@ async function expectWorkspaceLicense(workspace) { function expectCorrectWorkspaceExports(workspace) { // All non-root packages must provide the location of the ESM-compatible // JavaScript entrypoint and its matching type declaration file. - expectWorkspaceField( - workspace, - 'exports["."].import.types', - './dist/index.d.mts', - ); - expectWorkspaceField( - workspace, - 'exports["."].import.default', - './dist/index.mjs', - ); + expectWorkspaceField(workspace, 'exports["."].types', './dist/index.d.ts'); + expectWorkspaceField(workspace, 'exports["."].default', './dist/index.js'); - // All non-root package must provide the location of the CommonJS-compatible - // entrypoint and its matching type declaration file. - expectWorkspaceField( - workspace, - 'exports["."].require.types', - './dist/index.d.cts', - ); - expectWorkspaceField( - workspace, - 'exports["."].require.default', - './dist/index.cjs', - ); - expectWorkspaceField(workspace, 'main', './dist/index.cjs'); - expectWorkspaceField(workspace, 'types', './dist/index.d.cts'); + // Packages should not provide separate CommonJS/ESM exports. + expectWorkspaceField(workspace, 'exports["."].require', null); + expectWorkspaceField(workspace, 'exports["."].import', null); - // Types should not be set in the export object directly, but rather in the - // `import` and `require` subfields. - expectWorkspaceField(workspace, 'exports["."].types', null); + // Packages should not provide a "main" or "types" field. + expectWorkspaceField(workspace, 'main', null); + expectWorkspaceField(workspace, 'types', null); // All non-root packages must export a `package.json` file. expectWorkspaceField( @@ -586,6 +567,36 @@ function expectCorrectWorkspaceExports(workspace) { 'exports["./package.json"]', './package.json', ); + + const nonRootExports = Object.keys(workspace.manifest.exports).filter( + (key) => key !== '.' && key !== './package.json', + ); + + for (const key of nonRootExports) { + const prefix = `exports["${key}"]`; + expectWorkspaceField(workspace, `${prefix}.types`); + expectWorkspaceField(workspace, `${prefix}.default`); + + const typesValue = get(workspace.manifest, `${prefix}.types`); + if ( + typesValue && + (typeof typesValue !== 'string' || !typesValue.endsWith('.d.ts')) + ) { + workspace.error( + `Expected package's "${prefix}.types" field to end with ".d.ts", but it was "${typesValue}".`, + ); + } + + const importValue = get(workspace.manifest, `${prefix}.default`); + if ( + importValue && + (typeof importValue !== 'string' || !importValue.endsWith('.js')) + ) { + workspace.error( + `Expected package's "${prefix}.default" field to end with ".js", but it was "${importValue}".`, + ); + } + } } /** From 27cd67440f6a7c05419a03f1d77cbb6748950821 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Thu, 16 Jul 2026 13:43:03 +0200 Subject: [PATCH 03/17] Add `"type": "module"` to all packages Mark all packages (and the root) as native ESM by adding `"type": "module"` to their manifests. Also adds a Yarn constraint to enforce this field going forward. --- package.json | 1 + packages/account-tree-controller/package.json | 1 + packages/accounts-controller/package.json | 1 + packages/address-book-controller/package.json | 1 + packages/ai-controllers/package.json | 1 + packages/analytics-controller/package.json | 1 + packages/analytics-data-regulation-controller/package.json | 1 + packages/announcement-controller/package.json | 1 + packages/app-metadata-controller/package.json | 1 + packages/approval-controller/package.json | 1 + packages/assets-controller/package.json | 1 + packages/assets-controllers/package.json | 1 + packages/authenticated-user-storage/package.json | 1 + packages/base-controller/package.json | 1 + packages/base-data-service/package.json | 1 + packages/bitcoin-regtest-up/package.json | 1 + packages/bridge-controller/package.json | 1 + packages/bridge-status-controller/package.json | 1 + packages/build-utils/package.json | 1 + packages/chain-agnostic-permission/package.json | 1 + packages/chomp-api-service/package.json | 1 + packages/claims-controller/package.json | 1 + packages/client-controller/package.json | 1 + packages/client-utils/package.json | 1 + packages/compliance-controller/package.json | 1 + packages/composable-controller/package.json | 1 + packages/config-registry-controller/package.json | 1 + packages/connectivity-controller/package.json | 1 + packages/controller-utils/package.json | 1 + packages/core-backend/package.json | 1 + packages/delegation-controller/package.json | 1 + packages/earn-controller/package.json | 1 + packages/eip-5792-middleware/package.json | 1 + packages/eip-7702-internal-rpc-middleware/package.json | 1 + packages/eip1193-permission-middleware/package.json | 1 + packages/eth-block-tracker/package.json | 1 + packages/eth-json-rpc-middleware/package.json | 1 + packages/eth-json-rpc-provider/package.json | 1 + packages/foundryup/package.json | 1 + packages/gas-fee-controller/package.json | 1 + packages/gator-permissions-controller/package.json | 1 + packages/geolocation-controller/package.json | 1 + packages/java-tron-up/package.json | 1 + packages/json-rpc-engine/package.json | 1 + packages/json-rpc-middleware-stream/package.json | 1 + packages/keyring-controller/package.json | 1 + packages/kyc-controller/package.json | 1 + packages/local-node-utils/package.json | 1 + packages/logging-controller/package.json | 1 + packages/message-manager/package.json | 1 + packages/messenger-cli/package.json | 1 + packages/messenger/package.json | 1 + packages/money-account-api-data-service/package.json | 1 + packages/money-account-balance-service/package.json | 1 + packages/money-account-controller/package.json | 1 + packages/money-account-upgrade-controller/package.json | 1 + packages/money-account-utils/package.json | 1 + packages/multichain-account-service/package.json | 1 + packages/multichain-api-middleware/package.json | 1 + packages/multichain-network-controller/package.json | 1 + packages/multichain-transactions-controller/package.json | 1 + packages/name-controller/package.json | 1 + packages/network-connection-banner-controller/package.json | 1 + packages/network-controller/package.json | 1 + packages/network-enablement-controller/package.json | 1 + packages/notification-services-controller/package.json | 1 + packages/passkey-controller/package.json | 1 + packages/permission-controller/package.json | 1 + packages/permission-log-controller/package.json | 1 + packages/perps-controller/package.json | 1 + packages/phishing-controller/package.json | 1 + packages/platform-api-docs/package.json | 1 + packages/polling-controller/package.json | 1 + packages/preferences-controller/package.json | 1 + packages/profile-metrics-controller/package.json | 1 + packages/profile-sync-controller/package.json | 1 + packages/ramps-controller/package.json | 1 + packages/rate-limit-controller/package.json | 1 + packages/react-data-query/package.json | 1 + packages/remote-feature-flag-controller/package.json | 1 + packages/sample-controllers/package.json | 1 + packages/seedless-onboarding-controller/package.json | 1 + packages/selected-network-controller/package.json | 1 + packages/sentinel-api-service/package.json | 1 + packages/shield-controller/package.json | 1 + packages/signature-controller/package.json | 1 + packages/smart-transactions-controller/package.json | 1 + packages/snap-account-service/package.json | 1 + packages/social-controllers/package.json | 1 + packages/solana-test-validator-up/package.json | 1 + packages/stellar-quickstart-up/package.json | 1 + packages/storage-service/package.json | 1 + packages/subscription-controller/package.json | 1 + packages/transaction-controller/package.json | 1 + packages/transaction-pay-controller/package.json | 1 + packages/user-operation-controller/package.json | 1 + packages/wallet-cli/package.json | 1 + packages/wallet-framework-docs/package.json | 1 + packages/wallet/package.json | 1 + tsconfig.packages.json | 2 +- yarn.config.cjs | 3 +++ 101 files changed, 103 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a9059080d2..b2ac25666b2 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "packages/*" ], "files": [], + "type": "module", "scripts": { "build": "yarn tsc --build tsconfig.build.json --verbose", "build:clean": "yarn build:only-clean && yarn build", diff --git a/packages/account-tree-controller/package.json b/packages/account-tree-controller/package.json index dfb546a7689..5b1ef7f968c 100644 --- a/packages/account-tree-controller/package.json +++ b/packages/account-tree-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/accounts-controller/package.json b/packages/accounts-controller/package.json index 6e8d6decdbd..8f7c25a748b 100644 --- a/packages/accounts-controller/package.json +++ b/packages/accounts-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/address-book-controller/package.json b/packages/address-book-controller/package.json index 82955d3a6af..d55bb83dbd7 100644 --- a/packages/address-book-controller/package.json +++ b/packages/address-book-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/ai-controllers/package.json b/packages/ai-controllers/package.json index 5aa31176732..3e4fb410513 100644 --- a/packages/ai-controllers/package.json +++ b/packages/ai-controllers/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/analytics-controller/package.json b/packages/analytics-controller/package.json index c53ddc5ecf8..e03797f5a50 100644 --- a/packages/analytics-controller/package.json +++ b/packages/analytics-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/analytics-data-regulation-controller/package.json b/packages/analytics-data-regulation-controller/package.json index 0d83a5be02e..42f4974e4d9 100644 --- a/packages/analytics-data-regulation-controller/package.json +++ b/packages/analytics-data-regulation-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/announcement-controller/package.json b/packages/announcement-controller/package.json index 294b3f4249d..fea58fef52e 100644 --- a/packages/announcement-controller/package.json +++ b/packages/announcement-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/app-metadata-controller/package.json b/packages/app-metadata-controller/package.json index 04bc0e415c2..bc824b3f92a 100644 --- a/packages/app-metadata-controller/package.json +++ b/packages/app-metadata-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/approval-controller/package.json b/packages/approval-controller/package.json index 4e40587cca5..a8a31a13a9e 100644 --- a/packages/approval-controller/package.json +++ b/packages/approval-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/assets-controller/package.json b/packages/assets-controller/package.json index a0c29ab8948..e68ef991186 100644 --- a/packages/assets-controller/package.json +++ b/packages/assets-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json index 7e000ae5425..4b806157410 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/authenticated-user-storage/package.json b/packages/authenticated-user-storage/package.json index 6ab168b6ebd..25426bb0335 100644 --- a/packages/authenticated-user-storage/package.json +++ b/packages/authenticated-user-storage/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/base-controller/package.json b/packages/base-controller/package.json index 50c3590b2c2..37be5051b38 100644 --- a/packages/base-controller/package.json +++ b/packages/base-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", diff --git a/packages/base-data-service/package.json b/packages/base-data-service/package.json index e5e75e4581a..ffa9565be8b 100644 --- a/packages/base-data-service/package.json +++ b/packages/base-data-service/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/bitcoin-regtest-up/package.json b/packages/bitcoin-regtest-up/package.json index 21b786fea75..98f03b01f8b 100644 --- a/packages/bitcoin-regtest-up/package.json +++ b/packages/bitcoin-regtest-up/package.json @@ -19,6 +19,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/bridge-controller/package.json b/packages/bridge-controller/package.json index aa4f1415d32..16136a80808 100644 --- a/packages/bridge-controller/package.json +++ b/packages/bridge-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/bridge-status-controller/package.json b/packages/bridge-status-controller/package.json index a5c76fd9d72..e4fb593ec9a 100644 --- a/packages/bridge-status-controller/package.json +++ b/packages/bridge-status-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/build-utils/package.json b/packages/build-utils/package.json index cde2209fd1d..21a81da027f 100644 --- a/packages/build-utils/package.json +++ b/packages/build-utils/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/chain-agnostic-permission/package.json b/packages/chain-agnostic-permission/package.json index fe1be478680..38197cdc6d4 100644 --- a/packages/chain-agnostic-permission/package.json +++ b/packages/chain-agnostic-permission/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/chomp-api-service/package.json b/packages/chomp-api-service/package.json index 5dcf8792e8e..972a605ef93 100644 --- a/packages/chomp-api-service/package.json +++ b/packages/chomp-api-service/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/claims-controller/package.json b/packages/claims-controller/package.json index 1d2c0e26c27..71c72cf7bdd 100644 --- a/packages/claims-controller/package.json +++ b/packages/claims-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/client-controller/package.json b/packages/client-controller/package.json index 68f43f92175..9ea37f64c13 100644 --- a/packages/client-controller/package.json +++ b/packages/client-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/client-utils/package.json b/packages/client-utils/package.json index 3cfd1904fb0..f17bf7cb72e 100644 --- a/packages/client-utils/package.json +++ b/packages/client-utils/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/compliance-controller/package.json b/packages/compliance-controller/package.json index 357c3778331..5774084ce93 100644 --- a/packages/compliance-controller/package.json +++ b/packages/compliance-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/composable-controller/package.json b/packages/composable-controller/package.json index a462a6eea5d..ccf85a4a8ba 100644 --- a/packages/composable-controller/package.json +++ b/packages/composable-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/config-registry-controller/package.json b/packages/config-registry-controller/package.json index 3fcc17a47de..20e46e9f804 100644 --- a/packages/config-registry-controller/package.json +++ b/packages/config-registry-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/connectivity-controller/package.json b/packages/connectivity-controller/package.json index 3fa962b7274..9da28d353d5 100644 --- a/packages/connectivity-controller/package.json +++ b/packages/connectivity-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/controller-utils/package.json b/packages/controller-utils/package.json index dfa2534a276..0afb7b418e4 100644 --- a/packages/controller-utils/package.json +++ b/packages/controller-utils/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/core-backend/package.json b/packages/core-backend/package.json index e955b378668..91e29e3a9fc 100644 --- a/packages/core-backend/package.json +++ b/packages/core-backend/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/delegation-controller/package.json b/packages/delegation-controller/package.json index 11cbf04b8e6..abf44dc2f35 100644 --- a/packages/delegation-controller/package.json +++ b/packages/delegation-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/earn-controller/package.json b/packages/earn-controller/package.json index addf3f7a80e..b7ec531f94b 100644 --- a/packages/earn-controller/package.json +++ b/packages/earn-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/eip-5792-middleware/package.json b/packages/eip-5792-middleware/package.json index 6d96e50a58c..c8011bcf4d1 100644 --- a/packages/eip-5792-middleware/package.json +++ b/packages/eip-5792-middleware/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/eip-7702-internal-rpc-middleware/package.json b/packages/eip-7702-internal-rpc-middleware/package.json index e9f095787af..a558a144d5c 100644 --- a/packages/eip-7702-internal-rpc-middleware/package.json +++ b/packages/eip-7702-internal-rpc-middleware/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/eip1193-permission-middleware/package.json b/packages/eip1193-permission-middleware/package.json index 6305333b272..6884ed0f346 100644 --- a/packages/eip1193-permission-middleware/package.json +++ b/packages/eip1193-permission-middleware/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/eth-block-tracker/package.json b/packages/eth-block-tracker/package.json index 1c63801ebd4..6ba1fc1b4fe 100644 --- a/packages/eth-block-tracker/package.json +++ b/packages/eth-block-tracker/package.json @@ -19,6 +19,7 @@ "dist", "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/eth-json-rpc-middleware/package.json b/packages/eth-json-rpc-middleware/package.json index 2e924b023b2..93f7ed6ea9c 100644 --- a/packages/eth-json-rpc-middleware/package.json +++ b/packages/eth-json-rpc-middleware/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/eth-json-rpc-provider/package.json b/packages/eth-json-rpc-provider/package.json index 699696dfcd3..89d0f5cdbe5 100644 --- a/packages/eth-json-rpc-provider/package.json +++ b/packages/eth-json-rpc-provider/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/foundryup/package.json b/packages/foundryup/package.json index 16a3e5fba9c..911d28d12ce 100644 --- a/packages/foundryup/package.json +++ b/packages/foundryup/package.json @@ -21,6 +21,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { "./package.json": "./package.json" diff --git a/packages/gas-fee-controller/package.json b/packages/gas-fee-controller/package.json index 029c6cea3f2..fa24a8e2a63 100644 --- a/packages/gas-fee-controller/package.json +++ b/packages/gas-fee-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/gator-permissions-controller/package.json b/packages/gator-permissions-controller/package.json index 62d55573948..d2463bd1770 100644 --- a/packages/gator-permissions-controller/package.json +++ b/packages/gator-permissions-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/geolocation-controller/package.json b/packages/geolocation-controller/package.json index 8c96f239cc9..9a4fe5f1f29 100644 --- a/packages/geolocation-controller/package.json +++ b/packages/geolocation-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/java-tron-up/package.json b/packages/java-tron-up/package.json index a9556dd2a94..e3069b02846 100644 --- a/packages/java-tron-up/package.json +++ b/packages/java-tron-up/package.json @@ -19,6 +19,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/json-rpc-engine/package.json b/packages/json-rpc-engine/package.json index 58454c78cdd..8058f9c4db9 100644 --- a/packages/json-rpc-engine/package.json +++ b/packages/json-rpc-engine/package.json @@ -22,6 +22,7 @@ "dist/", "v2.js" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/json-rpc-middleware-stream/package.json b/packages/json-rpc-middleware-stream/package.json index 374ede3ad6e..e9fcde6ac19 100644 --- a/packages/json-rpc-middleware-stream/package.json +++ b/packages/json-rpc-middleware-stream/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/keyring-controller/package.json b/packages/keyring-controller/package.json index 191829d7d99..a18aa544a04 100644 --- a/packages/keyring-controller/package.json +++ b/packages/keyring-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/kyc-controller/package.json b/packages/kyc-controller/package.json index 4a401adb362..d767ee6bca5 100644 --- a/packages/kyc-controller/package.json +++ b/packages/kyc-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/local-node-utils/package.json b/packages/local-node-utils/package.json index 83021d051dc..223a4604a31 100644 --- a/packages/local-node-utils/package.json +++ b/packages/local-node-utils/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/logging-controller/package.json b/packages/logging-controller/package.json index 9f7083ce848..b461e4e08f4 100644 --- a/packages/logging-controller/package.json +++ b/packages/logging-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/message-manager/package.json b/packages/message-manager/package.json index 3c44084b92e..b36d2eace5c 100644 --- a/packages/message-manager/package.json +++ b/packages/message-manager/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/messenger-cli/package.json b/packages/messenger-cli/package.json index b0bdd70da82..3c0343d9b8d 100644 --- a/packages/messenger-cli/package.json +++ b/packages/messenger-cli/package.json @@ -21,6 +21,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "publishConfig": { "access": "public", diff --git a/packages/messenger/package.json b/packages/messenger/package.json index 93e9235b5d4..995b220b0ab 100644 --- a/packages/messenger/package.json +++ b/packages/messenger/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/money-account-api-data-service/package.json b/packages/money-account-api-data-service/package.json index 92cc602cfba..a2378783e68 100644 --- a/packages/money-account-api-data-service/package.json +++ b/packages/money-account-api-data-service/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/money-account-balance-service/package.json b/packages/money-account-balance-service/package.json index 3fbb05850d2..02bda49f9ae 100644 --- a/packages/money-account-balance-service/package.json +++ b/packages/money-account-balance-service/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/money-account-controller/package.json b/packages/money-account-controller/package.json index 4ac040d9a18..f35f1e11c47 100644 --- a/packages/money-account-controller/package.json +++ b/packages/money-account-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/money-account-upgrade-controller/package.json b/packages/money-account-upgrade-controller/package.json index 7c3a08c71d8..76a9d6fc760 100644 --- a/packages/money-account-upgrade-controller/package.json +++ b/packages/money-account-upgrade-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/money-account-utils/package.json b/packages/money-account-utils/package.json index 365957cf4cf..6da2db6d9a5 100644 --- a/packages/money-account-utils/package.json +++ b/packages/money-account-utils/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/multichain-account-service/package.json b/packages/multichain-account-service/package.json index 8cedf1c0f4a..5faa7050e5b 100644 --- a/packages/multichain-account-service/package.json +++ b/packages/multichain-account-service/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/multichain-api-middleware/package.json b/packages/multichain-api-middleware/package.json index f2922217e11..a0cdafe766e 100644 --- a/packages/multichain-api-middleware/package.json +++ b/packages/multichain-api-middleware/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/multichain-network-controller/package.json b/packages/multichain-network-controller/package.json index a2622985af2..eac1017a225 100644 --- a/packages/multichain-network-controller/package.json +++ b/packages/multichain-network-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/multichain-transactions-controller/package.json b/packages/multichain-transactions-controller/package.json index 9f32d79dfc6..cf3f88717b4 100644 --- a/packages/multichain-transactions-controller/package.json +++ b/packages/multichain-transactions-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/name-controller/package.json b/packages/name-controller/package.json index c69333701d2..9ff90d3179a 100644 --- a/packages/name-controller/package.json +++ b/packages/name-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/network-connection-banner-controller/package.json b/packages/network-connection-banner-controller/package.json index b4fcd14a2f3..aaa4531d7b7 100644 --- a/packages/network-connection-banner-controller/package.json +++ b/packages/network-connection-banner-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/network-controller/package.json b/packages/network-controller/package.json index 4afe9e74167..9304430ea15 100644 --- a/packages/network-controller/package.json +++ b/packages/network-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/network-enablement-controller/package.json b/packages/network-enablement-controller/package.json index b5669c66ee9..14cb760a33e 100644 --- a/packages/network-enablement-controller/package.json +++ b/packages/network-enablement-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/notification-services-controller/package.json b/packages/notification-services-controller/package.json index 755581fe9c3..04908492b6e 100644 --- a/packages/notification-services-controller/package.json +++ b/packages/notification-services-controller/package.json @@ -20,6 +20,7 @@ "notification-services/", "push-services/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/passkey-controller/package.json b/packages/passkey-controller/package.json index 9a3df270b5f..aac0311d7b5 100644 --- a/packages/passkey-controller/package.json +++ b/packages/passkey-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/permission-controller/package.json b/packages/permission-controller/package.json index 70190b60b3b..58fbc8a052f 100644 --- a/packages/permission-controller/package.json +++ b/packages/permission-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/permission-log-controller/package.json b/packages/permission-log-controller/package.json index 064e1f8e881..36e16a6fe28 100644 --- a/packages/permission-log-controller/package.json +++ b/packages/permission-log-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/perps-controller/package.json b/packages/perps-controller/package.json index 4ae315fd965..394f3faf123 100644 --- a/packages/perps-controller/package.json +++ b/packages/perps-controller/package.json @@ -21,6 +21,7 @@ "!dist/services/MYXClientService*", "!dist/services/MYXWalletService*" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/phishing-controller/package.json b/packages/phishing-controller/package.json index 023d3467cac..695904e7110 100644 --- a/packages/phishing-controller/package.json +++ b/packages/phishing-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/platform-api-docs/package.json b/packages/platform-api-docs/package.json index 6857935bebe..ede4f673cd5 100644 --- a/packages/platform-api-docs/package.json +++ b/packages/platform-api-docs/package.json @@ -20,6 +20,7 @@ "dist/", "site/" ], + "type": "module", "sideEffects": false, "publishConfig": { "access": "public", diff --git a/packages/polling-controller/package.json b/packages/polling-controller/package.json index eb91c8cb48a..a88a9bfb004 100644 --- a/packages/polling-controller/package.json +++ b/packages/polling-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/preferences-controller/package.json b/packages/preferences-controller/package.json index 858f553675b..674c74c8408 100644 --- a/packages/preferences-controller/package.json +++ b/packages/preferences-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/profile-metrics-controller/package.json b/packages/profile-metrics-controller/package.json index 99c26d0437a..6db03cf8053 100644 --- a/packages/profile-metrics-controller/package.json +++ b/packages/profile-metrics-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/profile-sync-controller/package.json b/packages/profile-sync-controller/package.json index 7d23380006b..629d1a1871a 100644 --- a/packages/profile-sync-controller/package.json +++ b/packages/profile-sync-controller/package.json @@ -21,6 +21,7 @@ "user-storage/", "sdk/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/ramps-controller/package.json b/packages/ramps-controller/package.json index 57b404dadcf..3a53b0eea20 100644 --- a/packages/ramps-controller/package.json +++ b/packages/ramps-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/rate-limit-controller/package.json b/packages/rate-limit-controller/package.json index 42312398c1c..b16b1e5a623 100644 --- a/packages/rate-limit-controller/package.json +++ b/packages/rate-limit-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/react-data-query/package.json b/packages/react-data-query/package.json index 839c213ba4f..6b0ecc69a0e 100644 --- a/packages/react-data-query/package.json +++ b/packages/react-data-query/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/remote-feature-flag-controller/package.json b/packages/remote-feature-flag-controller/package.json index 4e0cff6a2da..f0c40cb71a5 100644 --- a/packages/remote-feature-flag-controller/package.json +++ b/packages/remote-feature-flag-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/sample-controllers/package.json b/packages/sample-controllers/package.json index f761bf58ead..2a1b30c3346 100644 --- a/packages/sample-controllers/package.json +++ b/packages/sample-controllers/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/seedless-onboarding-controller/package.json b/packages/seedless-onboarding-controller/package.json index 40360525438..9d9ac3c559a 100644 --- a/packages/seedless-onboarding-controller/package.json +++ b/packages/seedless-onboarding-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/selected-network-controller/package.json b/packages/selected-network-controller/package.json index 8aff3e5210c..6c76b02421c 100644 --- a/packages/selected-network-controller/package.json +++ b/packages/selected-network-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/sentinel-api-service/package.json b/packages/sentinel-api-service/package.json index 045ab8cf915..7fb44991984 100644 --- a/packages/sentinel-api-service/package.json +++ b/packages/sentinel-api-service/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/shield-controller/package.json b/packages/shield-controller/package.json index 2dcfdcdd21c..c1cf790a427 100644 --- a/packages/shield-controller/package.json +++ b/packages/shield-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/signature-controller/package.json b/packages/signature-controller/package.json index 842497a349b..21db5d032e2 100644 --- a/packages/signature-controller/package.json +++ b/packages/signature-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/smart-transactions-controller/package.json b/packages/smart-transactions-controller/package.json index e9e2e538f81..84ca97869f0 100644 --- a/packages/smart-transactions-controller/package.json +++ b/packages/smart-transactions-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/snap-account-service/package.json b/packages/snap-account-service/package.json index 885a3929c46..e6bf4e06e64 100644 --- a/packages/snap-account-service/package.json +++ b/packages/snap-account-service/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/social-controllers/package.json b/packages/social-controllers/package.json index 94f481c201e..c8dcea8734c 100644 --- a/packages/social-controllers/package.json +++ b/packages/social-controllers/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/solana-test-validator-up/package.json b/packages/solana-test-validator-up/package.json index 47dd2de8976..b26fbd48894 100644 --- a/packages/solana-test-validator-up/package.json +++ b/packages/solana-test-validator-up/package.json @@ -19,6 +19,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/stellar-quickstart-up/package.json b/packages/stellar-quickstart-up/package.json index acd467b3ee5..bf0e091a97a 100644 --- a/packages/stellar-quickstart-up/package.json +++ b/packages/stellar-quickstart-up/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/storage-service/package.json b/packages/storage-service/package.json index 56e75e294d5..71dd8863d0a 100644 --- a/packages/storage-service/package.json +++ b/packages/storage-service/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/subscription-controller/package.json b/packages/subscription-controller/package.json index c0eb136801b..bafb1b50e4f 100644 --- a/packages/subscription-controller/package.json +++ b/packages/subscription-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index a2dcc010120..c91e9656ecb 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/transaction-pay-controller/package.json b/packages/transaction-pay-controller/package.json index 05228962de7..c1c1ffe0255 100644 --- a/packages/transaction-pay-controller/package.json +++ b/packages/transaction-pay-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/user-operation-controller/package.json b/packages/user-operation-controller/package.json index 5bfce348e96..2fcb5bd68c1 100644 --- a/packages/user-operation-controller/package.json +++ b/packages/user-operation-controller/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/packages/wallet-cli/package.json b/packages/wallet-cli/package.json index 08a82e85234..048c7f7492c 100644 --- a/packages/wallet-cli/package.json +++ b/packages/wallet-cli/package.json @@ -22,6 +22,7 @@ "bin/", "dist/" ], + "type": "module", "sideEffects": false, "exports": { "./package.json": "./package.json" diff --git a/packages/wallet-framework-docs/package.json b/packages/wallet-framework-docs/package.json index a727bc56c09..6ed4797c2ea 100644 --- a/packages/wallet-framework-docs/package.json +++ b/packages/wallet-framework-docs/package.json @@ -19,6 +19,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "scripts": { "build": "docusaurus build site", diff --git a/packages/wallet/package.json b/packages/wallet/package.json index 1bf25e60d5d..dcd8a90e85d 100644 --- a/packages/wallet/package.json +++ b/packages/wallet/package.json @@ -18,6 +18,7 @@ "files": [ "dist/" ], + "type": "module", "sideEffects": false, "exports": { ".": { diff --git a/tsconfig.packages.json b/tsconfig.packages.json index fbde19a5981..83a81722c5b 100644 --- a/tsconfig.packages.json +++ b/tsconfig.packages.json @@ -13,7 +13,7 @@ */ "paths": { "@metamask/json-rpc-engine/v2": ["../json-rpc-engine/src/v2/index.ts"], - "@metamask/*": ["../*/src"] + "@metamask/*": ["../*/src/index.ts"] } } } diff --git a/yarn.config.cjs b/yarn.config.cjs index 1ccf7cb84ba..9e46f0f20bb 100644 --- a/yarn.config.cjs +++ b/yarn.config.cjs @@ -90,6 +90,9 @@ module.exports = defineConfig({ // All packages must have a name. expectWorkspaceField(workspace, 'name'); + // All workspaces must specify "type: module". + expectWorkspaceField(workspace, 'type', 'module'); + if (isChildWorkspace) { // All non-root packages must have a name that matches its directory // (e.g., a package in a workspace directory called `foo` must be called From 46d5dc81d217dfaf45d817998388b99b426785ad Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Wed, 19 Aug 2026 15:16:53 +0200 Subject: [PATCH 04/17] Update yarn.lock --- yarn.lock | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 22b8644ed3b..e904ef8c19d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8684,13 +8684,20 @@ __metadata: languageName: node linkType: hard -"@metamask/safe-event-emitter@npm:^3.0.0, @metamask/safe-event-emitter@npm:^3.1.1": +"@metamask/safe-event-emitter@npm:3.1.1": version: 3.1.1 resolution: "@metamask/safe-event-emitter@npm:3.1.1" checksum: 10/e24db4d7c20764bfc5b025065f92518c805f0ffb1da4820078b8cff7dcae964c0f354cf053fcb7ac659de015d5ffdf21aae5e8d44e191ee8faa9066855f22653 languageName: node linkType: hard +"@metamask/safe-event-emitter@patch:@metamask/safe-event-emitter@npm%3A3.1.1#~/.yarn/patches/@metamask-safe-event-emitter-npm-3.1.1-a7872b1f5a.patch": + version: 3.1.1 + resolution: "@metamask/safe-event-emitter@patch:@metamask/safe-event-emitter@npm%3A3.1.1#~/.yarn/patches/@metamask-safe-event-emitter-npm-3.1.1-a7872b1f5a.patch::version=3.1.1&hash=4a033d" + checksum: 10/b47560199f61105a5a719b907400395893c52aa6a1d9aa37a4128b054351dd45fb485655dcb71f926e58da406f39f6a93c60396cc00ed1753a97ac3f5a2c7e5e + languageName: node + linkType: hard + "@metamask/sample-controllers@workspace:packages/sample-controllers": version: 0.0.0-use.local resolution: "@metamask/sample-controllers@workspace:packages/sample-controllers" From dd7cc085f07c8090af68bcb8de67440bc72119b1 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Thu, 16 Jul 2026 14:35:26 +0200 Subject: [PATCH 05/17] Replace `__dirname` with `import.meta.dirname` in all packages `__dirname` is not available in ESM. Replace all usages with `import.meta.dirname`, which is equivalent and available since Node.js 21.2. --- packages/account-tree-controller/jest.config.js | 2 +- packages/accounts-controller/jest.config.js | 2 +- packages/address-book-controller/jest.config.js | 2 +- packages/ai-controllers/jest.config.js | 2 +- packages/analytics-controller/jest.config.js | 2 +- .../jest.config.js | 2 +- packages/announcement-controller/jest.config.js | 2 +- packages/app-metadata-controller/jest.config.js | 2 +- packages/approval-controller/jest.config.js | 2 +- packages/assets-controller/jest.config.js | 2 +- packages/assets-controllers/jest.config.js | 2 +- packages/authenticated-user-storage/jest.config.js | 2 +- packages/base-controller/jest.config.js | 2 +- packages/base-data-service/jest.config.js | 2 +- packages/bitcoin-regtest-up/jest.config.js | 2 +- packages/bridge-controller/jest.config.js | 2 +- packages/bridge-status-controller/jest.config.js | 2 +- packages/build-utils/jest.config.js | 2 +- packages/chain-agnostic-permission/jest.config.js | 2 +- packages/chomp-api-service/jest.config.js | 2 +- packages/claims-controller/jest.config.js | 2 +- packages/client-controller/jest.config.js | 2 +- packages/client-utils/jest.config.js | 2 +- packages/compliance-controller/jest.config.js | 2 +- packages/composable-controller/jest.config.js | 2 +- packages/config-registry-controller/jest.config.js | 2 +- packages/connectivity-controller/jest.config.js | 2 +- packages/controller-utils/jest.config.js | 2 +- packages/core-backend/jest.config.js | 2 +- packages/delegation-controller/jest.config.js | 2 +- packages/earn-controller/jest.config.js | 2 +- packages/eip-5792-middleware/jest.config.js | 2 +- .../eip-7702-internal-rpc-middleware/jest.config.js | 2 +- .../eip1193-permission-middleware/jest.config.js | 2 +- packages/eth-block-tracker/jest.config.js | 2 +- packages/eth-json-rpc-middleware/jest.config.js | 2 +- packages/eth-json-rpc-provider/jest.config.js | 2 +- packages/foundryup/jest.config.js | 2 +- packages/gas-fee-controller/jest.config.js | 2 +- packages/gator-permissions-controller/jest.config.js | 2 +- packages/geolocation-controller/jest.config.js | 2 +- packages/java-tron-up/jest.config.js | 2 +- packages/json-rpc-engine/jest.config.js | 2 +- packages/json-rpc-middleware-stream/jest.config.js | 2 +- packages/keyring-controller/jest.config.js | 2 +- packages/kyc-controller/jest.config.js | 2 +- packages/local-node-utils/jest.config.js | 2 +- packages/logging-controller/jest.config.js | 2 +- packages/message-manager/jest.config.js | 2 +- packages/messenger-cli/jest.config.js | 2 +- packages/messenger/jest.config.js | 2 +- .../money-account-api-data-service/jest.config.js | 2 +- .../money-account-balance-service/jest.config.js | 2 +- packages/money-account-controller/jest.config.js | 2 +- .../money-account-upgrade-controller/jest.config.js | 2 +- packages/multichain-account-service/jest.config.js | 2 +- packages/multichain-api-middleware/jest.config.js | 2 +- .../multichain-network-controller/jest.config.js | 2 +- .../jest.config.js | 2 +- packages/name-controller/jest.config.js | 2 +- .../jest.config.js | 2 +- packages/network-controller/jest.config.js | 2 +- .../network-enablement-controller/jest.config.js | 2 +- .../notification-services-controller/jest.config.js | 2 +- packages/passkey-controller/jest.config.js | 2 +- packages/permission-controller/jest.config.js | 2 +- packages/permission-log-controller/jest.config.js | 2 +- packages/perps-controller/jest.config.js | 2 +- packages/phishing-controller/jest.config.js | 2 +- packages/platform-api-docs/jest.config.js | 2 +- packages/platform-api-docs/src/cli.ts | 4 ++-- packages/polling-controller/jest.config.js | 2 +- packages/preferences-controller/jest.config.js | 2 +- packages/profile-metrics-controller/jest.config.js | 2 +- packages/profile-sync-controller/jest.config.js | 2 +- packages/ramps-controller/dev-watch.js | 6 +++--- packages/ramps-controller/jest.config.js | 2 +- packages/ramps-controller/link-ramp-controller.js | 12 +++++++++--- packages/rate-limit-controller/jest.config.js | 2 +- packages/react-data-query/jest.config.js | 2 +- .../remote-feature-flag-controller/jest.config.js | 2 +- packages/sample-controllers/jest.config.js | 2 +- .../seedless-onboarding-controller/jest.config.js | 2 +- packages/selected-network-controller/jest.config.js | 2 +- packages/sentinel-api-service/jest.config.js | 2 +- packages/shield-controller/jest.config.js | 2 +- packages/signature-controller/jest.config.js | 2 +- .../smart-transactions-controller/jest.config.js | 2 +- packages/snap-account-service/jest.config.js | 2 +- packages/social-controllers/jest.config.js | 2 +- packages/solana-test-validator-up/jest.config.js | 2 +- packages/stellar-quickstart-up/jest.config.js | 2 +- packages/storage-service/jest.config.js | 2 +- packages/subscription-controller/jest.config.js | 2 +- packages/transaction-controller/jest.config.js | 2 +- packages/transaction-pay-controller/jest.config.js | 2 +- packages/user-operation-controller/jest.config.js | 2 +- packages/wallet-cli/jest.config.js | 2 +- packages/wallet-framework-docs/jest.config.js | 2 +- packages/wallet/jest.config.js | 2 +- .../create-package/package-template/jest.config.js | 2 +- scripts/create-package/utils.ts | 4 ++-- scripts/lint-teams-json.ts | 2 +- scripts/manage-codeowners/main.ts | 2 +- scripts/update-readme-content.ts | 2 +- 105 files changed, 117 insertions(+), 111 deletions(-) diff --git a/packages/account-tree-controller/jest.config.js b/packages/account-tree-controller/jest.config.js index a78c856767b..e7ca1a936d6 100644 --- a/packages/account-tree-controller/jest.config.js +++ b/packages/account-tree-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/accounts-controller/jest.config.js b/packages/accounts-controller/jest.config.js index 5312c1e6c3a..b8ee8a2e785 100644 --- a/packages/accounts-controller/jest.config.js +++ b/packages/accounts-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/address-book-controller/jest.config.js b/packages/address-book-controller/jest.config.js index 43c60a649b3..18e510603aa 100644 --- a/packages/address-book-controller/jest.config.js +++ b/packages/address-book-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/ai-controllers/jest.config.js b/packages/ai-controllers/jest.config.js index 55df7971f9f..3e6cab4dd05 100644 --- a/packages/ai-controllers/jest.config.js +++ b/packages/ai-controllers/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/analytics-controller/jest.config.js b/packages/analytics-controller/jest.config.js index 5c48b1b92e8..001b10d50fa 100644 --- a/packages/analytics-controller/jest.config.js +++ b/packages/analytics-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/analytics-data-regulation-controller/jest.config.js b/packages/analytics-data-regulation-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/analytics-data-regulation-controller/jest.config.js +++ b/packages/analytics-data-regulation-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/announcement-controller/jest.config.js b/packages/announcement-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/announcement-controller/jest.config.js +++ b/packages/announcement-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/app-metadata-controller/jest.config.js b/packages/app-metadata-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/app-metadata-controller/jest.config.js +++ b/packages/app-metadata-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/approval-controller/jest.config.js b/packages/approval-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/approval-controller/jest.config.js +++ b/packages/approval-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/assets-controller/jest.config.js b/packages/assets-controller/jest.config.js index 49ea0e46510..f28dc36764c 100644 --- a/packages/assets-controller/jest.config.js +++ b/packages/assets-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/assets-controllers/jest.config.js b/packages/assets-controllers/jest.config.js index a91d4995fcc..14de52e72b8 100644 --- a/packages/assets-controllers/jest.config.js +++ b/packages/assets-controllers/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/authenticated-user-storage/jest.config.js b/packages/authenticated-user-storage/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/authenticated-user-storage/jest.config.js +++ b/packages/authenticated-user-storage/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/base-controller/jest.config.js b/packages/base-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/base-controller/jest.config.js +++ b/packages/base-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/base-data-service/jest.config.js b/packages/base-data-service/jest.config.js index e45df2b6e59..3d11ce296d1 100644 --- a/packages/base-data-service/jest.config.js +++ b/packages/base-data-service/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/bitcoin-regtest-up/jest.config.js b/packages/bitcoin-regtest-up/jest.config.js index 2bc1c7a6203..9bbea3e0ee4 100644 --- a/packages/bitcoin-regtest-up/jest.config.js +++ b/packages/bitcoin-regtest-up/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/bridge-controller/jest.config.js b/packages/bridge-controller/jest.config.js index f9e336cb4c5..04288d715a4 100644 --- a/packages/bridge-controller/jest.config.js +++ b/packages/bridge-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/bridge-status-controller/jest.config.js b/packages/bridge-status-controller/jest.config.js index 86e3fc3cfeb..67266cdaa0e 100644 --- a/packages/bridge-status-controller/jest.config.js +++ b/packages/bridge-status-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/build-utils/jest.config.js b/packages/build-utils/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/build-utils/jest.config.js +++ b/packages/build-utils/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/chain-agnostic-permission/jest.config.js b/packages/chain-agnostic-permission/jest.config.js index 3ecd657de92..9450949c93a 100644 --- a/packages/chain-agnostic-permission/jest.config.js +++ b/packages/chain-agnostic-permission/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/chomp-api-service/jest.config.js b/packages/chomp-api-service/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/chomp-api-service/jest.config.js +++ b/packages/chomp-api-service/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/claims-controller/jest.config.js b/packages/claims-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/claims-controller/jest.config.js +++ b/packages/claims-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/client-controller/jest.config.js b/packages/client-controller/jest.config.js index 9efbc1e7d1f..9d1196b8160 100644 --- a/packages/client-controller/jest.config.js +++ b/packages/client-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { displayName, diff --git a/packages/client-utils/jest.config.js b/packages/client-utils/jest.config.js index d6ba5b87a98..b80a57946d8 100644 --- a/packages/client-utils/jest.config.js +++ b/packages/client-utils/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/compliance-controller/jest.config.js b/packages/compliance-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/compliance-controller/jest.config.js +++ b/packages/compliance-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/composable-controller/jest.config.js b/packages/composable-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/composable-controller/jest.config.js +++ b/packages/composable-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/config-registry-controller/jest.config.js b/packages/config-registry-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/config-registry-controller/jest.config.js +++ b/packages/config-registry-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/connectivity-controller/jest.config.js b/packages/connectivity-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/connectivity-controller/jest.config.js +++ b/packages/connectivity-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/controller-utils/jest.config.js b/packages/controller-utils/jest.config.js index f7ca96dbc15..c1256e3f873 100644 --- a/packages/controller-utils/jest.config.js +++ b/packages/controller-utils/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/core-backend/jest.config.js b/packages/core-backend/jest.config.js index 638112ed628..fe6700d9656 100644 --- a/packages/core-backend/jest.config.js +++ b/packages/core-backend/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/delegation-controller/jest.config.js b/packages/delegation-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/delegation-controller/jest.config.js +++ b/packages/delegation-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/earn-controller/jest.config.js b/packages/earn-controller/jest.config.js index 66bf6e01f38..b1014f160b7 100644 --- a/packages/earn-controller/jest.config.js +++ b/packages/earn-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/eip-5792-middleware/jest.config.js b/packages/eip-5792-middleware/jest.config.js index 729b145b19c..77a64c24eee 100644 --- a/packages/eip-5792-middleware/jest.config.js +++ b/packages/eip-5792-middleware/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/eip-7702-internal-rpc-middleware/jest.config.js b/packages/eip-7702-internal-rpc-middleware/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/eip-7702-internal-rpc-middleware/jest.config.js +++ b/packages/eip-7702-internal-rpc-middleware/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/eip1193-permission-middleware/jest.config.js b/packages/eip1193-permission-middleware/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/eip1193-permission-middleware/jest.config.js +++ b/packages/eip1193-permission-middleware/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/eth-block-tracker/jest.config.js b/packages/eth-block-tracker/jest.config.js index 01a358a1cef..7dd50e9bce2 100644 --- a/packages/eth-block-tracker/jest.config.js +++ b/packages/eth-block-tracker/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/eth-json-rpc-middleware/jest.config.js b/packages/eth-json-rpc-middleware/jest.config.js index fecbe76e3b3..39223ef70b2 100644 --- a/packages/eth-json-rpc-middleware/jest.config.js +++ b/packages/eth-json-rpc-middleware/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/eth-json-rpc-provider/jest.config.js b/packages/eth-json-rpc-provider/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/eth-json-rpc-provider/jest.config.js +++ b/packages/eth-json-rpc-provider/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/foundryup/jest.config.js b/packages/foundryup/jest.config.js index 3e2689f3405..13f8248a1ff 100644 --- a/packages/foundryup/jest.config.js +++ b/packages/foundryup/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/gas-fee-controller/jest.config.js b/packages/gas-fee-controller/jest.config.js index 9085847b1a8..9452336df20 100644 --- a/packages/gas-fee-controller/jest.config.js +++ b/packages/gas-fee-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/gator-permissions-controller/jest.config.js b/packages/gator-permissions-controller/jest.config.js index 37add1f8801..1e9f704b74d 100644 --- a/packages/gator-permissions-controller/jest.config.js +++ b/packages/gator-permissions-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/geolocation-controller/jest.config.js b/packages/geolocation-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/geolocation-controller/jest.config.js +++ b/packages/geolocation-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/java-tron-up/jest.config.js b/packages/java-tron-up/jest.config.js index ac981bb832e..ccf26af4889 100644 --- a/packages/java-tron-up/jest.config.js +++ b/packages/java-tron-up/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/json-rpc-engine/jest.config.js b/packages/json-rpc-engine/jest.config.js index d1d26575e17..f57db9f9e4d 100644 --- a/packages/json-rpc-engine/jest.config.js +++ b/packages/json-rpc-engine/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/json-rpc-middleware-stream/jest.config.js b/packages/json-rpc-middleware-stream/jest.config.js index f245081436d..7f77f0b9029 100644 --- a/packages/json-rpc-middleware-stream/jest.config.js +++ b/packages/json-rpc-middleware-stream/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/keyring-controller/jest.config.js b/packages/keyring-controller/jest.config.js index 02289944e6f..4b5ac713841 100644 --- a/packages/keyring-controller/jest.config.js +++ b/packages/keyring-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/kyc-controller/jest.config.js b/packages/kyc-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/kyc-controller/jest.config.js +++ b/packages/kyc-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/local-node-utils/jest.config.js b/packages/local-node-utils/jest.config.js index e733dd05831..313dad26a6c 100644 --- a/packages/local-node-utils/jest.config.js +++ b/packages/local-node-utils/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/logging-controller/jest.config.js b/packages/logging-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/logging-controller/jest.config.js +++ b/packages/logging-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/message-manager/jest.config.js b/packages/message-manager/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/message-manager/jest.config.js +++ b/packages/message-manager/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/messenger-cli/jest.config.js b/packages/messenger-cli/jest.config.js index ab426afd5c0..bd8650be06f 100644 --- a/packages/messenger-cli/jest.config.js +++ b/packages/messenger-cli/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/messenger/jest.config.js b/packages/messenger/jest.config.js index 9ad52b2640b..43b184dd091 100644 --- a/packages/messenger/jest.config.js +++ b/packages/messenger/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/money-account-api-data-service/jest.config.js b/packages/money-account-api-data-service/jest.config.js index c17efa251af..3c59dbe56c1 100644 --- a/packages/money-account-api-data-service/jest.config.js +++ b/packages/money-account-api-data-service/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { displayName, diff --git a/packages/money-account-balance-service/jest.config.js b/packages/money-account-balance-service/jest.config.js index c17efa251af..3c59dbe56c1 100644 --- a/packages/money-account-balance-service/jest.config.js +++ b/packages/money-account-balance-service/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { displayName, diff --git a/packages/money-account-controller/jest.config.js b/packages/money-account-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/money-account-controller/jest.config.js +++ b/packages/money-account-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/money-account-upgrade-controller/jest.config.js b/packages/money-account-upgrade-controller/jest.config.js index 1c5314007e1..69d5d9b4273 100644 --- a/packages/money-account-upgrade-controller/jest.config.js +++ b/packages/money-account-upgrade-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { displayName, diff --git a/packages/multichain-account-service/jest.config.js b/packages/multichain-account-service/jest.config.js index ffd06163763..97f6de173a0 100644 --- a/packages/multichain-account-service/jest.config.js +++ b/packages/multichain-account-service/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/multichain-api-middleware/jest.config.js b/packages/multichain-api-middleware/jest.config.js index a6816cce33a..a6f2baf410d 100644 --- a/packages/multichain-api-middleware/jest.config.js +++ b/packages/multichain-api-middleware/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/multichain-network-controller/jest.config.js b/packages/multichain-network-controller/jest.config.js index 3b19ddb3f39..be65bbdeba5 100644 --- a/packages/multichain-network-controller/jest.config.js +++ b/packages/multichain-network-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/multichain-transactions-controller/jest.config.js b/packages/multichain-transactions-controller/jest.config.js index 61cef5a0b68..7f37a7bf396 100644 --- a/packages/multichain-transactions-controller/jest.config.js +++ b/packages/multichain-transactions-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/name-controller/jest.config.js b/packages/name-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/name-controller/jest.config.js +++ b/packages/name-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/network-connection-banner-controller/jest.config.js b/packages/network-connection-banner-controller/jest.config.js index f6a03b68807..9e9e5413583 100644 --- a/packages/network-connection-banner-controller/jest.config.js +++ b/packages/network-connection-banner-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/network-controller/jest.config.js b/packages/network-controller/jest.config.js index e20eff6e4a0..6b53cf4f3a5 100644 --- a/packages/network-controller/jest.config.js +++ b/packages/network-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/network-enablement-controller/jest.config.js b/packages/network-enablement-controller/jest.config.js index 8df1ea4fd9d..d5269259364 100644 --- a/packages/network-enablement-controller/jest.config.js +++ b/packages/network-enablement-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/notification-services-controller/jest.config.js b/packages/notification-services-controller/jest.config.js index 24f98707e42..a5ca105d820 100644 --- a/packages/notification-services-controller/jest.config.js +++ b/packages/notification-services-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/passkey-controller/jest.config.js b/packages/passkey-controller/jest.config.js index 0f5e11a7b84..b524afcb51a 100644 --- a/packages/passkey-controller/jest.config.js +++ b/packages/passkey-controller/jest.config.js @@ -3,7 +3,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { displayName, diff --git a/packages/permission-controller/jest.config.js b/packages/permission-controller/jest.config.js index e69a27d2955..a4451065430 100644 --- a/packages/permission-controller/jest.config.js +++ b/packages/permission-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/permission-log-controller/jest.config.js b/packages/permission-log-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/permission-log-controller/jest.config.js +++ b/packages/permission-log-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/perps-controller/jest.config.js b/packages/perps-controller/jest.config.js index b776cf1a044..fbe9310453f 100644 --- a/packages/perps-controller/jest.config.js +++ b/packages/perps-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = { ...merge(baseConfig, { diff --git a/packages/phishing-controller/jest.config.js b/packages/phishing-controller/jest.config.js index 422b97aa459..31a7e82f883 100644 --- a/packages/phishing-controller/jest.config.js +++ b/packages/phishing-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/platform-api-docs/jest.config.js b/packages/platform-api-docs/jest.config.js index 4cf31d3b644..3fdd21d40f0 100644 --- a/packages/platform-api-docs/jest.config.js +++ b/packages/platform-api-docs/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/platform-api-docs/src/cli.ts b/packages/platform-api-docs/src/cli.ts index b6cae011091..cbf609b8e52 100644 --- a/packages/platform-api-docs/src/cli.ts +++ b/packages/platform-api-docs/src/cli.ts @@ -16,7 +16,7 @@ import { generate, resolveRepoUrl } from './generate.js'; * @returns Absolute path to the `docusaurus` executable. */ function resolveDocusaurus(): string { - return npmWhich(__dirname).sync('docusaurus'); + return npmWhich(import.meta.dirname).sync('docusaurus'); } /** @@ -51,7 +51,7 @@ async function runDocusaurus( * @param outDir - The output directory to set up. */ async function setupSite(outDir: string): Promise { - const packageDir = path.resolve(__dirname, '..'); + const packageDir = path.resolve(import.meta.dirname, '..'); const siteDir = path.join(packageDir, 'site'); const packageNodeModules = path.join(packageDir, 'node_modules'); const skip = new Set(['node_modules', 'docs', 'tsconfig.json']); diff --git a/packages/polling-controller/jest.config.js b/packages/polling-controller/jest.config.js index 47f2cf906ed..75445bc8ec8 100644 --- a/packages/polling-controller/jest.config.js +++ b/packages/polling-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/preferences-controller/jest.config.js b/packages/preferences-controller/jest.config.js index 0929655a0d7..6e72890625e 100644 --- a/packages/preferences-controller/jest.config.js +++ b/packages/preferences-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/profile-metrics-controller/jest.config.js b/packages/profile-metrics-controller/jest.config.js index 39096b2ce02..97c2b029b3c 100644 --- a/packages/profile-metrics-controller/jest.config.js +++ b/packages/profile-metrics-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/profile-sync-controller/jest.config.js b/packages/profile-sync-controller/jest.config.js index e5ccac39389..f14d3d4acd4 100644 --- a/packages/profile-sync-controller/jest.config.js +++ b/packages/profile-sync-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/ramps-controller/dev-watch.js b/packages/ramps-controller/dev-watch.js index 3d44c720b57..4959ba0f8b9 100644 --- a/packages/ramps-controller/dev-watch.js +++ b/packages/ramps-controller/dev-watch.js @@ -8,8 +8,8 @@ const path = require('path'); * Watches src/ directory and runs link script on changes */ -const srcDir = path.join(__dirname, 'src'); -const linkScript = path.join(__dirname, 'link-ramp-controller.js'); +const srcDir = path.join(import.meta.dirname, 'src'); +const linkScript = path.join(import.meta.dirname, 'link-ramp-controller.js'); console.log('👀 Watching ramps-controller src/ directory...'); console.log('📁 Press Ctrl+C to stop watching\n'); @@ -24,7 +24,7 @@ function runLinkScript() { console.log('🔄 Changes detected, rebuilding and linking...'); const child = spawn('node', [linkScript], { stdio: 'inherit', - cwd: __dirname, + cwd: import.meta.dirname, }); child.on('close', (code) => { diff --git a/packages/ramps-controller/jest.config.js b/packages/ramps-controller/jest.config.js index e999b4420f3..434f40cd68f 100644 --- a/packages/ramps-controller/jest.config.js +++ b/packages/ramps-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/ramps-controller/link-ramp-controller.js b/packages/ramps-controller/link-ramp-controller.js index 0646d418043..a9b14cb4465 100644 --- a/packages/ramps-controller/link-ramp-controller.js +++ b/packages/ramps-controller/link-ramp-controller.js @@ -18,9 +18,9 @@ function pathExistsSync(filePath) { * This builds and copies the ramps-controller files to the mobile app's node_modules */ -const rampsControllerPath = __dirname; +const rampsControllerPath = import.meta.dirname; const mobileNodeModulesPath = path.join( - __dirname, + import.meta.dirname, '..', '..', '..', @@ -56,7 +56,13 @@ try { } // Check if mobile app exists -const mobilePath = path.join(__dirname, '..', '..', '..', 'metamask-mobile'); +const mobilePath = path.join( + import.meta.dirname, + '..', + '..', + '..', + 'metamask-mobile', +); if (!pathExistsSync(mobilePath)) { console.error('❌ MetaMask mobile app not found at expected location.'); process.exit(1); diff --git a/packages/rate-limit-controller/jest.config.js b/packages/rate-limit-controller/jest.config.js index 2d216bdd979..5ebf986e456 100644 --- a/packages/rate-limit-controller/jest.config.js +++ b/packages/rate-limit-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/react-data-query/jest.config.js b/packages/react-data-query/jest.config.js index d65ab0be8ba..a34a357c9a2 100644 --- a/packages/react-data-query/jest.config.js +++ b/packages/react-data-query/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/remote-feature-flag-controller/jest.config.js b/packages/remote-feature-flag-controller/jest.config.js index bd46c807c9f..eccd6f27e55 100644 --- a/packages/remote-feature-flag-controller/jest.config.js +++ b/packages/remote-feature-flag-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/sample-controllers/jest.config.js b/packages/sample-controllers/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/sample-controllers/jest.config.js +++ b/packages/sample-controllers/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/seedless-onboarding-controller/jest.config.js b/packages/seedless-onboarding-controller/jest.config.js index ff67b94d816..0208f2f0d28 100644 --- a/packages/seedless-onboarding-controller/jest.config.js +++ b/packages/seedless-onboarding-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/selected-network-controller/jest.config.js b/packages/selected-network-controller/jest.config.js index e6b243e9a43..0c2ab744b92 100644 --- a/packages/selected-network-controller/jest.config.js +++ b/packages/selected-network-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/sentinel-api-service/jest.config.js b/packages/sentinel-api-service/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/sentinel-api-service/jest.config.js +++ b/packages/sentinel-api-service/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/shield-controller/jest.config.js b/packages/shield-controller/jest.config.js index ae4b5bf5106..2a8a7774d0c 100644 --- a/packages/shield-controller/jest.config.js +++ b/packages/shield-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/signature-controller/jest.config.js b/packages/signature-controller/jest.config.js index 5ff8040ea0b..61399cabd3a 100644 --- a/packages/signature-controller/jest.config.js +++ b/packages/signature-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/smart-transactions-controller/jest.config.js b/packages/smart-transactions-controller/jest.config.js index 04f7610988e..7071f00abc9 100644 --- a/packages/smart-transactions-controller/jest.config.js +++ b/packages/smart-transactions-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/snap-account-service/jest.config.js b/packages/snap-account-service/jest.config.js index 0eb4a09b245..af023e78258 100644 --- a/packages/snap-account-service/jest.config.js +++ b/packages/snap-account-service/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/social-controllers/jest.config.js b/packages/social-controllers/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/social-controllers/jest.config.js +++ b/packages/social-controllers/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/solana-test-validator-up/jest.config.js b/packages/solana-test-validator-up/jest.config.js index fd487307ddd..1fd10c39a0b 100644 --- a/packages/solana-test-validator-up/jest.config.js +++ b/packages/solana-test-validator-up/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/stellar-quickstart-up/jest.config.js b/packages/stellar-quickstart-up/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/stellar-quickstart-up/jest.config.js +++ b/packages/stellar-quickstart-up/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/storage-service/jest.config.js b/packages/storage-service/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/storage-service/jest.config.js +++ b/packages/storage-service/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/subscription-controller/jest.config.js b/packages/subscription-controller/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/subscription-controller/jest.config.js +++ b/packages/subscription-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/transaction-controller/jest.config.js b/packages/transaction-controller/jest.config.js index 636e85e9785..57fd227991a 100644 --- a/packages/transaction-controller/jest.config.js +++ b/packages/transaction-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/transaction-pay-controller/jest.config.js b/packages/transaction-pay-controller/jest.config.js index 363ffd2deb8..6036eeb026e 100644 --- a/packages/transaction-pay-controller/jest.config.js +++ b/packages/transaction-pay-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/user-operation-controller/jest.config.js b/packages/user-operation-controller/jest.config.js index 53362a9b4f2..e16c78443a8 100644 --- a/packages/user-operation-controller/jest.config.js +++ b/packages/user-operation-controller/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/wallet-cli/jest.config.js b/packages/wallet-cli/jest.config.js index 2c7fd279302..7180c8dfe09 100644 --- a/packages/wallet-cli/jest.config.js +++ b/packages/wallet-cli/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/wallet-framework-docs/jest.config.js b/packages/wallet-framework-docs/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/wallet-framework-docs/jest.config.js +++ b/packages/wallet-framework-docs/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/wallet/jest.config.js b/packages/wallet/jest.config.js index ca084133399..52fe484da39 100644 --- a/packages/wallet/jest.config.js +++ b/packages/wallet/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/scripts/create-package/package-template/jest.config.js b/scripts/create-package/package-template/jest.config.js index ca084133399..52fe484da39 100644 --- a/scripts/create-package/package-template/jest.config.js +++ b/scripts/create-package/package-template/jest.config.js @@ -8,7 +8,7 @@ const path = require('path'); const baseConfig = require('../../jest.config.packages'); -const displayName = path.basename(__dirname); +const displayName = path.basename(import.meta.dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/scripts/create-package/utils.ts b/scripts/create-package/utils.ts index 11320073968..2f7f4410fc9 100644 --- a/scripts/create-package/utils.ts +++ b/scripts/create-package/utils.ts @@ -9,8 +9,8 @@ import { MonorepoFiles, Placeholders } from './constants.js'; import type { FileMap } from './fs-utils.js'; import { readAllFiles, writeFiles } from './fs-utils.js'; -const PACKAGE_TEMPLATE_DIR = path.join(__dirname, 'package-template'); -const REPO_ROOT = path.join(__dirname, '..', '..'); +const PACKAGE_TEMPLATE_DIR = path.join(import.meta.dirname, 'package-template'); +const REPO_ROOT = path.join(import.meta.dirname, '..', '..'); const REPO_TS_CONFIG = path.join(REPO_ROOT, MonorepoFiles.TsConfig); const REPO_TS_CONFIG_BUILD = path.join(REPO_ROOT, MonorepoFiles.TsConfigBuild); const REPO_PACKAGE_JSON = path.join(REPO_ROOT, MonorepoFiles.PackageJson); diff --git a/scripts/lint-teams-json.ts b/scripts/lint-teams-json.ts index 3a066ca5f2f..0611c3d7d92 100644 --- a/scripts/lint-teams-json.ts +++ b/scripts/lint-teams-json.ts @@ -29,7 +29,7 @@ async function main(): Promise { }); const teams = await readJsonFile>( - path.resolve(__dirname, '../teams.json'), + path.resolve(import.meta.dirname, '../teams.json'), ); const assignedPackageNames = Object.keys(teams); diff --git a/scripts/manage-codeowners/main.ts b/scripts/manage-codeowners/main.ts index 054312b5f50..406400abba9 100644 --- a/scripts/manage-codeowners/main.ts +++ b/scripts/manage-codeowners/main.ts @@ -8,7 +8,7 @@ import codeownersSections from '../../codeowners.js'; * The path to the generated CODEOWNERS file. */ const CODEOWNERS_FILE_PATH = path.resolve( - __dirname, + import.meta.dirname, '../../.github/CODEOWNERS', ); diff --git a/scripts/update-readme-content.ts b/scripts/update-readme-content.ts index 69f9945ab9d..13f1e109737 100755 --- a/scripts/update-readme-content.ts +++ b/scripts/update-readme-content.ts @@ -15,7 +15,7 @@ const DEPENDENCY_GRAPH_START_MARKER = ''; const DEPENDENCY_GRAPH_END_MARKER = ''; const PACKAGE_LIST_START_MARKER = ''; const PACKAGE_LIST_END_MARKER = ''; -const README_PATH = path.resolve(__dirname, '../README.md'); +const README_PATH = path.resolve(import.meta.dirname, '../README.md'); main().catch((error) => { console.error(error); From b2866bead7645cd3da0f32cf9ba954ae15506c7a Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Thu, 20 Aug 2026 12:25:55 +0200 Subject: [PATCH 06/17] Fix ts-bridge call in CI --- .github/workflows/lint-build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-build-test.yml b/.github/workflows/lint-build-test.yml index 8108f10f004..f231f0b4331 100644 --- a/.github/workflows/lint-build-test.yml +++ b/.github/workflows/lint-build-test.yml @@ -218,7 +218,7 @@ jobs: echo "Building changed packages:" jq -r '"- " + (.references[].path | ltrimstr("./") | rtrimstr("/tsconfig.build.json"))' "$TSCONFIG" echo "" - yarn ts-bridge --project "$TSCONFIG" --verbose + yarn tsc --build --project "$TSCONFIG" --verbose else echo "No packages to build." fi From d98c9919f383adec4693f04524e6707ae7260dea Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Thu, 20 Aug 2026 13:07:10 +0200 Subject: [PATCH 07/17] Fix remaining build errors --- eslint-suppressions.json | 2 +- packages/accounts-controller/src/utils.ts | 4 +++- .../analytics-controller/src/AnalyticsController.ts | 2 +- packages/analytics-controller/src/index.ts | 2 +- packages/assets-controller/src/AssetsController.ts | 2 +- .../src/data-sources/AccountActivityDataSource.ts | 2 +- .../src/data-sources/RpcDataSource.ts | 2 +- .../data-sources/evm-rpc-services/utils/parsing.ts | 2 +- packages/assets-controller/src/selectors/balance.ts | 2 +- .../src/utils/normalizeAmountString.ts | 2 +- .../assets-controller/src/utils/normalizeAssetId.ts | 2 +- .../src/selectors/token-selectors.ts | 8 ++++++-- .../src/bridge-status-controller.ts | 2 +- .../src/scope/constants.ts | 1 + .../keyring-controller/src/KeyringController.ts | 1 + .../money-account-api-data-service/src/index.ts | 2 +- .../src/money-account-api-data-service.ts | 2 +- packages/money-account-balance-service/src/index.ts | 2 +- .../src/money-account-balance-service.ts | 2 +- .../src/requestNormalization.ts | 2 +- .../multichainMethodCallValidatorMiddleware.ts | 4 ++-- .../network-controller/src/create-network-client.ts | 1 + .../src/shared/to-raw-notification.ts | 5 ++--- packages/smart-transactions-controller/package.json | 1 + .../src/SmartTransactionsController.ts | 8 ++++---- .../src/tests/messenger-mock.ts | 7 +++++-- packages/wallet-cli/src/daemon/secrets.ts | 2 +- packages/wallet/src/utilities.ts | 2 +- yarn.lock | 13 +++++++------ 29 files changed, 51 insertions(+), 38 deletions(-) diff --git a/eslint-suppressions.json b/eslint-suppressions.json index cc77f42c19a..eb6623ab1a0 100644 --- a/eslint-suppressions.json +++ b/eslint-suppressions.json @@ -599,7 +599,7 @@ "count": 25 }, "@typescript-eslint/prefer-nullish-coalescing": { - "count": 1 + "count": 2 }, "no-negated-condition": { "count": 1 diff --git a/packages/accounts-controller/src/utils.ts b/packages/accounts-controller/src/utils.ts index 64090871669..e488b3d62ca 100644 --- a/packages/accounts-controller/src/utils.ts +++ b/packages/accounts-controller/src/utils.ts @@ -6,11 +6,13 @@ import type { Infer } from '@metamask/superstruct'; import { is, number, string, type } from '@metamask/superstruct'; import { hexToBytes } from '@metamask/utils'; import { sha256 } from 'ethereum-cryptography/sha256'; -import type { V4Options } from 'uuid'; import { v4 as uuid } from 'uuid'; import type { AccountId } from './AccountsController.js'; +// This is exported by the `uuid` package, but not importable in ESM. +type V4Options = Exclude[0], undefined>; + /** * Returns the name of the keyring type. * diff --git a/packages/analytics-controller/src/AnalyticsController.ts b/packages/analytics-controller/src/AnalyticsController.ts index 085142bba6c..b257cde8cb8 100644 --- a/packages/analytics-controller/src/AnalyticsController.ts +++ b/packages/analytics-controller/src/AnalyticsController.ts @@ -24,7 +24,7 @@ import type { AnalyticsLocationContext, AnalyticsUserTraits, AnalyticsTrackingEvent, -} from './AnalyticsPlatformAdapter.types'; +} from './AnalyticsPlatformAdapter.types.js'; import { analyticsControllerSelectors } from './selectors.js'; // === GENERAL === diff --git a/packages/analytics-controller/src/index.ts b/packages/analytics-controller/src/index.ts index a89cc035e82..fa29064acbe 100644 --- a/packages/analytics-controller/src/index.ts +++ b/packages/analytics-controller/src/index.ts @@ -19,7 +19,7 @@ export type { AnalyticsUserTraits, AnalyticsPlatformAdapter, AnalyticsTrackingEvent, -} from './AnalyticsPlatformAdapter.types'; +} from './AnalyticsPlatformAdapter.types.js'; // Export state types export type { diff --git a/packages/assets-controller/src/AssetsController.ts b/packages/assets-controller/src/AssetsController.ts index 65a2cdba703..229eeb3c404 100644 --- a/packages/assets-controller/src/AssetsController.ts +++ b/packages/assets-controller/src/AssetsController.ts @@ -71,7 +71,7 @@ import { parseCaipChainId, } from '@metamask/utils'; import { Mutex } from 'async-mutex'; -import BigNumberJS from 'bignumber.js'; +import { BigNumber as BigNumberJS } from 'bignumber.js'; import { isEqual } from 'lodash'; import type { AssetsControllerMethodActions } from './AssetsController-method-action-types.js'; diff --git a/packages/assets-controller/src/data-sources/AccountActivityDataSource.ts b/packages/assets-controller/src/data-sources/AccountActivityDataSource.ts index 196af953ac0..a5ef47fdbac 100644 --- a/packages/assets-controller/src/data-sources/AccountActivityDataSource.ts +++ b/packages/assets-controller/src/data-sources/AccountActivityDataSource.ts @@ -5,7 +5,7 @@ import type { } from '@metamask/core-backend'; import type { InternalAccount } from '@metamask/keyring-internal-api'; import { isCaipChainId } from '@metamask/utils'; -import BigNumberJS from 'bignumber.js'; +import { BigNumber as BigNumberJS } from 'bignumber.js'; import type { AssetsControllerMessenger } from '../AssetsController.js'; import { projectLogger, createModuleLogger } from '../logger.js'; diff --git a/packages/assets-controller/src/data-sources/RpcDataSource.ts b/packages/assets-controller/src/data-sources/RpcDataSource.ts index 8b3a7795db2..e9b0670ff05 100644 --- a/packages/assets-controller/src/data-sources/RpcDataSource.ts +++ b/packages/assets-controller/src/data-sources/RpcDataSource.ts @@ -22,7 +22,7 @@ import { KnownCaipNamespace, } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; -import BigNumberJS from 'bignumber.js'; +import { BigNumber as BigNumberJS } from 'bignumber.js'; import type { AssetsControllerGetStateAction, diff --git a/packages/assets-controller/src/data-sources/evm-rpc-services/utils/parsing.ts b/packages/assets-controller/src/data-sources/evm-rpc-services/utils/parsing.ts index dfc9b1922fa..e374149394f 100644 --- a/packages/assets-controller/src/data-sources/evm-rpc-services/utils/parsing.ts +++ b/packages/assets-controller/src/data-sources/evm-rpc-services/utils/parsing.ts @@ -5,7 +5,7 @@ import { parseCaipChainId, } from '@metamask/utils'; import type { CaipChainId, Hex } from '@metamask/utils'; -import BigNumberJS from 'bignumber.js'; +import { BigNumber as BigNumberJS } from 'bignumber.js'; import type { ChainId } from '../types/index.js'; diff --git a/packages/assets-controller/src/selectors/balance.ts b/packages/assets-controller/src/selectors/balance.ts index 752746c8517..d4e18a4b37e 100644 --- a/packages/assets-controller/src/selectors/balance.ts +++ b/packages/assets-controller/src/selectors/balance.ts @@ -9,7 +9,7 @@ import { parseCaipAssetType, parseCaipChainId, } from '@metamask/utils'; -import BigNumberJS from 'bignumber.js'; +import { BigNumber as BigNumberJS } from 'bignumber.js'; import type { AssetsControllerState } from '../AssetsController.js'; import type { diff --git a/packages/assets-controller/src/utils/normalizeAmountString.ts b/packages/assets-controller/src/utils/normalizeAmountString.ts index 69ec0399b4e..337b5150dec 100644 --- a/packages/assets-controller/src/utils/normalizeAmountString.ts +++ b/packages/assets-controller/src/utils/normalizeAmountString.ts @@ -1,4 +1,4 @@ -import BigNumberJS from 'bignumber.js'; +import { BigNumber as BigNumberJS } from 'bignumber.js'; /** * Normalize an asset balance `amount` string into a canonical plain-decimal diff --git a/packages/assets-controller/src/utils/normalizeAssetId.ts b/packages/assets-controller/src/utils/normalizeAssetId.ts index 6a3563dc89e..0d30676efeb 100644 --- a/packages/assets-controller/src/utils/normalizeAssetId.ts +++ b/packages/assets-controller/src/utils/normalizeAssetId.ts @@ -1,7 +1,7 @@ import { toChecksumAddress } from '@ethereumjs/util'; import { parseCaipAssetType, parseCaipChainId } from '@metamask/utils'; import type { MemoizedFunction } from 'lodash'; -import memoize from 'lodash/memoize'; +import { memoize } from 'lodash'; import type { Caip19AssetId } from '../types.js'; diff --git a/packages/assets-controllers/src/selectors/token-selectors.ts b/packages/assets-controllers/src/selectors/token-selectors.ts index 4dc85e8ef72..d3a9264c620 100644 --- a/packages/assets-controllers/src/selectors/token-selectors.ts +++ b/packages/assets-controllers/src/selectors/token-selectors.ts @@ -8,7 +8,6 @@ import type { NetworkState } from '@metamask/network-controller'; import { hexToBigInt, parseCaipAssetType } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; import { createSelector, weakMapMemoize } from 'reselect'; -import { TokenRwaData } from 'src/token-service'; import { shouldIncludeNativeToken } from '../constants.js'; import type { CurrencyRateState } from '../CurrencyRateController.js'; @@ -16,6 +15,7 @@ import type { MultichainAssetsControllerState } from '../MultichainAssetsControl import type { MultichainAssetsRatesControllerState } from '../MultichainAssetsRatesController/index.js'; import type { MultichainBalancesControllerState } from '../MultichainBalancesController/index.js'; import { getNativeTokenAddress } from '../token-prices-service/codefi-v2.js'; +import { TokenRwaData } from '../token-service.js'; import type { TokenBalancesControllerState } from '../TokenBalancesController.js'; import type { Token, @@ -461,7 +461,11 @@ const selectAllMultichainAssets = createAssetListSelector( }, ); -export const selectAllAssets = createAssetListSelector( +// TS2742: The inferred type of 'selectAllAssets' cannot be named without a +// reference to '../../../../node_modules/@metamask/account-tree-controller/dist/wallet.js'. +// This is likely not portable. A type annotation is necessary. +// eslint-disable-next-line @typescript-eslint/no-explicit-any +export const selectAllAssets: any = createAssetListSelector( [ selectAllEvmAssets, selectAllMultichainAssets, diff --git a/packages/bridge-status-controller/src/bridge-status-controller.ts b/packages/bridge-status-controller/src/bridge-status-controller.ts index 02e7b754b96..a3dac062592 100644 --- a/packages/bridge-status-controller/src/bridge-status-controller.ts +++ b/packages/bridge-status-controller/src/bridge-status-controller.ts @@ -36,7 +36,7 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import { numberToHex } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; -import { IntentManager } from './bridge-status-controller.intent'; +import { IntentManager } from './bridge-status-controller.intent.js'; import { ALLOWED_FEATURE_IDS_FOR_STATUS_EVENTS, BRIDGE_PROD_API_BASE_URL, diff --git a/packages/chain-agnostic-permission/src/scope/constants.ts b/packages/chain-agnostic-permission/src/scope/constants.ts index cc6f6a5977b..206c4f0cc31 100644 --- a/packages/chain-agnostic-permission/src/scope/constants.ts +++ b/packages/chain-agnostic-permission/src/scope/constants.ts @@ -54,6 +54,7 @@ export const Eip1193OnlyMethods = [ /** * All MetaMask methods, except for ones we have specified in the constants above. */ +// @ts-expect-error: TODO: `api-specs` is not supported in ESM. const Eip155Methods = MetaMaskOpenRPCDocument.methods .map(({ name }: { name: string }) => name) .filter((method: string) => !WalletEip155Methods.includes(method)) diff --git a/packages/keyring-controller/src/KeyringController.ts b/packages/keyring-controller/src/KeyringController.ts index 1fbf8426ff4..799c990961a 100644 --- a/packages/keyring-controller/src/KeyringController.ts +++ b/packages/keyring-controller/src/KeyringController.ts @@ -1376,6 +1376,7 @@ export class KeyringController< try { wallet = importers.fromEtherWallet(input, password); } catch { + // @ts-expect-error: Wallet.fromV3 does not exist? wallet = wallet ?? (await Wallet.fromV3(input, password, true)); } privateKey = bytesToHex(new Uint8Array(wallet.getPrivateKey())); diff --git a/packages/money-account-api-data-service/src/index.ts b/packages/money-account-api-data-service/src/index.ts index bf60cee5d1c..10efdcbc672 100644 --- a/packages/money-account-api-data-service/src/index.ts +++ b/packages/money-account-api-data-service/src/index.ts @@ -25,7 +25,7 @@ export type { DataFreshness, CashFlowType, CashFlowSource, -} from './response.types'; +} from './response.types.js'; export type { InterestWindow, InterestOptions, diff --git a/packages/money-account-api-data-service/src/money-account-api-data-service.ts b/packages/money-account-api-data-service/src/money-account-api-data-service.ts index f559b416c75..e62a99693b1 100644 --- a/packages/money-account-api-data-service/src/money-account-api-data-service.ts +++ b/packages/money-account-api-data-service/src/money-account-api-data-service.ts @@ -29,7 +29,7 @@ import type { InterestResponse, PositionResponse, RateHistoryResponse, -} from './response.types'; +} from './response.types.js'; import { HistoryResponseStruct, InterestResponseStruct, diff --git a/packages/money-account-balance-service/src/index.ts b/packages/money-account-balance-service/src/index.ts index 2690bdd4782..4a9fae6229c 100644 --- a/packages/money-account-balance-service/src/index.ts +++ b/packages/money-account-balance-service/src/index.ts @@ -22,7 +22,7 @@ export type { MoneyAccountBalanceResponse, MusdEquivalentValueResponse, NormalizedVaultApyResponse, -} from './response.types'; +} from './response.types.js'; export type { BalanceSource, BalanceSourcePolicy } from './constants.js'; export { BALANCE_SOURCE_POLICIES, diff --git a/packages/money-account-balance-service/src/money-account-balance-service.ts b/packages/money-account-balance-service/src/money-account-balance-service.ts index 33f1cb70e75..291f6149325 100644 --- a/packages/money-account-balance-service/src/money-account-balance-service.ts +++ b/packages/money-account-balance-service/src/money-account-balance-service.ts @@ -62,7 +62,7 @@ import type { MoneyAccountBalanceResponse, MusdEquivalentValueResponse, NormalizedVaultApyResponse, -} from './response.types'; +} from './response.types.js'; import { VaultApyRawResponseStruct, VaultConfigStruct } from './structs.js'; import type { VaultConfig } from './types.js'; diff --git a/packages/money-account-balance-service/src/requestNormalization.ts b/packages/money-account-balance-service/src/requestNormalization.ts index 88ca9f1f4a4..b06c180266e 100644 --- a/packages/money-account-balance-service/src/requestNormalization.ts +++ b/packages/money-account-balance-service/src/requestNormalization.ts @@ -1,6 +1,6 @@ import { Infer } from '@metamask/superstruct'; -import type { NormalizedVaultApyResponse } from './response.types'; +import type { NormalizedVaultApyResponse } from './response.types.js'; import { VaultApyRawResponseStruct } from './structs.js'; import { convertAprToApy } from './utils.js'; diff --git a/packages/multichain-api-middleware/src/middlewares/multichainMethodCallValidatorMiddleware.ts b/packages/multichain-api-middleware/src/middlewares/multichainMethodCallValidatorMiddleware.ts index 77977930849..b87819364c6 100644 --- a/packages/multichain-api-middleware/src/middlewares/multichainMethodCallValidatorMiddleware.ts +++ b/packages/multichain-api-middleware/src/middlewares/multichainMethodCallValidatorMiddleware.ts @@ -9,8 +9,8 @@ import type { OpenrpcDocument, ReferenceObject, } from '@open-rpc/meta-schema'; -import dereferenceDocument from '@open-rpc/schema-utils-js/build/dereference-document'; -import { makeCustomResolver } from '@open-rpc/schema-utils-js/build/parse-open-rpc-document'; +import { dereferenceDocument } from '@open-rpc/schema-utils-js'; +import { makeCustomResolver } from '@open-rpc/schema-utils-js/build/parse-open-rpc-document.js'; import type { Schema, ValidationError } from 'jsonschema'; import { Validator } from 'jsonschema'; diff --git a/packages/network-controller/src/create-network-client.ts b/packages/network-controller/src/create-network-client.ts index c83df15bc59..68f12217703 100644 --- a/packages/network-controller/src/create-network-client.ts +++ b/packages/network-controller/src/create-network-client.ts @@ -173,6 +173,7 @@ export function createNetworkClient({ if (configuration.type === NetworkClientType.Infura) { rpcApiMiddleware = asV2Middleware( createInfuraMiddleware({ + // @ts-expect-error: Type mismatch. rpcService: rpcServiceChain, options: { source: 'metamask', diff --git a/packages/notification-services-controller/src/shared/to-raw-notification.ts b/packages/notification-services-controller/src/shared/to-raw-notification.ts index 9363964500a..ef9d159e3f2 100644 --- a/packages/notification-services-controller/src/shared/to-raw-notification.ts +++ b/packages/notification-services-controller/src/shared/to-raw-notification.ts @@ -1,11 +1,10 @@ +import { TRIGGER_TYPES } from '../NotificationServicesController/constants/notification-schema.js'; import type { UnprocessedRawNotification, NormalisedAPINotification, OnChainRawNotification, PlatformRawNotification, -} from 'src/NotificationServicesController/types/notification-api'; - -import { TRIGGER_TYPES } from '../NotificationServicesController/constants/notification-schema.js'; +} from '../NotificationServicesController/types/notification-api/index.js'; import { isOnChainNotification } from './notification-api-type-guards.js'; /** diff --git a/packages/smart-transactions-controller/package.json b/packages/smart-transactions-controller/package.json index 84ca97869f0..b8c4958f932 100644 --- a/packages/smart-transactions-controller/package.json +++ b/packages/smart-transactions-controller/package.json @@ -65,6 +65,7 @@ "@metamask/transaction-controller": "^69.6.1", "@metamask/utils": "^11.11.0", "bignumber.js": "^9.1.2", + "klona": "^2.0.6", "lodash": "^4.17.21", "reselect": "^5.1.1" }, diff --git a/packages/smart-transactions-controller/src/SmartTransactionsController.ts b/packages/smart-transactions-controller/src/SmartTransactionsController.ts index c5e107f8260..aeb0b9053f2 100644 --- a/packages/smart-transactions-controller/src/SmartTransactionsController.ts +++ b/packages/smart-transactions-controller/src/SmartTransactionsController.ts @@ -34,7 +34,7 @@ import type { } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import cloneDeep from 'lodash/cloneDeep'; +import { klona } from 'klona'; import { API_BASE_URL, @@ -498,9 +498,9 @@ export class SmartTransactionsController extends StaticIntervalPollingController smartTransaction: SmartTransaction, prevSmartTransaction?: SmartTransaction, ) { - let updatedSmartTransaction = cloneDeep(smartTransaction); + let updatedSmartTransaction = klona(smartTransaction); updatedSmartTransaction = { - ...cloneDeep(prevSmartTransaction), + ...klona(prevSmartTransaction), ...updatedSmartTransaction, }; @@ -646,7 +646,7 @@ export class SmartTransactionsController extends StaticIntervalPollingController stx.txParams?.nonce === smartTransaction.txParams?.nonce && stx.status?.startsWith('cancelled'), ); - const snapshot = cloneDeep(smartTransaction); + const snapshot = klona(smartTransaction); const history = [snapshot]; const historifiedSmartTransaction = { ...smartTransaction, history }; const nextSmartTransactions = diff --git a/packages/transaction-pay-controller/src/tests/messenger-mock.ts b/packages/transaction-pay-controller/src/tests/messenger-mock.ts index f81bbf7516d..96fd295e4be 100644 --- a/packages/transaction-pay-controller/src/tests/messenger-mock.ts +++ b/packages/transaction-pay-controller/src/tests/messenger-mock.ts @@ -46,10 +46,13 @@ type RootMessenger = Messenger; * @param options.skipRegister - Whether to skip registering action handlers. * @returns The mock messenger and associated mock functions. */ -// eslint-disable-next-line @typescript-eslint/explicit-function-return-type +// TS2742: The inferred type of 'getMessengerMock' cannot be named without a +// reference to '../../../../node_modules/@metamask/transaction-controller/dist/utils/gas.js'. +// This is likely not portable. A type annotation is necessary. export function getMessengerMock({ skipRegister, -}: { skipRegister?: boolean } = {}) { + // eslint-disable-next-line @typescript-eslint/no-explicit-any +}: { skipRegister?: boolean } = {}): any { const getControllerStateMock: jest.MockedFn< TransactionPayControllerGetStateAction['handler'] > = jest.fn(); diff --git a/packages/wallet-cli/src/daemon/secrets.ts b/packages/wallet-cli/src/daemon/secrets.ts index af64973c49a..fad3bb512de 100644 --- a/packages/wallet-cli/src/daemon/secrets.ts +++ b/packages/wallet-cli/src/daemon/secrets.ts @@ -1,5 +1,5 @@ import { validateMnemonic } from '@metamask/scure-bip39'; -import { wordlist } from '@metamask/scure-bip39/dist/wordlists/english'; +import { wordlist } from '@metamask/scure-bip39/dist/wordlists/english.js'; const REDACTED = '[redacted]'; diff --git a/packages/wallet/src/utilities.ts b/packages/wallet/src/utilities.ts index 360d73f2bc2..ad02ef2c489 100644 --- a/packages/wallet/src/utilities.ts +++ b/packages/wallet/src/utilities.ts @@ -1,4 +1,4 @@ -import { wordlist } from '@metamask/scure-bip39/dist/wordlists/english'; +import { wordlist } from '@metamask/scure-bip39/dist/wordlists/english.js'; import { Wallet } from './Wallet.js'; diff --git a/yarn.lock b/yarn.lock index e904ef8c19d..918bf140a36 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6234,7 +6234,7 @@ __metadata: typedoc-plugin-missing-exports: "npm:^2.0.0" typescript: "npm:~5.3.3" bin: - bitcoin-regtest-up: ./dist/bin/bitcoin-regtest-up.mjs + bitcoin-regtest-up: ./dist/bin/bitcoin-regtest-up.js languageName: unknown linkType: soft @@ -7305,7 +7305,7 @@ __metadata: yargs: "npm:^17.7.2" yargs-parser: "npm:^21.1.1" bin: - mm-foundryup: ./dist/cli.mjs + mm-foundryup: ./dist/cli.js languageName: unknown linkType: soft @@ -7407,7 +7407,7 @@ __metadata: typedoc-plugin-missing-exports: "npm:^2.0.0" typescript: "npm:~5.3.3" bin: - java-tron-up: ./dist/bin/java-tron-up.mjs + java-tron-up: ./dist/bin/java-tron-up.js languageName: unknown linkType: soft @@ -7731,7 +7731,7 @@ __metadata: prettier: optional: true bin: - messenger-action-types: ./dist/cli.mjs + messenger-action-types: ./dist/cli.js languageName: unknown linkType: soft @@ -8427,7 +8427,7 @@ __metadata: typescript: "npm:~5.3.3" yargs: "npm:^17.7.2" bin: - platform-api-docs: ./dist/cli.mjs + platform-api-docs: ./dist/cli.js languageName: unknown linkType: soft @@ -8917,6 +8917,7 @@ __metadata: bignumber.js: "npm:^9.1.2" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" + klona: "npm:^2.0.6" lodash: "npm:^4.17.21" nock: "npm:^13.3.1" reselect: "npm:^5.1.1" @@ -9110,7 +9111,7 @@ __metadata: typedoc-plugin-missing-exports: "npm:^2.0.0" typescript: "npm:~5.3.3" bin: - solana-test-validator-up: ./dist/bin/solana-test-validator-up.mjs + solana-test-validator-up: ./dist/bin/solana-test-validator-up.js languageName: unknown linkType: soft From 95d9950c68b4f11c9270d21162aba64a15cad0fd Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Thu, 16 Jul 2026 16:50:07 +0200 Subject: [PATCH 08/17] Work around TypeScript ESM named-import issue in messenger-cli Older versions of TypeScript break when using named imports in ESM. Import the default export and destructure instead as a temporary workaround. Also passes `--formatter oxfmt` to the `messenger-action-types` scripts in packages missing it. --- packages/authenticated-user-storage/package.json | 4 ++-- packages/messenger-cli/src/parse-source.ts | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/authenticated-user-storage/package.json b/packages/authenticated-user-storage/package.json index 25426bb0335..df9ce335854 100644 --- a/packages/authenticated-user-storage/package.json +++ b/packages/authenticated-user-storage/package.json @@ -39,8 +39,8 @@ "changelog:validate": "../../scripts/validate-changelog.sh @metamask/authenticated-user-storage", "lint:tsconfigs": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts", "lint:tsconfigs:fix": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts --fix", - "messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --esm --check", - "messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --esm --generate", + "messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --check", + "messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --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", diff --git a/packages/messenger-cli/src/parse-source.ts b/packages/messenger-cli/src/parse-source.ts index 133ad6ce361..afda5b13c4a 100644 --- a/packages/messenger-cli/src/parse-source.ts +++ b/packages/messenger-cli/src/parse-source.ts @@ -10,7 +10,12 @@ import type { SourceFile, Type, } from 'typescript'; -import { +import typescript from 'typescript'; + +// Older versions of TypeScript break when importing directly in ESM. This is a +// temporary workaround +/* eslint-disable import-x/no-named-as-default-member */ +const { ScriptTarget, createProgram, createSourceFile, @@ -28,7 +33,8 @@ import { parseJsonConfigFileContent, readConfigFile, sys, -} from 'typescript'; +} = typescript; +/* eslint-enable import-x/no-named-as-default-member */ export type MethodInfo = { name: string; From 7952c06c3f3499121ffa3103c876af194b340a8d Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Mon, 24 Aug 2026 21:15:44 +0200 Subject: [PATCH 09/17] Run Jest as CommonJS against the ESM sources Adding `"type": "module"` to every package made each `jest.config.js` an ES module, so the `require` and `module.exports` they are written with no longer resolved and Jest could not start at all. Rather than convert the test setup to ESM, the configs move to `.cjs` and Jest keeps running as CommonJS. A `ts-jest` transform override compiles the sources to CommonJS for tests only, which leaves the published build untouched. This works because Jest treats TypeScript as ESM only when the extension is listed in `extensionsToTreatAsEsm`, which it is not here. Keeping the tests on CommonJS avoids importing `jest` from `@jest/globals` in every test file, swapping `lodash` for `lodash-es`, and rewriting `jest.mock` calls as `jest.unstable_mockModule`. It also resolves the failures where an external CommonJS dependency could not `require()` a monorepo package that had become ESM-only. The trade-off is that the suite exercises CommonJS while the packages ship ESM, so genuinely ESM-only problems are caught by the build and type checks rather than by the tests. --- eslint-suppressions.json | 2 +- eslint.config.mjs | 6 +-- ...ig.packages.js => jest.config.packages.cjs | 17 +++++++- ...nfig.scripts.js => jest.config.scripts.cjs | 0 package.json | 2 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../jest.config.cjs} | 2 +- .../jest.config.js | 26 ------------ .../jest.config.cjs} | 4 +- .../jest.config.cjs} | 4 +- .../jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 6 +-- ...st.environment.js => jest.environment.cjs} | 0 .../jest.config.cjs | 26 ++++++++++++ .../authenticated-user-storage/jest.config.js | 26 ------------ packages/base-controller/jest.config.cjs | 26 ++++++++++++ packages/base-controller/jest.config.js | 26 ------------ .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- packages/build-utils/jest.config.cjs | 26 ++++++++++++ packages/build-utils/jest.config.js | 26 ------------ .../{jest.config.js => jest.config.cjs} | 4 +- packages/chomp-api-service/jest.config.cjs | 26 ++++++++++++ packages/chomp-api-service/jest.config.js | 26 ------------ packages/claims-controller/jest.config.cjs | 26 ++++++++++++ packages/claims-controller/jest.config.js | 26 ------------ .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../compliance-controller/jest.config.cjs | 26 ++++++++++++ packages/compliance-controller/jest.config.js | 26 ------------ .../composable-controller/jest.config.cjs | 26 ++++++++++++ packages/composable-controller/jest.config.js | 26 ------------ .../jest.config.cjs | 26 ++++++++++++ .../config-registry-controller/jest.config.js | 26 ------------ .../connectivity-controller/jest.config.cjs | 26 ++++++++++++ .../connectivity-controller/jest.config.js | 26 ------------ .../{jest.config.js => jest.config.cjs} | 6 +-- ...st.environment.js => jest.environment.cjs} | 0 .../{jest.config.js => jest.config.cjs} | 4 +- .../delegation-controller/jest.config.cjs | 26 ++++++++++++ packages/delegation-controller/jest.config.js | 26 ------------ .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../jest.config.cjs | 26 ++++++++++++ .../jest.config.js | 26 ------------ .../jest.config.cjs | 26 ++++++++++++ .../jest.config.js | 26 ------------ .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- packages/eth-json-rpc-middleware/package.json | 1 + .../eth-json-rpc-provider/jest.config.cjs | 26 ++++++++++++ packages/eth-json-rpc-provider/jest.config.js | 26 ------------ .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../geolocation-controller/jest.config.cjs | 26 ++++++++++++ .../geolocation-controller/jest.config.js | 26 ------------ .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- packages/kyc-controller/jest.config.cjs | 26 ++++++++++++ packages/kyc-controller/jest.config.js | 26 ------------ .../{jest.config.js => jest.config.cjs} | 4 +- packages/logging-controller/jest.config.cjs | 26 ++++++++++++ packages/logging-controller/jest.config.js | 26 ------------ packages/message-manager/jest.config.cjs | 26 ++++++++++++ packages/message-manager/jest.config.js | 26 ------------ packages/messenger-cli/jest.config.cjs | 42 +++++++++++++++++++ packages/messenger-cli/jest.config.js | 29 ------------- packages/messenger-cli/package.json | 1 + packages/messenger-cli/src/check.test.ts | 29 +++++++++---- packages/messenger-cli/src/cli.test.ts | 3 +- packages/messenger-cli/src/fix.test.ts | 9 +++- .../messenger-cli/src/parse-source.test.ts | 13 ++++-- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../money-account-controller/jest.config.cjs | 26 ++++++++++++ .../money-account-controller/jest.config.js | 26 ------------ .../{jest.config.js => jest.config.cjs} | 4 +- packages/money-account-utils/jest.config.cjs | 26 ++++++++++++ .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- packages/name-controller/jest.config.cjs | 26 ++++++++++++ packages/name-controller/jest.config.js | 26 ------------ .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 6 +-- ...st.environment.js => jest.environment.cjs} | 0 .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../permission-log-controller/jest.config.cjs | 26 ++++++++++++ .../permission-log-controller/jest.config.js | 26 ------------ .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- packages/platform-api-docs/src/cli.test.ts | 6 +-- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../profile-metrics-controller/tsconfig.json | 2 +- .../{jest.config.js => jest.config.cjs} | 6 +-- ...st.environment.js => jest.environment.cjs} | 0 .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- packages/sample-controllers/jest.config.cjs | 26 ++++++++++++ packages/sample-controllers/jest.config.js | 26 ------------ packages/sample-controllers/tsconfig.json | 2 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- packages/sentinel-api-service/jest.config.cjs | 26 ++++++++++++ packages/sentinel-api-service/jest.config.js | 26 ------------ .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- packages/social-controllers/jest.config.cjs | 26 ++++++++++++ packages/social-controllers/jest.config.js | 26 ------------ .../{jest.config.js => jest.config.cjs} | 4 +- .../stellar-quickstart-up/jest.config.cjs | 26 ++++++++++++ packages/stellar-quickstart-up/jest.config.js | 26 ------------ packages/storage-service/jest.config.cjs | 26 ++++++++++++ packages/storage-service/jest.config.js | 26 ------------ .../subscription-controller/jest.config.cjs | 26 ++++++++++++ .../subscription-controller/jest.config.js | 26 ------------ .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 4 +- .../{jest.config.js => jest.config.cjs} | 6 +-- ...jest.config.e2e.js => jest.config.e2e.cjs} | 4 +- ...st.environment.js => jest.environment.cjs} | 0 packages/wallet-cli/package.json | 2 +- .../wallet-cli/src/daemon/prompts.test.ts | 13 +++--- .../wallet-framework-docs/jest.config.cjs | 26 ++++++++++++ packages/wallet-framework-docs/jest.config.js | 26 ------------ packages/wallet/jest.config.cjs | 26 ++++++++++++ packages/wallet/jest.config.js | 26 ------------ .../package-template/jest.config.cjs | 26 ++++++++++++ .../package-template/jest.config.js | 26 ------------ tsconfig.packages.json | 2 +- yarn.lock | 2 + 154 files changed, 1044 insertions(+), 983 deletions(-) rename jest.config.packages.js => jest.config.packages.cjs (93%) rename jest.config.scripts.js => jest.config.scripts.cjs (100%) rename packages/account-tree-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/accounts-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/address-book-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/ai-controllers/{jest.config.js => jest.config.cjs} (79%) rename packages/analytics-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/{money-account-utils/jest.config.js => analytics-data-regulation-controller/jest.config.cjs} (90%) delete mode 100644 packages/analytics-data-regulation-controller/jest.config.js rename packages/{approval-controller/jest.config.js => announcement-controller/jest.config.cjs} (82%) rename packages/{announcement-controller/jest.config.js => app-metadata-controller/jest.config.cjs} (82%) rename packages/{app-metadata-controller/jest.config.js => approval-controller/jest.config.cjs} (82%) rename packages/assets-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/assets-controllers/{jest.config.js => jest.config.cjs} (82%) rename packages/assets-controllers/{jest.environment.js => jest.environment.cjs} (100%) create mode 100644 packages/authenticated-user-storage/jest.config.cjs delete mode 100644 packages/authenticated-user-storage/jest.config.js create mode 100644 packages/base-controller/jest.config.cjs delete mode 100644 packages/base-controller/jest.config.js rename packages/base-data-service/{jest.config.js => jest.config.cjs} (82%) rename packages/bitcoin-regtest-up/{jest.config.js => jest.config.cjs} (86%) rename packages/bridge-controller/{jest.config.js => jest.config.cjs} (87%) rename packages/bridge-status-controller/{jest.config.js => jest.config.cjs} (90%) create mode 100644 packages/build-utils/jest.config.cjs delete mode 100644 packages/build-utils/jest.config.js rename packages/chain-agnostic-permission/{jest.config.js => jest.config.cjs} (82%) create mode 100644 packages/chomp-api-service/jest.config.cjs delete mode 100644 packages/chomp-api-service/jest.config.js create mode 100644 packages/claims-controller/jest.config.cjs delete mode 100644 packages/claims-controller/jest.config.js rename packages/client-controller/{jest.config.js => jest.config.cjs} (79%) rename packages/client-utils/{jest.config.js => jest.config.cjs} (86%) create mode 100644 packages/compliance-controller/jest.config.cjs delete mode 100644 packages/compliance-controller/jest.config.js create mode 100644 packages/composable-controller/jest.config.cjs delete mode 100644 packages/composable-controller/jest.config.js create mode 100644 packages/config-registry-controller/jest.config.cjs delete mode 100644 packages/config-registry-controller/jest.config.js create mode 100644 packages/connectivity-controller/jest.config.cjs delete mode 100644 packages/connectivity-controller/jest.config.js rename packages/controller-utils/{jest.config.js => jest.config.cjs} (77%) rename packages/controller-utils/{jest.environment.js => jest.environment.cjs} (100%) rename packages/core-backend/{jest.config.js => jest.config.cjs} (85%) create mode 100644 packages/delegation-controller/jest.config.cjs delete mode 100644 packages/delegation-controller/jest.config.js rename packages/earn-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/eip-5792-middleware/{jest.config.js => jest.config.cjs} (82%) create mode 100644 packages/eip-7702-internal-rpc-middleware/jest.config.cjs delete mode 100644 packages/eip-7702-internal-rpc-middleware/jest.config.js create mode 100644 packages/eip1193-permission-middleware/jest.config.cjs delete mode 100644 packages/eip1193-permission-middleware/jest.config.js rename packages/eth-block-tracker/{jest.config.js => jest.config.cjs} (82%) rename packages/eth-json-rpc-middleware/{jest.config.js => jest.config.cjs} (85%) create mode 100644 packages/eth-json-rpc-provider/jest.config.cjs delete mode 100644 packages/eth-json-rpc-provider/jest.config.js rename packages/foundryup/{jest.config.js => jest.config.cjs} (82%) rename packages/gas-fee-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/gator-permissions-controller/{jest.config.js => jest.config.cjs} (82%) create mode 100644 packages/geolocation-controller/jest.config.cjs delete mode 100644 packages/geolocation-controller/jest.config.js rename packages/java-tron-up/{jest.config.js => jest.config.cjs} (86%) rename packages/json-rpc-engine/{jest.config.js => jest.config.cjs} (82%) rename packages/json-rpc-middleware-stream/{jest.config.js => jest.config.cjs} (82%) rename packages/keyring-controller/{jest.config.js => jest.config.cjs} (82%) create mode 100644 packages/kyc-controller/jest.config.cjs delete mode 100644 packages/kyc-controller/jest.config.js rename packages/local-node-utils/{jest.config.js => jest.config.cjs} (82%) create mode 100644 packages/logging-controller/jest.config.cjs delete mode 100644 packages/logging-controller/jest.config.js create mode 100644 packages/message-manager/jest.config.cjs delete mode 100644 packages/message-manager/jest.config.js create mode 100644 packages/messenger-cli/jest.config.cjs delete mode 100644 packages/messenger-cli/jest.config.js rename packages/messenger/{jest.config.js => jest.config.cjs} (85%) rename packages/money-account-api-data-service/{jest.config.js => jest.config.cjs} (77%) rename packages/money-account-balance-service/{jest.config.js => jest.config.cjs} (77%) create mode 100644 packages/money-account-controller/jest.config.cjs delete mode 100644 packages/money-account-controller/jest.config.js rename packages/money-account-upgrade-controller/{jest.config.js => jest.config.cjs} (77%) create mode 100644 packages/money-account-utils/jest.config.cjs rename packages/multichain-account-service/{jest.config.js => jest.config.cjs} (84%) rename packages/multichain-api-middleware/{jest.config.js => jest.config.cjs} (82%) rename packages/multichain-network-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/multichain-transactions-controller/{jest.config.js => jest.config.cjs} (82%) create mode 100644 packages/name-controller/jest.config.cjs delete mode 100644 packages/name-controller/jest.config.js rename packages/network-connection-banner-controller/{jest.config.js => jest.config.cjs} (85%) rename packages/network-controller/{jest.config.js => jest.config.cjs} (86%) rename packages/network-enablement-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/notification-services-controller/{jest.config.js => jest.config.cjs} (81%) rename packages/notification-services-controller/{jest.environment.js => jest.environment.cjs} (100%) rename packages/passkey-controller/{jest.config.js => jest.config.cjs} (69%) rename packages/permission-controller/{jest.config.js => jest.config.cjs} (82%) create mode 100644 packages/permission-log-controller/jest.config.cjs delete mode 100644 packages/permission-log-controller/jest.config.js rename packages/perps-controller/{jest.config.js => jest.config.cjs} (88%) rename packages/phishing-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/platform-api-docs/{jest.config.js => jest.config.cjs} (85%) rename packages/polling-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/preferences-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/profile-metrics-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/profile-sync-controller/{jest.config.js => jest.config.cjs} (81%) rename packages/profile-sync-controller/{jest.environment.js => jest.environment.cjs} (100%) rename packages/ramps-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/rate-limit-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/react-data-query/{jest.config.js => jest.config.cjs} (85%) rename packages/remote-feature-flag-controller/{jest.config.js => jest.config.cjs} (82%) create mode 100644 packages/sample-controllers/jest.config.cjs delete mode 100644 packages/sample-controllers/jest.config.js rename packages/seedless-onboarding-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/selected-network-controller/{jest.config.js => jest.config.cjs} (85%) create mode 100644 packages/sentinel-api-service/jest.config.cjs delete mode 100644 packages/sentinel-api-service/jest.config.js rename packages/shield-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/signature-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/smart-transactions-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/snap-account-service/{jest.config.js => jest.config.cjs} (82%) create mode 100644 packages/social-controllers/jest.config.cjs delete mode 100644 packages/social-controllers/jest.config.js rename packages/solana-test-validator-up/{jest.config.js => jest.config.cjs} (86%) create mode 100644 packages/stellar-quickstart-up/jest.config.cjs delete mode 100644 packages/stellar-quickstart-up/jest.config.js create mode 100644 packages/storage-service/jest.config.cjs delete mode 100644 packages/storage-service/jest.config.js create mode 100644 packages/subscription-controller/jest.config.cjs delete mode 100644 packages/subscription-controller/jest.config.js rename packages/transaction-controller/{jest.config.js => jest.config.cjs} (84%) rename packages/transaction-pay-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/user-operation-controller/{jest.config.js => jest.config.cjs} (82%) rename packages/wallet-cli/{jest.config.js => jest.config.cjs} (88%) rename packages/wallet-cli/{jest.config.e2e.js => jest.config.e2e.cjs} (87%) rename packages/wallet-cli/{jest.environment.js => jest.environment.cjs} (100%) create mode 100644 packages/wallet-framework-docs/jest.config.cjs delete mode 100644 packages/wallet-framework-docs/jest.config.js create mode 100644 packages/wallet/jest.config.cjs delete mode 100644 packages/wallet/jest.config.js create mode 100644 scripts/create-package/package-template/jest.config.cjs delete mode 100644 scripts/create-package/package-template/jest.config.js diff --git a/eslint-suppressions.json b/eslint-suppressions.json index eb6623ab1a0..a2ee9b234d1 100644 --- a/eslint-suppressions.json +++ b/eslint-suppressions.json @@ -195,7 +195,7 @@ "count": 1 } }, - "packages/assets-controllers/jest.environment.js": { + "packages/assets-controllers/jest.environment.cjs": { "n/prefer-global/text-decoder": { "count": 1 }, diff --git a/eslint.config.mjs b/eslint.config.mjs index 297616d0ddb..5b6daf17bf9 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -125,7 +125,7 @@ const config = createConfig([ extends: [nodejs], }, { - files: ['**/*.{js,cjs}'], + files: ['**/*.cjs'], languageOptions: { sourceType: 'script', ecmaVersion: 2020, @@ -221,14 +221,14 @@ const config = createConfig([ }, }, { - files: ['**/jest.environment.js'], + files: ['**/jest.environment.cjs'], rules: { // These files run under Node, and thus `require(...)` is expected. 'n/global-require': 'off', }, }, { - files: ['**/*.mjs'], + files: ['**/*.js', '**/*.mjs'], languageOptions: { sourceType: 'module', }, diff --git a/jest.config.packages.js b/jest.config.packages.cjs similarity index 93% rename from jest.config.packages.js rename to jest.config.packages.cjs index a3e1943acaf..015459f09a0 100644 --- a/jest.config.packages.js +++ b/jest.config.packages.cjs @@ -190,7 +190,22 @@ module.exports = { // testURL: "http://localhost", // A map from regular expressions to paths to transformers - // transform: undefined, + // The packages are ESM, but Jest runs the tests as CommonJS: Jest only + // treats TypeScript as ESM when the extension is listed in + // `extensionsToTreatAsEsm`, so overriding the module settings here compiles + // the sources to CommonJS for tests without affecting the published build. + transform: { + '^.+\\.tsx?$': [ + 'ts-jest', + { + tsconfig: { + module: 'CommonJS', + moduleResolution: 'Node', + verbatimModuleSyntax: false, + }, + }, + ], + }, // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation // transformIgnorePatterns: undefined diff --git a/jest.config.scripts.js b/jest.config.scripts.cjs similarity index 100% rename from jest.config.scripts.js rename to jest.config.scripts.cjs diff --git a/package.json b/package.json index b2ac25666b2..99c8502b658 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "test": "yarn test:scripts --silent --collectCoverage=false --reporters=jest-silent-reporter && yarn test:scripts:shell && yarn test:packages", "test:clean": "yarn workspaces foreach --all --parallel --verbose run test:clean && yarn test", "test:packages": "yarn test:verbose --silent --collectCoverage=false --reporters=jest-silent-reporter", - "test:scripts": "NODE_OPTIONS=--experimental-vm-modules yarn jest --config ./jest.config.scripts.js --silent", + "test:scripts": "NODE_OPTIONS=--experimental-vm-modules yarn jest --config ./jest.config.scripts.cjs --silent", "test:scripts:shell": "node_modules/bats/bin/bats scripts/*.bats", "test:verbose": "yarn workspaces foreach --all --parallel --verbose run test:verbose", "workspaces:list-versions": "./scripts/list-workspace-versions.sh" diff --git a/packages/account-tree-controller/jest.config.js b/packages/account-tree-controller/jest.config.cjs similarity index 82% rename from packages/account-tree-controller/jest.config.js rename to packages/account-tree-controller/jest.config.cjs index e7ca1a936d6..543a5d9546d 100644 --- a/packages/account-tree-controller/jest.config.js +++ b/packages/account-tree-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/accounts-controller/jest.config.js b/packages/accounts-controller/jest.config.cjs similarity index 82% rename from packages/accounts-controller/jest.config.js rename to packages/accounts-controller/jest.config.cjs index b8ee8a2e785..694b55b218b 100644 --- a/packages/accounts-controller/jest.config.js +++ b/packages/accounts-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/address-book-controller/jest.config.js b/packages/address-book-controller/jest.config.cjs similarity index 82% rename from packages/address-book-controller/jest.config.js rename to packages/address-book-controller/jest.config.cjs index 18e510603aa..3f1909beebd 100644 --- a/packages/address-book-controller/jest.config.js +++ b/packages/address-book-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/ai-controllers/jest.config.js b/packages/ai-controllers/jest.config.cjs similarity index 79% rename from packages/ai-controllers/jest.config.js rename to packages/ai-controllers/jest.config.cjs index 3e6cab4dd05..05bf00fa97e 100644 --- a/packages/ai-controllers/jest.config.js +++ b/packages/ai-controllers/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/analytics-controller/jest.config.js b/packages/analytics-controller/jest.config.cjs similarity index 82% rename from packages/analytics-controller/jest.config.js rename to packages/analytics-controller/jest.config.cjs index 001b10d50fa..6a48a293141 100644 --- a/packages/analytics-controller/jest.config.js +++ b/packages/analytics-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/money-account-utils/jest.config.js b/packages/analytics-data-regulation-controller/jest.config.cjs similarity index 90% rename from packages/money-account-utils/jest.config.js rename to packages/analytics-data-regulation-controller/jest.config.cjs index ca084133399..6456e074bb0 100644 --- a/packages/money-account-utils/jest.config.js +++ b/packages/analytics-data-regulation-controller/jest.config.cjs @@ -6,7 +6,7 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); const displayName = path.basename(__dirname); diff --git a/packages/analytics-data-regulation-controller/jest.config.js b/packages/analytics-data-regulation-controller/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/analytics-data-regulation-controller/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/approval-controller/jest.config.js b/packages/announcement-controller/jest.config.cjs similarity index 82% rename from packages/approval-controller/jest.config.js rename to packages/announcement-controller/jest.config.cjs index 52fe484da39..6456e074bb0 100644 --- a/packages/approval-controller/jest.config.js +++ b/packages/announcement-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/announcement-controller/jest.config.js b/packages/app-metadata-controller/jest.config.cjs similarity index 82% rename from packages/announcement-controller/jest.config.js rename to packages/app-metadata-controller/jest.config.cjs index 52fe484da39..6456e074bb0 100644 --- a/packages/announcement-controller/jest.config.js +++ b/packages/app-metadata-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/app-metadata-controller/jest.config.js b/packages/approval-controller/jest.config.cjs similarity index 82% rename from packages/app-metadata-controller/jest.config.js rename to packages/approval-controller/jest.config.cjs index 52fe484da39..6456e074bb0 100644 --- a/packages/app-metadata-controller/jest.config.js +++ b/packages/approval-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/assets-controller/jest.config.js b/packages/assets-controller/jest.config.cjs similarity index 82% rename from packages/assets-controller/jest.config.js rename to packages/assets-controller/jest.config.cjs index f28dc36764c..64b2076d514 100644 --- a/packages/assets-controller/jest.config.js +++ b/packages/assets-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/assets-controllers/jest.config.js b/packages/assets-controllers/jest.config.cjs similarity index 82% rename from packages/assets-controllers/jest.config.js rename to packages/assets-controllers/jest.config.cjs index 14de52e72b8..71acce83961 100644 --- a/packages/assets-controllers/jest.config.js +++ b/packages/assets-controllers/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects @@ -31,5 +31,5 @@ module.exports = merge(baseConfig, { }, // We rely on `window` to make requests - testEnvironment: '/jest.environment.js', + testEnvironment: '/jest.environment.cjs', }); diff --git a/packages/assets-controllers/jest.environment.js b/packages/assets-controllers/jest.environment.cjs similarity index 100% rename from packages/assets-controllers/jest.environment.js rename to packages/assets-controllers/jest.environment.cjs diff --git a/packages/authenticated-user-storage/jest.config.cjs b/packages/authenticated-user-storage/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/authenticated-user-storage/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/authenticated-user-storage/jest.config.js b/packages/authenticated-user-storage/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/authenticated-user-storage/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/base-controller/jest.config.cjs b/packages/base-controller/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/base-controller/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/base-controller/jest.config.js b/packages/base-controller/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/base-controller/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/base-data-service/jest.config.js b/packages/base-data-service/jest.config.cjs similarity index 82% rename from packages/base-data-service/jest.config.js rename to packages/base-data-service/jest.config.cjs index 3d11ce296d1..abd4f404e7e 100644 --- a/packages/base-data-service/jest.config.js +++ b/packages/base-data-service/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/bitcoin-regtest-up/jest.config.js b/packages/bitcoin-regtest-up/jest.config.cjs similarity index 86% rename from packages/bitcoin-regtest-up/jest.config.js rename to packages/bitcoin-regtest-up/jest.config.cjs index 9bbea3e0ee4..66a7d6269bd 100644 --- a/packages/bitcoin-regtest-up/jest.config.js +++ b/packages/bitcoin-regtest-up/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/bridge-controller/jest.config.js b/packages/bridge-controller/jest.config.cjs similarity index 87% rename from packages/bridge-controller/jest.config.js rename to packages/bridge-controller/jest.config.cjs index 04288d715a4..7955f082f42 100644 --- a/packages/bridge-controller/jest.config.js +++ b/packages/bridge-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/bridge-status-controller/jest.config.js b/packages/bridge-status-controller/jest.config.cjs similarity index 90% rename from packages/bridge-status-controller/jest.config.js rename to packages/bridge-status-controller/jest.config.cjs index 67266cdaa0e..b640a219f3e 100644 --- a/packages/bridge-status-controller/jest.config.js +++ b/packages/bridge-status-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/build-utils/jest.config.cjs b/packages/build-utils/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/build-utils/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/build-utils/jest.config.js b/packages/build-utils/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/build-utils/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/chain-agnostic-permission/jest.config.js b/packages/chain-agnostic-permission/jest.config.cjs similarity index 82% rename from packages/chain-agnostic-permission/jest.config.js rename to packages/chain-agnostic-permission/jest.config.cjs index 9450949c93a..69a3b5bff7f 100644 --- a/packages/chain-agnostic-permission/jest.config.js +++ b/packages/chain-agnostic-permission/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/chomp-api-service/jest.config.cjs b/packages/chomp-api-service/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/chomp-api-service/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/chomp-api-service/jest.config.js b/packages/chomp-api-service/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/chomp-api-service/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/claims-controller/jest.config.cjs b/packages/claims-controller/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/claims-controller/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/claims-controller/jest.config.js b/packages/claims-controller/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/claims-controller/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/client-controller/jest.config.js b/packages/client-controller/jest.config.cjs similarity index 79% rename from packages/client-controller/jest.config.js rename to packages/client-controller/jest.config.cjs index 9d1196b8160..c1fd6a90ef2 100644 --- a/packages/client-controller/jest.config.js +++ b/packages/client-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { displayName, diff --git a/packages/client-utils/jest.config.js b/packages/client-utils/jest.config.cjs similarity index 86% rename from packages/client-utils/jest.config.js rename to packages/client-utils/jest.config.cjs index b80a57946d8..b058defa030 100644 --- a/packages/client-utils/jest.config.js +++ b/packages/client-utils/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/compliance-controller/jest.config.cjs b/packages/compliance-controller/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/compliance-controller/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/compliance-controller/jest.config.js b/packages/compliance-controller/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/compliance-controller/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/composable-controller/jest.config.cjs b/packages/composable-controller/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/composable-controller/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/composable-controller/jest.config.js b/packages/composable-controller/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/composable-controller/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/config-registry-controller/jest.config.cjs b/packages/config-registry-controller/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/config-registry-controller/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/config-registry-controller/jest.config.js b/packages/config-registry-controller/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/config-registry-controller/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/connectivity-controller/jest.config.cjs b/packages/connectivity-controller/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/connectivity-controller/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/connectivity-controller/jest.config.js b/packages/connectivity-controller/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/connectivity-controller/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/controller-utils/jest.config.js b/packages/controller-utils/jest.config.cjs similarity index 77% rename from packages/controller-utils/jest.config.js rename to packages/controller-utils/jest.config.cjs index c1256e3f873..52629c22795 100644 --- a/packages/controller-utils/jest.config.js +++ b/packages/controller-utils/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects @@ -25,5 +25,5 @@ module.exports = merge(baseConfig, { }, // We rely on `window` to make requests - testEnvironment: '/jest.environment.js', + testEnvironment: '/jest.environment.cjs', }); diff --git a/packages/controller-utils/jest.environment.js b/packages/controller-utils/jest.environment.cjs similarity index 100% rename from packages/controller-utils/jest.environment.js rename to packages/controller-utils/jest.environment.cjs diff --git a/packages/core-backend/jest.config.js b/packages/core-backend/jest.config.cjs similarity index 85% rename from packages/core-backend/jest.config.js rename to packages/core-backend/jest.config.cjs index fe6700d9656..5e65933d538 100644 --- a/packages/core-backend/jest.config.js +++ b/packages/core-backend/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/delegation-controller/jest.config.cjs b/packages/delegation-controller/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/delegation-controller/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/delegation-controller/jest.config.js b/packages/delegation-controller/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/delegation-controller/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/earn-controller/jest.config.js b/packages/earn-controller/jest.config.cjs similarity index 82% rename from packages/earn-controller/jest.config.js rename to packages/earn-controller/jest.config.cjs index b1014f160b7..8c056676b43 100644 --- a/packages/earn-controller/jest.config.js +++ b/packages/earn-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/eip-5792-middleware/jest.config.js b/packages/eip-5792-middleware/jest.config.cjs similarity index 82% rename from packages/eip-5792-middleware/jest.config.js rename to packages/eip-5792-middleware/jest.config.cjs index 77a64c24eee..d1992a3743b 100644 --- a/packages/eip-5792-middleware/jest.config.js +++ b/packages/eip-5792-middleware/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/eip-7702-internal-rpc-middleware/jest.config.cjs b/packages/eip-7702-internal-rpc-middleware/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/eip-7702-internal-rpc-middleware/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/eip-7702-internal-rpc-middleware/jest.config.js b/packages/eip-7702-internal-rpc-middleware/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/eip-7702-internal-rpc-middleware/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/eip1193-permission-middleware/jest.config.cjs b/packages/eip1193-permission-middleware/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/eip1193-permission-middleware/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/eip1193-permission-middleware/jest.config.js b/packages/eip1193-permission-middleware/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/eip1193-permission-middleware/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/eth-block-tracker/jest.config.js b/packages/eth-block-tracker/jest.config.cjs similarity index 82% rename from packages/eth-block-tracker/jest.config.js rename to packages/eth-block-tracker/jest.config.cjs index 7dd50e9bce2..ed2bf4de9b6 100644 --- a/packages/eth-block-tracker/jest.config.js +++ b/packages/eth-block-tracker/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/eth-json-rpc-middleware/jest.config.js b/packages/eth-json-rpc-middleware/jest.config.cjs similarity index 85% rename from packages/eth-json-rpc-middleware/jest.config.js rename to packages/eth-json-rpc-middleware/jest.config.cjs index 39223ef70b2..d251c422055 100644 --- a/packages/eth-json-rpc-middleware/jest.config.js +++ b/packages/eth-json-rpc-middleware/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/eth-json-rpc-middleware/package.json b/packages/eth-json-rpc-middleware/package.json index 93f7ed6ea9c..555fd2abdec 100644 --- a/packages/eth-json-rpc-middleware/package.json +++ b/packages/eth-json-rpc-middleware/package.json @@ -64,6 +64,7 @@ "deep-freeze-strict": "^1.1.1", "deepmerge": "^4.2.2", "jest": "^30.4.2", + "ts-jest": "^29.4.11", "tsx": "^4.20.5", "typedoc": "^0.25.13", "typescript": "~5.3.3" diff --git a/packages/eth-json-rpc-provider/jest.config.cjs b/packages/eth-json-rpc-provider/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/eth-json-rpc-provider/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/eth-json-rpc-provider/jest.config.js b/packages/eth-json-rpc-provider/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/eth-json-rpc-provider/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/foundryup/jest.config.js b/packages/foundryup/jest.config.cjs similarity index 82% rename from packages/foundryup/jest.config.js rename to packages/foundryup/jest.config.cjs index 13f8248a1ff..f2d3743752a 100644 --- a/packages/foundryup/jest.config.js +++ b/packages/foundryup/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/gas-fee-controller/jest.config.js b/packages/gas-fee-controller/jest.config.cjs similarity index 82% rename from packages/gas-fee-controller/jest.config.js rename to packages/gas-fee-controller/jest.config.cjs index 9452336df20..95d665f34c0 100644 --- a/packages/gas-fee-controller/jest.config.js +++ b/packages/gas-fee-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/gator-permissions-controller/jest.config.js b/packages/gator-permissions-controller/jest.config.cjs similarity index 82% rename from packages/gator-permissions-controller/jest.config.js rename to packages/gator-permissions-controller/jest.config.cjs index 1e9f704b74d..058dd12c896 100644 --- a/packages/gator-permissions-controller/jest.config.js +++ b/packages/gator-permissions-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/geolocation-controller/jest.config.cjs b/packages/geolocation-controller/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/geolocation-controller/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/geolocation-controller/jest.config.js b/packages/geolocation-controller/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/geolocation-controller/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/java-tron-up/jest.config.js b/packages/java-tron-up/jest.config.cjs similarity index 86% rename from packages/java-tron-up/jest.config.js rename to packages/java-tron-up/jest.config.cjs index ccf26af4889..76b33b29bcb 100644 --- a/packages/java-tron-up/jest.config.js +++ b/packages/java-tron-up/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/json-rpc-engine/jest.config.js b/packages/json-rpc-engine/jest.config.cjs similarity index 82% rename from packages/json-rpc-engine/jest.config.js rename to packages/json-rpc-engine/jest.config.cjs index f57db9f9e4d..4588f650d26 100644 --- a/packages/json-rpc-engine/jest.config.js +++ b/packages/json-rpc-engine/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/json-rpc-middleware-stream/jest.config.js b/packages/json-rpc-middleware-stream/jest.config.cjs similarity index 82% rename from packages/json-rpc-middleware-stream/jest.config.js rename to packages/json-rpc-middleware-stream/jest.config.cjs index 7f77f0b9029..71de6fc9880 100644 --- a/packages/json-rpc-middleware-stream/jest.config.js +++ b/packages/json-rpc-middleware-stream/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/keyring-controller/jest.config.js b/packages/keyring-controller/jest.config.cjs similarity index 82% rename from packages/keyring-controller/jest.config.js rename to packages/keyring-controller/jest.config.cjs index 4b5ac713841..5d3cc96f819 100644 --- a/packages/keyring-controller/jest.config.js +++ b/packages/keyring-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/kyc-controller/jest.config.cjs b/packages/kyc-controller/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/kyc-controller/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/kyc-controller/jest.config.js b/packages/kyc-controller/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/kyc-controller/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/local-node-utils/jest.config.js b/packages/local-node-utils/jest.config.cjs similarity index 82% rename from packages/local-node-utils/jest.config.js rename to packages/local-node-utils/jest.config.cjs index 313dad26a6c..5d72142042b 100644 --- a/packages/local-node-utils/jest.config.js +++ b/packages/local-node-utils/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/logging-controller/jest.config.cjs b/packages/logging-controller/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/logging-controller/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/logging-controller/jest.config.js b/packages/logging-controller/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/logging-controller/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/message-manager/jest.config.cjs b/packages/message-manager/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/message-manager/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/message-manager/jest.config.js b/packages/message-manager/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/message-manager/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/messenger-cli/jest.config.cjs b/packages/messenger-cli/jest.config.cjs new file mode 100644 index 00000000000..4d2130d21a8 --- /dev/null +++ b/packages/messenger-cli/jest.config.cjs @@ -0,0 +1,42 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +const config = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // Unlike the other packages, these tests run as ESM. `generate-content.ts` + // reaches for the ESM-only `oxfmt` through a dynamic `import()`, which the + // CommonJS transform would turn into a `require()` that cannot load it. + extensionsToTreatAsEsm: ['.ts'], + + // cli.ts is tested via execa subprocess in cli.test.ts; Jest can't instrument it + coveragePathIgnorePatterns: ['./src/cli.ts'], + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 90.65, + functions: 100, + lines: 97.39, + statements: 97.4, + }, + }, +}); + +// `deepmerge` concatenates arrays, so the CommonJS transform inherited from the +// base config has to be replaced outright rather than merged into. +config.transform = { + '^.+\\.tsx?$': ['ts-jest', { useESM: true }], +}; + +module.exports = config; diff --git a/packages/messenger-cli/jest.config.js b/packages/messenger-cli/jest.config.js deleted file mode 100644 index bd8650be06f..00000000000 --- a/packages/messenger-cli/jest.config.js +++ /dev/null @@ -1,29 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // cli.ts is tested via execa subprocess in cli.test.ts; Jest can't instrument it - coveragePathIgnorePatterns: ['./src/cli.ts'], - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 90.65, - functions: 100, - lines: 97.59, - statements: 97.6, - }, - }, -}); diff --git a/packages/messenger-cli/package.json b/packages/messenger-cli/package.json index 3c0343d9b8d..d50aaf1c280 100644 --- a/packages/messenger-cli/package.json +++ b/packages/messenger-cli/package.json @@ -45,6 +45,7 @@ "yargs": "^17.7.2" }, "devDependencies": { + "@jest/globals": "^30.4.1", "@metamask/auto-changelog": "^6.1.0", "@types/jest": "^30.0.0", "@types/yargs": "^17.0.32", diff --git a/packages/messenger-cli/src/check.test.ts b/packages/messenger-cli/src/check.test.ts index ea212269438..91aca0c700b 100644 --- a/packages/messenger-cli/src/check.test.ts +++ b/packages/messenger-cli/src/check.test.ts @@ -1,3 +1,4 @@ +import { jest } from '@jest/globals'; import { createSandbox } from '@metamask/utils/node'; import * as fs from 'node:fs'; import * as path from 'node:path'; @@ -27,7 +28,9 @@ describe('checkActionTypesFiles', () => { 'utf8', ); - const consoleSpy = jest.spyOn(console, 'log').mockImplementation(); + const consoleSpy = jest + .spyOn(console, 'log') + .mockImplementation(() => undefined); const result = await checkActionTypesFiles([controller], 'prettier'); consoleSpy.mockRestore(); @@ -52,8 +55,12 @@ describe('checkActionTypesFiles', () => { 'utf8', ); - const consoleSpy = jest.spyOn(console, 'log').mockImplementation(); - const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(); + const consoleSpy = jest + .spyOn(console, 'log') + .mockImplementation(() => undefined); + const consoleErrorSpy = jest + .spyOn(console, 'error') + .mockImplementation(() => undefined); const result = await checkActionTypesFiles([controller], 'prettier'); consoleSpy.mockRestore(); consoleErrorSpy.mockRestore(); @@ -73,8 +80,12 @@ describe('checkActionTypesFiles', () => { methods: [{ name: 'doStuff', jsDoc: '' }], }; - const consoleSpy = jest.spyOn(console, 'log').mockImplementation(); - const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(); + const consoleSpy = jest + .spyOn(console, 'log') + .mockImplementation(() => undefined); + const consoleErrorSpy = jest + .spyOn(console, 'error') + .mockImplementation(() => undefined); const result = await checkActionTypesFiles([controller], 'prettier'); consoleSpy.mockRestore(); consoleErrorSpy.mockRestore(); @@ -101,8 +112,12 @@ describe('checkActionTypesFiles', () => { Object.assign(new Error('EPERM'), { code: 'EPERM' }), ); - const consoleSpy = jest.spyOn(console, 'log').mockImplementation(); - const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(); + const consoleSpy = jest + .spyOn(console, 'log') + .mockImplementation(() => undefined); + const consoleErrorSpy = jest + .spyOn(console, 'error') + .mockImplementation(() => undefined); const result = await checkActionTypesFiles([controller], 'prettier'); expect(consoleErrorSpy).toHaveBeenCalledWith( diff --git a/packages/messenger-cli/src/cli.test.ts b/packages/messenger-cli/src/cli.test.ts index ce87d9138d8..c60ce41120a 100644 --- a/packages/messenger-cli/src/cli.test.ts +++ b/packages/messenger-cli/src/cli.test.ts @@ -1,9 +1,10 @@ +import { jest } from '@jest/globals'; import { createSandbox } from '@metamask/utils/node'; import execa from 'execa'; import * as fs from 'node:fs'; import * as path from 'node:path'; -const ROOT_DIR = path.resolve(__dirname, '..', '..', '..'); +const ROOT_DIR = path.resolve(import.meta.dirname, '..', '..', '..'); const TSX_PATH = path.join(ROOT_DIR, 'node_modules', '.bin', 'tsx'); const CLI_PATH = path.join( ROOT_DIR, diff --git a/packages/messenger-cli/src/fix.test.ts b/packages/messenger-cli/src/fix.test.ts index dd436ca363b..b16a3b5de8a 100644 --- a/packages/messenger-cli/src/fix.test.ts +++ b/packages/messenger-cli/src/fix.test.ts @@ -1,3 +1,4 @@ +import { jest } from '@jest/globals'; import { createSandbox } from '@metamask/utils/node'; import * as fs from 'node:fs'; import * as path from 'node:path'; @@ -20,7 +21,9 @@ describe('generateAllActionTypesFiles', () => { methods: [{ name: 'doStuff', jsDoc: '' }], }; - const consoleSpy = jest.spyOn(console, 'log').mockImplementation(); + const consoleSpy = jest + .spyOn(console, 'log') + .mockImplementation(() => undefined); await generateAllActionTypesFiles([controller], 'prettier'); consoleSpy.mockRestore(); @@ -52,7 +55,9 @@ describe('generateAllActionTypesFiles', () => { }, ]; - const consoleSpy = jest.spyOn(console, 'log').mockImplementation(); + const consoleSpy = jest + .spyOn(console, 'log') + .mockImplementation(() => undefined); await generateAllActionTypesFiles(controllers, 'prettier'); consoleSpy.mockRestore(); diff --git a/packages/messenger-cli/src/parse-source.test.ts b/packages/messenger-cli/src/parse-source.test.ts index f80a44d4cfb..4ebba2e3057 100644 --- a/packages/messenger-cli/src/parse-source.test.ts +++ b/packages/messenger-cli/src/parse-source.test.ts @@ -1,3 +1,4 @@ +import { jest } from '@jest/globals'; import { createSandbox } from '@metamask/utils/node'; import * as fs from 'node:fs'; import * as path from 'node:path'; @@ -445,7 +446,9 @@ class BadTsconfigController { 'utf8', ); - const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(); + const consoleErrorSpy = jest + .spyOn(console, 'error') + .mockImplementation(() => undefined); const result = await parseSourceFile(controllerFile); expect(result).toBeNull(); @@ -478,7 +481,9 @@ class NoTsconfigController { 'utf8', ); - const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(); + const consoleErrorSpy = jest + .spyOn(console, 'error') + .mockImplementation(() => undefined); const result = await parseSourceFile(controllerFile); // Should return null because assert fails when type checker can't be created @@ -492,7 +497,9 @@ class NoTsconfigController { it('returns null and logs error for invalid file', async () => { expect.assertions(2); - const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(); + const consoleErrorSpy = jest + .spyOn(console, 'error') + .mockImplementation(() => undefined); const result = await parseSourceFile('/nonexistent/file.ts'); diff --git a/packages/messenger/jest.config.js b/packages/messenger/jest.config.cjs similarity index 85% rename from packages/messenger/jest.config.js rename to packages/messenger/jest.config.cjs index 43b184dd091..93fea407a10 100644 --- a/packages/messenger/jest.config.js +++ b/packages/messenger/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/money-account-api-data-service/jest.config.js b/packages/money-account-api-data-service/jest.config.cjs similarity index 77% rename from packages/money-account-api-data-service/jest.config.js rename to packages/money-account-api-data-service/jest.config.cjs index 3c59dbe56c1..4e1004f80ec 100644 --- a/packages/money-account-api-data-service/jest.config.js +++ b/packages/money-account-api-data-service/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { displayName, diff --git a/packages/money-account-balance-service/jest.config.js b/packages/money-account-balance-service/jest.config.cjs similarity index 77% rename from packages/money-account-balance-service/jest.config.js rename to packages/money-account-balance-service/jest.config.cjs index 3c59dbe56c1..4e1004f80ec 100644 --- a/packages/money-account-balance-service/jest.config.js +++ b/packages/money-account-balance-service/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { displayName, diff --git a/packages/money-account-controller/jest.config.cjs b/packages/money-account-controller/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/money-account-controller/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/money-account-controller/jest.config.js b/packages/money-account-controller/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/money-account-controller/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/money-account-upgrade-controller/jest.config.js b/packages/money-account-upgrade-controller/jest.config.cjs similarity index 77% rename from packages/money-account-upgrade-controller/jest.config.js rename to packages/money-account-upgrade-controller/jest.config.cjs index 69d5d9b4273..8125dff7e09 100644 --- a/packages/money-account-upgrade-controller/jest.config.js +++ b/packages/money-account-upgrade-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { displayName, diff --git a/packages/money-account-utils/jest.config.cjs b/packages/money-account-utils/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/money-account-utils/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/multichain-account-service/jest.config.js b/packages/multichain-account-service/jest.config.cjs similarity index 84% rename from packages/multichain-account-service/jest.config.js rename to packages/multichain-account-service/jest.config.cjs index 97f6de173a0..a4b9bd90eeb 100644 --- a/packages/multichain-account-service/jest.config.js +++ b/packages/multichain-account-service/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/multichain-api-middleware/jest.config.js b/packages/multichain-api-middleware/jest.config.cjs similarity index 82% rename from packages/multichain-api-middleware/jest.config.js rename to packages/multichain-api-middleware/jest.config.cjs index a6f2baf410d..41869fb9684 100644 --- a/packages/multichain-api-middleware/jest.config.js +++ b/packages/multichain-api-middleware/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/multichain-network-controller/jest.config.js b/packages/multichain-network-controller/jest.config.cjs similarity index 82% rename from packages/multichain-network-controller/jest.config.js rename to packages/multichain-network-controller/jest.config.cjs index be65bbdeba5..853be4bf83b 100644 --- a/packages/multichain-network-controller/jest.config.js +++ b/packages/multichain-network-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/multichain-transactions-controller/jest.config.js b/packages/multichain-transactions-controller/jest.config.cjs similarity index 82% rename from packages/multichain-transactions-controller/jest.config.js rename to packages/multichain-transactions-controller/jest.config.cjs index 7f37a7bf396..c2ddb8f7c8f 100644 --- a/packages/multichain-transactions-controller/jest.config.js +++ b/packages/multichain-transactions-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/name-controller/jest.config.cjs b/packages/name-controller/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/name-controller/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/name-controller/jest.config.js b/packages/name-controller/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/name-controller/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/network-connection-banner-controller/jest.config.js b/packages/network-connection-banner-controller/jest.config.cjs similarity index 85% rename from packages/network-connection-banner-controller/jest.config.js rename to packages/network-connection-banner-controller/jest.config.cjs index 9e9e5413583..a0f19ea501a 100644 --- a/packages/network-connection-banner-controller/jest.config.js +++ b/packages/network-connection-banner-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/network-controller/jest.config.js b/packages/network-controller/jest.config.cjs similarity index 86% rename from packages/network-controller/jest.config.js rename to packages/network-controller/jest.config.cjs index 6b53cf4f3a5..7c9351912c4 100644 --- a/packages/network-controller/jest.config.js +++ b/packages/network-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/network-enablement-controller/jest.config.js b/packages/network-enablement-controller/jest.config.cjs similarity index 82% rename from packages/network-enablement-controller/jest.config.js rename to packages/network-enablement-controller/jest.config.cjs index d5269259364..cece7750158 100644 --- a/packages/network-enablement-controller/jest.config.js +++ b/packages/network-enablement-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/notification-services-controller/jest.config.js b/packages/notification-services-controller/jest.config.cjs similarity index 81% rename from packages/notification-services-controller/jest.config.js rename to packages/notification-services-controller/jest.config.cjs index a5ca105d820..cb0212f8d0c 100644 --- a/packages/notification-services-controller/jest.config.js +++ b/packages/notification-services-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects @@ -32,5 +32,5 @@ module.exports = merge(baseConfig, { ], // These tests rely on the Crypto API - testEnvironment: '/jest.environment.js', + testEnvironment: '/jest.environment.cjs', }); diff --git a/packages/notification-services-controller/jest.environment.js b/packages/notification-services-controller/jest.environment.cjs similarity index 100% rename from packages/notification-services-controller/jest.environment.js rename to packages/notification-services-controller/jest.environment.cjs diff --git a/packages/passkey-controller/jest.config.js b/packages/passkey-controller/jest.config.cjs similarity index 69% rename from packages/passkey-controller/jest.config.js rename to packages/passkey-controller/jest.config.cjs index b524afcb51a..61aeb28fc4e 100644 --- a/packages/passkey-controller/jest.config.js +++ b/packages/passkey-controller/jest.config.cjs @@ -1,9 +1,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { displayName, diff --git a/packages/permission-controller/jest.config.js b/packages/permission-controller/jest.config.cjs similarity index 82% rename from packages/permission-controller/jest.config.js rename to packages/permission-controller/jest.config.cjs index a4451065430..1a1b5e8c2ce 100644 --- a/packages/permission-controller/jest.config.js +++ b/packages/permission-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/permission-log-controller/jest.config.cjs b/packages/permission-log-controller/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/permission-log-controller/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/permission-log-controller/jest.config.js b/packages/permission-log-controller/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/permission-log-controller/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/perps-controller/jest.config.js b/packages/perps-controller/jest.config.cjs similarity index 88% rename from packages/perps-controller/jest.config.js rename to packages/perps-controller/jest.config.cjs index fbe9310453f..76070d8b174 100644 --- a/packages/perps-controller/jest.config.js +++ b/packages/perps-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = { ...merge(baseConfig, { diff --git a/packages/phishing-controller/jest.config.js b/packages/phishing-controller/jest.config.cjs similarity index 82% rename from packages/phishing-controller/jest.config.js rename to packages/phishing-controller/jest.config.cjs index 31a7e82f883..e94b4c5e85b 100644 --- a/packages/phishing-controller/jest.config.js +++ b/packages/phishing-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/platform-api-docs/jest.config.js b/packages/platform-api-docs/jest.config.cjs similarity index 85% rename from packages/platform-api-docs/jest.config.js rename to packages/platform-api-docs/jest.config.cjs index 3fdd21d40f0..29a133bbdea 100644 --- a/packages/platform-api-docs/jest.config.js +++ b/packages/platform-api-docs/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/platform-api-docs/src/cli.test.ts b/packages/platform-api-docs/src/cli.test.ts index bc084e33afe..ca35d209f25 100644 --- a/packages/platform-api-docs/src/cli.test.ts +++ b/packages/platform-api-docs/src/cli.test.ts @@ -149,9 +149,9 @@ export type QuxMessenger = Messenger<'Qux', QuxAction, never>; const result = await runCLI(['--help']); expect(result.exitCode).toBe(0); - expect(result.all).toContain( - 'Produces documentation for the platform API, the set of actions and events\navailable in clients through the message bus', - ); + // Keep this short: yargs wraps the help text to the terminal width, so a + // longer excerpt would depend on where the tests run. + expect(result.all).toContain('Produces documentation for the platform API'); }); it('exits with error when no scannable directories found', async () => { diff --git a/packages/polling-controller/jest.config.js b/packages/polling-controller/jest.config.cjs similarity index 82% rename from packages/polling-controller/jest.config.js rename to packages/polling-controller/jest.config.cjs index 75445bc8ec8..06f2e9e67af 100644 --- a/packages/polling-controller/jest.config.js +++ b/packages/polling-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/preferences-controller/jest.config.js b/packages/preferences-controller/jest.config.cjs similarity index 82% rename from packages/preferences-controller/jest.config.js rename to packages/preferences-controller/jest.config.cjs index 6e72890625e..7e9d3a514e9 100644 --- a/packages/preferences-controller/jest.config.js +++ b/packages/preferences-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/profile-metrics-controller/jest.config.js b/packages/profile-metrics-controller/jest.config.cjs similarity index 82% rename from packages/profile-metrics-controller/jest.config.js rename to packages/profile-metrics-controller/jest.config.cjs index 97c2b029b3c..9468d682921 100644 --- a/packages/profile-metrics-controller/jest.config.js +++ b/packages/profile-metrics-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/profile-metrics-controller/tsconfig.json b/packages/profile-metrics-controller/tsconfig.json index 0bcad567710..f5c8ceb09e8 100644 --- a/packages/profile-metrics-controller/tsconfig.json +++ b/packages/profile-metrics-controller/tsconfig.json @@ -35,7 +35,7 @@ * uncompiled source code for packages that live in this repo. * * NOTE: This must be synchronized with the `moduleNameMapper` option in - * `jest.config.packages.js`. + * `jest.config.packages.cjs`. * * NOTE 2: This is not necessary when copying this package to `packages/`. */ diff --git a/packages/profile-sync-controller/jest.config.js b/packages/profile-sync-controller/jest.config.cjs similarity index 81% rename from packages/profile-sync-controller/jest.config.js rename to packages/profile-sync-controller/jest.config.cjs index f14d3d4acd4..d87ad734b94 100644 --- a/packages/profile-sync-controller/jest.config.js +++ b/packages/profile-sync-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects @@ -32,5 +32,5 @@ module.exports = merge(baseConfig, { ], // These tests rely on the Crypto API - testEnvironment: '/jest.environment.js', + testEnvironment: '/jest.environment.cjs', }); diff --git a/packages/profile-sync-controller/jest.environment.js b/packages/profile-sync-controller/jest.environment.cjs similarity index 100% rename from packages/profile-sync-controller/jest.environment.js rename to packages/profile-sync-controller/jest.environment.cjs diff --git a/packages/ramps-controller/jest.config.js b/packages/ramps-controller/jest.config.cjs similarity index 82% rename from packages/ramps-controller/jest.config.js rename to packages/ramps-controller/jest.config.cjs index 434f40cd68f..2494defae24 100644 --- a/packages/ramps-controller/jest.config.js +++ b/packages/ramps-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/rate-limit-controller/jest.config.js b/packages/rate-limit-controller/jest.config.cjs similarity index 82% rename from packages/rate-limit-controller/jest.config.js rename to packages/rate-limit-controller/jest.config.cjs index 5ebf986e456..8c68d2142ab 100644 --- a/packages/rate-limit-controller/jest.config.js +++ b/packages/rate-limit-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/react-data-query/jest.config.js b/packages/react-data-query/jest.config.cjs similarity index 85% rename from packages/react-data-query/jest.config.js rename to packages/react-data-query/jest.config.cjs index a34a357c9a2..bb9d733bf05 100644 --- a/packages/react-data-query/jest.config.js +++ b/packages/react-data-query/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/remote-feature-flag-controller/jest.config.js b/packages/remote-feature-flag-controller/jest.config.cjs similarity index 82% rename from packages/remote-feature-flag-controller/jest.config.js rename to packages/remote-feature-flag-controller/jest.config.cjs index eccd6f27e55..3edac144e09 100644 --- a/packages/remote-feature-flag-controller/jest.config.js +++ b/packages/remote-feature-flag-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/sample-controllers/jest.config.cjs b/packages/sample-controllers/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/sample-controllers/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/sample-controllers/jest.config.js b/packages/sample-controllers/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/sample-controllers/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/sample-controllers/tsconfig.json b/packages/sample-controllers/tsconfig.json index c291290d7db..57a908d3930 100644 --- a/packages/sample-controllers/tsconfig.json +++ b/packages/sample-controllers/tsconfig.json @@ -26,7 +26,7 @@ * uncompiled source code for packages that live in this repo. * * NOTE: This must be synchronized with the `moduleNameMapper` option in - * `jest.config.packages.js`. + * `jest.config.packages.cjs`. * * NOTE 2: This is not necessary when copying this package to `packages/`. */ diff --git a/packages/seedless-onboarding-controller/jest.config.js b/packages/seedless-onboarding-controller/jest.config.cjs similarity index 82% rename from packages/seedless-onboarding-controller/jest.config.js rename to packages/seedless-onboarding-controller/jest.config.cjs index 0208f2f0d28..0c23b528ade 100644 --- a/packages/seedless-onboarding-controller/jest.config.js +++ b/packages/seedless-onboarding-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/selected-network-controller/jest.config.js b/packages/selected-network-controller/jest.config.cjs similarity index 85% rename from packages/selected-network-controller/jest.config.js rename to packages/selected-network-controller/jest.config.cjs index 0c2ab744b92..c3e394df131 100644 --- a/packages/selected-network-controller/jest.config.js +++ b/packages/selected-network-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/sentinel-api-service/jest.config.cjs b/packages/sentinel-api-service/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/sentinel-api-service/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/sentinel-api-service/jest.config.js b/packages/sentinel-api-service/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/sentinel-api-service/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/shield-controller/jest.config.js b/packages/shield-controller/jest.config.cjs similarity index 82% rename from packages/shield-controller/jest.config.js rename to packages/shield-controller/jest.config.cjs index 2a8a7774d0c..05c061d3dea 100644 --- a/packages/shield-controller/jest.config.js +++ b/packages/shield-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/signature-controller/jest.config.js b/packages/signature-controller/jest.config.cjs similarity index 82% rename from packages/signature-controller/jest.config.js rename to packages/signature-controller/jest.config.cjs index 61399cabd3a..c8c219e0667 100644 --- a/packages/signature-controller/jest.config.js +++ b/packages/signature-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/smart-transactions-controller/jest.config.js b/packages/smart-transactions-controller/jest.config.cjs similarity index 82% rename from packages/smart-transactions-controller/jest.config.js rename to packages/smart-transactions-controller/jest.config.cjs index 7071f00abc9..5c184ef83b5 100644 --- a/packages/smart-transactions-controller/jest.config.js +++ b/packages/smart-transactions-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/snap-account-service/jest.config.js b/packages/snap-account-service/jest.config.cjs similarity index 82% rename from packages/snap-account-service/jest.config.js rename to packages/snap-account-service/jest.config.cjs index af023e78258..78bc62a4db7 100644 --- a/packages/snap-account-service/jest.config.js +++ b/packages/snap-account-service/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/social-controllers/jest.config.cjs b/packages/social-controllers/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/social-controllers/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/social-controllers/jest.config.js b/packages/social-controllers/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/social-controllers/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/solana-test-validator-up/jest.config.js b/packages/solana-test-validator-up/jest.config.cjs similarity index 86% rename from packages/solana-test-validator-up/jest.config.js rename to packages/solana-test-validator-up/jest.config.cjs index 1fd10c39a0b..96c64c8c389 100644 --- a/packages/solana-test-validator-up/jest.config.js +++ b/packages/solana-test-validator-up/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/stellar-quickstart-up/jest.config.cjs b/packages/stellar-quickstart-up/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/stellar-quickstart-up/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/stellar-quickstart-up/jest.config.js b/packages/stellar-quickstart-up/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/stellar-quickstart-up/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/storage-service/jest.config.cjs b/packages/storage-service/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/storage-service/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/storage-service/jest.config.js b/packages/storage-service/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/storage-service/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/subscription-controller/jest.config.cjs b/packages/subscription-controller/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/subscription-controller/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/subscription-controller/jest.config.js b/packages/subscription-controller/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/subscription-controller/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/transaction-controller/jest.config.js b/packages/transaction-controller/jest.config.cjs similarity index 84% rename from packages/transaction-controller/jest.config.js rename to packages/transaction-controller/jest.config.cjs index 57fd227991a..be6f5d6833e 100644 --- a/packages/transaction-controller/jest.config.js +++ b/packages/transaction-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/transaction-pay-controller/jest.config.js b/packages/transaction-pay-controller/jest.config.cjs similarity index 82% rename from packages/transaction-pay-controller/jest.config.js rename to packages/transaction-pay-controller/jest.config.cjs index 6036eeb026e..92659169abb 100644 --- a/packages/transaction-pay-controller/jest.config.js +++ b/packages/transaction-pay-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/user-operation-controller/jest.config.js b/packages/user-operation-controller/jest.config.cjs similarity index 82% rename from packages/user-operation-controller/jest.config.js rename to packages/user-operation-controller/jest.config.cjs index e16c78443a8..3e0c784acac 100644 --- a/packages/user-operation-controller/jest.config.js +++ b/packages/user-operation-controller/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects diff --git a/packages/wallet-cli/jest.config.js b/packages/wallet-cli/jest.config.cjs similarity index 88% rename from packages/wallet-cli/jest.config.js rename to packages/wallet-cli/jest.config.cjs index 7180c8dfe09..16a8801da44 100644 --- a/packages/wallet-cli/jest.config.js +++ b/packages/wallet-cli/jest.config.cjs @@ -6,9 +6,9 @@ const merge = require('deepmerge'); const path = require('path'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); -const displayName = path.basename(import.meta.dirname); +const displayName = path.basename(__dirname); module.exports = merge(baseConfig, { // The display name when running multiple projects @@ -17,7 +17,7 @@ module.exports = merge(baseConfig, { // The e2e test constructs a real KeyringController, which needs the Web // Crypto API; this environment polyfills `crypto` when the test realm (Node // < 21 under --experimental-vm-modules) lacks it. - testEnvironment: '/jest.environment.js', + testEnvironment: '/jest.environment.cjs', // The test harness in `src/test/` is exercised by the command tests but // not all of its error/edge branches are worth driving directly — it's diff --git a/packages/wallet-cli/jest.config.e2e.js b/packages/wallet-cli/jest.config.e2e.cjs similarity index 87% rename from packages/wallet-cli/jest.config.e2e.js rename to packages/wallet-cli/jest.config.e2e.cjs index aff6a9372c3..60484cd9bb8 100644 --- a/packages/wallet-cli/jest.config.e2e.js +++ b/packages/wallet-cli/jest.config.e2e.cjs @@ -10,7 +10,7 @@ const merge = require('deepmerge'); -const baseConfig = require('../../jest.config.packages'); +const baseConfig = require('../../jest.config.packages.cjs'); module.exports = merge(baseConfig, { displayName: 'wallet-cli:e2e', @@ -24,7 +24,7 @@ module.exports = merge(baseConfig, { collectCoverage: false, // The CLI runs in a normal Node process with the Web Crypto globals, so this - // suite needs neither the `jest.environment.js` polyfill nor any coverage + // suite needs neither the `jest.environment.cjs` polyfill nor any coverage // threshold. testEnvironment: 'node', }); diff --git a/packages/wallet-cli/jest.environment.js b/packages/wallet-cli/jest.environment.cjs similarity index 100% rename from packages/wallet-cli/jest.environment.js rename to packages/wallet-cli/jest.environment.cjs diff --git a/packages/wallet-cli/package.json b/packages/wallet-cli/package.json index 048c7f7492c..a2907b0b046 100644 --- a/packages/wallet-cli/package.json +++ b/packages/wallet-cli/package.json @@ -41,7 +41,7 @@ "since-latest-release": "../../scripts/since-latest-release.sh", "test": "yarn test:prepare && NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter", "test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache", - "test:e2e": "yarn test:prepare && NODE_OPTIONS=--experimental-vm-modules jest --config jest.config.e2e.js", + "test:e2e": "yarn test:prepare && NODE_OPTIONS=--experimental-vm-modules jest --config jest.config.e2e.cjs", "test:e2e:install-anvil": "mm-foundryup", "test:prepare": "./scripts/install-binaries.sh", "test:verbose": "NODE_OPTIONS=--experimental-vm-modules jest --verbose", diff --git a/packages/wallet-cli/src/daemon/prompts.test.ts b/packages/wallet-cli/src/daemon/prompts.test.ts index 2ab323496fe..f2c98294565 100644 --- a/packages/wallet-cli/src/daemon/prompts.test.ts +++ b/packages/wallet-cli/src/daemon/prompts.test.ts @@ -1,16 +1,17 @@ // `@inquirer/confirm` and `@inquirer/password` are ESM-only and `prompts.ts` -// reaches them via dynamic `import()`. Use jest's ESM mock API and dynamic -// imports to mirror that. The import statements below tag this file as a -// module for the `import-x/unambiguous` lint rule, even though they import -// only types. +// reaches them via dynamic `import()`. The tests compile to CommonJS, which +// turns those into `require()`, so the plain mock API applies to them and the +// real ESM-only packages are never loaded. The import statements below tag +// this file as a module for the `import-x/unambiguous` lint rule, even though +// they import only types. import type Confirm from '@inquirer/confirm'; import type Password from '@inquirer/password'; -jest.unstable_mockModule('@inquirer/confirm', () => ({ +jest.mock('@inquirer/confirm', () => ({ __esModule: true, default: jest.fn(), })); -jest.unstable_mockModule('@inquirer/password', () => ({ +jest.mock('@inquirer/password', () => ({ __esModule: true, default: jest.fn(), })); diff --git a/packages/wallet-framework-docs/jest.config.cjs b/packages/wallet-framework-docs/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/wallet-framework-docs/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/wallet-framework-docs/jest.config.js b/packages/wallet-framework-docs/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/wallet-framework-docs/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/packages/wallet/jest.config.cjs b/packages/wallet/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/packages/wallet/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/packages/wallet/jest.config.js b/packages/wallet/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/packages/wallet/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/scripts/create-package/package-template/jest.config.cjs b/scripts/create-package/package-template/jest.config.cjs new file mode 100644 index 00000000000..6456e074bb0 --- /dev/null +++ b/scripts/create-package/package-template/jest.config.cjs @@ -0,0 +1,26 @@ +/* + * For a detailed explanation regarding each configuration property and type check, visit: + * https://jestjs.io/docs/configuration + */ + +const merge = require('deepmerge'); +const path = require('path'); + +const baseConfig = require('../../jest.config.packages.cjs'); + +const displayName = path.basename(__dirname); + +module.exports = merge(baseConfig, { + // The display name when running multiple projects + displayName, + + // An object that configures minimum threshold enforcement for coverage results + coverageThreshold: { + global: { + branches: 100, + functions: 100, + lines: 100, + statements: 100, + }, + }, +}); diff --git a/scripts/create-package/package-template/jest.config.js b/scripts/create-package/package-template/jest.config.js deleted file mode 100644 index 52fe484da39..00000000000 --- a/scripts/create-package/package-template/jest.config.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * For a detailed explanation regarding each configuration property and type check, visit: - * https://jestjs.io/docs/configuration - */ - -const merge = require('deepmerge'); -const path = require('path'); - -const baseConfig = require('../../jest.config.packages'); - -const displayName = path.basename(import.meta.dirname); - -module.exports = merge(baseConfig, { - // The display name when running multiple projects - displayName, - - // An object that configures minimum threshold enforcement for coverage results - coverageThreshold: { - global: { - branches: 100, - functions: 100, - lines: 100, - statements: 100, - }, - }, -}); diff --git a/tsconfig.packages.json b/tsconfig.packages.json index 83a81722c5b..f0d7cffcca6 100644 --- a/tsconfig.packages.json +++ b/tsconfig.packages.json @@ -9,7 +9,7 @@ * uncompiled source code for packages that live in this repo. * * NOTE: This must be synchronized with the `moduleNameMapper` option in - * `jest.config.packages.js`. + * `jest.config.packages.cjs`. */ "paths": { "@metamask/json-rpc-engine/v2": ["../json-rpc-engine/src/v2/index.ts"], diff --git a/yarn.lock b/yarn.lock index 918bf140a36..3023acc189e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7015,6 +7015,7 @@ __metadata: jest: "npm:^30.4.2" klona: "npm:^2.0.6" safe-stable-stringify: "npm:^2.4.3" + ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" typedoc: "npm:^0.25.13" typescript: "npm:~5.3.3" @@ -7708,6 +7709,7 @@ __metadata: version: 0.0.0-use.local resolution: "@metamask/messenger-cli@workspace:packages/messenger-cli" dependencies: + "@jest/globals": "npm:^30.4.1" "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/utils": "npm:^11.11.0" "@types/jest": "npm:^30.0.0" From a9224fce4e26512c04e04a3cec784ad7e93ac756 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Mon, 24 Aug 2026 21:48:02 +0200 Subject: [PATCH 10/17] Move remaining CommonJS config files off the `.js` extension `"type": "module"` in the root manifest makes every `.js` file an ES module, so `.prettierrc.js` could no longer use `module.exports`. It moves to `.prettierrc.cjs`, and the entry point in `knip.config.mts` is updated to match. The `permission-controller` ESLint config is removed rather than renamed. It extends a root `.eslintrc.js` that no longer exists now that the repo uses flat config in `eslint.config.mjs`, and nothing references it, so it has no effect. --- .prettierrc.js => .prettierrc.cjs | 0 knip.config.mts | 2 +- packages/permission-controller/.eslintrc.js | 85 --------------------- scripts/create-package/utils.ts | 2 +- 4 files changed, 2 insertions(+), 87 deletions(-) rename .prettierrc.js => .prettierrc.cjs (100%) delete mode 100644 packages/permission-controller/.eslintrc.js diff --git a/.prettierrc.js b/.prettierrc.cjs similarity index 100% rename from .prettierrc.js rename to .prettierrc.cjs diff --git a/knip.config.mts b/knip.config.mts index d3d13d37c46..1faa468d593 100644 --- a/knip.config.mts +++ b/knip.config.mts @@ -7,7 +7,7 @@ const config: KnipConfig = { 'scripts/**/*.{ts,js,sh}', 'tests/**/*.ts', '*.config.{js,cjs,mjs,ts}', - '.prettierrc.js', + '.prettierrc.cjs', ], project: ['scripts/**/*.ts', 'tests/**/*.ts', '*.{js,cjs,mjs,ts}'], ignore: ['scripts/create-package/package-template/**'], diff --git a/packages/permission-controller/.eslintrc.js b/packages/permission-controller/.eslintrc.js deleted file mode 100644 index 1e60b9c9bd4..00000000000 --- a/packages/permission-controller/.eslintrc.js +++ /dev/null @@ -1,85 +0,0 @@ -module.exports = { - extends: ['../../.eslintrc.js'], - - overrides: [ - { - files: ['src/PermissionController.test.ts'], - rules: { - // This is taken directly from @metamask/eslint-config-typescript@12.1.0 - '@typescript-eslint/naming-convention': [ - 'error', - // We have to disable the default selector for our objectLiteralProperty - // filter to work. - // { - // selector: 'default', - // format: ['camelCase'], - // leadingUnderscore: 'allow', - // trailingUnderscore: 'forbid', - // }, - { - selector: 'enumMember', - format: ['PascalCase'], - }, - { - selector: 'interface', - format: ['PascalCase'], - custom: { - regex: '^I[A-Z]', - match: false, - }, - }, - { - selector: 'objectLiteralMethod', - format: ['camelCase', 'PascalCase', 'UPPER_CASE'], - }, - // This option is modified by the addition of a filter. - { - selector: 'objectLiteralProperty', - format: ['camelCase', 'PascalCase', 'UPPER_CASE'], - filter: { - // Match RPC method names like foo_bar, foo_barBaz, etc., and metamask.io - regex: '(^[a-z]+_[a-z]+[a-zA-Z0-9]*)|metamask\\.io$', - match: false, - }, - }, - { - selector: 'typeLike', - format: ['PascalCase'], - }, - { - selector: 'typeParameter', - format: ['PascalCase'], - custom: { - regex: '^.{3,}', - match: true, - }, - }, - { - selector: 'variable', - format: ['camelCase', 'UPPER_CASE', 'PascalCase'], - leadingUnderscore: 'allow', - }, - { - selector: 'parameter', - format: ['camelCase', 'PascalCase'], - leadingUnderscore: 'allow', - }, - { - selector: [ - 'classProperty', - 'objectLiteralProperty', - 'typeProperty', - 'classMethod', - 'objectLiteralMethod', - 'typeMethod', - 'accessor', - 'enumMember', - ], - format: null, - modifiers: ['requiresQuotes'], - }, - ], - }, - }, - ], -}; diff --git a/scripts/create-package/utils.ts b/scripts/create-package/utils.ts index 2f7f4410fc9..f8011f54459 100644 --- a/scripts/create-package/utils.ts +++ b/scripts/create-package/utils.ts @@ -24,7 +24,7 @@ const allPlaceholdersRegex = new RegExp( // Our lint config really hates this, but it works. // eslint-disable-next-line const prettierRc = require( - path.join(REPO_ROOT, '.prettierrc.js'), + path.join(REPO_ROOT, '.prettierrc.cjs'), ) as PrettierOptions; /** From 2ff2e01c77eb64268bc6a9511a1b33ab319b3bdc Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Mon, 24 Aug 2026 22:33:32 +0200 Subject: [PATCH 11/17] Run the `scripts` tests as ESM The packages compile to CommonJS for tests, but the scripts cannot: they use `import.meta`, which has no CommonJS equivalent. Their Jest config opts into ESM instead, through `extensionsToTreatAsEsm` and the `useESM` option of `ts-jest`. Running as ESM means `require` and the injected `jest` global are gone, so `utils.ts` loads the Prettier config through `createRequire`, and the test files import `jest` from `@jest/globals`. `jest.mock` has no effect on ES modules, so the mocked modules move to `jest.unstable_mockModule` and are pulled in with dynamic imports afterwards. The `process.exit` spy in `cli.test.ts` now has to be installed before `cli.js` is imported. The ESM build of yargs captures `process.exit` by reference when it loads, so a spy installed later is never consulted, and its implementation is re-armed per test because `resetMocks` clears it. --- eslint.config.mjs | 4 ++ jest.config.scripts.cjs | 9 +++ package.json | 2 + packages/bridge-controller/tests/mock-sse.ts | 1 - scripts/create-package/cli.test.ts | 50 ++++++++++---- scripts/create-package/commands.test.ts | 13 ++-- scripts/create-package/index.test.ts | 23 ++++--- scripts/create-package/utils.test.ts | 71 ++++++++++++-------- scripts/create-package/utils.ts | 7 +- yarn.lock | 4 +- 10 files changed, 124 insertions(+), 60 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 5b6daf17bf9..bc2658108d8 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -181,6 +181,10 @@ const config = createConfig([ 'jest/no-alias-methods': 'error', 'jest/no-commented-out-tests': 'error', 'jest/no-disabled-tests': 'error', + + // `import { jest } from '@jest/globals'` is required in ESM test files + // and intentionally shadows the Jest-injected global. + '@typescript-eslint/no-shadow': ['error', { allow: ['jest'] }], }, settings: { node: { diff --git a/jest.config.scripts.cjs b/jest.config.scripts.cjs index 64cd2bd44ac..4a6d8b66f87 100644 --- a/jest.config.scripts.cjs +++ b/jest.config.scripts.cjs @@ -42,6 +42,15 @@ module.exports = { preset: 'ts-jest', + // Unlike the packages, the scripts use `import.meta`, which has no CommonJS + // equivalent, so their tests run as ESM. Jest only treats TypeScript as ESM + // when the extension is listed here. + extensionsToTreatAsEsm: ['.ts', '.mts'], + + transform: { + '^.+\\.m?tsx?$': ['ts-jest', { useESM: true }], + }, + // "resetMocks" resets all mocks, including mocked modules, to jest.fn(), // between each test case. resetMocks: true, diff --git a/package.json b/package.json index 99c8502b658..5fcc5b92ae5 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,7 @@ "devDependencies": { "@actions/core": "^3.0.1", "@actions/github": "^9.1.1", + "@jest/globals": "^30.4.1", "@lavamoat/allow-scripts": "^3.0.4", "@lavamoat/preinstall-always-fail": "^2.1.0", "@metamask/create-release-branch": "^4.2.2", @@ -109,6 +110,7 @@ "rimraf": "^5.0.5", "semver": "^7.6.3", "simple-git-hooks": "^2.8.0", + "ts-jest": "^29.4.11", "tsx": "^4.20.5", "typescript": "~5.3.3", "typescript-eslint": "^8.48.0", diff --git a/packages/bridge-controller/tests/mock-sse.ts b/packages/bridge-controller/tests/mock-sse.ts index eaf485e5d44..d7bc5a31e9d 100644 --- a/packages/bridge-controller/tests/mock-sse.ts +++ b/packages/bridge-controller/tests/mock-sse.ts @@ -1,4 +1,3 @@ -// eslint-disable-next-line @typescript-eslint/no-shadow import { ReadableStream } from 'node:stream/web'; import { flushPromises } from '../../../tests/helpers.js'; diff --git a/scripts/create-package/cli.test.ts b/scripts/create-package/cli.test.ts index 21f7cb254ff..7d85f9c09af 100644 --- a/scripts/create-package/cli.test.ts +++ b/scripts/create-package/cli.test.ts @@ -1,8 +1,22 @@ -import cli from './cli.js'; -import { commands, commandMap } from './commands.js'; -import * as utils from './utils.js'; - -jest.mock('./utils'); +import { jest } from '@jest/globals'; + +// `jest.mock` does not apply to ES modules, so the module registry is stubbed +// with `jest.unstable_mockModule` and the modules under test are imported +// dynamically afterwards. +jest.unstable_mockModule('./utils.js', () => ({ + readMonorepoFiles: jest.fn(), + finalizeAndWriteData: jest.fn(), +})); + +// yargs' ESM shim captures `process.exit` by reference when it is loaded, so +// the spy has to be installed before `cli.js` pulls yargs in. Its +// implementation is re-armed in `beforeEach`, because `resetMocks` clears it +// between tests. +const exitSpy = jest.spyOn(process, 'exit'); + +const { default: cli } = await import('./cli.js'); +const { commands, commandMap } = await import('./commands.js'); +const utils = await import('./utils.js'); /** * Returns a mock `process.argv` array with the provided arguments. Includes @@ -44,7 +58,7 @@ describe('create-package/cli', () => { beforeEach(() => { // yargs calls process.exit() with 1 on failure and sometimes 0 on success. // We have to intercept it. - jest.spyOn(process, 'exit').mockImplementation((code) => { + exitSpy.mockImplementation((code) => { if (code === 1) { throw new Error('exit: 1'); } else { @@ -63,7 +77,9 @@ describe('create-package/cli', () => { it('should error if a string option contains only whitespace', async () => { const defaultCommand = commandMap.$0; - jest.spyOn(defaultCommand, 'handler').mockImplementation(); + jest + .spyOn(defaultCommand, 'handler') + .mockImplementation(async () => undefined); await expect(cli(getMockArgv('--name', ' '), commands)).rejects.toThrow( 'exit: 1', @@ -79,14 +95,14 @@ describe('create-package/cli', () => { const defaultCommand = commandMap.$0; jest.spyOn(defaultCommand, 'handler'); - jest.spyOn(utils, 'readMonorepoFiles').mockResolvedValue({ + jest.mocked(utils.readMonorepoFiles).mockResolvedValue({ tsConfig: {}, tsConfigBuild: {}, nodeVersions: '>=18.0.0', // TODO: Replace `any` with type // eslint-disable-next-line @typescript-eslint/no-explicit-any } as any); - jest.spyOn(utils, 'finalizeAndWriteData').mockResolvedValue(); + jest.mocked(utils.finalizeAndWriteData).mockResolvedValue(); expect( await cli( @@ -105,14 +121,14 @@ describe('create-package/cli', () => { const defaultCommand = commandMap.$0; jest.spyOn(defaultCommand, 'handler'); - jest.spyOn(utils, 'readMonorepoFiles').mockResolvedValue({ + jest.mocked(utils.readMonorepoFiles).mockResolvedValue({ tsConfig: {}, tsConfigBuild: {}, nodeVersions: '>=18.0.0', // TODO: Replace `any` with type // eslint-disable-next-line @typescript-eslint/no-explicit-any } as any); - jest.spyOn(utils, 'finalizeAndWriteData').mockResolvedValue(); + jest.mocked(utils.finalizeAndWriteData).mockResolvedValue(); expect( await cli( @@ -129,7 +145,9 @@ describe('create-package/cli', () => { it('should create a new package', async () => { const defaultCommand = commandMap.$0; - jest.spyOn(defaultCommand, 'handler').mockImplementation(); + jest + .spyOn(defaultCommand, 'handler') + .mockImplementation(async () => undefined); expect( await cli( @@ -146,7 +164,9 @@ describe('create-package/cli', () => { it('should error if the package name is missing', async () => { const defaultCommand = commandMap.$0; - jest.spyOn(defaultCommand, 'handler').mockImplementation(); + jest + .spyOn(defaultCommand, 'handler') + .mockImplementation(async () => undefined); await expect( cli(getMockArgv('--description', 'bar'), commands), @@ -159,7 +179,9 @@ describe('create-package/cli', () => { it('should error if the package description is missing', async () => { const defaultCommand = commandMap.$0; - jest.spyOn(defaultCommand, 'handler').mockImplementation(); + jest + .spyOn(defaultCommand, 'handler') + .mockImplementation(async () => undefined); await expect(cli(getMockArgv('--name', 'foo'), commands)).rejects.toThrow( 'exit: 1', diff --git a/scripts/create-package/commands.test.ts b/scripts/create-package/commands.test.ts index 4e51bf7ec46..5276ea42cbf 100644 --- a/scripts/create-package/commands.test.ts +++ b/scripts/create-package/commands.test.ts @@ -1,21 +1,26 @@ +import { jest } from '@jest/globals'; import type { Arguments } from 'yargs'; import type { CreatePackageOptions } from './commands.js'; -import { createPackageHandler } from './commands.js'; -import * as utils from './utils.js'; -jest.mock('./utils', () => ({ +// `jest.mock` does not apply to ES modules, so the module registry is stubbed +// with `jest.unstable_mockModule` and the modules under test are imported +// dynamically afterwards. +jest.unstable_mockModule('./utils.js', () => ({ finalizeAndWriteData: jest.fn(), readMonorepoFiles: jest.fn(), })); +const utils = await import('./utils.js'); +const { createPackageHandler } = await import('./commands.js'); + // January 2 to avoid time zone issues. jest.useFakeTimers().setSystemTime(new Date('2023-01-02')); describe('create-package/commands', () => { describe('createPackageHandler', () => { it('should create the expected package', async () => { - (utils.readMonorepoFiles as jest.Mock).mockResolvedValue({ + jest.mocked(utils.readMonorepoFiles).mockResolvedValue({ tsConfig: { references: [{ path: '../packages/foo' }], }, diff --git a/scripts/create-package/index.test.ts b/scripts/create-package/index.test.ts index 39436aea78c..56d730ba1af 100644 --- a/scripts/create-package/index.test.ts +++ b/scripts/create-package/index.test.ts @@ -1,7 +1,15 @@ -import cli from './cli.js'; -import { commands } from './commands.js'; +import { jest } from '@jest/globals'; -jest.mock('./cli'); +// `jest.mock` does not apply to ES modules, so the module registry is stubbed +// with `jest.unstable_mockModule` and the modules under test are imported +// dynamically afterwards. +jest.unstable_mockModule('./cli.js', () => ({ + __esModule: true, + default: jest.fn(), +})); + +const { default: cli } = await import('./cli.js'); +const { commands } = await import('./commands.js'); describe('create-package/index', () => { let originalProcess: typeof globalThis.process; @@ -16,13 +24,12 @@ describe('create-package/index', () => { }); it('executes the CLI application', async () => { - const mock = cli as jest.MockedFunction; - mock.mockRejectedValue('foo'); + jest.mocked(cli).mockRejectedValue('foo'); - jest.spyOn(console, 'error').mockImplementation(); + jest.spyOn(console, 'error').mockImplementation(() => undefined); - // eslint-disable-next-line @typescript-eslint/no-require-imports, n/global-require, import-x/no-unassigned-import - require('.'); + // Importing the entry point runs it, which is the behaviour under test. + await import('./index.js'); await new Promise((resolve) => setImmediate(resolve)); expect(cli).toHaveBeenCalledTimes(1); diff --git a/scripts/create-package/utils.test.ts b/scripts/create-package/utils.test.ts index c48b8a308b7..9f7d385410b 100644 --- a/scripts/create-package/utils.test.ts +++ b/scripts/create-package/utils.test.ts @@ -1,15 +1,16 @@ +import { jest } from '@jest/globals'; import * as commentJson from 'comment-json'; -import execa from 'execa'; -import fs from 'fs'; +import type { Stats } from 'fs'; import path from 'path'; -import { format } from 'prettier'; import { MonorepoFiles } from './constants.js'; -import * as fsUtils from './fs-utils.js'; import type { PackageData } from './utils.js'; -import { finalizeAndWriteData, readMonorepoFiles } from './utils.js'; -jest.mock('fs', () => ({ +// `jest.mock` does not apply to ES modules, so the module registry is stubbed +// with `jest.unstable_mockModule` and the modules under test are imported +// dynamically afterwards. `utils.ts` reaches for the default and the named +// exports of `fs`, so the mock exposes the same object as both. +const fsMock = { existsSync: jest.fn(), promises: { mkdir: jest.fn(), @@ -17,19 +18,27 @@ jest.mock('fs', () => ({ writeFile: jest.fn(), stat: jest.fn(), }, -})); +}; + +jest.unstable_mockModule('fs', () => ({ ...fsMock, default: fsMock })); -jest.mock('execa', () => jest.fn()); +jest.unstable_mockModule('execa', () => ({ default: jest.fn() })); -jest.mock('prettier', () => ({ +jest.unstable_mockModule('prettier', () => ({ format: jest.fn(), })); -jest.mock('./fs-utils', () => ({ +jest.unstable_mockModule('./fs-utils.js', () => ({ readAllFiles: jest.fn(), writeFiles: jest.fn(), })); +const { default: fs } = await import('fs'); +const { default: execa } = await import('execa'); +const { format } = await import('prettier'); +const fsUtils = await import('./fs-utils.js'); +const { finalizeAndWriteData, readMonorepoFiles } = await import('./utils.js'); + describe('create-package/utils', () => { describe('readMonorepoFiles', () => { const tsConfig = JSON.stringify({ @@ -43,20 +52,24 @@ describe('create-package/utils', () => { }); it('should read the expected monorepo files', async () => { - (fs.promises.readFile as jest.Mock).mockImplementation( - async (filePath: string) => { - switch (path.basename(filePath)) { - case MonorepoFiles.TsConfig: - return tsConfig; - case MonorepoFiles.TsConfigBuild: - return tsConfigBuild; - case MonorepoFiles.PackageJson: - return packageJson; - default: - throw new Error(`Unexpected file: ${path.basename(filePath)}`); - } - }, - ); + // `readFile` is overloaded, which `mockImplementation` cannot match, so + // it is narrowed to the single signature `utils.ts` relies on. + const readFile = jest.mocked( + fs.promises.readFile, + ) as unknown as jest.Mock<(filePath: string) => Promise>; + + readFile.mockImplementation(async (filePath) => { + switch (path.basename(filePath)) { + case MonorepoFiles.TsConfig: + return tsConfig; + case MonorepoFiles.TsConfigBuild: + return tsConfigBuild; + case MonorepoFiles.PackageJson: + return packageJson; + default: + throw new Error(`Unexpected file: ${path.basename(filePath)}`); + } + }); const monorepoFileData = await readMonorepoFiles(); @@ -91,9 +104,9 @@ describe('create-package/utils', () => { const mockError = new Error('Not found') as NodeJS.ErrnoException; mockError.code = 'ENOENT'; - jest.spyOn(fs.promises, 'stat').mockRejectedValue(mockError); + jest.mocked(fs.promises.stat).mockRejectedValue(mockError); - (fsUtils.readAllFiles as jest.Mock).mockResolvedValueOnce({ + jest.mocked(fsUtils.readAllFiles).mockResolvedValueOnce({ 'src/index.ts': 'export default 42;', 'src/index.test.ts': 'export default 42;', 'mock1.file': @@ -102,7 +115,7 @@ describe('create-package/utils', () => { 'mock3.file': 'PACKAGE_DESCRIPTION PACKAGE_DIRECTORY_NAME', }); - (format as jest.Mock).mockImplementation((input) => input); + jest.mocked(format).mockImplementation(async (input) => input); await finalizeAndWriteData(packageData, monorepoFileData); @@ -183,7 +196,7 @@ describe('create-package/utils', () => { nodeVersions: '20.0.0', }; - (fs.promises.stat as jest.Mock).mockResolvedValue({}); + jest.mocked(fs.promises.stat).mockResolvedValue({} as Stats); await expect( finalizeAndWriteData(packageData, monorepoFileData), @@ -197,7 +210,7 @@ describe('create-package/utils', () => { const mockError = new Error('Permission denied') as NodeJS.ErrnoException; mockError.code = 'EACCES'; - jest.spyOn(fs.promises, 'stat').mockRejectedValue(mockError); + jest.mocked(fs.promises.stat).mockRejectedValue(mockError); const packageData: PackageData = { name: '@metamask/foo', diff --git a/scripts/create-package/utils.ts b/scripts/create-package/utils.ts index f8011f54459..66aa316006d 100644 --- a/scripts/create-package/utils.ts +++ b/scripts/create-package/utils.ts @@ -1,6 +1,7 @@ import * as commentJson from 'comment-json'; import execa from 'execa'; import { promises as fs } from 'fs'; +import { createRequire } from 'module'; import path from 'path'; import { format as prettierFormat } from 'prettier'; import type { Options as PrettierOptions } from 'prettier'; @@ -21,9 +22,9 @@ const allPlaceholdersRegex = new RegExp( 'gu', ); -// Our lint config really hates this, but it works. -// eslint-disable-next-line -const prettierRc = require( +// The Prettier config is CommonJS, so it is loaded through `createRequire` +// rather than an `import`, which would need to be asynchronous. +const prettierRc = createRequire(import.meta.url)( path.join(REPO_ROOT, '.prettierrc.cjs'), ) as PrettierOptions; diff --git a/yarn.lock b/yarn.lock index 3023acc189e..fc575945237 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5070,7 +5070,7 @@ __metadata: languageName: node linkType: hard -"@jest/globals@npm:30.4.1": +"@jest/globals@npm:30.4.1, @jest/globals@npm:^30.4.1": version: 30.4.1 resolution: "@jest/globals@npm:30.4.1" dependencies: @@ -6646,6 +6646,7 @@ __metadata: dependencies: "@actions/core": "npm:^3.0.1" "@actions/github": "npm:^9.1.1" + "@jest/globals": "npm:^30.4.1" "@lavamoat/allow-scripts": "npm:^3.0.4" "@lavamoat/preinstall-always-fail": "npm:^2.1.0" "@metamask/create-release-branch": "npm:^4.2.2" @@ -6693,6 +6694,7 @@ __metadata: rimraf: "npm:^5.0.5" semver: "npm:^7.6.3" simple-git-hooks: "npm:^2.8.0" + ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" typescript: "npm:~5.3.3" typescript-eslint: "npm:^8.48.0" From b2724b85f567f4a224464d155b7b0bd8d4ba4f40 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Tue, 25 Aug 2026 11:23:05 +0200 Subject: [PATCH 12/17] Replace `lodash` with `lodash-es` `lodash` is CommonJS, so its named exports cannot be imported from an ES module: `import { cloneDeep } from 'lodash'` throws at run time once the packages are loaded as ESM. This went unnoticed because the tests compile to CommonJS, where the same import is fine. It surfaced in the `wallet-cli` daemon end-to-end test, which spawns the built CLI and so loads the real ES modules. The sources now import `lodash-es`, which publishes the same API as an ES module. Jest maps it back to `lodash` for the tests, since the reverse problem applies there: an ES module cannot be `require`d. Two call sites needed more than a rename. `smart-transactions-controller` imported the default export, which `lodash-es` does not provide, so it imports the functions it uses by name. `assets-controller` referred to the `MemoizedFunction` type, which `@types/lodash-es` does not re-export, so it takes that type from `@types/lodash` instead; the import is erased at compile time and adds no run-time dependency. --- eslint-suppressions.json | 3 - jest.config.packages.cjs | 5 ++ knip.config.mts | 10 +-- packages/account-tree-controller/package.json | 2 +- packages/accounts-controller/package.json | 2 +- .../src/AccountsController.ts | 2 +- packages/analytics-controller/package.json | 2 +- .../src/AnalyticsController.ts | 2 +- packages/assets-controller/package.json | 3 +- .../assets-controller/src/AssetsController.ts | 2 +- .../src/migrations/healAssetsInfoMetadata.ts | 2 +- .../src/utils/formatExchangeRatesForBridge.ts | 2 +- .../src/utils/formatStateForTransactionPay.ts | 2 +- .../src/utils/normalizeAssetId.ts | 4 +- packages/assets-controllers/package.json | 4 +- .../src/AccountTrackerController.ts | 2 +- .../src/TokenBalancesController.ts | 2 +- .../src/TokenRatesController.ts | 2 +- .../src/TokensController.ts | 2 +- .../src/selectors/token-selectors.test.ts | 2 +- .../src/utils/create-batch-handler.ts | 2 +- packages/base-data-service/package.json | 4 +- .../base-data-service/src/BaseDataService.ts | 2 +- packages/bridge-controller/package.json | 2 +- .../bridge-controller/src/selectors.test.ts | 2 +- packages/bridge-controller/src/selectors.ts | 2 +- .../src/utils/quote-metadata/merge.test.ts | 2 +- .../src/utils/quote-metadata/merge.ts | 2 +- .../quote-metadata/to-quote-metadata-v1.ts | 2 +- .../tests/mock-quotes-erc20-erc20.ts | 2 +- .../tests/mock-quotes-erc20-native.ts | 2 +- .../tests/mock-quotes-native-erc20-eth.ts | 2 +- .../tests/mock-quotes-native-erc20.ts | 2 +- .../tests/mock-quotes-sol-erc20.ts | 2 +- .../bridge-status-controller/package.json | 2 +- .../chain-agnostic-permission/package.json | 2 +- .../src/caip25Permission.test.ts | 2 +- .../src/caip25Permission.ts | 2 +- .../src/scope/transform.ts | 2 +- packages/controller-utils/package.json | 4 +- packages/controller-utils/src/util.ts | 2 +- packages/eip-5792-middleware/package.json | 2 +- .../src/hooks/processSendCalls.ts | 2 +- .../package.json | 2 +- .../src/wallet-requestPermissions.ts | 2 +- packages/keyring-controller/package.json | 2 +- .../src/KeyringController.ts | 2 +- .../tests/mocks/mockEncryptor.ts | 2 +- .../multichain-account-service/package.json | 2 +- .../package.json | 4 +- .../MultichainNetworkService.test.ts | 2 +- .../MultichainNetworkService.ts | 2 +- packages/network-controller/package.json | 4 +- .../src/NetworkController.ts | 2 +- .../not-handled-by-middleware.ts | 2 +- .../package.json | 4 +- .../NotificationServicesController.ts | 2 +- .../selected-network-controller/package.json | 2 +- packages/shield-controller/package.json | 2 +- .../shield-controller/src/ShieldController.ts | 2 +- packages/signature-controller/package.json | 2 +- .../package.json | 2 +- .../src/utils.ts | 12 +-- packages/snap-account-service/package.json | 2 +- .../src/SnapPlatformWatcher.ts | 2 +- packages/transaction-controller/package.json | 2 +- .../src/TransactionController.ts | 2 +- .../src/api/simulation-api.test.ts | 2 +- .../src/api/simulation-api.ts | 2 +- .../src/helpers/PendingTransactionTracker.ts | 2 +- .../src/helpers/ResimulateHelper.ts | 2 +- .../src/helpers/TransactionPoller.ts | 2 +- .../src/hooks/CollectPublishHook.test.ts | 2 +- .../src/hooks/CollectPublishHook.ts | 2 +- .../src/utils/batch.test.ts | 2 +- .../src/utils/gas-fee-tokens.test.ts | 2 +- .../src/utils/gas.test.ts | 2 +- .../src/utils/prepare.ts | 2 +- .../transaction-controller/src/utils/swaps.ts | 2 +- .../transaction-pay-controller/package.json | 2 +- .../src/TransactionPayController.ts | 2 +- .../src/actions/update-fiat-payment.test.ts | 2 +- .../src/actions/update-payment-token.test.ts | 2 +- .../src/helpers/QuoteRefresher.ts | 2 +- .../src/strategy/relay/relay-quotes.test.ts | 2 +- .../relay/relay-submit-execute.test.ts | 2 +- .../src/strategy/relay/relay-submit.test.ts | 2 +- .../src/strategy/server/server-submit.test.ts | 2 +- .../src/utils/feature-flags.ts | 2 +- .../src/utils/gas.test.ts | 2 +- .../src/utils/quotes.test.ts | 2 +- .../src/utils/transaction.test.ts | 2 +- .../src/utils/transaction.ts | 2 +- .../user-operation-controller/package.json | 2 +- .../src/UserOperationController.ts | 2 +- .../src/utils/gas-fees.test.ts | 2 +- .../src/utils/gas.test.ts | 2 +- .../src/utils/validation.test.ts | 2 +- yarn.lock | 79 +++++++++++-------- 99 files changed, 167 insertions(+), 145 deletions(-) diff --git a/eslint-suppressions.json b/eslint-suppressions.json index a2ee9b234d1..54b71e8f501 100644 --- a/eslint-suppressions.json +++ b/eslint-suppressions.json @@ -2111,9 +2111,6 @@ "@typescript-eslint/explicit-function-return-type": { "count": 10 }, - "@typescript-eslint/naming-convention": { - "count": 1 - }, "@typescript-eslint/no-explicit-any": { "count": 4 }, diff --git a/jest.config.packages.cjs b/jest.config.packages.cjs index 015459f09a0..e066df2f412 100644 --- a/jest.config.packages.cjs +++ b/jest.config.packages.cjs @@ -94,6 +94,11 @@ module.exports = { '/../../node_modules/@metamask/$1', ], '^uuid$': require.resolve('uuid'), + // The sources import `lodash-es`, because `lodash` is CommonJS and its + // named exports cannot be imported from an ES module. The tests compile to + // CommonJS, where the reverse is true, so they are pointed back at + // `lodash`. The two have the same API. + '^lodash-es$': require.resolve('lodash'), }, // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader diff --git a/knip.config.mts b/knip.config.mts index 1faa468d593..abfaf9dd739 100644 --- a/knip.config.mts +++ b/knip.config.mts @@ -41,7 +41,7 @@ const config: KnipConfig = { ignoreDependencies: [ '@metamask/controller-utils', '@metamask/keyring-internal-api', - 'lodash', + 'lodash-es', ], }, 'packages/analytics-data-regulation-controller': { @@ -66,7 +66,7 @@ const config: KnipConfig = { ignoreDependencies: [ '@metamask/gas-fee-controller', '@metamask/remote-feature-flag-controller', - 'lodash', + 'lodash-es', 'nock', ], }, @@ -127,7 +127,7 @@ const config: KnipConfig = { ignoreDependencies: [ '@metamask/base-controller', '@metamask/superstruct', - 'lodash', + 'lodash-es', ], }, 'packages/multichain-network-controller': { @@ -183,10 +183,10 @@ const config: KnipConfig = { ignoreDependencies: ['cockatiel', 'nock'], }, 'packages/selected-network-controller': { - ignoreDependencies: ['immer', 'lodash', 'nock'], + ignoreDependencies: ['immer', 'lodash-es', 'nock'], }, 'packages/signature-controller': { - ignoreDependencies: ['lodash'], + ignoreDependencies: ['lodash-es'], }, 'packages/snap-account-service': { ignoreDependencies: [ diff --git a/packages/account-tree-controller/package.json b/packages/account-tree-controller/package.json index 5b1ef7f968c..98311505145 100644 --- a/packages/account-tree-controller/package.json +++ b/packages/account-tree-controller/package.json @@ -61,7 +61,7 @@ "@metamask/superstruct": "^3.4.1", "@metamask/utils": "^11.11.0", "fast-deep-equal": "^3.1.3", - "lodash": "^4.17.21" + "lodash-es": "^4.17.21" }, "devDependencies": { "@metamask/account-api": "^2.0.0", diff --git a/packages/accounts-controller/package.json b/packages/accounts-controller/package.json index 8f7c25a748b..51a2fd3d67c 100644 --- a/packages/accounts-controller/package.json +++ b/packages/accounts-controller/package.json @@ -63,7 +63,7 @@ "deepmerge": "^4.2.2", "ethereum-cryptography": "^2.1.2", "immer": "^9.0.6", - "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "uuid": "^8.3.2" }, "devDependencies": { diff --git a/packages/accounts-controller/src/AccountsController.ts b/packages/accounts-controller/src/AccountsController.ts index c4ee9b5ae62..50af609db83 100644 --- a/packages/accounts-controller/src/AccountsController.ts +++ b/packages/accounts-controller/src/AccountsController.ts @@ -34,7 +34,7 @@ import type { NetworkClientId } from '@metamask/network-controller'; import { isCaipChainId } from '@metamask/utils'; import type { CaipChainId } from '@metamask/utils'; import type { WritableDraft } from 'immer/dist/internal.js'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import { AccountsControllerMethodActions } from './AccountsController-method-action-types.js'; import { projectLogger as log } from './logger.js'; diff --git a/packages/analytics-controller/package.json b/packages/analytics-controller/package.json index e03797f5a50..281824fafc8 100644 --- a/packages/analytics-controller/package.json +++ b/packages/analytics-controller/package.json @@ -52,7 +52,7 @@ "@metamask/geolocation-controller": "^1.0.0", "@metamask/messenger": "^2.0.0", "@metamask/utils": "^11.11.0", - "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "uuid": "^8.3.2" }, "devDependencies": { diff --git a/packages/analytics-controller/src/AnalyticsController.ts b/packages/analytics-controller/src/AnalyticsController.ts index b257cde8cb8..dd8ceac3813 100644 --- a/packages/analytics-controller/src/AnalyticsController.ts +++ b/packages/analytics-controller/src/AnalyticsController.ts @@ -10,7 +10,7 @@ import type { } from '@metamask/geolocation-controller'; import type { Messenger } from '@metamask/messenger'; import type { Json } from '@metamask/utils'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import { v4 as uuid } from 'uuid'; import type { AnalyticsControllerMethodActions } from './AnalyticsController-method-action-types.js'; diff --git a/packages/assets-controller/package.json b/packages/assets-controller/package.json index e68ef991186..45821a7437c 100644 --- a/packages/assets-controller/package.json +++ b/packages/assets-controller/package.json @@ -77,13 +77,14 @@ "@metamask/utils": "^11.11.0", "async-mutex": "^0.5.0", "bignumber.js": "^9.1.2", - "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "p-limit": "^3.1.0" }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@types/jest": "^30.0.0", "@types/lodash": "^4.14.191", + "@types/lodash-es": "^4.17.12", "deepmerge": "^4.2.2", "jest": "^30.4.2", "ts-jest": "^29.4.11", diff --git a/packages/assets-controller/src/AssetsController.ts b/packages/assets-controller/src/AssetsController.ts index 229eeb3c404..367de48a948 100644 --- a/packages/assets-controller/src/AssetsController.ts +++ b/packages/assets-controller/src/AssetsController.ts @@ -72,7 +72,7 @@ import { } from '@metamask/utils'; import { Mutex } from 'async-mutex'; import { BigNumber as BigNumberJS } from 'bignumber.js'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; import type { AssetsControllerMethodActions } from './AssetsController-method-action-types.js'; import type { diff --git a/packages/assets-controller/src/migrations/healAssetsInfoMetadata.ts b/packages/assets-controller/src/migrations/healAssetsInfoMetadata.ts index 5546a7faefe..e3f75f6fbb5 100644 --- a/packages/assets-controller/src/migrations/healAssetsInfoMetadata.ts +++ b/packages/assets-controller/src/migrations/healAssetsInfoMetadata.ts @@ -7,7 +7,7 @@ import { hasProperty, isObject, } from '@metamask/utils'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import { createModuleLogger, projectLogger } from '../logger.js'; import type { diff --git a/packages/assets-controller/src/utils/formatExchangeRatesForBridge.ts b/packages/assets-controller/src/utils/formatExchangeRatesForBridge.ts index c452f271853..f95bb782126 100644 --- a/packages/assets-controller/src/utils/formatExchangeRatesForBridge.ts +++ b/packages/assets-controller/src/utils/formatExchangeRatesForBridge.ts @@ -9,7 +9,7 @@ import { } from '@metamask/assets-controllers'; import { Hex, KnownCaipNamespace, numberToHex } from '@metamask/utils'; import { parseCaipAssetType, parseCaipChainId } from '@metamask/utils'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; import type { AssetMetadata, diff --git a/packages/assets-controller/src/utils/formatStateForTransactionPay.ts b/packages/assets-controller/src/utils/formatStateForTransactionPay.ts index f2084924a4a..104ce0a03ea 100644 --- a/packages/assets-controller/src/utils/formatStateForTransactionPay.ts +++ b/packages/assets-controller/src/utils/formatStateForTransactionPay.ts @@ -2,7 +2,7 @@ import { toChecksumAddress } from '@ethereumjs/util'; import { getNativeTokenAddress } from '@metamask/assets-controllers'; import { numberToHex } from '@metamask/utils'; import { parseCaipAssetType, parseCaipChainId } from '@metamask/utils'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; import type { AssetBalance, diff --git a/packages/assets-controller/src/utils/normalizeAssetId.ts b/packages/assets-controller/src/utils/normalizeAssetId.ts index 0d30676efeb..8ec323eafb7 100644 --- a/packages/assets-controller/src/utils/normalizeAssetId.ts +++ b/packages/assets-controller/src/utils/normalizeAssetId.ts @@ -1,7 +1,9 @@ import { toChecksumAddress } from '@ethereumjs/util'; import { parseCaipAssetType, parseCaipChainId } from '@metamask/utils'; +// `@types/lodash-es` only re-exports the functions, so the helper type +// comes from `@types/lodash`. This is erased at compile time. import type { MemoizedFunction } from 'lodash'; -import { memoize } from 'lodash'; +import { memoize } from 'lodash-es'; import type { Caip19AssetId } from '../types.js'; diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json index 4b806157410..27168572951 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -90,7 +90,7 @@ "bitcoin-address-validation": "^2.2.3", "bn.js": "^5.2.1", "immer": "^9.0.6", - "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "multiformats": "^9.9.0", "reselect": "^5.1.1", "single-call-balance-checker-abi": "^1.0.0", @@ -105,7 +105,7 @@ "@metamask/keyring-snap-client": "^10.0.0", "@metamask/providers": "^22.1.0", "@types/jest": "^30.0.0", - "@types/lodash": "^4.14.191", + "@types/lodash-es": "^4.17.12", "@types/node": "^22.13.14", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/packages/assets-controllers/src/AccountTrackerController.ts b/packages/assets-controllers/src/AccountTrackerController.ts index 3606dbbd1c2..81b98c962a9 100644 --- a/packages/assets-controllers/src/AccountTrackerController.ts +++ b/packages/assets-controllers/src/AccountTrackerController.ts @@ -42,7 +42,7 @@ import type { import { assert, KnownCaipNamespace } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; import { Mutex } from 'async-mutex'; -import { cloneDeep, isEqual } from 'lodash'; +import { cloneDeep, isEqual } from 'lodash-es'; import type { AccountTrackerControllerMethodActions } from './AccountTrackerController-method-action-types.js'; import { STAKING_CONTRACT_ADDRESS_BY_CHAINID } from './AssetsContractController.js'; diff --git a/packages/assets-controllers/src/TokenBalancesController.ts b/packages/assets-controllers/src/TokenBalancesController.ts index d0afde3cc57..e251f071eb4 100644 --- a/packages/assets-controllers/src/TokenBalancesController.ts +++ b/packages/assets-controllers/src/TokenBalancesController.ts @@ -52,7 +52,7 @@ import { parseCaipChainId, } from '@metamask/utils'; import { produce } from 'immer'; -import { isEqual, union } from 'lodash'; +import { isEqual, union } from 'lodash-es'; import type { AccountTrackerControllerUpdateNativeBalancesAction, diff --git a/packages/assets-controllers/src/TokenRatesController.ts b/packages/assets-controllers/src/TokenRatesController.ts index a27105de668..a0baede1d90 100644 --- a/packages/assets-controllers/src/TokenRatesController.ts +++ b/packages/assets-controllers/src/TokenRatesController.ts @@ -12,7 +12,7 @@ import type { import type { NetworkEnablementControllerGetStateAction } from '@metamask/network-enablement-controller'; import { StaticIntervalPollingController } from '@metamask/polling-controller'; import type { Hex } from '@metamask/utils'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; import { reduceInBatchesSerially, diff --git a/packages/assets-controllers/src/TokensController.ts b/packages/assets-controllers/src/TokensController.ts index ca22af31657..67137e0b58c 100644 --- a/packages/assets-controllers/src/TokensController.ts +++ b/packages/assets-controllers/src/TokensController.ts @@ -42,7 +42,7 @@ import { isStrictHexString } from '@metamask/utils'; import type { Hex, Json } from '@metamask/utils'; import { Mutex } from 'async-mutex'; import type { Patch } from 'immer'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import { v1 as random } from 'uuid'; import { formatAggregatorNames, formatIconUrlWithProxy } from './assetsUtil.js'; diff --git a/packages/assets-controllers/src/selectors/token-selectors.test.ts b/packages/assets-controllers/src/selectors/token-selectors.test.ts index 3ca474bde2e..79a3761dbc8 100644 --- a/packages/assets-controllers/src/selectors/token-selectors.test.ts +++ b/packages/assets-controllers/src/selectors/token-selectors.test.ts @@ -8,7 +8,7 @@ import type { AccountsControllerState } from '@metamask/accounts-controller'; import { TrxScope } from '@metamask/keyring-api'; import type { NetworkState } from '@metamask/network-controller'; import type { Hex } from '@metamask/utils'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import type { AccountGroupMultichainAccountObject } from '../../../account-tree-controller/src/group.js'; import type { CurrencyRateState } from '../CurrencyRateController.js'; diff --git a/packages/assets-controllers/src/utils/create-batch-handler.ts b/packages/assets-controllers/src/utils/create-batch-handler.ts index 4d202b9575d..f68546f1c0f 100644 --- a/packages/assets-controllers/src/utils/create-batch-handler.ts +++ b/packages/assets-controllers/src/utils/create-batch-handler.ts @@ -1,4 +1,4 @@ -import { debounce } from 'lodash'; +import { debounce } from 'lodash-es'; type PendingSettler = { resolve: () => void; diff --git a/packages/base-data-service/package.json b/packages/base-data-service/package.json index ffa9565be8b..acbb6f579f2 100644 --- a/packages/base-data-service/package.json +++ b/packages/base-data-service/package.json @@ -56,12 +56,12 @@ "@tanstack/query-core": "^5.62.16", "cockatiel": "^3.1.2", "fast-deep-equal": "^3.1.3", - "lodash": "^4.17.21" + "lodash-es": "^4.17.21" }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@types/jest": "^30.0.0", - "@types/lodash": "^4.14.191", + "@types/lodash-es": "^4.17.12", "deepmerge": "^4.2.2", "jest": "^30.4.2", "nock": "^13.3.1", diff --git a/packages/base-data-service/src/BaseDataService.ts b/packages/base-data-service/src/BaseDataService.ts index c694a761a17..6aef4f0ade4 100644 --- a/packages/base-data-service/src/BaseDataService.ts +++ b/packages/base-data-service/src/BaseDataService.ts @@ -31,7 +31,7 @@ import { hydrate, } from '@tanstack/query-core'; import deepEqual from 'fast-deep-equal'; -import { debounce, DebouncedFunc } from 'lodash'; +import { debounce, DebouncedFunc } from 'lodash-es'; import { createServicePolicy, diff --git a/packages/bridge-controller/package.json b/packages/bridge-controller/package.json index 16136a80808..6d006d3da0e 100644 --- a/packages/bridge-controller/package.json +++ b/packages/bridge-controller/package.json @@ -81,7 +81,7 @@ "deepmerge": "^4.2.2", "jest": "^30.4.2", "jest-environment-jsdom": "^30.4.1", - "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "nock": "^13.3.1", "ts-jest": "^29.4.11", "tsx": "^4.20.5", diff --git a/packages/bridge-controller/src/selectors.test.ts b/packages/bridge-controller/src/selectors.test.ts index 39983e7caaa..2436b1eb587 100644 --- a/packages/bridge-controller/src/selectors.test.ts +++ b/packages/bridge-controller/src/selectors.test.ts @@ -8,7 +8,7 @@ import { parseCaipChainId, } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { merge } from 'lodash'; +import { merge } from 'lodash-es'; import { mockBridgeQuotesErc20Erc20V1 } from '../tests/mock-quotes-erc20-erc20.js'; import { diff --git a/packages/bridge-controller/src/selectors.ts b/packages/bridge-controller/src/selectors.ts index 39677f3c211..ac286484989 100644 --- a/packages/bridge-controller/src/selectors.ts +++ b/packages/bridge-controller/src/selectors.ts @@ -12,7 +12,7 @@ import type { import type { CaipAssetType } from '@metamask/utils'; import { isStrictHexString, parseCaipAssetType } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { orderBy } from 'lodash'; +import { orderBy } from 'lodash-es'; import { createSelector as createSelector_, createStructuredSelector as createStructuredSelector_, diff --git a/packages/bridge-controller/src/utils/quote-metadata/merge.test.ts b/packages/bridge-controller/src/utils/quote-metadata/merge.test.ts index 820f77c0067..5b665e58118 100644 --- a/packages/bridge-controller/src/utils/quote-metadata/merge.test.ts +++ b/packages/bridge-controller/src/utils/quote-metadata/merge.test.ts @@ -1,4 +1,4 @@ -import { merge } from 'lodash'; +import { merge } from 'lodash-es'; import { getMockBridgeQuotesErc20Erc20V2 } from '../../../tests/mock-quotes-erc20-erc20.js'; import { diff --git a/packages/bridge-controller/src/utils/quote-metadata/merge.ts b/packages/bridge-controller/src/utils/quote-metadata/merge.ts index 8ba6bddf4b3..5d55db11824 100644 --- a/packages/bridge-controller/src/utils/quote-metadata/merge.ts +++ b/packages/bridge-controller/src/utils/quote-metadata/merge.ts @@ -1,4 +1,4 @@ -import { merge } from 'lodash'; +import { merge } from 'lodash-es'; import type { DeepPartial } from '../../types.js'; import type { QuoteResponse } from '../../validators/quote-response.js'; diff --git a/packages/bridge-controller/src/utils/quote-metadata/to-quote-metadata-v1.ts b/packages/bridge-controller/src/utils/quote-metadata/to-quote-metadata-v1.ts index 9f37cb4e113..350a19d0bfb 100644 --- a/packages/bridge-controller/src/utils/quote-metadata/to-quote-metadata-v1.ts +++ b/packages/bridge-controller/src/utils/quote-metadata/to-quote-metadata-v1.ts @@ -1,4 +1,4 @@ -import { merge } from 'lodash'; +import { merge } from 'lodash-es'; import type { DeepPartial } from '../../types.js'; import type { AmountsAndAsset } from '../../validators/amount-and-asset.js'; diff --git a/packages/bridge-controller/tests/mock-quotes-erc20-erc20.ts b/packages/bridge-controller/tests/mock-quotes-erc20-erc20.ts index eb64b1806a6..247f87ac8a9 100644 --- a/packages/bridge-controller/tests/mock-quotes-erc20-erc20.ts +++ b/packages/bridge-controller/tests/mock-quotes-erc20-erc20.ts @@ -1,4 +1,4 @@ -import { merge } from 'lodash'; +import { merge } from 'lodash-es'; import { toQuoteResponseV2 } from '../src/index.js'; import type { DeepPartial } from '../src/types.js'; diff --git a/packages/bridge-controller/tests/mock-quotes-erc20-native.ts b/packages/bridge-controller/tests/mock-quotes-erc20-native.ts index 05f6c011530..c60f18cd50f 100644 --- a/packages/bridge-controller/tests/mock-quotes-erc20-native.ts +++ b/packages/bridge-controller/tests/mock-quotes-erc20-native.ts @@ -1,4 +1,4 @@ -import { merge } from 'lodash'; +import { merge } from 'lodash-es'; import { toQuoteResponseV2 } from '../src/coercers/quote-response-v1-to-v2.js'; import type { DeepPartial } from '../src/types.js'; diff --git a/packages/bridge-controller/tests/mock-quotes-native-erc20-eth.ts b/packages/bridge-controller/tests/mock-quotes-native-erc20-eth.ts index 6ef89d6770e..a162d6ed3fa 100644 --- a/packages/bridge-controller/tests/mock-quotes-native-erc20-eth.ts +++ b/packages/bridge-controller/tests/mock-quotes-native-erc20-eth.ts @@ -1,4 +1,4 @@ -import { merge } from 'lodash'; +import { merge } from 'lodash-es'; import { toQuoteResponseV2 } from '../src/coercers/quote-response-v1-to-v2.js'; import type { DeepPartial } from '../src/types.js'; diff --git a/packages/bridge-controller/tests/mock-quotes-native-erc20.ts b/packages/bridge-controller/tests/mock-quotes-native-erc20.ts index 52214e3c433..0a3db27ac23 100644 --- a/packages/bridge-controller/tests/mock-quotes-native-erc20.ts +++ b/packages/bridge-controller/tests/mock-quotes-native-erc20.ts @@ -1,5 +1,5 @@ import { KnownCaipNamespace } from '@metamask/utils'; -import { merge } from 'lodash'; +import { merge } from 'lodash-es'; import { toQuoteResponseV2 } from '../src/coercers/quote-response-v1-to-v2.js'; import type { DeepPartial } from '../src/types.js'; diff --git a/packages/bridge-controller/tests/mock-quotes-sol-erc20.ts b/packages/bridge-controller/tests/mock-quotes-sol-erc20.ts index 92e90049ea9..0a98de74b06 100644 --- a/packages/bridge-controller/tests/mock-quotes-sol-erc20.ts +++ b/packages/bridge-controller/tests/mock-quotes-sol-erc20.ts @@ -1,4 +1,4 @@ -import { merge } from 'lodash'; +import { merge } from 'lodash-es'; import { toQuoteResponseV2 } from '../src/coercers/quote-response-v1-to-v2.js'; import type { DeepPartial } from '../src/types.js'; diff --git a/packages/bridge-status-controller/package.json b/packages/bridge-status-controller/package.json index e4fb593ec9a..f1145c52c94 100644 --- a/packages/bridge-status-controller/package.json +++ b/packages/bridge-status-controller/package.json @@ -70,7 +70,7 @@ "deepmerge": "^4.2.2", "jest": "^30.4.2", "jest-environment-jsdom": "^30.4.1", - "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "nock": "^13.3.1", "ts-jest": "^29.4.11", "tsx": "^4.20.5", diff --git a/packages/chain-agnostic-permission/package.json b/packages/chain-agnostic-permission/package.json index 38197cdc6d4..00521e916ad 100644 --- a/packages/chain-agnostic-permission/package.json +++ b/packages/chain-agnostic-permission/package.json @@ -51,7 +51,7 @@ "@metamask/permission-controller": "^13.1.1", "@metamask/rpc-errors": "^7.0.2", "@metamask/utils": "^11.11.0", - "lodash": "^4.17.21" + "lodash-es": "^4.17.21" }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", diff --git a/packages/chain-agnostic-permission/src/caip25Permission.test.ts b/packages/chain-agnostic-permission/src/caip25Permission.test.ts index b8fb923934f..f35a35b981a 100644 --- a/packages/chain-agnostic-permission/src/caip25Permission.test.ts +++ b/packages/chain-agnostic-permission/src/caip25Permission.test.ts @@ -8,7 +8,7 @@ import type { PermissionSpecificationConstraint, CaveatSpecificationConstraint, } from '@metamask/permission-controller'; -import { pick } from 'lodash'; +import { pick } from 'lodash-es'; import type { Caip25CaveatValue } from './caip25Permission.js'; import { diff --git a/packages/chain-agnostic-permission/src/caip25Permission.ts b/packages/chain-agnostic-permission/src/caip25Permission.ts index 1b3959e7f2b..3758969b4f7 100644 --- a/packages/chain-agnostic-permission/src/caip25Permission.ts +++ b/packages/chain-agnostic-permission/src/caip25Permission.ts @@ -23,7 +23,7 @@ import type { Hex, NonEmptyArray, } from '@metamask/utils'; -import { cloneDeep, isEqual, pick } from 'lodash'; +import { cloneDeep, isEqual, pick } from 'lodash-es'; import { CaveatTypes, PermissionKeys } from './constants.js'; import { diff --git a/packages/chain-agnostic-permission/src/scope/transform.ts b/packages/chain-agnostic-permission/src/scope/transform.ts index cb364d513b3..c5d84c64dd3 100644 --- a/packages/chain-agnostic-permission/src/scope/transform.ts +++ b/packages/chain-agnostic-permission/src/scope/transform.ts @@ -1,5 +1,5 @@ import type { CaipReference } from '@metamask/utils'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import type { ExternalScopeObject, diff --git a/packages/controller-utils/package.json b/packages/controller-utils/package.json index 0afb7b418e4..359f757efdd 100644 --- a/packages/controller-utils/package.json +++ b/packages/controller-utils/package.json @@ -57,13 +57,13 @@ "cockatiel": "^3.1.2", "eth-ens-namehash": "^2.0.8", "fast-deep-equal": "^3.1.3", - "lodash": "^4.17.21" + "lodash-es": "^4.17.21" }, "devDependencies": { "@babel/runtime": "^7.23.9", "@metamask/auto-changelog": "^6.1.0", "@types/jest": "^30.0.0", - "@types/lodash": "^4.14.191", + "@types/lodash-es": "^4.17.12", "deepmerge": "^4.2.2", "jest": "^30.4.2", "jest-environment-jsdom": "^30.4.1", diff --git a/packages/controller-utils/src/util.ts b/packages/controller-utils/src/util.ts index 71a0f8c5430..e2e4e5cac3d 100644 --- a/packages/controller-utils/src/util.ts +++ b/packages/controller-utils/src/util.ts @@ -13,7 +13,7 @@ import type { BigNumber } from 'bignumber.js'; import BN from 'bn.js'; import ensNamehash from 'eth-ens-namehash'; import deepEqual from 'fast-deep-equal'; -import { memoize } from 'lodash'; +import { memoize } from 'lodash-es'; import { MAX_SAFE_CHAIN_ID } from './constants.js'; diff --git a/packages/eip-5792-middleware/package.json b/packages/eip-5792-middleware/package.json index c8011bcf4d1..e01ed335b26 100644 --- a/packages/eip-5792-middleware/package.json +++ b/packages/eip-5792-middleware/package.json @@ -51,7 +51,7 @@ "@metamask/superstruct": "^3.4.1", "@metamask/transaction-controller": "^69.6.1", "@metamask/utils": "^11.11.0", - "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "uuid": "^8.3.2" }, "devDependencies": { diff --git a/packages/eip-5792-middleware/src/hooks/processSendCalls.ts b/packages/eip-5792-middleware/src/hooks/processSendCalls.ts index 9e6d59720f5..416ffcd5ba0 100644 --- a/packages/eip-5792-middleware/src/hooks/processSendCalls.ts +++ b/packages/eip-5792-middleware/src/hooks/processSendCalls.ts @@ -11,7 +11,7 @@ import type { import { TransactionEnvelopeType } from '@metamask/transaction-controller'; import type { Hex, JsonRpcRequest } from '@metamask/utils'; import { add0x, bytesToHex } from '@metamask/utils'; -import { groupBy } from 'lodash'; +import { groupBy } from 'lodash-es'; import { parse, v4 as uuid } from 'uuid'; import { diff --git a/packages/eip1193-permission-middleware/package.json b/packages/eip1193-permission-middleware/package.json index 6884ed0f346..4222ebbfcd5 100644 --- a/packages/eip1193-permission-middleware/package.json +++ b/packages/eip1193-permission-middleware/package.json @@ -51,7 +51,7 @@ "@metamask/json-rpc-engine": "^10.5.0", "@metamask/permission-controller": "^13.1.1", "@metamask/utils": "^11.11.0", - "lodash": "^4.17.21" + "lodash-es": "^4.17.21" }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", diff --git a/packages/eip1193-permission-middleware/src/wallet-requestPermissions.ts b/packages/eip1193-permission-middleware/src/wallet-requestPermissions.ts index d49fee4f791..4dc6e03f71a 100644 --- a/packages/eip1193-permission-middleware/src/wallet-requestPermissions.ts +++ b/packages/eip1193-permission-middleware/src/wallet-requestPermissions.ts @@ -22,7 +22,7 @@ import type { JsonRpcRequest, PendingJsonRpcResponse, } from '@metamask/utils'; -import { pick } from 'lodash'; +import { pick } from 'lodash-es'; import { CaveatTypes, EndowmentTypes, RestrictedMethods } from './types.js'; diff --git a/packages/keyring-controller/package.json b/packages/keyring-controller/package.json index a18aa544a04..89350565c12 100644 --- a/packages/keyring-controller/package.json +++ b/packages/keyring-controller/package.json @@ -62,7 +62,7 @@ "async-mutex": "^0.5.0", "ethereumjs-wallet": "^1.0.1", "immer": "^9.0.6", - "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "ulid": "^2.3.0" }, "devDependencies": { diff --git a/packages/keyring-controller/src/KeyringController.ts b/packages/keyring-controller/src/KeyringController.ts index 799c990961a..74559b17c72 100644 --- a/packages/keyring-controller/src/KeyringController.ts +++ b/packages/keyring-controller/src/KeyringController.ts @@ -39,7 +39,7 @@ import { Mutex } from 'async-mutex'; import type { MutexInterface } from 'async-mutex'; import Wallet, { thirdparty as importers } from 'ethereumjs-wallet'; import type { Patch } from 'immer'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; // When generating a ULID within the same millisecond, monotonicFactory provides some guarantees regarding sort order. import { ulid } from 'ulid'; diff --git a/packages/keyring-controller/tests/mocks/mockEncryptor.ts b/packages/keyring-controller/tests/mocks/mockEncryptor.ts index af97c8d3e5c..92e3acd7382 100644 --- a/packages/keyring-controller/tests/mocks/mockEncryptor.ts +++ b/packages/keyring-controller/tests/mocks/mockEncryptor.ts @@ -6,7 +6,7 @@ import type { EncryptionResult, } from '@metamask/browser-passworder'; import type { Json } from '@metamask/utils'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; import type { Encryptor } from '../../src/KeyringController.js'; diff --git a/packages/multichain-account-service/package.json b/packages/multichain-account-service/package.json index 5faa7050e5b..7b47a252c78 100644 --- a/packages/multichain-account-service/package.json +++ b/packages/multichain-account-service/package.json @@ -67,7 +67,7 @@ "@metamask/superstruct": "^3.4.1", "@metamask/utils": "^11.11.0", "async-mutex": "^0.5.0", - "lodash": "^4.17.21" + "lodash-es": "^4.17.21" }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", diff --git a/packages/multichain-network-controller/package.json b/packages/multichain-network-controller/package.json index eac1017a225..c5d3da8dc0d 100644 --- a/packages/multichain-network-controller/package.json +++ b/packages/multichain-network-controller/package.json @@ -58,13 +58,13 @@ "@metamask/superstruct": "^3.4.1", "@metamask/utils": "^11.11.0", "@solana/addresses": "^2.0.0", - "lodash": "^4.17.21" + "lodash-es": "^4.17.21" }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", "@metamask/keyring-controller": "^27.1.1", "@types/jest": "^30.0.0", - "@types/lodash": "^4.14.191", + "@types/lodash-es": "^4.17.12", "@types/uuid": "^8.3.0", "deepmerge": "^4.2.2", "immer": "^9.0.6", diff --git a/packages/multichain-network-controller/src/MultichainNetworkService/MultichainNetworkService.test.ts b/packages/multichain-network-controller/src/MultichainNetworkService/MultichainNetworkService.test.ts index be29e727cf9..9b1743a7bac 100644 --- a/packages/multichain-network-controller/src/MultichainNetworkService/MultichainNetworkService.test.ts +++ b/packages/multichain-network-controller/src/MultichainNetworkService/MultichainNetworkService.test.ts @@ -1,6 +1,6 @@ import { KnownCaipNamespace } from '@metamask/utils'; import type { CaipAccountId } from '@metamask/utils'; -import { chunk } from 'lodash'; +import { chunk } from 'lodash-es'; import { MULTICHAIN_ACCOUNTS_CLIENT_HEADER, diff --git a/packages/multichain-network-controller/src/MultichainNetworkService/MultichainNetworkService.ts b/packages/multichain-network-controller/src/MultichainNetworkService/MultichainNetworkService.ts index e564c491812..801b0cef9df 100644 --- a/packages/multichain-network-controller/src/MultichainNetworkService/MultichainNetworkService.ts +++ b/packages/multichain-network-controller/src/MultichainNetworkService/MultichainNetworkService.ts @@ -1,6 +1,6 @@ import { assert } from '@metamask/superstruct'; import type { CaipAccountId } from '@metamask/utils'; -import { chunk } from 'lodash'; +import { chunk } from 'lodash-es'; import { ActiveNetworksResponseStruct, diff --git a/packages/network-controller/package.json b/packages/network-controller/package.json index 9304430ea15..8839d72e107 100644 --- a/packages/network-controller/package.json +++ b/packages/network-controller/package.json @@ -77,7 +77,7 @@ "@types/deep-freeze-strict": "^1.1.0", "@types/jest": "^30.0.0", "@types/jest-when": "^2.7.3", - "@types/lodash": "^4.14.191", + "@types/lodash-es": "^4.17.12", "@types/node-fetch": "^2.6.12", "cockatiel": "^3.1.2", "deep-freeze-strict": "^1.1.1", @@ -85,7 +85,7 @@ "jest": "^30.4.2", "jest-environment-jsdom": "^30.4.1", "jest-when": "^3.7.0", - "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "nock": "^13.3.1", "node-fetch": "^2.7.0", "ts-jest": "^29.4.11", diff --git a/packages/network-controller/src/NetworkController.ts b/packages/network-controller/src/NetworkController.ts index 5f0cbc17be1..3719f7e2616 100644 --- a/packages/network-controller/src/NetworkController.ts +++ b/packages/network-controller/src/NetworkController.ts @@ -52,7 +52,7 @@ import { import deepEqual from 'fast-deep-equal'; import type { Draft } from 'immer'; import { produce } from 'immer'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import type { Logger } from 'loglevel'; import { createSelector } from 'reselect'; import * as URI from 'uri-js'; diff --git a/packages/network-controller/tests/network-client/not-handled-by-middleware.ts b/packages/network-controller/tests/network-client/not-handled-by-middleware.ts index c4ee0afec87..e7af4e0f45e 100644 --- a/packages/network-controller/tests/network-client/not-handled-by-middleware.ts +++ b/packages/network-controller/tests/network-client/not-handled-by-middleware.ts @@ -1,4 +1,4 @@ -import { fill } from 'lodash'; +import { fill } from 'lodash-es'; import type { ProviderType } from './helpers.js'; import { withMockedCommunications, withNetworkClient } from './helpers.js'; diff --git a/packages/notification-services-controller/package.json b/packages/notification-services-controller/package.json index 04908492b6e..17a54642646 100644 --- a/packages/notification-services-controller/package.json +++ b/packages/notification-services-controller/package.json @@ -80,7 +80,7 @@ "@metamask/utils": "^11.11.0", "bignumber.js": "^9.1.2", "firebase": "^11.2.0", - "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "loglevel": "^1.8.1", "semver": "^7.6.3", "uuid": "^8.3.2" @@ -90,7 +90,7 @@ "@lavamoat/preinstall-always-fail": "^2.1.0", "@metamask/auto-changelog": "^6.1.0", "@types/jest": "^30.0.0", - "@types/lodash": "^4.14.191", + "@types/lodash-es": "^4.17.12", "@types/readable-stream": "^2.3.0", "@types/semver": "^7", "contentful": "^10.15.0", diff --git a/packages/notification-services-controller/src/NotificationServicesController/NotificationServicesController.ts b/packages/notification-services-controller/src/NotificationServicesController/NotificationServicesController.ts index 5fac52146a2..31493e196ef 100644 --- a/packages/notification-services-controller/src/NotificationServicesController/NotificationServicesController.ts +++ b/packages/notification-services-controller/src/NotificationServicesController/NotificationServicesController.ts @@ -31,7 +31,7 @@ import type { Messenger } from '@metamask/messenger'; import type { AuthenticationController } from '@metamask/profile-sync-controller'; import type { Hex } from '@metamask/utils'; import { assert } from '@metamask/utils'; -import { debounce } from 'lodash'; +import { debounce } from 'lodash-es'; import log from 'loglevel'; import type { diff --git a/packages/selected-network-controller/package.json b/packages/selected-network-controller/package.json index 6c76b02421c..40321bf2b57 100644 --- a/packages/selected-network-controller/package.json +++ b/packages/selected-network-controller/package.json @@ -63,7 +63,7 @@ "immer": "^9.0.6", "jest": "^30.4.2", "jest-environment-jsdom": "^30.4.1", - "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "nock": "^13.3.1", "ts-jest": "^29.4.11", "tsx": "^4.20.5", diff --git a/packages/shield-controller/package.json b/packages/shield-controller/package.json index c1cf790a427..61fc7d4a00d 100644 --- a/packages/shield-controller/package.json +++ b/packages/shield-controller/package.json @@ -67,7 +67,7 @@ "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", - "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "ts-jest": "^29.4.11", "tsx": "^4.20.5", "typedoc": "^0.25.13", diff --git a/packages/shield-controller/src/ShieldController.ts b/packages/shield-controller/src/ShieldController.ts index 1c1d16fb980..d1fd38ff4e8 100644 --- a/packages/shield-controller/src/ShieldController.ts +++ b/packages/shield-controller/src/ShieldController.ts @@ -14,7 +14,7 @@ import type { TransactionControllerStateChangeEvent, TransactionMeta, } from '@metamask/transaction-controller'; -import { cloneDeep, isEqual } from 'lodash'; +import { cloneDeep, isEqual } from 'lodash-es'; import { controllerName } from './constants.js'; import { projectLogger, createModuleLogger } from './logger.js'; diff --git a/packages/signature-controller/package.json b/packages/signature-controller/package.json index 21db5d032e2..4b239d2d323 100644 --- a/packages/signature-controller/package.json +++ b/packages/signature-controller/package.json @@ -60,7 +60,7 @@ "@metamask/network-controller": "^36.0.0", "@metamask/utils": "^11.11.0", "jsonschema": "^1.4.1", - "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "uuid": "^8.3.2" }, "devDependencies": { diff --git a/packages/smart-transactions-controller/package.json b/packages/smart-transactions-controller/package.json index b8c4958f932..d2a081e002a 100644 --- a/packages/smart-transactions-controller/package.json +++ b/packages/smart-transactions-controller/package.json @@ -66,7 +66,7 @@ "@metamask/utils": "^11.11.0", "bignumber.js": "^9.1.2", "klona": "^2.0.6", - "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "reselect": "^5.1.1" }, "devDependencies": { diff --git a/packages/smart-transactions-controller/src/utils.ts b/packages/smart-transactions-controller/src/utils.ts index def15a74890..c087f63c2c6 100644 --- a/packages/smart-transactions-controller/src/utils.ts +++ b/packages/smart-transactions-controller/src/utils.ts @@ -7,7 +7,7 @@ import type { } from '@metamask/transaction-controller'; import { TransactionStatus } from '@metamask/transaction-controller'; import { BigNumber } from 'bignumber.js'; -import _ from 'lodash'; +import { camelCase, isArray, isObject, mapKeys, mapValues } from 'lodash-es'; // Ignoring TypeScript errors here because this import is disallowed for production builds, because // the `package.json` file is above the root directory. @@ -146,19 +146,19 @@ export const getStxProcessingTime = ( export const mapKeysToCamel = ( obj: Record, ): Record => { - if (!_.isObject(obj)) { + if (!isObject(obj)) { return obj; } - const mappedValues = _.mapValues(obj, (val: Record) => { - if (_.isArray(val)) { + const mappedValues = mapValues(obj, (val: Record) => { + if (isArray(val)) { return val.map(mapKeysToCamel); - } else if (_.isObject(val)) { + } else if (isObject(val)) { return mapKeysToCamel(val); } return val; }); // eslint-disable-next-line @typescript-eslint/no-unused-vars - return _.mapKeys(mappedValues, (value, key) => _.camelCase(key)); + return mapKeys(mappedValues, (value, key) => camelCase(key)); }; export async function handleFetch(request: string, options?: RequestInit) { diff --git a/packages/snap-account-service/package.json b/packages/snap-account-service/package.json index e6bf4e06e64..d0cccf000c3 100644 --- a/packages/snap-account-service/package.json +++ b/packages/snap-account-service/package.json @@ -58,7 +58,7 @@ "@metamask/snaps-controllers": "^19.0.0", "@metamask/snaps-sdk": "^11.0.0", "@metamask/utils": "^11.11.0", - "lodash": "^4.17.21" + "lodash-es": "^4.17.21" }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", diff --git a/packages/snap-account-service/src/SnapPlatformWatcher.ts b/packages/snap-account-service/src/SnapPlatformWatcher.ts index ec3797464ed..b4ba6869e5f 100644 --- a/packages/snap-account-service/src/SnapPlatformWatcher.ts +++ b/packages/snap-account-service/src/SnapPlatformWatcher.ts @@ -1,5 +1,5 @@ import { createDeferredPromise, DeferredPromise } from '@metamask/utils'; -import { once } from 'lodash'; +import { once } from 'lodash-es'; import { projectLogger as log } from './logger.js'; import type { SnapAccountServiceMessenger } from './SnapAccountService.js'; diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index c91e9656ecb..d3e78505e19 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -74,7 +74,7 @@ "eth-method-registry": "^4.0.0", "ethereum-cryptography": "^2.1.2", "fast-json-patch": "^3.1.1", - "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "uuid": "^8.3.2" }, "devDependencies": { diff --git a/packages/transaction-controller/src/TransactionController.ts b/packages/transaction-controller/src/TransactionController.ts index aaf788a8052..19de1671966 100644 --- a/packages/transaction-controller/src/TransactionController.ts +++ b/packages/transaction-controller/src/TransactionController.ts @@ -68,7 +68,7 @@ import { add0x } from '@metamask/utils'; // This package purposefully relies on Node's EventEmitter module. // eslint-disable-next-line import-x/no-nodejs-modules import { EventEmitter } from 'events'; -import { cloneDeep, mapValues, merge, noop, pickBy, sortBy } from 'lodash'; +import { cloneDeep, mapValues, merge, noop, pickBy, sortBy } from 'lodash-es'; import { v1 as random } from 'uuid'; import { DefaultGasFeeFlow } from './gas-flows/DefaultGasFeeFlow.js'; diff --git a/packages/transaction-controller/src/api/simulation-api.test.ts b/packages/transaction-controller/src/api/simulation-api.test.ts index 74191d0668b..8148c9bee08 100644 --- a/packages/transaction-controller/src/api/simulation-api.test.ts +++ b/packages/transaction-controller/src/api/simulation-api.test.ts @@ -1,5 +1,5 @@ import type { Hex } from '@metamask/utils'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import type { GetSimulationConfig } from 'src'; import { CHAIN_IDS, DELEGATION_MANAGER_ADDRESSES } from '../constants.js'; diff --git a/packages/transaction-controller/src/api/simulation-api.ts b/packages/transaction-controller/src/api/simulation-api.ts index 4d080a3055e..ff16cbbb050 100644 --- a/packages/transaction-controller/src/api/simulation-api.ts +++ b/packages/transaction-controller/src/api/simulation-api.ts @@ -1,7 +1,7 @@ import { convertHexToDecimal } from '@metamask/controller-utils'; import { createModuleLogger } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import { CODE_DELEGATION_MANAGER_NO_SIGNATURE_ERRORS, diff --git a/packages/transaction-controller/src/helpers/PendingTransactionTracker.ts b/packages/transaction-controller/src/helpers/PendingTransactionTracker.ts index a510d828ca2..80b0918635c 100644 --- a/packages/transaction-controller/src/helpers/PendingTransactionTracker.ts +++ b/packages/transaction-controller/src/helpers/PendingTransactionTracker.ts @@ -6,7 +6,7 @@ import type { Json } from '@metamask/utils'; // This package purposefully relies on Node's EventEmitter module. // eslint-disable-next-line import-x/no-nodejs-modules import EventEmitter from 'events'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import { createModuleLogger, projectLogger } from '../logger.js'; import type { TransactionControllerMessenger } from '../TransactionController.js'; diff --git a/packages/transaction-controller/src/helpers/ResimulateHelper.ts b/packages/transaction-controller/src/helpers/ResimulateHelper.ts index 123f9ff190b..5e3875d1676 100644 --- a/packages/transaction-controller/src/helpers/ResimulateHelper.ts +++ b/packages/transaction-controller/src/helpers/ResimulateHelper.ts @@ -1,7 +1,7 @@ import type { Hex } from '@metamask/utils'; import { remove0x } from '@metamask/utils'; import { BN } from 'bn.js'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; import { createModuleLogger, projectLogger } from '../logger.js'; import { TransactionContainerType, TransactionStatus } from '../types.js'; diff --git a/packages/transaction-controller/src/helpers/TransactionPoller.ts b/packages/transaction-controller/src/helpers/TransactionPoller.ts index 406400e2a3d..0c87c10b4a3 100644 --- a/packages/transaction-controller/src/helpers/TransactionPoller.ts +++ b/packages/transaction-controller/src/helpers/TransactionPoller.ts @@ -2,7 +2,7 @@ import type { Transaction } from '@metamask/core-backend'; import type { BlockTracker } from '@metamask/network-controller'; import { createModuleLogger } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash-es'; import { projectLogger } from '../logger.js'; import type { TransactionControllerMessenger } from '../TransactionController.js'; diff --git a/packages/transaction-controller/src/hooks/CollectPublishHook.test.ts b/packages/transaction-controller/src/hooks/CollectPublishHook.test.ts index ce853bf9a22..23bf3f27ac8 100644 --- a/packages/transaction-controller/src/hooks/CollectPublishHook.test.ts +++ b/packages/transaction-controller/src/hooks/CollectPublishHook.test.ts @@ -1,4 +1,4 @@ -import { noop } from 'lodash'; +import { noop } from 'lodash-es'; import { flushPromises } from '../../../../tests/helpers.js'; import type { TransactionMeta } from '../index.js'; diff --git a/packages/transaction-controller/src/hooks/CollectPublishHook.ts b/packages/transaction-controller/src/hooks/CollectPublishHook.ts index 978608f61e8..5e15e8fd4b9 100644 --- a/packages/transaction-controller/src/hooks/CollectPublishHook.ts +++ b/packages/transaction-controller/src/hooks/CollectPublishHook.ts @@ -1,6 +1,6 @@ import type { DeferredPromise, Hex } from '@metamask/utils'; import { createDeferredPromise, createModuleLogger } from '@metamask/utils'; -import { sortBy } from 'lodash'; +import { sortBy } from 'lodash-es'; import { projectLogger } from '../logger.js'; import type { diff --git a/packages/transaction-controller/src/utils/batch.test.ts b/packages/transaction-controller/src/utils/batch.test.ts index b546577fff1..55a1899a6a5 100644 --- a/packages/transaction-controller/src/utils/batch.test.ts +++ b/packages/transaction-controller/src/utils/batch.test.ts @@ -2,7 +2,7 @@ import { ORIGIN_METAMASK } from '@metamask/approval-controller'; import type { AddResult } from '@metamask/approval-controller'; import { ApprovalType } from '@metamask/controller-utils'; import { rpcErrors, errorCodes } from '@metamask/rpc-errors'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import { flushPromises } from '../../../../tests/helpers.js'; import { DefaultGasFeeFlow } from '../gas-flows/DefaultGasFeeFlow.js'; diff --git a/packages/transaction-controller/src/utils/gas-fee-tokens.test.ts b/packages/transaction-controller/src/utils/gas-fee-tokens.test.ts index 6cad84fc4ec..0d831209142 100644 --- a/packages/transaction-controller/src/utils/gas-fee-tokens.test.ts +++ b/packages/transaction-controller/src/utils/gas-fee-tokens.test.ts @@ -1,5 +1,5 @@ import type { Hex } from '@metamask/utils'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import { simulateTransactions } from '../api/simulation-api.js'; import type { diff --git a/packages/transaction-controller/src/utils/gas.test.ts b/packages/transaction-controller/src/utils/gas.test.ts index 0d15aca708e..01e7d585a35 100644 --- a/packages/transaction-controller/src/utils/gas.test.ts +++ b/packages/transaction-controller/src/utils/gas.test.ts @@ -1,7 +1,7 @@ import type { NetworkClientId } from '@metamask/network-controller'; import { remove0x } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import type { SimulationResponse, diff --git a/packages/transaction-controller/src/utils/prepare.ts b/packages/transaction-controller/src/utils/prepare.ts index 96bd589b672..1586f750984 100644 --- a/packages/transaction-controller/src/utils/prepare.ts +++ b/packages/transaction-controller/src/utils/prepare.ts @@ -4,7 +4,7 @@ import type { TypedTransaction, TypedTxData } from '@ethereumjs/tx'; import { TransactionFactory } from '@ethereumjs/tx'; import { bytesToHex } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import type { AuthorizationList, TransactionParams } from '../types.js'; diff --git a/packages/transaction-controller/src/utils/swaps.ts b/packages/transaction-controller/src/utils/swaps.ts index 685cf00cc35..04e5cfd38e9 100644 --- a/packages/transaction-controller/src/utils/swaps.ts +++ b/packages/transaction-controller/src/utils/swaps.ts @@ -1,5 +1,5 @@ import type { NetworkClientId } from '@metamask/network-controller'; -import { merge, pickBy } from 'lodash'; +import { merge, pickBy } from 'lodash-es'; import { CHAIN_IDS } from '../constants.js'; import { createModuleLogger, projectLogger } from '../logger.js'; diff --git a/packages/transaction-pay-controller/package.json b/packages/transaction-pay-controller/package.json index c1c1ffe0255..c448262e57f 100644 --- a/packages/transaction-pay-controller/package.json +++ b/packages/transaction-pay-controller/package.json @@ -69,7 +69,7 @@ "bignumber.js": "^9.1.2", "bn.js": "^5.2.1", "immer": "^9.0.6", - "lodash": "^4.17.21" + "lodash-es": "^4.17.21" }, "devDependencies": { "@metamask/auto-changelog": "^6.1.0", diff --git a/packages/transaction-pay-controller/src/TransactionPayController.ts b/packages/transaction-pay-controller/src/TransactionPayController.ts index b522deed48f..60e47e74567 100644 --- a/packages/transaction-pay-controller/src/TransactionPayController.ts +++ b/packages/transaction-pay-controller/src/TransactionPayController.ts @@ -2,7 +2,7 @@ import type { StateMetadata } from '@metamask/base-controller'; import { BaseController } from '@metamask/base-controller'; import type { TransactionMeta } from '@metamask/transaction-controller'; import type { Draft } from 'immer'; -import { noop } from 'lodash'; +import { noop } from 'lodash-es'; import { updateFiatPayment } from './actions/update-fiat-payment.js'; import { updatePaymentToken } from './actions/update-payment-token.js'; diff --git a/packages/transaction-pay-controller/src/actions/update-fiat-payment.test.ts b/packages/transaction-pay-controller/src/actions/update-fiat-payment.test.ts index 58baa2427b5..10f28b800fc 100644 --- a/packages/transaction-pay-controller/src/actions/update-fiat-payment.test.ts +++ b/packages/transaction-pay-controller/src/actions/update-fiat-payment.test.ts @@ -1,5 +1,5 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; -import { noop } from 'lodash'; +import { noop } from 'lodash-es'; import type { TransactionData, TransactionFiatPayment } from '../types.js'; import { getTransaction } from '../utils/transaction.js'; diff --git a/packages/transaction-pay-controller/src/actions/update-payment-token.test.ts b/packages/transaction-pay-controller/src/actions/update-payment-token.test.ts index d637f586166..7184ea2bbab 100644 --- a/packages/transaction-pay-controller/src/actions/update-payment-token.test.ts +++ b/packages/transaction-pay-controller/src/actions/update-payment-token.test.ts @@ -1,5 +1,5 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; -import { noop } from 'lodash'; +import { noop } from 'lodash-es'; import type { TransactionData, TransactionPaymentToken } from '../types.js'; import { diff --git a/packages/transaction-pay-controller/src/helpers/QuoteRefresher.ts b/packages/transaction-pay-controller/src/helpers/QuoteRefresher.ts index f90e2e58c3e..df9dc8eaad2 100644 --- a/packages/transaction-pay-controller/src/helpers/QuoteRefresher.ts +++ b/packages/transaction-pay-controller/src/helpers/QuoteRefresher.ts @@ -1,6 +1,6 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import { createModuleLogger } from '@metamask/utils'; -import { noop } from 'lodash'; +import { noop } from 'lodash-es'; import { TransactionPayStrategy } from '../constants.js'; import type { diff --git a/packages/transaction-pay-controller/src/strategy/relay/relay-quotes.test.ts b/packages/transaction-pay-controller/src/strategy/relay/relay-quotes.test.ts index 03487050b8e..0486058202d 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/relay-quotes.test.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/relay-quotes.test.ts @@ -5,7 +5,7 @@ import type { TransactionMeta, } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import { getDefaultRemoteFeatureFlagControllerState } from '../../../../remote-feature-flag-controller/src/remote-feature-flag-controller.js'; import { diff --git a/packages/transaction-pay-controller/src/strategy/relay/relay-submit-execute.test.ts b/packages/transaction-pay-controller/src/strategy/relay/relay-submit-execute.test.ts index 7daade07019..c0719865cdc 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/relay-submit-execute.test.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/relay-submit-execute.test.ts @@ -1,7 +1,7 @@ import { generateEIP7702BatchTransaction } from '@metamask/transaction-controller'; import type { TransactionMeta } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import { getMessengerMock } from '../../tests/messenger-mock.js'; import type { TransactionPayQuote } from '../../types.js'; diff --git a/packages/transaction-pay-controller/src/strategy/relay/relay-submit.test.ts b/packages/transaction-pay-controller/src/strategy/relay/relay-submit.test.ts index 8fbf3cd3e2c..794210c5ddb 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/relay-submit.test.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/relay-submit.test.ts @@ -5,7 +5,7 @@ import type { TransactionMeta, } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import { PaymentOverride } from '../../constants.js'; import { getMessengerMock } from '../../tests/messenger-mock.js'; diff --git a/packages/transaction-pay-controller/src/strategy/server/server-submit.test.ts b/packages/transaction-pay-controller/src/strategy/server/server-submit.test.ts index 0d0230b6081..fbe12854135 100644 --- a/packages/transaction-pay-controller/src/strategy/server/server-submit.test.ts +++ b/packages/transaction-pay-controller/src/strategy/server/server-submit.test.ts @@ -2,7 +2,7 @@ import { successfulFetch } from '@metamask/controller-utils'; import { TransactionStatus } from '@metamask/transaction-controller'; import type { TransactionMeta } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import { PaymentOverride } from '../../constants.js'; import { getMessengerMock } from '../../tests/messenger-mock.js'; diff --git a/packages/transaction-pay-controller/src/utils/feature-flags.ts b/packages/transaction-pay-controller/src/utils/feature-flags.ts index b9c34ebc06d..349c69941a0 100644 --- a/packages/transaction-pay-controller/src/utils/feature-flags.ts +++ b/packages/transaction-pay-controller/src/utils/feature-flags.ts @@ -6,7 +6,7 @@ import type { import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { uniq } from 'lodash'; +import { uniq } from 'lodash-es'; import { isTransactionPayStrategy, diff --git a/packages/transaction-pay-controller/src/utils/gas.test.ts b/packages/transaction-pay-controller/src/utils/gas.test.ts index 83fb3ab603a..8a3edf9de11 100644 --- a/packages/transaction-pay-controller/src/utils/gas.test.ts +++ b/packages/transaction-pay-controller/src/utils/gas.test.ts @@ -1,6 +1,6 @@ import { toHex } from '@metamask/controller-utils'; import type { Hex } from '@metamask/utils'; -import { clone, cloneDeep } from 'lodash'; +import { clone, cloneDeep } from 'lodash-es'; import type { GasFeeEstimates } from '../../../gas-fee-controller/src/index.js'; import type { diff --git a/packages/transaction-pay-controller/src/utils/quotes.test.ts b/packages/transaction-pay-controller/src/utils/quotes.test.ts index c0135333d94..ea27b172a66 100644 --- a/packages/transaction-pay-controller/src/utils/quotes.test.ts +++ b/packages/transaction-pay-controller/src/utils/quotes.test.ts @@ -2,7 +2,7 @@ import { TransactionStatus } from '@metamask/transaction-controller'; import type { TransactionMeta } from '@metamask/transaction-controller'; import type { BatchTransaction } from '@metamask/transaction-controller'; import type { Hex, Json } from '@metamask/utils'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import { TransactionPayStrategy } from '../constants.js'; import { getMessengerMock } from '../tests/messenger-mock.js'; diff --git a/packages/transaction-pay-controller/src/utils/transaction.test.ts b/packages/transaction-pay-controller/src/utils/transaction.test.ts index 8db399076d4..68fe77d7935 100644 --- a/packages/transaction-pay-controller/src/utils/transaction.test.ts +++ b/packages/transaction-pay-controller/src/utils/transaction.test.ts @@ -8,7 +8,7 @@ import { import type { TransactionMeta } from '@metamask/transaction-controller'; import type { TransactionControllerState } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { noop } from 'lodash'; +import { noop } from 'lodash-es'; import { NATIVE_TOKEN_ADDRESS } from '../constants.js'; import { getMessengerMock } from '../tests/messenger-mock.js'; diff --git a/packages/transaction-pay-controller/src/utils/transaction.ts b/packages/transaction-pay-controller/src/utils/transaction.ts index 5713675a37c..3978940281f 100644 --- a/packages/transaction-pay-controller/src/utils/transaction.ts +++ b/packages/transaction-pay-controller/src/utils/transaction.ts @@ -6,7 +6,7 @@ import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; import type { Patch } from 'immer'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import { projectLogger } from '../logger.js'; import type { diff --git a/packages/user-operation-controller/package.json b/packages/user-operation-controller/package.json index 2fcb5bd68c1..79b7aa674bc 100644 --- a/packages/user-operation-controller/package.json +++ b/packages/user-operation-controller/package.json @@ -64,7 +64,7 @@ "@metamask/utils": "^11.11.0", "bn.js": "^5.2.1", "immer": "^9.0.6", - "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "uuid": "^8.3.2" }, "devDependencies": { diff --git a/packages/user-operation-controller/src/UserOperationController.ts b/packages/user-operation-controller/src/UserOperationController.ts index f3785ec2b46..a33a0f22b38 100644 --- a/packages/user-operation-controller/src/UserOperationController.ts +++ b/packages/user-operation-controller/src/UserOperationController.ts @@ -30,7 +30,7 @@ import { add0x } from '@metamask/utils'; // This package purposefully relies on Node's EventEmitter module. // eslint-disable-next-line import-x/no-nodejs-modules import EventEmitter from 'events'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import { v1 as random } from 'uuid'; import { ADDRESS_ZERO, EMPTY_BYTES, VALUE_ZERO } from './constants.js'; diff --git a/packages/user-operation-controller/src/utils/gas-fees.test.ts b/packages/user-operation-controller/src/utils/gas-fees.test.ts index 3aaddfdbb7b..79d3f396a55 100644 --- a/packages/user-operation-controller/src/utils/gas-fees.test.ts +++ b/packages/user-operation-controller/src/utils/gas-fees.test.ts @@ -3,7 +3,7 @@ import type { GasFeeState } from '@metamask/gas-fee-controller'; import { GAS_ESTIMATE_TYPES } from '@metamask/gas-fee-controller'; import { UserFeeLevel } from '@metamask/transaction-controller'; import type { TransactionParams } from '@metamask/transaction-controller'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import type { UpdateGasFeesRequest } from './gas-fees.js'; import { updateGasFees } from './gas-fees.js'; diff --git a/packages/user-operation-controller/src/utils/gas.test.ts b/packages/user-operation-controller/src/utils/gas.test.ts index 04bbdaf9529..35dc2c094a0 100644 --- a/packages/user-operation-controller/src/utils/gas.test.ts +++ b/packages/user-operation-controller/src/utils/gas.test.ts @@ -1,4 +1,4 @@ -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import { VALUE_ZERO } from '../constants.js'; import type { BundlerEstimateUserOperationGasResponse } from '../helpers/Bundler.js'; diff --git a/packages/user-operation-controller/src/utils/validation.test.ts b/packages/user-operation-controller/src/utils/validation.test.ts index ac45e248373..b7faa6daf56 100644 --- a/packages/user-operation-controller/src/utils/validation.test.ts +++ b/packages/user-operation-controller/src/utils/validation.test.ts @@ -1,7 +1,7 @@ /* eslint-disable jest/expect-expect */ import { TransactionType } from '@metamask/transaction-controller'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash-es'; import type { PrepareUserOperationResponse, diff --git a/yarn.lock b/yarn.lock index fc575945237..a857d131277 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5759,7 +5759,7 @@ __metadata: deepmerge: "npm:^4.2.2" fast-deep-equal: "npm:^3.1.3" jest: "npm:^30.4.2" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" typedoc: "npm:^0.25.13" @@ -5797,7 +5797,7 @@ __metadata: ethereum-cryptography: "npm:^2.1.2" immer: "npm:^9.0.6" jest: "npm:^30.4.2" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" typedoc: "npm:^0.25.13" @@ -5875,7 +5875,7 @@ __metadata: "@types/uuid": "npm:^8.3.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" typedoc: "npm:^0.25.13" @@ -6004,11 +6004,12 @@ __metadata: "@metamask/utils": "npm:^11.11.0" "@types/jest": "npm:^30.0.0" "@types/lodash": "npm:^4.14.191" + "@types/lodash-es": "npm:^4.17.12" async-mutex: "npm:^0.5.0" bignumber.js: "npm:^9.1.2" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" p-limit: "npm:^3.1.0" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" @@ -6067,7 +6068,7 @@ __metadata: "@tanstack/query-core": "npm:^5.62.16" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^30.0.0" - "@types/lodash": "npm:^4.14.191" + "@types/lodash-es": "npm:^4.17.12" "@types/node": "npm:^22.13.14" "@types/uuid": "npm:^8.3.0" async-mutex: "npm:^0.5.0" @@ -6077,7 +6078,7 @@ __metadata: immer: "npm:^9.0.6" jest: "npm:^30.4.2" jest-environment-jsdom: "npm:^30.4.1" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" multiformats: "npm:^9.9.0" nock: "npm:^13.3.1" reselect: "npm:^5.1.1" @@ -6204,12 +6205,12 @@ __metadata: "@metamask/utils": "npm:^11.11.0" "@tanstack/query-core": "npm:^5.62.16" "@types/jest": "npm:^30.0.0" - "@types/lodash": "npm:^4.14.191" + "@types/lodash-es": "npm:^4.17.12" cockatiel: "npm:^3.1.2" deepmerge: "npm:^4.2.2" fast-deep-equal: "npm:^3.1.3" jest: "npm:^30.4.2" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" nock: "npm:^13.3.1" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" @@ -6272,7 +6273,7 @@ __metadata: deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" jest-environment-jsdom: "npm:^30.4.1" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" nock: "npm:^13.3.1" reselect: "npm:^5.1.1" ts-jest: "npm:^29.4.11" @@ -6308,7 +6309,7 @@ __metadata: deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" jest-environment-jsdom: "npm:^30.4.1" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" nock: "npm:^13.3.1" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" @@ -6360,7 +6361,7 @@ __metadata: "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" typedoc: "npm:^0.25.13" @@ -6591,7 +6592,7 @@ __metadata: "@spruceid/siwe-parser": "npm:2.1.0" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^30.0.0" - "@types/lodash": "npm:^4.14.191" + "@types/lodash-es": "npm:^4.17.12" bignumber.js: "npm:^9.1.2" bn.js: "npm:^5.2.1" cockatiel: "npm:^3.1.2" @@ -6600,7 +6601,7 @@ __metadata: fast-deep-equal: "npm:^3.1.3" jest: "npm:^30.4.2" jest-environment-jsdom: "npm:^30.4.1" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" nock: "npm:^13.3.1" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" @@ -6815,7 +6816,7 @@ __metadata: deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" klona: "npm:^2.0.6" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" typedoc: "npm:^0.25.13" @@ -6859,7 +6860,7 @@ __metadata: "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" typedoc: "npm:^0.25.13" @@ -7514,7 +7515,7 @@ __metadata: ethereumjs-wallet: "npm:^1.0.1" immer: "npm:^9.0.6" jest: "npm:^30.4.2" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" typedoc: "npm:^0.25.13" @@ -7935,7 +7936,7 @@ __metadata: async-mutex: "npm:^0.5.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" typedoc: "npm:^0.25.13" @@ -7998,12 +7999,12 @@ __metadata: "@metamask/utils": "npm:^11.11.0" "@solana/addresses": "npm:^2.0.0" "@types/jest": "npm:^30.0.0" - "@types/lodash": "npm:^4.14.191" + "@types/lodash-es": "npm:^4.17.12" "@types/uuid": "npm:^8.3.0" deepmerge: "npm:^4.2.2" immer: "npm:^9.0.6" jest: "npm:^30.4.2" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" nock: "npm:^13.3.1" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" @@ -8115,7 +8116,7 @@ __metadata: "@types/deep-freeze-strict": "npm:^1.1.0" "@types/jest": "npm:^30.0.0" "@types/jest-when": "npm:^2.7.3" - "@types/lodash": "npm:^4.14.191" + "@types/lodash-es": "npm:^4.17.12" "@types/node-fetch": "npm:^2.6.12" cockatiel: "npm:^3.1.2" deep-freeze-strict: "npm:^1.1.1" @@ -8125,7 +8126,7 @@ __metadata: jest: "npm:^30.4.2" jest-environment-jsdom: "npm:^30.4.1" jest-when: "npm:^3.7.0" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" loglevel: "npm:^1.8.1" nock: "npm:^13.3.1" node-fetch: "npm:^2.7.0" @@ -8195,7 +8196,7 @@ __metadata: "@metamask/profile-sync-controller": "npm:^29.0.0" "@metamask/utils": "npm:^11.11.0" "@types/jest": "npm:^30.0.0" - "@types/lodash": "npm:^4.14.191" + "@types/lodash-es": "npm:^4.17.12" "@types/readable-stream": "npm:^2.3.0" "@types/semver": "npm:^7" bignumber.js: "npm:^9.1.2" @@ -8204,7 +8205,7 @@ __metadata: firebase: "npm:^11.2.0" jest: "npm:^30.4.2" jest-environment-jsdom: "npm:^30.4.1" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" loglevel: "npm:^1.8.1" nock: "npm:^13.3.1" semver: "npm:^7.6.3" @@ -8786,7 +8787,7 @@ __metadata: immer: "npm:^9.0.6" jest: "npm:^30.4.2" jest-environment-jsdom: "npm:^30.4.1" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" nock: "npm:^13.3.1" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" @@ -8840,7 +8841,7 @@ __metadata: cockatiel: "npm:^3.1.2" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" typedoc: "npm:^0.25.13" @@ -8870,7 +8871,7 @@ __metadata: deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" jsonschema: "npm:^1.4.1" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" typedoc: "npm:^0.25.13" @@ -8922,7 +8923,7 @@ __metadata: deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" klona: "npm:^2.0.6" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" nock: "npm:^13.3.1" reselect: "npm:^5.1.1" ts-jest: "npm:^29.4.11" @@ -8952,7 +8953,7 @@ __metadata: "@types/jest": "npm:^30.0.0" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" typedoc: "npm:^0.25.13" @@ -9262,7 +9263,7 @@ __metadata: immer: "npm:^9.0.6" jest: "npm:^30.4.2" jest-environment-jsdom: "npm:^30.4.1" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" nock: "npm:^13.3.1" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" @@ -9304,7 +9305,7 @@ __metadata: deepmerge: "npm:^4.2.2" immer: "npm:^9.0.6" jest: "npm:^30.4.2" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" typedoc: "npm:^0.25.13" @@ -9337,7 +9338,7 @@ __metadata: deepmerge: "npm:^4.2.2" immer: "npm:^9.0.6" jest: "npm:^30.4.2" - lodash: "npm:^4.17.21" + lodash-es: "npm:^4.17.21" ts-jest: "npm:^29.4.11" tsx: "npm:^4.20.5" typedoc: "npm:^0.25.13" @@ -11910,6 +11911,22 @@ __metadata: languageName: node linkType: hard +"@types/lodash-es@npm:^4.17.12": + version: 4.17.12 + resolution: "@types/lodash-es@npm:4.17.12" + dependencies: + "@types/lodash": "npm:*" + checksum: 10/56b9a433348b11c31051c6fa9028540a033a08fb80b400c589d740446c19444d73b217cf1471d4036448ef686a83e8cf2a35d1fadcb3f2105f26701f94aebb07 + languageName: node + linkType: hard + +"@types/lodash@npm:*": + version: 4.17.25 + resolution: "@types/lodash@npm:4.17.25" + checksum: 10/f786e05664439cc8d327fd97c62c060d81b3c4ed52127d01fbc926139e1a669c1554bf3cd0dbb43f8fcc7d9b5c6c23c543cc36de8dc815c9f289ea852b26ebd6 + languageName: node + linkType: hard + "@types/lodash@npm:^4.14.191, @types/lodash@npm:^4.17.20": version: 4.17.20 resolution: "@types/lodash@npm:4.17.20" From c8b45d8840c3b2f544068f947d26868e1c0fdaaf Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Tue, 25 Aug 2026 11:46:34 +0200 Subject: [PATCH 13/17] Resolve `ethereumjs-wallet` through its CommonJS namespace `ethereumjs-wallet` is CommonJS, and Node cannot reliably detect its named exports, so `import { thirdparty }` throws once the package is loaded as an ES module. Node 22 fails on it where Node 24 happens to cope, which is why this only appeared in the `wallet-cli` daemon end-to-end test. The package also declares a TypeScript-style default export, so `module.exports` is reached through `default` under Node's interop but is the namespace itself once `esModuleInterop` has unwrapped it for the CommonJS test build. Both shapes are now resolved explicitly, which also fixes `Wallet.fromV3` being `undefined` under ESM. --- .../src/KeyringController.ts | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/packages/keyring-controller/src/KeyringController.ts b/packages/keyring-controller/src/KeyringController.ts index 74559b17c72..f935aa5e85a 100644 --- a/packages/keyring-controller/src/KeyringController.ts +++ b/packages/keyring-controller/src/KeyringController.ts @@ -37,7 +37,7 @@ import { } from '@metamask/utils'; import { Mutex } from 'async-mutex'; import type { MutexInterface } from 'async-mutex'; -import Wallet, { thirdparty as importers } from 'ethereumjs-wallet'; +import * as ethereumjsWallet from 'ethereumjs-wallet'; import type { Patch } from 'immer'; import { cloneDeep } from 'lodash-es'; // When generating a ULID within the same millisecond, monotonicFactory provides some guarantees regarding sort order. @@ -53,6 +53,26 @@ import type { TypedMessageParams, } from './types.js'; +/** + * `ethereumjs-wallet` is CommonJS, and Node cannot reliably detect its named + * exports, so importing `thirdparty` directly fails at run time. It also + * declares a TypeScript-style default export, which means `module.exports` is + * reached through `default` under Node's ESM interop but is the namespace + * itself once `esModuleInterop` has unwrapped it. Both shapes are resolved + * here so the imports work whichever applies. + */ +/* istanbul ignore next: only one branch is reachable per module system */ +const walletModule = (typeof ethereumjsWallet.default === 'object' && +ethereumjsWallet.default + ? ethereumjsWallet.default + : ethereumjsWallet) as unknown as { + default: typeof ethereumjsWallet.default; + thirdparty: typeof ethereumjsWallet.thirdparty; +}; + +const Wallet = walletModule.default; +const importers = walletModule.thirdparty; + const name = 'KeyringController'; const MESSENGER_EXPOSED_METHODS = [ From b27fe5ae45c49916bbececad92c62ad008d94fce Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Tue, 25 Aug 2026 11:46:44 +0200 Subject: [PATCH 14/17] Stop running the daemon end-to-end tests on Node 20 Support for Node 18 and 20 was dropped in #9168, which set `engines` to `^22.14.0 || ^24` and trimmed the test matrices, but the `wallet-cli` daemon end-to-end job kept its own matrix and was missed. Node 20 also lacks the ESM interop these packages now rely on. --- .github/workflows/lint-build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-build-test.yml b/.github/workflows/lint-build-test.yml index f231f0b4331..2cbe87dbf27 100644 --- a/.github/workflows/lint-build-test.yml +++ b/.github/workflows/lint-build-test.yml @@ -344,7 +344,7 @@ jobs: needs: prepare strategy: matrix: - node-version: [20.x, 22.x, 24.x] + node-version: [22.x, 24.x] steps: - name: Checkout and setup environment uses: MetaMask/action-checkout-and-setup@v3 From 87055dc613721301c0c0888cf03eb6afef965db1 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Tue, 25 Aug 2026 12:34:59 +0200 Subject: [PATCH 15/17] Remove the build info files in `build:only-clean` The build info files record which outputs `tsc` has already produced, so deleting `dist` without them leaves the two disagreeing. Incremental builds then skip work whose output is gone, which surfaces as a cascade of TS6305 "has not been built from source file" errors that a clean build does not resolve. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5fcc5b92ae5..96aefe9b819 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "build": "yarn tsc --build tsconfig.build.json --verbose", "build:clean": "yarn build:only-clean && yarn build", "build:docs": "yarn workspaces foreach --all --no-private --parallel --interlaced --verbose run build:docs", - "build:only-clean": "rimraf -g 'packages/*/dist'", + "build:only-clean": "rimraf -g 'packages/*/dist' 'packages/*/tsconfig.build.tsbuildinfo'", "build:types": "tsc --build tsconfig.build.json --verbose", "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", From d547328ccd7243d336c4390c29a2c7dcb1cc43a0 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Wed, 26 Aug 2026 12:13:26 +0200 Subject: [PATCH 16/17] Bump `@metamask/safe-event-emitter` to `^3.1.3` Under `moduleResolution: "Node16"`, TypeScript decides whether a declaration file is ESM or CommonJS from the nearest `package.json` `"type"` field. `@metamask/safe-event-emitter` declares no `"type"`, so its ESM declarations were read as CommonJS and the default import resolved to the module namespace rather than the class, leaving `class JsonRpcEngine extends SafeEventEmitter` failing to build. That was carried as a patch adding an `index.d.mts`, which TypeScript always treats as ESM. Version 3.1.3 ships the same fix, so the patch and its resolutions are removed in favour of the released version. Pinning to a patched `3.1.1` would also have silently dropped the fix as soon as anything asked for a newer version. --- ...e-event-emitter-npm-3.1.1-a7872b1f5a.patch | 24 ------------------- package.json | 2 -- packages/eth-block-tracker/package.json | 2 +- packages/json-rpc-engine/package.json | 2 +- .../json-rpc-middleware-stream/package.json | 2 +- .../multichain-api-middleware/package.json | 2 +- yarn.lock | 23 +++++++----------- 7 files changed, 12 insertions(+), 45 deletions(-) delete mode 100644 .yarn/patches/@metamask-safe-event-emitter-npm-3.1.1-a7872b1f5a.patch diff --git a/.yarn/patches/@metamask-safe-event-emitter-npm-3.1.1-a7872b1f5a.patch b/.yarn/patches/@metamask-safe-event-emitter-npm-3.1.1-a7872b1f5a.patch deleted file mode 100644 index a5ef80d01f5..00000000000 --- a/.yarn/patches/@metamask-safe-event-emitter-npm-3.1.1-a7872b1f5a.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/dist/esm/index.d.mts b/dist/esm/index.d.mts -new file mode 100644 -index 0000000000000000000000000000000000000000..d48ab7ade4e48f566f3ca48c60636368919b1044 ---- /dev/null -+++ b/dist/esm/index.d.mts -@@ -0,0 +1,5 @@ -+/// -+import { EventEmitter } from 'events'; -+export default class SafeEventEmitter extends EventEmitter { -+ emit(type: string, ...args: any[]): boolean; -+} -diff --git a/package.json b/package.json -index 87ca2f6363c43d2f9d45be268e8ba03c1669c02c..72211f17fe3976ef8dac7d8512d60a6de1275fbd 100644 ---- a/package.json -+++ b/package.json -@@ -8,7 +8,7 @@ - "exports": { - ".": { - "import": { -- "types": "./dist/esm/index.d.ts", -+ "types": "./dist/esm/index.d.mts", - "default": "./dist/esm/index.mjs" - }, - "require": { diff --git a/package.json b/package.json index 96aefe9b819..687a2b87047 100644 --- a/package.json +++ b/package.json @@ -118,8 +118,6 @@ "yargs": "^17.7.2" }, "resolutions": { - "@metamask/safe-event-emitter@npm:^3.0.0": "patch:@metamask/safe-event-emitter@npm%3A3.1.1#~/.yarn/patches/@metamask-safe-event-emitter-npm-3.1.1-a7872b1f5a.patch", - "@metamask/safe-event-emitter@npm:^3.1.1": "patch:@metamask/safe-event-emitter@npm%3A3.1.1#~/.yarn/patches/@metamask-safe-event-emitter-npm-3.1.1-a7872b1f5a.patch", "@nktkas/hyperliquid@npm:^0.33.1": "patch:@nktkas/hyperliquid@npm%3A0.33.1#~/.yarn/patches/@nktkas-hyperliquid-npm-0.33.1-6a541fdd1d.patch", "elliptic@6.5.4": "^6.5.7", "fast-xml-parser@^4.3.4": "^4.4.1", diff --git a/packages/eth-block-tracker/package.json b/packages/eth-block-tracker/package.json index 6ba1fc1b4fe..59fdfe14d4b 100644 --- a/packages/eth-block-tracker/package.json +++ b/packages/eth-block-tracker/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@metamask/eth-json-rpc-provider": "^6.0.1", - "@metamask/safe-event-emitter": "^3.0.0", + "@metamask/safe-event-emitter": "^3.1.3", "@metamask/utils": "^11.11.0", "json-rpc-random-id": "^1.0.1" }, diff --git a/packages/json-rpc-engine/package.json b/packages/json-rpc-engine/package.json index 8058f9c4db9..5de0a768190 100644 --- a/packages/json-rpc-engine/package.json +++ b/packages/json-rpc-engine/package.json @@ -56,7 +56,7 @@ "dependencies": { "@metamask/messenger": "^2.0.0", "@metamask/rpc-errors": "^7.0.2", - "@metamask/safe-event-emitter": "^3.0.0", + "@metamask/safe-event-emitter": "^3.1.3", "@metamask/utils": "^11.11.0", "@types/deep-freeze-strict": "^1.1.0", "deep-freeze-strict": "^1.1.1", diff --git a/packages/json-rpc-middleware-stream/package.json b/packages/json-rpc-middleware-stream/package.json index e9fcde6ac19..121557d982b 100644 --- a/packages/json-rpc-middleware-stream/package.json +++ b/packages/json-rpc-middleware-stream/package.json @@ -47,7 +47,7 @@ }, "dependencies": { "@metamask/json-rpc-engine": "^10.5.0", - "@metamask/safe-event-emitter": "^3.0.0", + "@metamask/safe-event-emitter": "^3.1.3", "@metamask/utils": "^11.11.0", "readable-stream": "^3.6.2" }, diff --git a/packages/multichain-api-middleware/package.json b/packages/multichain-api-middleware/package.json index a0cdafe766e..a5ba21b4cc9 100644 --- a/packages/multichain-api-middleware/package.json +++ b/packages/multichain-api-middleware/package.json @@ -64,7 +64,7 @@ "@metamask/auto-changelog": "^6.1.0", "@metamask/eth-json-rpc-filters": "^9.0.0", "@metamask/multichain-transactions-controller": "^7.1.2", - "@metamask/safe-event-emitter": "^3.0.0", + "@metamask/safe-event-emitter": "^3.1.3", "@types/jest": "^30.0.0", "deepmerge": "^4.2.2", "jest": "^30.4.2", diff --git a/yarn.lock b/yarn.lock index a857d131277..584442c3792 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6939,7 +6939,7 @@ __metadata: "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/eth-json-rpc-provider": "npm:^6.0.1" "@metamask/json-rpc-engine": "npm:^10.5.0" - "@metamask/safe-event-emitter": "npm:^3.0.0" + "@metamask/safe-event-emitter": "npm:^3.1.3" "@metamask/utils": "npm:^11.11.0" "@types/jest": "npm:^30.0.0" "@types/json-rpc-random-id": "npm:^1.0.1" @@ -7424,7 +7424,7 @@ __metadata: "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/messenger": "npm:^2.0.0" "@metamask/rpc-errors": "npm:^7.0.2" - "@metamask/safe-event-emitter": "npm:^3.0.0" + "@metamask/safe-event-emitter": "npm:^3.1.3" "@metamask/utils": "npm:^11.11.0" "@types/deep-freeze-strict": "npm:^1.1.0" "@types/jest": "npm:^30.0.0" @@ -7445,7 +7445,7 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^6.1.0" "@metamask/json-rpc-engine": "npm:^10.5.0" - "@metamask/safe-event-emitter": "npm:^3.0.0" + "@metamask/safe-event-emitter": "npm:^3.1.3" "@metamask/utils": "npm:^11.11.0" "@types/jest": "npm:^30.0.0" "@types/readable-stream": "npm:^2.3.0" @@ -7965,7 +7965,7 @@ __metadata: "@metamask/network-controller": "npm:^36.0.0" "@metamask/permission-controller": "npm:^13.1.1" "@metamask/rpc-errors": "npm:^7.0.2" - "@metamask/safe-event-emitter": "npm:^3.0.0" + "@metamask/safe-event-emitter": "npm:^3.1.3" "@metamask/snaps-controllers": "npm:^19.0.0" "@metamask/utils": "npm:^11.11.0" "@open-rpc/meta-schema": "npm:^1.14.6" @@ -8689,17 +8689,10 @@ __metadata: languageName: node linkType: hard -"@metamask/safe-event-emitter@npm:3.1.1": - version: 3.1.1 - resolution: "@metamask/safe-event-emitter@npm:3.1.1" - checksum: 10/e24db4d7c20764bfc5b025065f92518c805f0ffb1da4820078b8cff7dcae964c0f354cf053fcb7ac659de015d5ffdf21aae5e8d44e191ee8faa9066855f22653 - languageName: node - linkType: hard - -"@metamask/safe-event-emitter@patch:@metamask/safe-event-emitter@npm%3A3.1.1#~/.yarn/patches/@metamask-safe-event-emitter-npm-3.1.1-a7872b1f5a.patch": - version: 3.1.1 - resolution: "@metamask/safe-event-emitter@patch:@metamask/safe-event-emitter@npm%3A3.1.1#~/.yarn/patches/@metamask-safe-event-emitter-npm-3.1.1-a7872b1f5a.patch::version=3.1.1&hash=4a033d" - checksum: 10/b47560199f61105a5a719b907400395893c52aa6a1d9aa37a4128b054351dd45fb485655dcb71f926e58da406f39f6a93c60396cc00ed1753a97ac3f5a2c7e5e +"@metamask/safe-event-emitter@npm:^3.0.0, @metamask/safe-event-emitter@npm:^3.1.1, @metamask/safe-event-emitter@npm:^3.1.3": + version: 3.1.3 + resolution: "@metamask/safe-event-emitter@npm:3.1.3" + checksum: 10/adec56b940385cc34ecd14149c1f0a5c0273f255d7cb7a7df31dfda92381443b58534d173deb0b3361e3ca48a27847b5d715442874c2f6c53be9523c82f4ff2a languageName: node linkType: hard From cae7015a2dd70af0e8962ff3f16fb7bd53c84528 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Thu, 27 Aug 2026 13:24:47 +0200 Subject: [PATCH 17/17] Replace `klona` with `lodash-es`'s `cloneDeep` in `smart-transactions-controller` `lodash-es` is already a dependency of this package for other uses, so `klona` was an unnecessary second deep-clone implementation. Using `cloneDeep` avoids the extra dependency. --- packages/smart-transactions-controller/package.json | 1 - .../src/SmartTransactionsController.ts | 8 ++++---- yarn.lock | 10 +--------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/packages/smart-transactions-controller/package.json b/packages/smart-transactions-controller/package.json index d2a081e002a..e3d5fb39d29 100644 --- a/packages/smart-transactions-controller/package.json +++ b/packages/smart-transactions-controller/package.json @@ -65,7 +65,6 @@ "@metamask/transaction-controller": "^69.6.1", "@metamask/utils": "^11.11.0", "bignumber.js": "^9.1.2", - "klona": "^2.0.6", "lodash-es": "^4.17.21", "reselect": "^5.1.1" }, diff --git a/packages/smart-transactions-controller/src/SmartTransactionsController.ts b/packages/smart-transactions-controller/src/SmartTransactionsController.ts index aeb0b9053f2..2c9589dbff0 100644 --- a/packages/smart-transactions-controller/src/SmartTransactionsController.ts +++ b/packages/smart-transactions-controller/src/SmartTransactionsController.ts @@ -34,7 +34,7 @@ import type { } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { klona } from 'klona'; +import { cloneDeep } from 'lodash-es'; import { API_BASE_URL, @@ -498,9 +498,9 @@ export class SmartTransactionsController extends StaticIntervalPollingController smartTransaction: SmartTransaction, prevSmartTransaction?: SmartTransaction, ) { - let updatedSmartTransaction = klona(smartTransaction); + let updatedSmartTransaction = cloneDeep(smartTransaction); updatedSmartTransaction = { - ...klona(prevSmartTransaction), + ...cloneDeep(prevSmartTransaction), ...updatedSmartTransaction, }; @@ -646,7 +646,7 @@ export class SmartTransactionsController extends StaticIntervalPollingController stx.txParams?.nonce === smartTransaction.txParams?.nonce && stx.status?.startsWith('cancelled'), ); - const snapshot = klona(smartTransaction); + const snapshot = cloneDeep(smartTransaction); const history = [snapshot]; const historifiedSmartTransaction = { ...smartTransaction, history }; const nextSmartTransactions = diff --git a/yarn.lock b/yarn.lock index 584442c3792..96f04168cfc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8915,7 +8915,6 @@ __metadata: bignumber.js: "npm:^9.1.2" deepmerge: "npm:^4.2.2" jest: "npm:^30.4.2" - klona: "npm:^2.0.6" lodash-es: "npm:^4.17.21" nock: "npm:^13.3.1" reselect: "npm:^5.1.1" @@ -11913,20 +11912,13 @@ __metadata: languageName: node linkType: hard -"@types/lodash@npm:*": +"@types/lodash@npm:*, @types/lodash@npm:^4.14.191, @types/lodash@npm:^4.17.20": version: 4.17.25 resolution: "@types/lodash@npm:4.17.25" checksum: 10/f786e05664439cc8d327fd97c62c060d81b3c4ed52127d01fbc926139e1a669c1554bf3cd0dbb43f8fcc7d9b5c6c23c543cc36de8dc815c9f289ea852b26ebd6 languageName: node linkType: hard -"@types/lodash@npm:^4.14.191, @types/lodash@npm:^4.17.20": - version: 4.17.20 - resolution: "@types/lodash@npm:4.17.20" - checksum: 10/8cd8ad3bd78d2e06a93ae8d6c9907981d5673655fec7cb274a4d9a59549aab5bb5b3017361280773b8990ddfccf363e14d1b37c97af8a9fe363de677f9a61524 - languageName: node - linkType: hard - "@types/mdast@npm:^4.0.0, @types/mdast@npm:^4.0.2": version: 4.0.4 resolution: "@types/mdast@npm:4.0.4"