From 2fc1e2377ac590eb0455f0a2b0ffef76f3f0b0ef Mon Sep 17 00:00:00 2001
From: Sergey Belov <peimei@ya.ru>
Date: Fri, 10 Apr 2015 22:03:46 +0300
Subject: [PATCH] Replace underscore with lodash

---
 package.json    |  2 +-
 src/cli.js      | 10 ++++++----
 src/jshint.js   |  2 +-
 src/lex.js      |  2 +-
 src/messages.js |  2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 109f12d04c..cb79319e0c 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "minimatch":           "2.0.x",
     "shelljs":             "0.3.x",
     "strip-json-comments": "1.0.x",
-    "underscore":          "1.8.x"
+    "lodash":              "3.6.x"
   },
 
   "devDependencies": {
diff --git a/src/cli.js b/src/cli.js
index 72230d2409..6995b522eb 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var _                 = require("underscore");
+var _                 = require("lodash");
 var fs                = require("fs");
 var cli               = require("cli");
 var path              = require("path");
@@ -533,9 +533,11 @@ var exports = {
 
       if (config['extends']) {
         var baseConfig = exports.loadConfig(path.resolve(config.dirname, config['extends']));
-        config.globals = _.extend({}, baseConfig.globals, config.globals);
-        config.overrides = _.extend({}, baseConfig.overrides, config.overrides);
-        _.defaults(config, baseConfig);
+        config = _.merge({}, baseConfig, config, function(a, b) {
+          if (_.isArray(a)) {
+            return a.concat(b);
+          }
+        });
         delete config['extends'];
       }
 
diff --git a/src/jshint.js b/src/jshint.js
index d5b6ae8aac..fe27fe191d 100644
--- a/src/jshint.js
+++ b/src/jshint.js
@@ -32,7 +32,7 @@
 /*global console:true */
 /*exported console */
 
-var _        = require("underscore");
+var _        = require("lodash");
 var events   = require("events");
 var vars     = require("./vars.js");
 var messages = require("./messages.js");
diff --git a/src/lex.js b/src/lex.js
index 9a922d6e7e..260b7e749b 100644
--- a/src/lex.js
+++ b/src/lex.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-var _      = require("underscore");
+var _      = require("lodash");
 var events = require("events");
 var reg    = require("./reg.js");
 var state  = require("./state.js").state;
diff --git a/src/messages.js b/src/messages.js
index 7603a4b7b0..f2c5e1cc66 100644
--- a/src/messages.js
+++ b/src/messages.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var _ = require("underscore");
+var _ = require("lodash");
 
 var errors = {
   // JSHint options