From c4e88083d27f431b595e96bda6a20dd7d162761d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20Go=C5=82e=CC=A8biowski?= <m.goleb@gmail.com>
Date: Wed, 18 Dec 2013 15:23:27 +0100
Subject: [PATCH] Build: Upgrade to grunt-contrib-jshint 0.7.1 and squash
 subtasks
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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
---
 Gruntfile.js | 21 ++++++---------------
 package.json |  2 +-
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 759edfcf1..f49a93386 100644
--- 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 9417bf5b5..d144bdb8c 100644
--- 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",
-- 
2.39.5