From 49c4bc4d72f645ba2d0f036486fb84aede5654dc Mon Sep 17 00:00:00 2001
From: Vladimir Gorej <vladimir.gorej@gmail.com>
Date: Mon, 19 Jul 2021 10:22:30 +0200
Subject: [PATCH] chore(deps): replace @kyleshockey/* deps with originals

@kyleshockey/object-assign-deep - no longer needs transpilation
as current JavaScript engines already supports all the code in the library.

@kyleshockey/xml - by installing stream library directly, we can use origin
xml library without the fork.

Refs #7341
---
 package-lock.json              | 23 ++++++++++-------------
 package.json                   |  5 +++--
 src/core/plugins/samples/fn.js |  2 +-
 src/core/system.js             |  2 +-
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ef5777e79299..f56fc528b0c4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2972,19 +2972,6 @@
         "vary": "^1.1.2"
       }
     },
-    "@kyleshockey/object-assign-deep": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@kyleshockey/object-assign-deep/-/object-assign-deep-0.4.2.tgz",
-      "integrity": "sha1-hJAPDu/DcnmPR1G1JigwuCCJIuw="
-    },
-    "@kyleshockey/xml": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@kyleshockey/xml/-/xml-1.0.2.tgz",
-      "integrity": "sha512-iMo32MPLcI9cPxs3YL5kmKxKgDmkSZDCFEqIT5eRk7d/Ll8r4X3SwGYSigzALd6+RHWlFEmjL1QyaQ15xDZFlw==",
-      "requires": {
-        "stream": "^0.0.2"
-      }
-    },
     "@nicolo-ribaudo/chokidar-2": {
       "version": "2.1.8-no-fsevents.2",
       "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.2.tgz",
@@ -19748,6 +19735,11 @@
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
+    "object-assign-deep": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/object-assign-deep/-/object-assign-deep-0.4.0.tgz",
+      "integrity": "sha512-54Uvn3s+4A/cMWx9tlRez1qtc7pN7pbQ+Yi7mjLjcBpWLlP+XbSHiHbQW6CElDiV4OvuzqnMrBdkgxI1mT8V/Q=="
+    },
     "object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
@@ -28604,6 +28596,11 @@
       "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
       "dev": true
     },
+    "xml": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
+      "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU="
+    },
     "xml-but-prettier": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/xml-but-prettier/-/xml-but-prettier-1.0.1.tgz",
diff --git a/package.json b/package.json
index c0a1dd704086..ab8f1fb7811d 100644
--- a/package.json
+++ b/package.json
@@ -60,8 +60,6 @@
   "dependencies": {
     "@babel/runtime-corejs3": "^7.14.7",
     "@braintree/sanitize-url": "^5.0.2",
-    "@kyleshockey/object-assign-deep": "^0.4.2",
-    "@kyleshockey/xml": "^1.0.2",
     "base64-js": "^1.5.1",
     "classnames": "^2.3.1",
     "css.escape": "1.5.1",
@@ -73,6 +71,7 @@
     "js-yaml": "^3.13.1",
     "lodash": "^4.17.21",
     "memoizee": "^0.4.15",
+    "object-assign-deep": "=0.4.0",
     "prop-types": "^15.7.2",
     "randombytes": "^2.1.0",
     "react": "=17.0.2",
@@ -90,8 +89,10 @@
     "reselect": "^4.0.0",
     "serialize-error": "^8.1.0",
     "sha.js": "^2.4.11",
+    "stream": "=0.0.2",
     "swagger-client": "^3.13.6",
     "url-parse": "^1.5.1",
+    "xml": "=1.0.1",
     "xml-but-prettier": "^1.0.1",
     "zenscroll": "^4.0.2"
   },
diff --git a/src/core/plugins/samples/fn.js b/src/core/plugins/samples/fn.js
index cfcc937586f1..ff5335ed31af 100644
--- a/src/core/plugins/samples/fn.js
+++ b/src/core/plugins/samples/fn.js
@@ -1,5 +1,5 @@
 import { objectify, isFunc, normalizeArray, deeplyStripKey } from "core/utils"
-import XML from "@kyleshockey/xml"
+import XML from "xml"
 import memoizee from "memoizee"
 import isEmpty from "lodash/isEmpty"
 
diff --git a/src/core/system.js b/src/core/system.js
index 3179b43fd71d..f6f517ba828f 100644
--- a/src/core/system.js
+++ b/src/core/system.js
@@ -4,7 +4,7 @@ import Im, { fromJS, Map } from "immutable"
 import deepExtend from "deep-extend"
 import { combineReducers } from "redux-immutable"
 import { serializeError } from "serialize-error"
-import assignDeep from "@kyleshockey/object-assign-deep"
+import assignDeep from "object-assign-deep"
 import { NEW_THROWN_ERR } from "corePlugins/err/actions"
 import win from "core/window"