Browse files

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
  • Loading branch information...
1 parent 2d73150 commit 7deee6af72bfcf328fa09a28a1e68159cc58513f @mgol mgol committed Dec 18, 2013
Showing with 7 additions and 16 deletions.
  1. +6 −15 Gruntfile.js
  2. +1 −1 package.json
View
21 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: {
View
2 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",

0 comments on commit 7deee6a

Please sign in to comment.