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:
@@ -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"
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
Reference in New Issue
Block a user