Skip to content

Commit

Permalink
fix(devDeps): babel@7.23.2->7.25.9 (#28068)
Browse files Browse the repository at this point in the history
<!--
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.
  • Loading branch information
legobeat authored Oct 25, 2024
1 parent aa6dd41 commit 440a0fa
Show file tree
Hide file tree
Showing 10 changed files with 906 additions and 1,277 deletions.
12 changes: 0 additions & 12 deletions .yarn/patches/@babel-core-npm-7.23.2-b93f586907.patch

This file was deleted.

12 changes: 12 additions & 0 deletions .yarn/patches/@babel-core-npm-7.25.9-4ae3bff7f3.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/lib/index.js b/lib/index.js
index 55b58e10eef589ff80ae33ebd1f1efe488b01153..e919c190d33ab9563f1364667fb4f5894bb6435d 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -211,7 +211,6 @@ var _transform = require("./transform.js");
var _transformFile = require("./transform-file.js");
var _transformAst = require("./transform-ast.js");
var _parse = require("./parse.js");
-var thisFile = require("./index.js");
;
const version = exports.version = "7.25.9";
const resolvePlugin = (name, dirname) => resolvers.resolvePlugin(name, dirname, false).filepath;
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
diff --git a/helpers/construct.js b/helpers/construct.js
index 771e1d7952e80f11619424fbabb3744b959ffa49..5fe152bc1129bd8c8b7bb217ca1972ac4e089051 100644
index aee8e70448824f509d6605e2dfa4455167442f21..00a69eba8d4c15a1f9aa318a50abb96c2ec447d9 100644
--- a/helpers/construct.js
+++ b/helpers/construct.js
@@ -1,10 +1,21 @@
@@ -1,10 +1,22 @@
var isNativeReflectConstruct = require("./isNativeReflectConstruct.js");
-var setPrototypeOf = require("./setPrototypeOf.js");
-var isNativeReflectConstruct = require("./isNativeReflectConstruct.js");
-function _construct(t, e, r) {
- if (isNativeReflectConstruct()) return Reflect.construct.apply(null, arguments);
- var o = [null];
Expand Down
61 changes: 2 additions & 59 deletions lavamoat/browserify/beta/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -2329,11 +2329,6 @@
"lodash": true
}
},
"@metamask/smart-transactions-controller>@babel/runtime": {
"globals": {
"regeneratorRuntime": "write"
}
},
"@metamask/smart-transactions-controller>@ethereumjs/tx": {
"packages": {
"@ethereumjs/tx>ethereum-cryptography": true,
Expand Down Expand Up @@ -2396,9 +2391,9 @@
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/rpc-errors": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
"bn.js": true,
"browserify>buffer": true,
"eth-method-registry": true,
"fast-json-patch": true,
"lodash": true,
"uuid": true,
Expand Down Expand Up @@ -2470,58 +2465,6 @@
"semver": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
"packages": {
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": {
"packages": {
"@metamask/ethjs>ethjs-abi": true,
"@metamask/ethjs>js-sha3": true,
"@metamask/smart-transactions-controller>@babel/runtime": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true,
"promise-to-callback": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": {
"globals": {
"clearInterval": true,
"setInterval": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": {
"packages": {
"@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
"browserify>buffer": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": {
"globals": {
"console": true
},
"packages": {
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": true,
"promise-to-callback": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": {
"packages": {
"@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
"@metamask/ethjs>@metamask/number-to-bn": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": {
"packages": {
"promise-to-callback": true
}
},
"@metamask/smart-transactions-controller>bignumber.js": {
"globals": {
"crypto": true,
Expand Down Expand Up @@ -5108,10 +5051,10 @@
"document": true
},
"packages": {
"@babel/runtime": true,
"prop-types": true,
"react": true,
"react-dom": true,
"react-redux>@babel/runtime": true,
"react-redux>hoist-non-react-statics": true,
"react-redux>react-is": true
}
Expand Down
61 changes: 2 additions & 59 deletions lavamoat/browserify/flask/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -2329,11 +2329,6 @@
"lodash": true
}
},
"@metamask/smart-transactions-controller>@babel/runtime": {
"globals": {
"regeneratorRuntime": "write"
}
},
"@metamask/smart-transactions-controller>@ethereumjs/tx": {
"packages": {
"@ethereumjs/tx>ethereum-cryptography": true,
Expand Down Expand Up @@ -2396,9 +2391,9 @@
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/rpc-errors": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
"bn.js": true,
"browserify>buffer": true,
"eth-method-registry": true,
"fast-json-patch": true,
"lodash": true,
"uuid": true,
Expand Down Expand Up @@ -2470,58 +2465,6 @@
"semver": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
"packages": {
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": {
"packages": {
"@metamask/ethjs>ethjs-abi": true,
"@metamask/ethjs>js-sha3": true,
"@metamask/smart-transactions-controller>@babel/runtime": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true,
"promise-to-callback": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": {
"globals": {
"clearInterval": true,
"setInterval": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": {
"packages": {
"@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
"browserify>buffer": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": {
"globals": {
"console": true
},
"packages": {
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": true,
"promise-to-callback": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": {
"packages": {
"@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
"@metamask/ethjs>@metamask/number-to-bn": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": {
"packages": {
"promise-to-callback": true
}
},
"@metamask/smart-transactions-controller>bignumber.js": {
"globals": {
"crypto": true,
Expand Down Expand Up @@ -5108,10 +5051,10 @@
"document": true
},
"packages": {
"@babel/runtime": true,
"prop-types": true,
"react": true,
"react-dom": true,
"react-redux>@babel/runtime": true,
"react-redux>hoist-non-react-statics": true,
"react-redux>react-is": true
}
Expand Down
61 changes: 2 additions & 59 deletions lavamoat/browserify/main/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -2329,11 +2329,6 @@
"lodash": true
}
},
"@metamask/smart-transactions-controller>@babel/runtime": {
"globals": {
"regeneratorRuntime": "write"
}
},
"@metamask/smart-transactions-controller>@ethereumjs/tx": {
"packages": {
"@ethereumjs/tx>ethereum-cryptography": true,
Expand Down Expand Up @@ -2396,9 +2391,9 @@
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/rpc-errors": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
"bn.js": true,
"browserify>buffer": true,
"eth-method-registry": true,
"fast-json-patch": true,
"lodash": true,
"uuid": true,
Expand Down Expand Up @@ -2470,58 +2465,6 @@
"semver": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
"packages": {
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": {
"packages": {
"@metamask/ethjs>ethjs-abi": true,
"@metamask/ethjs>js-sha3": true,
"@metamask/smart-transactions-controller>@babel/runtime": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true,
"promise-to-callback": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-filter": {
"globals": {
"clearInterval": true,
"setInterval": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": {
"packages": {
"@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
"browserify>buffer": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query": {
"globals": {
"console": true
},
"packages": {
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": true,
"promise-to-callback": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-format": {
"packages": {
"@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
"@metamask/ethjs>@metamask/number-to-bn": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract>@metamask/ethjs-util": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-query>@metamask/ethjs-rpc": {
"packages": {
"promise-to-callback": true
}
},
"@metamask/smart-transactions-controller>bignumber.js": {
"globals": {
"crypto": true,
Expand Down Expand Up @@ -5108,10 +5051,10 @@
"document": true
},
"packages": {
"@babel/runtime": true,
"prop-types": true,
"react": true,
"react-dom": true,
"react-redux>@babel/runtime": true,
"react-redux>hoist-non-react-statics": true,
"react-redux>react-is": true
}
Expand Down
Loading

0 comments on commit 440a0fa

Please sign in to comment.