Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  * lodash@3
  * minimatch@2
  * [email protected]
  * [email protected]
  • Loading branch information
Rui Marinho committed Feb 1, 2015
1 parent 8d0175f commit 20cec38
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ gulp.task('test', ['lint'], function (done) {

m.addFile(__dirname + '/test/specs/index.js');

m.run().on('end', done);
});
m.run(done);
});
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
"dependencies": {
"gulp-util": "^3.0.0",
"jshint": "^2.5.6",
"lodash": "^2.4.1",
"minimatch": "^1.0.0",
"lodash": "^3.0.1",
"minimatch": "^2.0.1",
"rcloader": "^0.1.2",
"through2": "~0.6.1"
},
"devDependencies": {
"gulp": "~3.8.10",
"mocha": "^1.18.2",
"gulp": "^3.8.10",
"mocha": "^2.1.0",
"should": "^4.0.4"
},
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions src/lint.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ module.exports = function createLintFunction(userOpts) {
}

if (cfg.overrides) {
_.each(cfg.overrides, function (options, pattern) {
_.forEach(cfg.overrides, function (options, pattern) {
if (!minimatch(file.path, pattern, { nocase: true, matchBase: true })) return;

if (options.globals) {
globals = _.extend(globals, options.globals);
globals = _.assign(globals, options.globals);
delete options.globals;
}

_.extend(cfg, options);
_.assign(cfg, options);
});

delete cfg.overrides;
Expand Down

0 comments on commit 20cec38

Please sign in to comment.