diff --git a/.yarn/patches/luxon-npm-3.1.0-16e2508500.patch b/.yarn/patches/luxon-npm-3.1.0-16e2508500.patch deleted file mode 100644 index 06d7389a4b97..000000000000 --- a/.yarn/patches/luxon-npm-3.1.0-16e2508500.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/build/cjs-browser/luxon.js b/build/cjs-browser/luxon.js -index 9ab2b9fd75714368c9c71975ea280bf5d49cb237..14c2891068731bb8bd4ac834d22fb5525a5ed162 100644 ---- a/build/cjs-browser/luxon.js -+++ b/build/cjs-browser/luxon.js -@@ -7373,7 +7373,7 @@ var DateTime = /*#__PURE__*/function () { - */ - ; - -- _proto.toLocaleString = function toLocaleString(formatOpts, opts) { -+ Reflect.defineProperty(_proto, 'toLocaleString', { value: function toLocaleString(formatOpts, opts) { - if (formatOpts === void 0) { - formatOpts = DATE_SHORT; - } -@@ -7383,7 +7383,7 @@ var DateTime = /*#__PURE__*/function () { - } - - return this.isValid ? Formatter.create(this.loc.clone(opts), formatOpts).formatDateTime(this) : INVALID; -- } -+ }}) - /** - * Returns an array of format "parts", meaning individual tokens along with metadata. This is allows callers to post-process individual sections of the formatted output. - * Defaults to the system's locale if no locale has been specified diff --git a/.yarn/patches/luxon-npm-3.2.1-56f8d97395.patch b/.yarn/patches/luxon-npm-3.2.1-56f8d97395.patch new file mode 100644 index 000000000000..20ee46808781 --- /dev/null +++ b/.yarn/patches/luxon-npm-3.2.1-56f8d97395.patch @@ -0,0 +1,40 @@ +diff --git a/build/cjs-browser/luxon.js b/build/cjs-browser/luxon.js +index 776c38ae1679eaed97ef5fa9a666e37e48747df6..336fb0ddfffd12604b5ab1609ba0685755739c9c 100644 +--- a/build/cjs-browser/luxon.js ++++ b/build/cjs-browser/luxon.js +@@ -4226,7 +4226,7 @@ var Interval = /*#__PURE__*/function () { + * @example Interval.fromISO('2022-11-07T17:00Z/2022-11-07T19:00Z').toLocaleString({ weekday: 'short', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }); //=> Mon, Nov 07, 6:00 – 8:00 p + * @return {string} + */; +- _proto.toLocaleString = function toLocaleString(formatOpts, opts) { ++ Reflect.defineProperty(_proto, 'toLocaleString', { value: function toLocaleString(formatOpts, opts) { + if (formatOpts === void 0) { + formatOpts = DATE_SHORT; + } +@@ -4234,7 +4234,7 @@ var Interval = /*#__PURE__*/function () { + opts = {}; + } + return this.isValid ? Formatter.create(this.s.loc.clone(opts), formatOpts).formatInterval(this) : INVALID$1; +- } ++ }}) + + /** + * Returns an ISO 8601-compliant string representation of this Interval. +@@ -6598,7 +6598,7 @@ var DateTime = /*#__PURE__*/function () { + * @example DateTime.now().toLocaleString({ hour: '2-digit', minute: '2-digit', hourCycle: 'h23' }); //=> '11:32' + * @return {string} + */; +- _proto.toLocaleString = function toLocaleString(formatOpts, opts) { ++ Reflect.defineProperty(_proto, 'toLocaleString', { value: function toLocaleString(formatOpts, opts) { + if (formatOpts === void 0) { + formatOpts = DATE_SHORT; + } +@@ -6606,7 +6606,7 @@ var DateTime = /*#__PURE__*/function () { + opts = {}; + } + return this.isValid ? Formatter.create(this.loc.clone(opts), formatOpts).formatDateTime(this) : INVALID; +- } ++ }}) + + /** + * Returns an array of format "parts", meaning individual tokens along with metadata. This is allows callers to post-process individual sections of the formatted output. diff --git a/package.json b/package.json index 6c76820fe28e..300c0c0d750c 100644 --- a/package.json +++ b/package.json @@ -175,14 +175,13 @@ "web3@^0.20.7": "patch:web3@npm%3A0.20.7#./.yarn/patches/web3-npm-0.20.7-ee7ef00c57.patch", "watchify@^4.0.0": "patch:watchify@npm%3A4.0.0#./.yarn/patches/watchify-npm-4.0.0-4fd965dd49.patch", "undeclared-identifiers@^1.1.2": "patch:undeclared-identifiers@npm%3A1.1.2#./.yarn/patches/undeclared-identifiers-npm-1.1.2-13d6792e9e.patch", - "luxon@^1.26.0": "patch:luxon@npm%3A1.26.0#./.yarn/patches/luxon-npm-1.26.0-09624ad59c.patch", "sass@^1.32.4": "patch:sass@npm%3A1.35.2#./.yarn/patches/sass-npm-1.35.2-6df4e15d13.patch", "sass@^1.26.3": "patch:sass@npm%3A1.35.2#./.yarn/patches/sass-npm-1.35.2-6df4e15d13.patch", "sass@^1.29.0": "patch:sass@npm%3A1.35.2#./.yarn/patches/sass-npm-1.35.2-6df4e15d13.patch", "squirrelly@^8.0.8": "patch:squirrelly@npm%3A8.0.8#./.yarn/patches/squirrelly-npm-8.0.8-1d17420d8d.patch", "stylelint@^13.6.1": "patch:stylelint@npm%3A13.6.1#./.yarn/patches/stylelint-npm-13.6.1-47aaddf62b.patch", - "luxon@^3.1.0": "patch:luxon@npm%3A3.1.0#./.yarn/patches/luxon-npm-3.1.0-16e2508500.patch", - "luxon@^3.0.1": "patch:luxon@npm%3A3.1.0#./.yarn/patches/luxon-npm-3.1.0-16e2508500.patch", + "luxon@^3.0.1": "patch:luxon@npm%3A3.2.1#./.yarn/patches/luxon-npm-3.2.1-56f8d97395.patch", + "luxon@^3.2.1": "patch:luxon@npm%3A3.2.1#./.yarn/patches/luxon-npm-3.2.1-56f8d97395.patch", "improved-yarn-audit@^3.0.0": "patch:improved-yarn-audit@npm%3A3.0.0#./.yarn/patches/improved-yarn-audit-npm-3.0.0-3e37ee431a.patch", "lockfile-lint-api@^5.4.6": "patch:lockfile-lint-api@npm%3A5.4.6#./.yarn/patches/lockfile-lint-api-npm-5.4.6-dc86b73900.patch", "symbol-observable": "^2.0.3", @@ -290,7 +289,7 @@ "localforage": "^1.9.0", "lodash": "^4.17.21", "loglevel": "^1.4.1", - "luxon": "^3.1.0", + "luxon": "^3.2.1", "nanoid": "^2.1.6", "nonce-tracker": "^1.0.0", "obj-multiplex": "^1.0.0", diff --git a/yarn.lock b/yarn.lock index 5392f5826ed2..6a2bf7092fb1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22269,17 +22269,17 @@ __metadata: languageName: node linkType: hard -"luxon@npm:3.1.0": - version: 3.1.0 - resolution: "luxon@npm:3.1.0" - checksum: f8a850b759ba7a2e009d904c522ed7bc264bf4add57578f8948e52a0ed96b627b025b5aad8032295b570ae19fac41f0ffab91bdb128715fb0cc020798a7ba886 +"luxon@npm:3.2.1": + version: 3.2.1 + resolution: "luxon@npm:3.2.1" + checksum: 3fa3def2c5f5d3032b4c46220c4da8aeb467ac979888fc9d2557adcd22195f93516b4ad5909a75862bec8dc6ddc0953b0f38e6d2f4a8ab8450ddc531a83cf20d languageName: node linkType: hard -"luxon@patch:luxon@npm%3A3.1.0#./.yarn/patches/luxon-npm-3.1.0-16e2508500.patch::locator=metamask-crx%40workspace%3A.": - version: 3.1.0 - resolution: "luxon@patch:luxon@npm%3A3.1.0#./.yarn/patches/luxon-npm-3.1.0-16e2508500.patch::version=3.1.0&hash=cbeda1&locator=metamask-crx%40workspace%3A." - checksum: 4ab1d73a2ef272d953048b6a59c10d3787a8690449c5c2784e99e9f8b3c2869dc1ea54e69f2e6f31b44acc5b9ef0e9d198af9a6680f45675eb015a60f727ebb8 +"luxon@patch:luxon@npm%3A3.2.1#./.yarn/patches/luxon-npm-3.2.1-56f8d97395.patch::locator=metamask-crx%40workspace%3A.": + version: 3.2.1 + resolution: "luxon@patch:luxon@npm%3A3.2.1#./.yarn/patches/luxon-npm-3.2.1-56f8d97395.patch::version=3.2.1&hash=aef1f3&locator=metamask-crx%40workspace%3A." + checksum: a1758bc8aa02c6faadef4f012d7f35af2ab7722ed79bfcbeb828bc960faf3c8001d6d659d8cc13ebbd96ccd957381bc848ad6d10e2fe88cd2996a65816efcc84 languageName: node linkType: hard @@ -23063,7 +23063,7 @@ __metadata: lodash: ^4.17.21 loglevel: ^1.4.1 loose-envify: ^1.4.0 - luxon: ^3.1.0 + luxon: ^3.2.1 madge: ^5.0.1 mocha: ^7.2.0 mockttp: ^2.6.0