Skip to content

Commit 09b2580

Browse files
committed
fix(assign): Now using ponyfill
Now using ponyfill for Object.assign that will try to use browser's native and fallback to its implementation.
1 parent c9fcdab commit 09b2580

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
"lodash.isobject": "^3.0.2",
5858
"lodash.isplainobject": "^4.0.6",
5959
"lodash.map": "^4.6.0",
60+
"object-assign": "^4.1.1",
6061
"redux": "^3.7.2"
6162
},
6263
"czConfig": {

src/components/connector.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import shallowEqual from '../utils/shallowEqual';
22
import wrapActionCreators from '../utils/wrapActionCreators';
33
import invariant from 'invariant';
44

5+
import assign from 'object-assign';
56
import isPlainObject from 'lodash.isplainobject';
67
import isFunction from 'lodash.isfunction';
78
import isObject from 'lodash.isobject';
89

9-
const assign = Object.assign;
1010
const defaultMapStateToTarget = () => ({});
1111
const defaultMapDispatchToTarget = dispatch => ({dispatch});
1212

src/components/ngRedux.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import invariant from 'invariant';
33
import {createStore, applyMiddleware, compose, combineReducers} from 'redux';
44
import digestMiddleware from './digestMiddleware';
55

6+
import assign from 'object-assign';
67
import curry from 'lodash.curry';
78
import isFunction from 'lodash.isfunction';
89
import map from 'lodash.map';
@@ -12,7 +13,6 @@ const isArray = Array.isArray;
1213
const typeIs = curry((type, val) => typeof val === type);
1314
const isObject = typeIs('object');
1415
const isString = typeIs('string');
15-
const assign = Object.assign;
1616

1717
export default function ngReduxProvider() {
1818
let _reducer = undefined;

yarn.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -1799,7 +1799,7 @@ oauth-sign@~0.8.1:
17991799
version "0.8.2"
18001800
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
18011801

1802-
object-assign@^4.0.1, object-assign@^4.1.0:
1802+
object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
18031803
version "4.1.1"
18041804
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
18051805

0 commit comments

Comments
 (0)