Skip to content

Commit 8da68d6

Browse files
authored
Merge pull request #209 from angular-redux/chore/update-lodash
chore(lib): update lodash and redux dependencies
2 parents 51518f6 + c86f756 commit 8da68d6

File tree

6 files changed

+28
-59
lines changed

6 files changed

+28
-59
lines changed

package-lock.json

+17-43
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-7
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,9 @@
5858
"dependencies": {
5959
"babel-runtime": "^6.26.0",
6060
"invariant": "^2.2.2",
61-
"lodash.curry": "^4.1.1",
62-
"lodash.debounce": "^4.0.8",
63-
"lodash.isfunction": "^3.0.8",
64-
"lodash.isobject": "^3.0.2",
65-
"lodash.isplainobject": "^4.0.6",
66-
"lodash.map": "^4.6.0"
61+
"lodash": "4.17.11"
6762
},
6863
"peerDependencies": {
69-
"redux": "^3.0.0"
64+
"redux": ">3.0.0"
7065
}
7166
}

src/components/connector.js

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

5-
import isPlainObject from 'lodash.isplainobject';
6-
import isFunction from 'lodash.isfunction';
7-
import isObject from 'lodash.isobject';
5+
import isPlainObject from 'lodash/isPlainObject';
6+
import isFunction from 'lodash/isFunction';
7+
import isObject from 'lodash/isObject';
88

99
const assign = Object.assign;
1010
const defaultMapStateToTarget = () => ({});

src/components/digestMiddleware.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import debounce from 'lodash.debounce';
1+
import debounce from 'lodash/debounce';
22

33
export default function digestMiddleware($rootScope, debounceConfig) {
44
let debouncedFunction = (expr) => {

src/components/ngRedux.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import digestMiddleware from './digestMiddleware';
55
import providedStoreMiddleware from './providedStoreMiddleware';
66
import wrapStore from './storeWrapper';
77

8-
import curry from 'lodash.curry';
9-
import isFunction from 'lodash.isfunction';
10-
import map from 'lodash.map';
8+
import curry from 'lodash/curry';
9+
import isFunction from 'lodash/isFunction';
10+
import map from 'lodash/map';
1111

1212
const isArray = Array.isArray;
1313

@@ -97,7 +97,7 @@ export default function ngReduxProvider() {
9797
const store = createStore(_reducer, _initialState, compose(middlewares, ...resolvedStoreEnhancer));
9898

9999
const mergedStore = assign({}, store, { connect: Connector(store) });
100-
100+
101101
if (_providedStore) wrapStore(_providedStore, mergedStore);
102102

103103
return mergedStore;

test/components/connector.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import expect from 'expect';
22
let sinon = require('sinon');
33
import { createStore } from 'redux';
44
import Connector from '../../src/components/connector';
5-
import isFunction from 'lodash.isfunction';
5+
import isFunction from 'lodash/isFunction';
66

77
const assign = Object.assign;
88

0 commit comments

Comments
 (0)