Skip to content

Commit

Permalink
Replace underscore with lodash
Browse files Browse the repository at this point in the history
  • Loading branch information
arikon authored and rwaldron committed Apr 10, 2015
1 parent 29b5a7e commit 2fc1e23
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -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": {
Expand Down
10 changes: 6 additions & 4 deletions 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");
Expand Down Expand Up @@ -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'];
}

Expand Down
2 changes: 1 addition & 1 deletion src/jshint.js
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion src/lex.js
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/messages.js
@@ -1,6 +1,6 @@
"use strict";

var _ = require("underscore");
var _ = require("lodash");

var errors = {
// JSHint options
Expand Down

0 comments on commit 2fc1e23

Please sign in to comment.