Build: Upgrade to grunt-contrib-jshint 0.7.1 and squash subtasks

grunt-contrib-jshint 0.7.1 allows the jshintrc option to be set to true to have
it read the appropriate config file based on the file being checked. The only
place where we can’t use it is the check for dist/jquery.js that has the onevar
option removed.

Fixes #14504

diff --git a/Gruntfile.js b/Gruntfile.js
index 4030a3e6545190871aedfdc4b52bee5d3a249b42..1739ed5fb78ce43cead752081a3797895452e038 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -80,27 +80,18 @@ module.exports = function( grunt ) {
                        }
                },
                jshint: {
-                       src: {
-                               src: "src/**/*.js",
+                       all: {
+                               src: [
+                                       "src/**/*.js", "Gruntfile.js", "test/**/*.js", "build/tasks/*",
+                                       "build/{bower-install,release-notes,release}.js"
+                               ],
                                options: {
-                                       jshintrc: "src/.jshintrc"
+                                       jshintrc: true
                                }
                        },
                        dist: {
                                src: "dist/jquery.js",
                                options: srcHintOptions
-                       },
-                       grunt: {
-                               src: [ "Gruntfile.js", "build/tasks/*", "build/{bower-install,release-notes,release}.js" ],
-                               options: {
-                                       jshintrc: ".jshintrc"
-                               }
-                       },
-                       tests: {
-                               src: "test/**/*.js",
-                               options: {
-                                       jshintrc: "test/.jshintrc"
-                               }
                        }
                },
                jscs: {

diff --git a/package.json b/package.json
index 03fb510decc309ca2b752bed3a79e0dda5d88dc6..b3fa511ce905d8a6deaa362b219da2251ec7f20c 100644 (file)
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "grunt-bowercopy": "~0.4.1",
     "grunt-cli": "~0.1.11",
     "grunt-compare-size": "~0.4.0",
-    "grunt-contrib-jshint": "~0.7.0",
+    "grunt-contrib-jshint": "~0.7.1",
     "grunt-contrib-uglify": "~0.2.7",
     "grunt-contrib-watch": "~0.5.3",
     "grunt-git-authors": "~1.2.0",