Merge pull request #17 from bloglovin/update_everything

update everything, remove dependencyCheck
bloglovin · Mar 23, 2017 · 2f4cf82 · 2f4cf82
2 parents bc173a8 + b0540c2
commit 2f4cf82
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 37 deletions.
diff --git a/index.js b/index.js
@@ -8,6 +8,7 @@ var lib = {
 var _ = require('lodash');
 
 exports.initConfig = function (grunt, config, options) {
+  var defaults, plugins, testTasks, integrationTestTasks, cwd;
   config = config || {};
   options = options || {};
 
@@ -25,14 +26,13 @@ exports.initConfig = function (grunt, config, options) {
   }
 
   // Default task options
-  var defaults = {
+  defaults = {
     pkg: grunt.file.readJSON('package.json'),
     jshint: {
       files: _.union([
         '*.js',
         'lib/**/*.js',
         'test/**/*.js',
-        'bin/**/*.js',
         'cli/**/*.js',
         'tasks/**/*.js',
       ], options.jsFiles || []),
@@ -59,16 +59,6 @@ exports.initConfig = function (grunt, config, options) {
     }),
   };
 
-  if (!options.noDependencyCheck) {
-    defaults['dependency-check'] = {
-      files: _.union(['<%= jshint.files %>'], options.dependencyFiles || []),
-      options: {
-        excludeUnusedDev: true,
-        ignoreUnused: options.ignoreUnusedDependencies || [],
-      }
-    };
-  }
-
   if (!options.noMocha) {
     defaults.mocha_istanbul = {
       options: {
@@ -94,26 +84,21 @@ exports.initConfig = function (grunt, config, options) {
   _.defaults(config, defaults);
   grunt.initConfig(config);
 
-  var plugins = [
+  plugins = [
     'grunt-notify',
     'grunt-lintspaces',
     'grunt-contrib-jshint',
     'grunt-contrib-watch',
   ];
 
-  var testTasks = ['lintspaces', 'jshint', 'setTestEnv'];
-  var integrationTestTasks = options.noIntegration ? ['test'] : ['test', 'mocha_istanbul:integration'];
+  testTasks = ['lintspaces', 'jshint', 'setTestEnv'];
+  integrationTestTasks = options.noIntegration ? ['test'] : ['test', 'mocha_istanbul:integration'];
 
   if (!options.noJSCS) {
     plugins.push('grunt-jscs');
     testTasks.push('jscs');
   }
 
-  if (!options.noDependencyCheck) {
-    plugins.push('dependency-check');
-    testTasks.push('dependency-check');
-  }
-
   if (!options.noMocha) {
     plugins.push('grunt-mocha-istanbul');
     testTasks.push('mocha_istanbul:basic');
@@ -123,7 +108,7 @@ exports.initConfig = function (grunt, config, options) {
   integrationTestTasks = integrationTestTasks.concat(options.extraTestAllTasks || []);
 
   // Uhm, HACK! But WTF Grunt!
-  var cwd = process.cwd();
+  cwd = process.cwd();
   process.chdir(__dirname);
   // Manually load the plugins so that we don't pollute the parent module
   // with loads of peer dependencies.

diff --git a/package.json b/package.json
@@ -18,27 +18,29 @@
   },
   "homepage": "https://github.com/bloglovin/lintlovin",
   "dependencies": {
-    "dependency-check": "^2.1.0",
-    "grunt-contrib-jshint": "~0.11.0",
-    "grunt-contrib-watch": "~0.6.1",
-    "grunt-jscs": "^1.2.0",
-    "grunt-lintspaces": "~0.6.0",
-    "grunt-mocha-istanbul": "^2.1.0",
+    "dependency-check": "^2.8.0",
+    "grunt-contrib-jshint": "~1.1.0",
+    "grunt-contrib-watch": "~1.0.0",
+    "grunt-dependency-check": "^1.1.0",
+    "grunt-jscs": "^3.0.1",
+    "grunt-lintspaces": "~0.8.1",
+    "grunt-mocha-istanbul": "^5.0.2",
     "grunt-notify": ">=0.3.1 <0.5.0",
-    "lodash": "^3.0.0",
+    "lodash": "^4.17.4",
     "time-grunt": "^1.0.0"
   },
   "peerDependencies": {
-    "grunt": "~0.4.5",
-    "husky": ">=0.6.1 <0.8.0",
-    "istanbul": "~0.3.0",
-    "mocha": ">=1.21.4-0 <3.0.0-0"
+    "grunt": "~1.0.1",
+    "husky": "~0.13.2",
+    "mocha": "^3.2.0",
+    "istanbul": "~0.3.0"
   },
   "devDependencies": {
-    "chai": "^2.0.0",
-    "grunt": "~0.4.5",
-    "husky": "~0.7.0",
+    "chai": "^3.5.0",
+    "grunt": "~1.0.1",
+    "husky": "~0.13.2",
     "js-yaml": "^3.2.1",
-    "mocha": ">=1.21.4-0 <3.0.0-0"
+    "mocha": "^3.2.0",
+    "istanbul": "~0.3.0"
   }
 }
diff --git a/test/docs.js b/test/docs.js
@@ -20,10 +20,11 @@ suite('README', function testClient() {
     var jshintOptions = JSON.parse(jshintrc);
 
     var yamlBlock = yaml.exec(readme);
+    var documentedOptions;
     if (!yamlBlock) {
       throw new Error('No yaml code block in the readme');
     }
-    var documentedOptions = lib.jsYaml.safeLoad(yamlBlock[1]);
+    documentedOptions = lib.jsYaml.safeLoad(yamlBlock[1]);
 
     expect(documentedOptions).to.deep.equal(jshintOptions);
     done();