Skip to content

Commit

Permalink
chore(deps): replace @kyleshockey/* deps with originals
Browse files Browse the repository at this point in the history
@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
  • Loading branch information
char0n committed Jul 19, 2021
1 parent 660e61f commit 859a679
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 18 deletions.
18 changes: 5 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -90,8 +88,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"
},
Expand Down
2 changes: 1 addition & 1 deletion src/core/plugins/samples/fn.js
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
4 changes: 2 additions & 2 deletions src/core/system.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 merge from "lodash/merge"
import { NEW_THROWN_ERR } from "corePlugins/err/actions"
import win from "core/window"

Expand Down Expand Up @@ -313,7 +313,7 @@ export default class Store {

function combinePlugins(plugins, toolbox, pluginOptions) {
if(isObject(plugins) && !isArray(plugins)) {
return assignDeep({}, plugins)
return merge({}, plugins)
}

if(isFunc(plugins)) {
Expand Down

0 comments on commit 859a679

Please sign in to comment.