aboutsummaryrefslogtreecommitdiffstats
path: root/Gruntfile.js
diff options
context:
space:
mode:
authorTimmy Willison <timmywillisn@gmail.com>2013-04-09 12:48:34 -0400
committerTimmy Willison <timmywillisn@gmail.com>2013-04-09 12:48:50 -0400
commit738b8f84310f3d33d22fae976b83d94a684e01a8 (patch)
tree04635c0a92622220ad9c506442f481fea96a7c4a /Gruntfile.js
parent6bf2c3e49a7504ed88364a146992e00526497dcd (diff)
downloadjquery-738b8f84310f3d33d22fae976b83d94a684e01a8.tar.gz
jquery-738b8f84310f3d33d22fae976b83d94a684e01a8.zip
Add onevar to jshintrc, but remove the option for linting the concatenated file
Diffstat (limited to 'Gruntfile.js')
-rw-r--r--Gruntfile.js11
1 files changed, 7 insertions, 4 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index a48639482..5f3a02c2c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -14,7 +14,12 @@ module.exports = function( grunt ) {
data = grunt.file.readJSON( filepath );
} catch(e) {}
return data;
- };
+ },
+ srcHintOptions = readOptionalJSON("src/.jshintrc");
+
+ // The concatenated file won't pass onevar
+ // But our modules can
+ delete srcHintOptions.onevar;
grunt.initConfig({
pkg: grunt.file.readJSON("package.json"),
@@ -72,9 +77,7 @@ module.exports = function( grunt ) {
jshint: {
dist: {
src: [ "dist/jquery.js" ],
- options: {
- jshintrc: "src/.jshintrc"
- }
+ options: srcHintOptions
},
grunt: {
src: [ "Gruntfile.js" ],