diff --git a/grunt/config/esvm.js b/grunt/config/esvm.js index b9b2ede31..984bafe68 100644 --- a/grunt/config/esvm.js +++ b/grunt/config/esvm.js @@ -1,5 +1,5 @@ var utils = require('../utils'); -var _ = require('lodash-node'); +var _ = require('lodash'); var join = require('path').join; var defaultOpts = { diff --git a/package.json b/package.json index 5a7f741ca..64353f827 100644 --- a/package.json +++ b/package.json @@ -83,8 +83,7 @@ "chalk": "~0.5.1", "bluebird": "~2.8.2", "forever-agent": "~0.5.2", - "lodash": "^3.0.0", - "lodash-node": "~2.4" + "lodash": "^3.0.0" }, "repository": { "type": "git", diff --git a/scripts/ci.js b/scripts/ci.js index 8bb0819fb..eb372f1b9 100644 --- a/scripts/ci.js +++ b/scripts/ci.js @@ -17,7 +17,7 @@ *******/ var Promise = require('bluebird'); -var _ = require('lodash-node'); +var _ = require('lodash'); var through2 = require('through2'); var map = require('through2-map'); var split = require('split'); diff --git a/scripts/release/bower.js b/scripts/release/bower.js index 550c6cb4a..3889bbbf7 100644 --- a/scripts/release/bower.js +++ b/scripts/release/bower.js @@ -1,7 +1,7 @@ var fs = require('fs'); var spawn = require('../_spawn'); var async = require('async'); -var _ = require('lodash-node'); +var _ = require('lodash'); var root = require('path').join(__dirname, '../..'); var bowerDir = root + '/src/bower_es_js'; diff --git a/src/lib/utils.js b/src/lib/utils.js index 6d8b25b14..3386e44bd 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -1,5 +1,5 @@ var path = require('path'); -var _ = require('lodash-node/modern'); +var _ = require('lodash'); var nodeUtils = require('util'); /** diff --git a/test/fixtures/keepalive.js b/test/fixtures/keepalive.js index f3c95e105..f0cf81dd8 100644 --- a/test/fixtures/keepalive.js +++ b/test/fixtures/keepalive.js @@ -1,6 +1,6 @@ var clock = require('sinon').useFakeTimers(); var Client = require('../../src/elasticsearch').Client; -var _ = require('lodash-node'); +var _ = require('lodash'); var times = require('async').times; process.once('message', function (port) { diff --git a/test/mocks/browser_http.js b/test/mocks/browser_http.js index eb4ddf25e..bcc228ecb 100644 --- a/test/mocks/browser_http.js +++ b/test/mocks/browser_http.js @@ -29,7 +29,7 @@ module.exports = MockHttpRequest; -var _ = require('lodash-node'); +var _ = require('lodash'); function MockHttpRequest() { // These are internal flags and data structures diff --git a/test/mocks/browser_server.js b/test/mocks/browser_server.js index baa365840..7c4d0db59 100644 --- a/test/mocks/browser_server.js +++ b/test/mocks/browser_server.js @@ -3,7 +3,7 @@ var complete = []; var MockHttpRequest = require('./browser_http'); var XhrServer = MockHttpRequest.MockHttpServer; var parseUrl = MockHttpRequest.prototype.parseUri; -var _ = require('lodash-node'); +var _ = require('lodash'); var server = new XhrServer(function (request) { var reqDetails = { diff --git a/test/unit/browser_builds/angular.js b/test/unit/browser_builds/angular.js index 11e946f2f..540b8fffd 100644 --- a/test/unit/browser_builds/angular.js +++ b/test/unit/browser_builds/angular.js @@ -1,4 +1,4 @@ -var _ = require('lodash-node'); +var _ = require('lodash'); var expect = require('expect.js'); var Promise = require('bluebird'); var sinon = require('sinon'); diff --git a/test/unit/buffer_flush_tests.js b/test/unit/buffer_flush_tests.js index 520f55382..7023c73ff 100644 --- a/test/unit/buffer_flush_tests.js +++ b/test/unit/buffer_flush_tests.js @@ -3,7 +3,7 @@ module.exports = function (makeLogger) { var stub = require('../utils/auto_release_stub').make(); var fs = require('fs'); var once = require('events').EventEmitter.prototype.once; - var _ = require('lodash-node'); + var _ = require('lodash'); describe('buffer flush', function () { if (require('stream').Writable) { diff --git a/test/unit/specs/client_action.js b/test/unit/specs/client_action.js index c97047d09..a2e58490b 100644 --- a/test/unit/specs/client_action.js +++ b/test/unit/specs/client_action.js @@ -1,6 +1,6 @@ var ca = require('../../../src/lib/client_action'); var expect = require('expect.js'); -var _ = require('lodash-node'); +var _ = require('lodash'); var Promise = require('bluebird'); /** diff --git a/test/unit/specs/connection_abstract.js b/test/unit/specs/connection_abstract.js index f949af516..27ac5c1bd 100644 --- a/test/unit/specs/connection_abstract.js +++ b/test/unit/specs/connection_abstract.js @@ -2,7 +2,7 @@ var ConnectionAbstract = require('../../../src/lib/connection'); var Host = require('../../../src/lib/host'); var sinon = require('sinon'); var expect = require('expect.js'); -var _ = require('lodash-node'); +var _ = require('lodash'); var errors = require('../../../src/lib/errors'); var stub = require('../../utils/auto_release_stub').make(); diff --git a/test/unit/specs/connection_pool.js b/test/unit/specs/connection_pool.js index 5f43e02e3..c698e9ae7 100644 --- a/test/unit/specs/connection_pool.js +++ b/test/unit/specs/connection_pool.js @@ -2,7 +2,7 @@ var ConnectionPool = require('../../../src/lib/connection_pool'); var Host = require('../../../src/lib/host'); var errors = require('../../../src/lib/errors'); var ConnectionAbstract = require('../../../src/lib/connection'); -var _ = require('lodash-node'); +var _ = require('lodash'); var EventEmitter = require('events').EventEmitter; var expect = require('expect.js'); var sinon = require('sinon'); diff --git a/test/unit/specs/errors.js b/test/unit/specs/errors.js index 8105d983d..9df14a975 100644 --- a/test/unit/specs/errors.js +++ b/test/unit/specs/errors.js @@ -1,6 +1,6 @@ var errors = require('../../../src/lib/errors'); var expect = require('expect.js'); -var _ = require('lodash-node'); +var _ = require('lodash'); _.each(errors, function (CustomError, name) { if (name.charAt(0) !== '_') { diff --git a/test/unit/specs/file_logger.js b/test/unit/specs/file_logger.js index 680adf1d4..3d6435496 100644 --- a/test/unit/specs/file_logger.js +++ b/test/unit/specs/file_logger.js @@ -2,7 +2,7 @@ describe('File Logger', function () { var Log = require('../../../src/lib/log'); var FileLogger = require('../../../src/lib/loggers/file'); var once = require('events').EventEmitter.prototype.once; - var _ = require('lodash-node'); + var _ = require('lodash'); var parentLog; var logger; var expect = require('expect.js'); diff --git a/test/unit/specs/host.js b/test/unit/specs/host.js index d77282eb3..025e34a8c 100644 --- a/test/unit/specs/host.js +++ b/test/unit/specs/host.js @@ -1,5 +1,5 @@ var Host = require('../../../src/lib/host'); -var _ = require('lodash-node'); +var _ = require('lodash'); var expect = require('expect.js'); var url = require('url'); var expectSubObject = require('../../utils/expect_sub_object'); diff --git a/test/unit/specs/http_connector.js b/test/unit/specs/http_connector.js index 92fbb88b8..b9778b277 100644 --- a/test/unit/specs/http_connector.js +++ b/test/unit/specs/http_connector.js @@ -1,6 +1,6 @@ describe('Http Connector', function () { - var _ = require('lodash-node'); + var _ = require('lodash'); var expect = require('expect.js'); var nock = require('nock'); var sinon = require('sinon'); diff --git a/test/unit/specs/log.js b/test/unit/specs/log.js index 7845502db..8976c01bd 100644 --- a/test/unit/specs/log.js +++ b/test/unit/specs/log.js @@ -1,5 +1,5 @@ var Log = require('../../../src/lib/log'); -var _ = require('lodash-node'); +var _ = require('lodash'); var expect = require('expect.js'); describe('Log class', function () { diff --git a/test/unit/specs/random_selector.js b/test/unit/specs/random_selector.js index dd3364880..91b0149b0 100644 --- a/test/unit/specs/random_selector.js +++ b/test/unit/specs/random_selector.js @@ -1,6 +1,6 @@ describe('Random Selector', function () { var randomSelector = require('../../../src/lib/selectors/random'); - var _ = require('lodash-node'); + var _ = require('lodash'); var expect = require('expect.js'); it('chooses a selection by random', function () { diff --git a/test/unit/specs/round_robin_selector.js b/test/unit/specs/round_robin_selector.js index 0c8fafbec..2298a0180 100644 --- a/test/unit/specs/round_robin_selector.js +++ b/test/unit/specs/round_robin_selector.js @@ -1,6 +1,6 @@ describe('Round Robin Selector', function () { var selector = require('../../../src/lib/selectors/round_robin'); - var _ = require('lodash-node'); + var _ = require('lodash'); var expect = require('expect.js'); it('chooses options in order', function () { diff --git a/test/unit/specs/stream_logger.js b/test/unit/specs/stream_logger.js index 53e89567a..50f940b2d 100644 --- a/test/unit/specs/stream_logger.js +++ b/test/unit/specs/stream_logger.js @@ -4,7 +4,7 @@ describe('Stream Logger', function () { var MockWritableStream = require('../../mocks/writable_stream'); var once = require('events').EventEmitter.prototype.once; var stream = new MockWritableStream(); - var _ = require('lodash-node'); + var _ = require('lodash'); var expect = require('expect.js'); var parentLog; diff --git a/test/unit/specs/transport.js b/test/unit/specs/transport.js index b1480b556..2932e7678 100644 --- a/test/unit/specs/transport.js +++ b/test/unit/specs/transport.js @@ -5,7 +5,7 @@ var Promise = require('bluebird'); var sinon = require('sinon'); var expect = require('expect.js'); -var _ = require('lodash-node'); +var _ = require('lodash'); var nodeList = require('../../fixtures/short_node_list.json'); var stub = require('../../utils/auto_release_stub').make(); diff --git a/test/unit/specs/transport_with_server.js b/test/unit/specs/transport_with_server.js index df6c80ddd..865885da8 100644 --- a/test/unit/specs/transport_with_server.js +++ b/test/unit/specs/transport_with_server.js @@ -7,7 +7,7 @@ var expect = require('expect.js'); var sinon = require('sinon'); var nock = require('../../mocks/server.js'); var through2 = require('through2'); -var _ = require('lodash-node'); +var _ = require('lodash'); var nodeList = require('../../fixtures/short_node_list.json'); var stub = require('../../utils/auto_release_stub').make(); diff --git a/test/utils/expect_sub_object.js b/test/utils/expect_sub_object.js index 371e445ef..57b6b4276 100644 --- a/test/utils/expect_sub_object.js +++ b/test/utils/expect_sub_object.js @@ -1,4 +1,4 @@ -var _ = require('lodash-node'); +var _ = require('lodash'); var expect = require('expect.js'); module.exports = function expectSubObject(obj, subObj) { _.forOwn(subObj, function (val, prop) { diff --git a/test/utils/jenkins-reporter.js b/test/utils/jenkins-reporter.js index a8a5cae74..4b5b9f620 100644 --- a/test/utils/jenkins-reporter.js +++ b/test/utils/jenkins-reporter.js @@ -7,7 +7,7 @@ module.exports = JenkinsReporter; var Base = require('mocha/lib/reporters/base'); -var _ = require('lodash-node'); +var _ = require('lodash'); var chalk = require('chalk'); var makeJUnitXml = require('./make_j_unit_xml'); var fs = require('fs'); diff --git a/test/utils/make_j_unit_xml.js b/test/utils/make_j_unit_xml.js index 00db4fd74..2aaa8ad14 100644 --- a/test/utils/make_j_unit_xml.js +++ b/test/utils/make_j_unit_xml.js @@ -28,7 +28,7 @@ var testXml = require('xmlbuilder'); var suites = testXml.create('testsuites'); var suiteCount = 0; var moment = require('moment'); -var _ = require('lodash-node'); +var _ = require('lodash'); var chalk = require('chalk'); function makeJUnitXml(runnerName, testDetails) { diff --git a/test/utils/server.js b/test/utils/server.js index dd96a31b3..0ebe2894b 100644 --- a/test/utils/server.js +++ b/test/utils/server.js @@ -1,7 +1,7 @@ var express = require('express'); var http = require('http'); var fs = require('fs'); -var _ = require('lodash-node'); +var _ = require('lodash'); var async = require('async'); var root = require('path').join(__dirname, '../..'); var browserify = require('browserify');