Merge pull request #99 from marcus/master

Move to lodash v 3.0.1
BinaryMuse · Jan 30, 2015 · 2e35d07 · 2e35d07
2 parents a9b3dd5 + 5c56be3
commit 2e35d07
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/lib/create_store.js b/lib/create_store.js
@@ -1,5 +1,5 @@
-var _each = require("lodash-node/modern/collections/forEach"),
-    _isFunction = require("lodash-node/modern/objects/isFunction"),
+var _each = require("lodash-node/modern/collection/forEach"),
+    _isFunction = require("lodash-node/modern/lang/isFunction"),
     Store = require("./store"),
     inherits = require("inherits");
 

diff --git a/lib/dispatcher.js b/lib/dispatcher.js
@@ -1,13 +1,13 @@
-var _clone = require("lodash-node/modern/objects/clone"),
-    _mapValues = require("lodash-node/modern/objects/mapValues"),
-    _forOwn = require("lodash-node/modern/objects/forOwn"),
-    _intersection = require("lodash-node/modern/arrays/intersection"),
-    _keys = require("lodash-node/modern/objects/keys"),
-    _map = require("lodash-node/modern/collections/map"),
-    _each = require("lodash-node/modern/collections/forEach"),
-    _size = require("lodash-node/modern/collections/size"),
-    _findKey = require("lodash-node/modern/objects/findKey"),
-    _uniq = require("lodash-node/modern/arrays/uniq");
+var _clone = require("lodash-node/modern/lang/clone"),
+    _mapValues = require("lodash-node/modern/object/mapValues"),
+    _forOwn = require("lodash-node/modern/object/forOwn"),
+    _intersection = require("lodash-node/modern/array/intersection"),
+    _keys = require("lodash-node/modern/object/keys"),
+    _map = require("lodash-node/modern/collection/map"),
+    _each = require("lodash-node/modern/collection/forEach"),
+    _size = require("lodash-node/modern/collection/size"),
+    _findKey = require("lodash-node/modern/object/findKey"),
+    _uniq = require("lodash-node/modern/array/uniq");
 
 var Dispatcher = function(stores) {
   this.stores = {};

diff --git a/lib/flux.js b/lib/flux.js
@@ -1,10 +1,10 @@
 var EventEmitter = require("eventemitter3"),
     inherits = require("inherits"),
     objectPath = require("object-path"),
-    _each = require("lodash-node/modern/collections/forEach"),
-    _reduce = require("lodash-node/modern/collections/reduce"),
-    _isFunction = require("lodash-node/modern/objects/isFunction"),
-    _isString = require("lodash-node/modern/objects/isString");
+    _each = require("lodash-node/modern/collection/forEach"),
+    _reduce = require("lodash-node/modern/collection/reduce"),
+    _isFunction = require("lodash-node/modern/lang/isFunction"),
+    _isString = require("lodash-node/modern/lang/isString");
 
 var Dispatcher = require("./dispatcher");
 

diff --git a/lib/store.js b/lib/store.js
@@ -1,7 +1,7 @@
 var EventEmitter = require("eventemitter3"),
     inherits = require("inherits"),
-    _isFunction = require("lodash-node/modern/objects/isFunction"),
-    _isObject = require("lodash-node/modern/objects/isObject");
+    _isFunction = require("lodash-node/modern/lang/isFunction"),
+    _isObject = require("lodash-node/modern/lang/isObject");
 
 function Store(dispatcher) {
   this.dispatcher = dispatcher;

diff --git a/lib/store_watch_mixin.js b/lib/store_watch_mixin.js
@@ -1,4 +1,4 @@
-var _each = require("lodash-node/modern/collections/forEach");
+var _each = require("lodash-node/modern/collection/forEach");
 
 var StoreWatchMixin = function() {
   var storeNames = Array.prototype.slice.call(arguments);

diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
   "dependencies": {
     "eventemitter3": "^0.1.5",
     "inherits": "^2.0.1",
-    "lodash-node": "^2.4.1",
+    "lodash-node": "^3.0.1",
     "object-path": "^0.6.0"
   },
   "jshintConfig": {