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.

(cherry-picked from 7deee6af72bfcf328fa09a28a1e68159cc58513f)

Fixes #14504

diff --git a/Gruntfile.js b/Gruntfile.js
index 759edfcf157ab939b36cf26052b19b3eb2708dba..f49a933868a187e3e2ef2bed50d88d2c63e0d8ea 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -77,27 +77,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 9417bf5b575602cc9e3fd43d0785afdc13f254b1..d144bdb8cdf99f7c6c799a24de999a103d5f17e3 100644 (file)
--- a/package.json
+++ b/package.json
@@ -35,7 +35,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",