Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

1 files changed, 8 insertions, 1 deletions

diff --git a/Gruntfile.js b/Gruntfile.js
index 3dc69a17c..095b7ed3e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -116,6 +116,13 @@ module.exports = function (grunt) {
       }
     },
 
+    eslint: {
+      options: {
+        configFile: 'js/.eslintrc'
+      },
+      target: 'js/src/*.js'
+    },
+
     jscs: {
       options: {
         config: 'js/.jscsrc'
@@ -449,7 +456,7 @@ module.exports = function (grunt) {
     testSubtasks.push('saucelabs-qunit');
   }
   grunt.registerTask('test', testSubtasks);
-  grunt.registerTask('test-js', ['jscs:core', 'jscs:test', 'jscs:grunt', 'qunit']);
+  grunt.registerTask('test-js', ['eslint', 'jscs:core', 'jscs:test', 'jscs:grunt', 'qunit']);
 
   // JS distribution task.
   grunt.registerTask('dist-js', ['concat', 'lineremover', 'babel:dist', 'stamp', 'uglify:core', 'commonjs']);