From: Michał Gołębiowski <m.goleb@gmail.com>
Date: Wed, 18 Dec 2013 14:23:27 +0000 (+0100)
Subject: Build: Upgrade to grunt-contrib-jshint 0.7.1 and squash subtasks
X-Git-Tag: 2.1.0-beta3~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7deee6af72bfcf328fa09a28a1e68159cc58513f;p=jquery.git

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 4030a3e65..1739ed5fb 100644
--- 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 03fb510de..b3fa511ce 100644
--- 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",