Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/application.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var Proto = require('uberproto');
var _ = require('underscore');
var _ = require('lodash');

var mixins = require('./mixins');
var stripSlashes = function (name) {
Expand Down
2 changes: 1 addition & 1 deletion lib/feathers.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

var _ = require('underscore');
var _ = require('lodash');
var express = require('express');
var Proto = require('uberproto');
var Application = require('./application');
Expand Down
2 changes: 1 addition & 1 deletion lib/mixins/event.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

var _ = require('underscore');
var _ = require('lodash');
var rubberduck = require('rubberduck');
var EventEmitter = require('events').EventEmitter;
var eventMappings = {
Expand Down
2 changes: 1 addition & 1 deletion lib/providers/primus.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion lib/providers/rest/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

var _ = require('underscore');
var _ = require('lodash');
var wrappers = require('./wrappers');

module.exports = function (config) {
Expand Down
2 changes: 1 addition & 1 deletion lib/providers/rest/wrappers.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var _ = require('underscore');
var _ = require('lodash');

/**
* Return a service callback that sets the data in the given
Expand Down
2 changes: 1 addition & 1 deletion lib/providers/socketio.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

var _ = require('underscore');
var _ = require('lodash');
var socketio = require('socket.io');
var Proto = require('uberproto');

Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion test/mixins/event.test.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion test/providers/service-fixture.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

var _ = require('underscore');
var _ = require('lodash');
var assert = require('assert');

var findAllData = [{
Expand Down