Skip to content

Commit

Permalink
Merge branch 'main' into mikesposito/lint-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
mikesposito authored Jan 17, 2025
2 parents ccd406e + 52d1c16 commit 6637ca0
Show file tree
Hide file tree
Showing 12 changed files with 47 additions and 29 deletions.
2 changes: 1 addition & 1 deletion eslint-warning-thresholds.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"jsdoc/check-tag-names": 375,
"jsdoc/require-returns": 22,
"jsdoc/tag-lines": 328,
"n/no-unsupported-features/node-builtins": 18,
"n/no-unsupported-features/node-builtins": 4,
"n/prefer-global/text-encoder": 4,
"n/prefer-global/text-decoder": 4,
"prettier/prettier": 115,
Expand Down
7 changes: 7 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import jest from '@metamask/eslint-config-jest';
import nodejs from '@metamask/eslint-config-nodejs';
import typescript from '@metamask/eslint-config-typescript';

const NODE_LTS_VERSION = 22;

const config = createConfig([
...base,
{
Expand Down Expand Up @@ -83,6 +85,11 @@ const config = createConfig([
'jest/prefer-lowercase-title': 'warn',
'jest/prefer-strict-equal': 'warn',
},
settings: {
node: {
version: `^${NODE_LTS_VERSION}`,
},
},
},
{
// These files are test helpers, not tests. We still use the Jest ESLint
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@metamask/core-monorepo",
"version": "283.0.0",
"version": "284.0.0",
"private": true,
"description": "Monorepo for packages shared between MetaMask clients",
"repository": {
Expand Down
9 changes: 8 additions & 1 deletion packages/accounts-controller/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [21.0.1]

### Changed

- Bump `@metamask/eth-snap-keyring` from `^8.0.0` to `^8.1.0` ([#5167](https://github.com/MetaMask/core/pull/5167))

## [21.0.0]

### Changed
Expand Down Expand Up @@ -388,7 +394,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

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

[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
[21.0.1]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
[21.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
[20.0.2]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
[20.0.1]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions packages/accounts-controller/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@metamask/accounts-controller",
"version": "21.0.0",
"version": "21.0.1",
"description": "Manages internal accounts",
"keywords": [
"MetaMask",
Expand Down Expand Up @@ -49,7 +49,7 @@
"dependencies": {
"@ethereumjs/util": "^8.1.0",
"@metamask/base-controller": "^7.1.1",
"@metamask/eth-snap-keyring": "^8.0.0",
"@metamask/eth-snap-keyring": "^8.1.0",
"@metamask/keyring-api": "^13.0.0",
"@metamask/keyring-internal-api": "^2.0.0",
"@metamask/snaps-sdk": "^6.7.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/assets-controllers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
},
"devDependencies": {
"@babel/runtime": "^7.23.9",
"@metamask/accounts-controller": "^21.0.0",
"@metamask/accounts-controller": "^21.0.1",
"@metamask/approval-controller": "^7.1.2",
"@metamask/auto-changelog": "^3.4.4",
"@metamask/ethjs-provider-http": "^0.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/keyring-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@metamask/eth-simple-keyring": "^6.0.5",
"@metamask/keyring-api": "^13.0.0",
"@metamask/keyring-internal-api": "^2.0.0",
"@metamask/message-manager": "^11.0.3",
"@metamask/message-manager": "^12.0.0",
"@metamask/utils": "^11.0.1",
"async-mutex": "^0.5.0",
"ethereumjs-wallet": "^1.0.1",
Expand Down
5 changes: 4 additions & 1 deletion packages/message-manager/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [12.0.0]

### Changed

- **BREAKING:** Base class of `DecryptMessageManager` and `EncryptionPublicKeyManager`(`AbstractMessageManager`) now expects new options to initialise ([#5103](https://github.com/MetaMask/core/pull/5103))
Expand Down Expand Up @@ -357,7 +359,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

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

[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
[12.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
[11.0.3]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
[11.0.2]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
[11.0.1]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion packages/message-manager/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@metamask/message-manager",
"version": "11.0.3",
"version": "12.0.0",
"description": "Stores and manages interactions with signing requests",
"keywords": [
"MetaMask",
Expand Down
2 changes: 1 addition & 1 deletion packages/profile-sync-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"devDependencies": {
"@lavamoat/allow-scripts": "^3.0.4",
"@lavamoat/preinstall-always-fail": "^2.1.0",
"@metamask/accounts-controller": "^21.0.0",
"@metamask/accounts-controller": "^21.0.1",
"@metamask/auto-changelog": "^3.4.4",
"@metamask/keyring-internal-api": "^2.0.0",
"@metamask/providers": "^18.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/transaction-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
},
"devDependencies": {
"@babel/runtime": "^7.23.9",
"@metamask/accounts-controller": "^21.0.0",
"@metamask/accounts-controller": "^21.0.1",
"@metamask/approval-controller": "^7.1.2",
"@metamask/auto-changelog": "^3.4.4",
"@metamask/eth-block-tracker": "^11.0.3",
Expand Down
37 changes: 19 additions & 18 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2255,14 +2255,14 @@ __metadata:
languageName: node
linkType: hard

"@metamask/accounts-controller@npm:^21.0.0, @metamask/accounts-controller@workspace:packages/accounts-controller":
"@metamask/accounts-controller@npm:^21.0.1, @metamask/accounts-controller@workspace:packages/accounts-controller":
version: 0.0.0-use.local
resolution: "@metamask/accounts-controller@workspace:packages/accounts-controller"
dependencies:
"@ethereumjs/util": "npm:^8.1.0"
"@metamask/auto-changelog": "npm:^3.4.4"
"@metamask/base-controller": "npm:^7.1.1"
"@metamask/eth-snap-keyring": "npm:^8.0.0"
"@metamask/eth-snap-keyring": "npm:^8.1.0"
"@metamask/keyring-api": "npm:^13.0.0"
"@metamask/keyring-controller": "npm:^19.0.3"
"@metamask/keyring-internal-api": "npm:^2.0.0"
Expand Down Expand Up @@ -2375,7 +2375,7 @@ __metadata:
"@ethersproject/contracts": "npm:^5.7.0"
"@ethersproject/providers": "npm:^5.7.0"
"@metamask/abi-utils": "npm:^2.0.3"
"@metamask/accounts-controller": "npm:^21.0.0"
"@metamask/accounts-controller": "npm:^21.0.1"
"@metamask/approval-controller": "npm:^7.1.2"
"@metamask/auto-changelog": "npm:^3.4.4"
"@metamask/base-controller": "npm:^7.1.1"
Expand Down Expand Up @@ -2878,16 +2878,16 @@ __metadata:
languageName: node
linkType: hard

"@metamask/eth-snap-keyring@npm:^8.0.0":
version: 8.0.0
resolution: "@metamask/eth-snap-keyring@npm:8.0.0"
"@metamask/eth-snap-keyring@npm:^8.1.0":
version: 8.1.0
resolution: "@metamask/eth-snap-keyring@npm:8.1.0"
dependencies:
"@ethereumjs/tx": "npm:^4.2.0"
"@metamask/eth-sig-util": "npm:^8.1.2"
"@metamask/keyring-api": "npm:^13.0.0"
"@metamask/keyring-internal-api": "npm:^2.0.0"
"@metamask/keyring-internal-snap-client": "npm:^2.0.0"
"@metamask/keyring-utils": "npm:^1.0.0"
"@metamask/keyring-utils": "npm:^1.1.0"
"@metamask/snaps-controllers": "npm:^9.10.0"
"@metamask/snaps-sdk": "npm:^6.7.0"
"@metamask/snaps-utils": "npm:^8.3.0"
Expand All @@ -2899,7 +2899,7 @@ __metadata:
peerDependencies:
"@metamask/keyring-api": ^13.0.0
"@metamask/providers": ^18.3.1
checksum: 10/51bc9f703109acd662aac36986568cb25995307a2607f4634067cdd2353afda2eb620438993452f1376f6c7323660556df6c3e02c0c0b9e3dbe2d11d56d2a93f
checksum: 10/4b758f14540cf8ea892a80d8cf70234305e7f6978ab46dc58b727d6c6944d11dee22841fc17b22a7620662a5051ec189675f2dd06638733b9b1c3e8436c8b623
languageName: node
linkType: hard

Expand Down Expand Up @@ -3187,7 +3187,7 @@ __metadata:
"@metamask/eth-simple-keyring": "npm:^6.0.5"
"@metamask/keyring-api": "npm:^13.0.0"
"@metamask/keyring-internal-api": "npm:^2.0.0"
"@metamask/message-manager": "npm:^11.0.3"
"@metamask/message-manager": "npm:^12.0.0"
"@metamask/scure-bip39": "npm:^2.1.1"
"@metamask/utils": "npm:^11.0.1"
"@types/jest": "npm:^27.4.1"
Expand Down Expand Up @@ -3251,13 +3251,14 @@ __metadata:
languageName: node
linkType: hard

"@metamask/keyring-utils@npm:^1.0.0":
version: 1.0.0
resolution: "@metamask/keyring-utils@npm:1.0.0"
"@metamask/keyring-utils@npm:^1.0.0, @metamask/keyring-utils@npm:^1.1.0":
version: 1.1.0
resolution: "@metamask/keyring-utils@npm:1.1.0"
dependencies:
"@metamask/superstruct": "npm:^3.1.0"
"@metamask/utils": "npm:^9.3.0"
checksum: 10/f74f7343a7154b029e0fa4c25735c589eba4dc25a9e323d43b7c733ce5dbb23ce603a4f02aac455163993649ceeaf714b8b843985ba7a9cb00b926b3b8dc6b51
"@metamask/utils": "npm:^11.0.1"
bitcoin-address-validation: "npm:^2.2.3"
checksum: 10/327eb37dcee41f47df212a9790672deec15c11692e370c15bb5687a2c90078b4d14dc61a9d7ce317e4bda03f18284731229feee19c1adae35bc859313da37ba5
languageName: node
linkType: hard

Expand All @@ -3279,7 +3280,7 @@ __metadata:
languageName: unknown
linkType: soft

"@metamask/message-manager@npm:^11.0.3, @metamask/message-manager@workspace:packages/message-manager":
"@metamask/message-manager@npm:^12.0.0, @metamask/message-manager@workspace:packages/message-manager":
version: 0.0.0-use.local
resolution: "@metamask/message-manager@workspace:packages/message-manager"
dependencies:
Expand Down Expand Up @@ -3603,7 +3604,7 @@ __metadata:
dependencies:
"@lavamoat/allow-scripts": "npm:^3.0.4"
"@lavamoat/preinstall-always-fail": "npm:^2.1.0"
"@metamask/accounts-controller": "npm:^21.0.0"
"@metamask/accounts-controller": "npm:^21.0.1"
"@metamask/auto-changelog": "npm:^3.4.4"
"@metamask/base-controller": "npm:^7.1.1"
"@metamask/keyring-api": "npm:^13.0.0"
Expand Down Expand Up @@ -3959,7 +3960,7 @@ __metadata:
"@ethersproject/abi": "npm:^5.7.0"
"@ethersproject/contracts": "npm:^5.7.0"
"@ethersproject/providers": "npm:^5.7.0"
"@metamask/accounts-controller": "npm:^21.0.0"
"@metamask/accounts-controller": "npm:^21.0.1"
"@metamask/approval-controller": "npm:^7.1.2"
"@metamask/auto-changelog": "npm:^3.4.4"
"@metamask/base-controller": "npm:^7.1.1"
Expand Down Expand Up @@ -4092,7 +4093,7 @@ __metadata:
languageName: node
linkType: hard

"@metamask/utils@npm:^9.0.0, @metamask/utils@npm:^9.1.0, @metamask/utils@npm:^9.2.1, @metamask/utils@npm:^9.3.0":
"@metamask/utils@npm:^9.0.0, @metamask/utils@npm:^9.1.0, @metamask/utils@npm:^9.2.1":
version: 9.3.0
resolution: "@metamask/utils@npm:9.3.0"
dependencies:
Expand Down

0 comments on commit 6637ca0

Please sign in to comment.