From 2cff91226183c06a40c5e96959f048ad74fb0307 Mon Sep 17 00:00:00 2001 From: Josh Ponelat Date: Wed, 19 Apr 2017 06:35:35 +0200 Subject: [PATCH] remove object-assign dep ( which was missing from package.json ) --- src/core/system.js | 7 +++---- src/core/utils.js | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/core/system.js b/src/core/system.js index 05c8fb3a..551b7ca1 100644 --- a/src/core/system.js +++ b/src/core/system.js @@ -2,7 +2,6 @@ import { createStore, applyMiddleware, bindActionCreators, compose } from "redux import Im, { fromJS, Map } from "immutable" import deepExtend from "deep-extend" import { combineReducers } from "redux-immutable" -import assign from "object-assign" import serializeError from "serialize-error" import { NEW_THROWN_ERR } from "corePlugins/err/actions" import win from "core/window" @@ -74,7 +73,7 @@ export default class Store { let dispatch = this.getStore().dispatch let getState = this.getStore().getState - this.boundSystem = assign({}, + this.boundSystem = Object.assign({}, this.getRootInjects(), this.getWrappedAndBoundActions(dispatch), this.getBoundSelectors(getState, this.getSystem), @@ -92,7 +91,7 @@ export default class Store { } getRootInjects() { - return assign({ + return Object.assign({ getSystem: this.getSystem, getStore: this.getStore.bind(this), getComponents: this.getComponents.bind(this), @@ -251,7 +250,7 @@ export default class Store { getMapStateToProps() { return () => { - let obj = assign({}, this.getSystem()) + let obj = Object.assign({}, this.getSystem()) return obj } } diff --git a/src/core/utils.js b/src/core/utils.js index 2d94ac25..7b98d037 100644 --- a/src/core/utils.js +++ b/src/core/utils.js @@ -1,5 +1,4 @@ import Im from "immutable" -import assign from "object-assign" import shallowEqual from "shallowequal" import camelCase from "lodash/camelCase" @@ -85,7 +84,7 @@ export function objReduce(obj, fn) { return Object.keys(obj).reduce((newObj, key) => { let res = fn(obj[key], key) if(res && typeof res === "object") - assign(newObj, res) + Object.assign(newObj, res) return newObj }, {}) }