From 1baa94d1ab63e21c701f0aa78231238ab1e385c9 Mon Sep 17 00:00:00 2001
From: Etienne Dusseault <etienne.dusseault@gmail.com>
Date: Tue, 20 Apr 2021 11:37:21 +0800
Subject: [PATCH] Dep Upgrades for Lavamoat Patches (#10902)

* dep upgrades

* apply more patches
---
 package.json                        |  4 ++--
 patches/fast-json-patch+2.2.1.patch | 13 +++++++++++++
 patches/luxon+1.26.0.patch          | 20 ++++++++++++++++++++
 yarn.lock                           | 17 ++++++++++++-----
 4 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 patches/fast-json-patch+2.2.1.patch
 create mode 100644 patches/luxon+1.26.0.patch

diff --git a/package.json b/package.json
index f6ead484d..2971fcb11 100644
--- a/package.json
+++ b/package.json
@@ -138,7 +138,7 @@
     "ethjs-query": "^0.3.4",
     "extension-port-stream": "^2.0.0",
     "extensionizer": "^1.0.1",
-    "fast-json-patch": "^2.0.4",
+    "fast-json-patch": "^2.2.1",
     "fast-safe-stringify": "^2.0.7",
     "fuse.js": "^3.2.0",
     "globalthis": "^1.0.1",
@@ -151,7 +151,7 @@
     "localforage": "^1.9.0",
     "lodash": "^4.17.19",
     "loglevel": "^1.4.1",
-    "luxon": "^1.24.1",
+    "luxon": "^1.26.0",
     "nanoid": "^2.1.6",
     "nonce-tracker": "^1.0.0",
     "obj-multiplex": "^1.0.0",
diff --git a/patches/fast-json-patch+2.2.1.patch b/patches/fast-json-patch+2.2.1.patch
new file mode 100644
index 000000000..d8f7b20f8
--- /dev/null
+++ b/patches/fast-json-patch+2.2.1.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/fast-json-patch/lib/helpers.js b/node_modules/fast-json-patch/lib/helpers.js
+index 0ac28b4..d048c0a 100644
+--- a/node_modules/fast-json-patch/lib/helpers.js
++++ b/node_modules/fast-json-patch/lib/helpers.js
+@@ -21,7 +21,7 @@ var _hasOwnProperty = Object.prototype.hasOwnProperty;
+ function hasOwnProperty(obj, key) {
+     return _hasOwnProperty.call(obj, key);
+ }
+-exports.hasOwnProperty = hasOwnProperty;
++Object.defineProperty(exports, "hasOwnProperty", { value: hasOwnProperty });
+ function _objectKeys(obj) {
+     if (Array.isArray(obj)) {
+         var keys = new Array(obj.length);
\ No newline at end of file
diff --git a/patches/luxon+1.26.0.patch b/patches/luxon+1.26.0.patch
new file mode 100644
index 000000000..6c4482216
--- /dev/null
+++ b/patches/luxon+1.26.0.patch
@@ -0,0 +1,20 @@
+diff --git a/node_modules/luxon/build/cjs-browser/luxon.js b/node_modules/luxon/build/cjs-browser/luxon.js
+index 206a47a..5556d1d 100644
+--- a/node_modules/luxon/build/cjs-browser/luxon.js
++++ b/node_modules/luxon/build/cjs-browser/luxon.js
+@@ -7243,13 +7243,13 @@ var DateTime = /*#__PURE__*/function () {
+    */
+   ;
+ 
+-  _proto.toLocaleString = function toLocaleString(opts) {
++  Reflect.defineProperty(_proto, 'toLocaleString', { value: function toLocaleString(opts) {
+     if (opts === void 0) {
+       opts = DATE_SHORT;
+     }
+ 
+     return this.isValid ? Formatter.create(this.loc.clone(opts), opts).formatDateTime(this) : INVALID$2;
+-  }
++  }})
+   /**
+    * 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
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index bb86894b8..0bac545a6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11552,13 +11552,20 @@ fast-json-parse@^1.0.3:
   resolved "https://registry.yarnpkg.com/fast-json-parse/-/fast-json-parse-1.0.3.tgz#43e5c61ee4efa9265633046b770fb682a7577c4d"
   integrity sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==
 
-fast-json-patch@^2.0.4, fast-json-patch@^2.0.6:
+fast-json-patch@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-2.0.6.tgz#86fff8f8662391aa819722864d632e603e6ee605"
   integrity sha1-hv/4+GYjkaqBlyKGTWMuYD5u5gU=
   dependencies:
     deep-equal "^1.0.1"
 
+fast-json-patch@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-2.2.1.tgz#18150d36c9ab65c7209e7d4eb113f4f8eaabe6d9"
+  integrity sha512-4j5uBaTnsYAV5ebkidvxiLUYOwjQ+JSFljeqfTxCrH9bDmlCQaOJFS84oDJ2rAXZq2yskmk3ORfoP9DCwqFNig==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
@@ -17690,10 +17697,10 @@ ltgt@~2.1.1:
   resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.1.3.tgz#10851a06d9964b971178441c23c9e52698eece34"
   integrity sha1-EIUaBtmWS5cReEQcI8nlJpjuzjQ=
 
-luxon@^1.24.1:
-  version "1.24.1"
-  resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.24.1.tgz#a8383266131ed4eaed4b5f430f96f3695403a52a"
-  integrity sha512-CgnIMKAWT0ghcuWFfCWBnWGOddM0zu6c4wZAWmD0NN7MZTnro0+833DF6tJep+xlxRPg4KtsYEHYLfTMBQKwYg==
+luxon@^1.26.0:
+  version "1.26.0"
+  resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.26.0.tgz#d3692361fda51473948252061d0f8561df02b578"
+  integrity sha512-+V5QIQ5f6CDXQpWNICELwjwuHdqeJM1UenlZWx5ujcRMc9venvluCjFb4t5NYLhb6IhkbMVOxzVuOqkgMxee2A==
 
 mafmt@^6.0.0, mafmt@^6.0.2, mafmt@^6.0.4, mafmt@^6.0.7:
   version "6.0.7"