Skip to content

Commit 440a0fa

Browse files
authored
fix(devDeps): babel@7.23.2->7.25.9 (#28068)
<!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** - Bump `@babel/core` and `@babel/runtime` to latest - Fix: replace previous usage of unpatched `@babel/runtime` with consistent usage of patched version - The unpatched version was inadvertently used by `@metamask/smart-transactions-controller` [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28068?quickstart=1) ## **Related issues** - #27049 - #27923 ## **Manual testing steps** ## **Screenshots/Recordings** ### **Before** ### **After** ## **Pre-merge author checklist** - [x] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.
1 parent aa6dd41 commit 440a0fa

File tree

10 files changed

+906
-1277
lines changed

10 files changed

+906
-1277
lines changed

.yarn/patches/@babel-core-npm-7.23.2-b93f586907.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/lib/index.js b/lib/index.js
2+
index 55b58e10eef589ff80ae33ebd1f1efe488b01153..e919c190d33ab9563f1364667fb4f5894bb6435d 100644
3+
--- a/lib/index.js
4+
+++ b/lib/index.js
5+
@@ -211,7 +211,6 @@ var _transform = require("./transform.js");
6+
var _transformFile = require("./transform-file.js");
7+
var _transformAst = require("./transform-ast.js");
8+
var _parse = require("./parse.js");
9+
-var thisFile = require("./index.js");
10+
;
11+
const version = exports.version = "7.25.9";
12+
const resolvePlugin = (name, dirname) => resolvers.resolvePlugin(name, dirname, false).filepath;

.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch renamed to .yarn/patches/@babel-runtime-npm-7.25.9-fe8c62510a.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
diff --git a/helpers/construct.js b/helpers/construct.js
2-
index 771e1d7952e80f11619424fbabb3744b959ffa49..5fe152bc1129bd8c8b7bb217ca1972ac4e089051 100644
2+
index aee8e70448824f509d6605e2dfa4455167442f21..00a69eba8d4c15a1f9aa318a50abb96c2ec447d9 100644
33
--- a/helpers/construct.js
44
+++ b/helpers/construct.js
5-
@@ -1,10 +1,21 @@
5+
@@ -1,10 +1,22 @@
6+
var isNativeReflectConstruct = require("./isNativeReflectConstruct.js");
67
-var setPrototypeOf = require("./setPrototypeOf.js");
7-
-var isNativeReflectConstruct = require("./isNativeReflectConstruct.js");
88
-function _construct(t, e, r) {
99
- if (isNativeReflectConstruct()) return Reflect.construct.apply(null, arguments);
1010
- var o = [null];

lavamoat/browserify/beta/policy.json

Lines changed: 2 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2329,11 +2329,6 @@
23292329
"lodash": true
23302330
}
23312331
},
2332-
"@metamask/smart-transactions-controller>@babel/runtime": {
2333-
"globals": {
2334-
"regeneratorRuntime": "write"
2335-
}
2336-
},
23372332
"@metamask/smart-transactions-controller>@ethereumjs/tx": {
23382333
"packages": {
23392334
"@ethereumjs/tx>ethereum-cryptography": true,
@@ -2396,9 +2391,9 @@
23962391
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true,
23972392
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/rpc-errors": true,
23982393
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true,
2399-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
24002394
"bn.js": true,
24012395
"browserify>buffer": true,
2396+
"eth-method-registry": true,
24022397
"fast-json-patch": true,
24032398
"lodash": true,
24042399
"uuid": true,
@@ -2470,58 +2465,6 @@
24702465
"semver": true
24712466
}
24722467
},
2473-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
2474-
"packages": {
2475-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
2476-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": true
2477-
}
2478-
},
2479-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": {
2480-
"packages": {
2481-
"@metamask/ethjs>ethjs-abi": true,
2482-
"@metamask/ethjs>js-sha3": true,
2483-
"@metamask/smart-transactions-controller>@babel/runtime": true,
2484-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": true,
2485-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true,
2486-
"promise-to-callback": true
2487-
}
2488-
},
2489-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": {
2490-
"globals": {
2491-
"clearInterval": true,
2492-
"setInterval": true
2493-
}
2494-
},
2495-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": {
2496-
"packages": {
2497-
"@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
2498-
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
2499-
"browserify>buffer": true
2500-
}
2501-
},
2502-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": {
2503-
"globals": {
2504-
"console": true
2505-
},
2506-
"packages": {
2507-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": true,
2508-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": true,
2509-
"promise-to-callback": true
2510-
}
2511-
},
2512-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": {
2513-
"packages": {
2514-
"@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
2515-
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
2516-
"@metamask/ethjs>@metamask/number-to-bn": true,
2517-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true
2518-
}
2519-
},
2520-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": {
2521-
"packages": {
2522-
"promise-to-callback": true
2523-
}
2524-
},
25252468
"@metamask/smart-transactions-controller>bignumber.js": {
25262469
"globals": {
25272470
"crypto": true,
@@ -5108,10 +5051,10 @@
51085051
"document": true
51095052
},
51105053
"packages": {
5054+
"@babel/runtime": true,
51115055
"prop-types": true,
51125056
"react": true,
51135057
"react-dom": true,
5114-
"react-redux>@babel/runtime": true,
51155058
"react-redux>hoist-non-react-statics": true,
51165059
"react-redux>react-is": true
51175060
}

lavamoat/browserify/flask/policy.json

Lines changed: 2 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2329,11 +2329,6 @@
23292329
"lodash": true
23302330
}
23312331
},
2332-
"@metamask/smart-transactions-controller>@babel/runtime": {
2333-
"globals": {
2334-
"regeneratorRuntime": "write"
2335-
}
2336-
},
23372332
"@metamask/smart-transactions-controller>@ethereumjs/tx": {
23382333
"packages": {
23392334
"@ethereumjs/tx>ethereum-cryptography": true,
@@ -2396,9 +2391,9 @@
23962391
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true,
23972392
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/rpc-errors": true,
23982393
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true,
2399-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
24002394
"bn.js": true,
24012395
"browserify>buffer": true,
2396+
"eth-method-registry": true,
24022397
"fast-json-patch": true,
24032398
"lodash": true,
24042399
"uuid": true,
@@ -2470,58 +2465,6 @@
24702465
"semver": true
24712466
}
24722467
},
2473-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
2474-
"packages": {
2475-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
2476-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": true
2477-
}
2478-
},
2479-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": {
2480-
"packages": {
2481-
"@metamask/ethjs>ethjs-abi": true,
2482-
"@metamask/ethjs>js-sha3": true,
2483-
"@metamask/smart-transactions-controller>@babel/runtime": true,
2484-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": true,
2485-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true,
2486-
"promise-to-callback": true
2487-
}
2488-
},
2489-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": {
2490-
"globals": {
2491-
"clearInterval": true,
2492-
"setInterval": true
2493-
}
2494-
},
2495-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": {
2496-
"packages": {
2497-
"@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
2498-
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
2499-
"browserify>buffer": true
2500-
}
2501-
},
2502-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": {
2503-
"globals": {
2504-
"console": true
2505-
},
2506-
"packages": {
2507-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": true,
2508-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": true,
2509-
"promise-to-callback": true
2510-
}
2511-
},
2512-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": {
2513-
"packages": {
2514-
"@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
2515-
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
2516-
"@metamask/ethjs>@metamask/number-to-bn": true,
2517-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true
2518-
}
2519-
},
2520-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": {
2521-
"packages": {
2522-
"promise-to-callback": true
2523-
}
2524-
},
25252468
"@metamask/smart-transactions-controller>bignumber.js": {
25262469
"globals": {
25272470
"crypto": true,
@@ -5108,10 +5051,10 @@
51085051
"document": true
51095052
},
51105053
"packages": {
5054+
"@babel/runtime": true,
51115055
"prop-types": true,
51125056
"react": true,
51135057
"react-dom": true,
5114-
"react-redux>@babel/runtime": true,
51155058
"react-redux>hoist-non-react-statics": true,
51165059
"react-redux>react-is": true
51175060
}

lavamoat/browserify/main/policy.json

Lines changed: 2 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2329,11 +2329,6 @@
23292329
"lodash": true
23302330
}
23312331
},
2332-
"@metamask/smart-transactions-controller>@babel/runtime": {
2333-
"globals": {
2334-
"regeneratorRuntime": "write"
2335-
}
2336-
},
23372332
"@metamask/smart-transactions-controller>@ethereumjs/tx": {
23382333
"packages": {
23392334
"@ethereumjs/tx>ethereum-cryptography": true,
@@ -2396,9 +2391,9 @@
23962391
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true,
23972392
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/rpc-errors": true,
23982393
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true,
2399-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
24002394
"bn.js": true,
24012395
"browserify>buffer": true,
2396+
"eth-method-registry": true,
24022397
"fast-json-patch": true,
24032398
"lodash": true,
24042399
"uuid": true,
@@ -2470,58 +2465,6 @@
24702465
"semver": true
24712466
}
24722467
},
2473-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
2474-
"packages": {
2475-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
2476-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": true
2477-
}
2478-
},
2479-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": {
2480-
"packages": {
2481-
"@metamask/ethjs>ethjs-abi": true,
2482-
"@metamask/ethjs>js-sha3": true,
2483-
"@metamask/smart-transactions-controller>@babel/runtime": true,
2484-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": true,
2485-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true,
2486-
"promise-to-callback": true
2487-
}
2488-
},
2489-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": {
2490-
"globals": {
2491-
"clearInterval": true,
2492-
"setInterval": true
2493-
}
2494-
},
2495-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": {
2496-
"packages": {
2497-
"@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
2498-
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
2499-
"browserify>buffer": true
2500-
}
2501-
},
2502-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": {
2503-
"globals": {
2504-
"console": true
2505-
},
2506-
"packages": {
2507-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": true,
2508-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": true,
2509-
"promise-to-callback": true
2510-
}
2511-
},
2512-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": {
2513-
"packages": {
2514-
"@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
2515-
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
2516-
"@metamask/ethjs>@metamask/number-to-bn": true,
2517-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true
2518-
}
2519-
},
2520-
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": {
2521-
"packages": {
2522-
"promise-to-callback": true
2523-
}
2524-
},
25252468
"@metamask/smart-transactions-controller>bignumber.js": {
25262469
"globals": {
25272470
"crypto": true,
@@ -5108,10 +5051,10 @@
51085051
"document": true
51095052
},
51105053
"packages": {
5054+
"@babel/runtime": true,
51115055
"prop-types": true,
51125056
"react": true,
51135057
"react-dom": true,
5114-
"react-redux>@babel/runtime": true,
51155058
"react-redux>hoist-non-react-statics": true,
51165059
"react-redux>react-is": true
51175060
}

0 commit comments

Comments
 (0)