Skip to content

Commit

Permalink
Build: Upgrade to grunt-contrib-jshint 0.7.1 and squash subtasks
Browse files Browse the repository at this point in the history
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
mgol committed Dec 18, 2013
1 parent 2d73150 commit 7deee6a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 16 deletions.
21 changes: 6 additions & 15 deletions Gruntfile.js
Expand Up @@ -80,27 +80,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: {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -34,7 +34,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",
Expand Down

0 comments on commit 7deee6a

Please sign in to comment.