Merge remote-tracking branch 'lo/dependency/lodash/upgrade'

This commit is contained in:
Dan Abramov 2016-02-02 17:57:11 +00:00
commit 778803eb97
3 changed files with 4 additions and 4 deletions

View File

@ -61,7 +61,7 @@
"react": "^0.14.0" "react": "^0.14.0"
}, },
"dependencies": { "dependencies": {
"lodash": "^3.10.1", "lodash": "^4.2.0",
"react-redux": "^4.0.0", "react-redux": "^4.0.0",
"redux": "^3.2.1" "redux": "^3.2.1"
} }

View File

@ -1,4 +1,4 @@
import difference from 'lodash/array/difference'; import {difference} from 'lodash/array';
export const ActionTypes = { export const ActionTypes = {
PERFORM_ACTION: 'PERFORM_ACTION', PERFORM_ACTION: 'PERFORM_ACTION',

View File

@ -1,5 +1,5 @@
import mapValues from 'lodash/object/mapValues'; import {mapValues} from 'lodash/object';
import identity from 'lodash/utility/identity'; import {identity} from 'lodash/utility';
export default function persistState(sessionId, deserializeState = identity, deserializeAction = identity) { export default function persistState(sessionId, deserializeState = identity, deserializeAction = identity) {
if (!sessionId) { if (!sessionId) {