diff --git a/lib/application.js b/lib/application.js index 810bbc9eb9..fa8870b1ea 100644 --- a/lib/application.js +++ b/lib/application.js @@ -1,7 +1,7 @@ 'use strict'; var Proto = require('uberproto'); -var _ = require('underscore'); +var _ = require('lodash'); var mixins = require('./mixins'); var stripSlashes = function (name) { diff --git a/lib/feathers.js b/lib/feathers.js index c3d8bbef35..a95f94a064 100644 --- a/lib/feathers.js +++ b/lib/feathers.js @@ -1,6 +1,6 @@ 'use strict'; -var _ = require('underscore'); +var _ = require('lodash'); var express = require('express'); var Proto = require('uberproto'); var Application = require('./application'); diff --git a/lib/mixins/event.js b/lib/mixins/event.js index eb1a066ddd..67eef68e00 100644 --- a/lib/mixins/event.js +++ b/lib/mixins/event.js @@ -1,6 +1,6 @@ 'use strict'; -var _ = require('underscore'); +var _ = require('lodash'); var rubberduck = require('rubberduck'); var EventEmitter = require('events').EventEmitter; var eventMappings = { diff --git a/lib/providers/primus.js b/lib/providers/primus.js index 1db4ade9e6..04aeb19172 100644 --- a/lib/providers/primus.js +++ b/lib/providers/primus.js @@ -1,6 +1,6 @@ 'use strict'; -var _ = require('underscore'); +var _ = require('lodash'); var Proto = require('uberproto'); var Primus = require('primus'); var Emitter = require('primus-emitter'); diff --git a/lib/providers/rest/index.js b/lib/providers/rest/index.js index a0042ddbc1..67fa613db2 100644 --- a/lib/providers/rest/index.js +++ b/lib/providers/rest/index.js @@ -1,6 +1,6 @@ 'use strict'; -var _ = require('underscore'); +var _ = require('lodash'); var wrappers = require('./wrappers'); module.exports = function (config) { diff --git a/lib/providers/rest/wrappers.js b/lib/providers/rest/wrappers.js index d5b7442f3a..29fa57c3f7 100644 --- a/lib/providers/rest/wrappers.js +++ b/lib/providers/rest/wrappers.js @@ -1,4 +1,4 @@ -var _ = require('underscore'); +var _ = require('lodash'); /** * Return a service callback that sets the data in the given diff --git a/lib/providers/socketio.js b/lib/providers/socketio.js index 1b58258dca..74e2368bbd 100644 --- a/lib/providers/socketio.js +++ b/lib/providers/socketio.js @@ -1,6 +1,6 @@ 'use strict'; -var _ = require('underscore'); +var _ = require('lodash'); var socketio = require('socket.io'); var Proto = require('uberproto'); diff --git a/package.json b/package.json index 1890f5fe33..704e7fa818 100644 --- a/package.json +++ b/package.json @@ -34,23 +34,23 @@ "npm": "*" }, "dependencies": { - "uberproto": "~ 1.1.0", - "express": "~ 3.4.0", + "uberproto": "~1.x", + "express": "~3.4.0", "rubberduck": "~1.x", - "underscore": "~1.5.0", "socket.io": "~0.9.0", - "primus-emitter": "~2.0.5", - "primus": "~1.5.1" + "primus-emitter": "~3.x", + "primus": "~2.x", + "lodash": "~2.4.1" }, "devDependencies": { - "request": "~2.21.0", - "socket.io-client": "~0.9.11", - "grunt-cli": "~0.1.7", - "grunt": "~0.4.1", - "grunt-release": "~0.5.1", - "mocha": "~1.11.0", + "request": "~2.x", + "socket.io-client": "~0.9.0", + "grunt-cli": "~0.1.0", + "grunt": "~0.4.0", + "grunt-release": "~0.5.0", + "mocha": "~1.x", "grunt-contrib-jshint": "~0.x", "grunt-simple-mocha": "~0.4.0", - "grunt-jsbeautifier": "~0.2.2" + "grunt-jsbeautifier": "~0.2.0" } } diff --git a/test/mixins/event.test.js b/test/mixins/event.test.js index ce74274aea..3c372ba092 100644 --- a/test/mixins/event.test.js +++ b/test/mixins/event.test.js @@ -1,7 +1,7 @@ 'use strict'; var assert = require('assert'); -var _ = require('underscore'); +var _ = require('lodash'); var Proto = require('uberproto'); var mixinEvent = require('../../lib/mixins/event'); var EventMixin = mixinEvent.Mixin; diff --git a/test/providers/service-fixture.js b/test/providers/service-fixture.js index 49a7628de7..945fcbe5d4 100644 --- a/test/providers/service-fixture.js +++ b/test/providers/service-fixture.js @@ -1,6 +1,6 @@ 'use strict'; -var _ = require('underscore'); +var _ = require('lodash'); var assert = require('assert'); var findAllData = [{