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 7deee6af72)

Fixes #14504
This commit is contained in:
Michał Gołębiowski 2013-12-18 15:23:27 +01:00
parent 15d245ff57
commit c4e88083d2
2 changed files with 7 additions and 16 deletions

View File

@ -77,27 +77,18 @@ module.exports = function( grunt ) {
} }
}, },
jshint: { jshint: {
src: { all: {
src: "src/**/*.js", src: [
"src/**/*.js", "Gruntfile.js", "test/**/*.js", "build/tasks/*",
"build/{bower-install,release-notes,release}.js"
],
options: { options: {
jshintrc: "src/.jshintrc" jshintrc: true
} }
}, },
dist: { dist: {
src: "dist/jquery.js", src: "dist/jquery.js",
options: srcHintOptions 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: { jscs: {

View File

@ -35,7 +35,7 @@
"grunt-bowercopy": "~0.4.1", "grunt-bowercopy": "~0.4.1",
"grunt-cli": "~0.1.11", "grunt-cli": "~0.1.11",
"grunt-compare-size": "~0.4.0", "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-uglify": "~0.2.7",
"grunt-contrib-watch": "~0.5.3", "grunt-contrib-watch": "~0.5.3",
"grunt-git-authors": "~1.2.0", "grunt-git-authors": "~1.2.0",