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

gaearon · gaearon · commit 778803eb979e · 2016-02-02T17:57:11.000Z
diff --git a/package.json b/package.json
@@ -61,7 +61,7 @@
     "react": "^0.14.0"
   },
   "dependencies": {
-    "lodash": "^3.10.1",
+    "lodash": "^4.2.0",
     "react-redux": "^4.0.0",
     "redux": "^3.2.1"
   }
diff --git a/src/instrument.js b/src/instrument.js
@@ -1,4 +1,4 @@
-import difference from 'lodash/array/difference';
+import {difference} from 'lodash/array';
 
 export const ActionTypes = {
   PERFORM_ACTION: 'PERFORM_ACTION',
diff --git a/src/persistState.js b/src/persistState.js
@@ -1,5 +1,5 @@
-import mapValues from 'lodash/object/mapValues';
-import identity from 'lodash/utility/identity';
+import {mapValues} from 'lodash/object';
+import {identity} from 'lodash/utility';
 
 export default function persistState(sessionId, deserializeState = identity, deserializeAction = identity) {
   if (!sessionId) {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import difference from 'lodash/array/difference';`
	`1`	`+import {difference} from 'lodash/array';`
`2`	`2`
`3`	`3`	`export const ActionTypes = {`
`4`	`4`	`PERFORM_ACTION: 'PERFORM_ACTION',`