remove object-assign dep ( which was missing from package.json )
This commit is contained in:
@@ -2,7 +2,6 @@ import { createStore, applyMiddleware, bindActionCreators, compose } from "redux
|
|||||||
import Im, { fromJS, Map } from "immutable"
|
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 assign from "object-assign"
|
|
||||||
import serializeError from "serialize-error"
|
import serializeError from "serialize-error"
|
||||||
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"
|
||||||
@@ -74,7 +73,7 @@ export default class Store {
|
|||||||
let dispatch = this.getStore().dispatch
|
let dispatch = this.getStore().dispatch
|
||||||
let getState = this.getStore().getState
|
let getState = this.getStore().getState
|
||||||
|
|
||||||
this.boundSystem = assign({},
|
this.boundSystem = Object.assign({},
|
||||||
this.getRootInjects(),
|
this.getRootInjects(),
|
||||||
this.getWrappedAndBoundActions(dispatch),
|
this.getWrappedAndBoundActions(dispatch),
|
||||||
this.getBoundSelectors(getState, this.getSystem),
|
this.getBoundSelectors(getState, this.getSystem),
|
||||||
@@ -92,7 +91,7 @@ export default class Store {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getRootInjects() {
|
getRootInjects() {
|
||||||
return assign({
|
return Object.assign({
|
||||||
getSystem: this.getSystem,
|
getSystem: this.getSystem,
|
||||||
getStore: this.getStore.bind(this),
|
getStore: this.getStore.bind(this),
|
||||||
getComponents: this.getComponents.bind(this),
|
getComponents: this.getComponents.bind(this),
|
||||||
@@ -251,7 +250,7 @@ export default class Store {
|
|||||||
|
|
||||||
getMapStateToProps() {
|
getMapStateToProps() {
|
||||||
return () => {
|
return () => {
|
||||||
let obj = assign({}, this.getSystem())
|
let obj = Object.assign({}, this.getSystem())
|
||||||
return obj
|
return obj
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import Im from "immutable"
|
import Im from "immutable"
|
||||||
import assign from "object-assign"
|
|
||||||
import shallowEqual from "shallowequal"
|
import shallowEqual from "shallowequal"
|
||||||
|
|
||||||
import camelCase from "lodash/camelCase"
|
import camelCase from "lodash/camelCase"
|
||||||
@@ -85,7 +84,7 @@ export function objReduce(obj, fn) {
|
|||||||
return Object.keys(obj).reduce((newObj, key) => {
|
return Object.keys(obj).reduce((newObj, key) => {
|
||||||
let res = fn(obj[key], key)
|
let res = fn(obj[key], key)
|
||||||
if(res && typeof res === "object")
|
if(res && typeof res === "object")
|
||||||
assign(newObj, res)
|
Object.assign(newObj, res)
|
||||||
return newObj
|
return newObj
|
||||||
}, {})
|
}, {})
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user