chore(deps): replace @kyleshockey/* deps with originals

@kyleshockey/object-assign-deep - replaced by lodash/merge. If behavior
not be compatible well use lodash/mergeWith.

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

Refs #7341
This commit is contained in:
Vladimir Gorej
2021-07-19 10:22:30 +02:00
parent 4c369b0027
commit cf9a3657cc
4 changed files with 10 additions and 18 deletions

18
package-lock.json generated
View File

@@ -2815,19 +2815,6 @@
"vary": "^1.1.2" "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": { "@nicolo-ribaudo/chokidar-2": {
"version": "2.1.8-no-fsevents.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", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.2.tgz",
@@ -27096,6 +27083,11 @@
"integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
"dev": true "dev": true
}, },
"xml": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
"integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU="
},
"xml-but-prettier": { "xml-but-prettier": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/xml-but-prettier/-/xml-but-prettier-1.0.1.tgz", "resolved": "https://registry.npmjs.org/xml-but-prettier/-/xml-but-prettier-1.0.1.tgz",

View File

@@ -60,8 +60,6 @@
"dependencies": { "dependencies": {
"@babel/runtime-corejs3": "^7.14.7", "@babel/runtime-corejs3": "^7.14.7",
"@braintree/sanitize-url": "^5.0.2", "@braintree/sanitize-url": "^5.0.2",
"@kyleshockey/object-assign-deep": "^0.4.2",
"@kyleshockey/xml": "^1.0.2",
"base64-js": "^1.5.1", "base64-js": "^1.5.1",
"classnames": "^2.3.1", "classnames": "^2.3.1",
"css.escape": "1.5.1", "css.escape": "1.5.1",
@@ -90,8 +88,10 @@
"reselect": "^4.0.0", "reselect": "^4.0.0",
"serialize-error": "^8.1.0", "serialize-error": "^8.1.0",
"sha.js": "^2.4.11", "sha.js": "^2.4.11",
"stream": "=0.0.2",
"swagger-client": "^3.13.6", "swagger-client": "^3.13.6",
"url-parse": "^1.5.1", "url-parse": "^1.5.1",
"xml": "=1.0.1",
"xml-but-prettier": "^1.0.1", "xml-but-prettier": "^1.0.1",
"zenscroll": "^4.0.2" "zenscroll": "^4.0.2"
}, },

View File

@@ -1,5 +1,5 @@
import { objectify, isFunc, normalizeArray, deeplyStripKey } from "core/utils" import { objectify, isFunc, normalizeArray, deeplyStripKey } from "core/utils"
import XML from "@kyleshockey/xml" import XML from "xml"
import memoizee from "memoizee" import memoizee from "memoizee"
import isEmpty from "lodash/isEmpty" import isEmpty from "lodash/isEmpty"

View File

@@ -4,7 +4,7 @@ import Im, { fromJS, Map } from "immutable"
import deepExtend from "deep-extend" import deepExtend from "deep-extend"
import { combineReducers } from "redux-immutable" import { combineReducers } from "redux-immutable"
import { serializeError } from "serialize-error" import { serializeError } from "serialize-error"
import assignDeep from "@kyleshockey/object-assign-deep" import merge from "lodash/merge"
import { NEW_THROWN_ERR } from "corePlugins/err/actions" import { NEW_THROWN_ERR } from "corePlugins/err/actions"
import win from "core/window" import win from "core/window"
@@ -313,7 +313,7 @@ export default class Store {
function combinePlugins(plugins, toolbox, pluginOptions) { function combinePlugins(plugins, toolbox, pluginOptions) {
if(isObject(plugins) && !isArray(plugins)) { if(isObject(plugins) && !isArray(plugins)) {
return assignDeep({}, plugins) return merge({}, plugins)
} }
if(isFunc(plugins)) { if(isFunc(plugins)) {