transition away from lodash-node

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 = {

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",

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');

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';

src/lib/utils.js

@@ -1,5 +1,5 @@
 var path = require('path');
-var _ = require('lodash-node/modern');
+var _ = require('lodash');
 var nodeUtils = require('util');
 
 /**

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) {

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

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 = {

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');

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) {

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');
 
 /**

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();

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');

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) !== '_') {

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');

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');

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');

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 () {

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 () {

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 () {

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;
 

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();
 

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();
 

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) {

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');

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) {

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');