diff options
| author | Timmy Willison <timmywillisn@gmail.com> | 2013-04-09 12:48:34 -0400 |
|---|---|---|
| committer | Timmy Willison <timmywillisn@gmail.com> | 2013-04-09 12:48:34 -0400 |
| commit | ac9cad19fa0473315489ee952ba73afdaeb80386 (patch) | |
| tree | 7c818aa60fcb810a0d43d49e229c0399e26f6251 /Gruntfile.js | |
| parent | e01a6231c78448043de6672940a41637ba5bdf28 (diff) | |
| download | jquery-ac9cad19fa0473315489ee952ba73afdaeb80386.tar.gz jquery-ac9cad19fa0473315489ee952ba73afdaeb80386.zip | |
Add onevar to jshintrc, but remove the option for linting the concatenated file
Diffstat (limited to 'Gruntfile.js')
| -rw-r--r-- | Gruntfile.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 9d9f85a20..e753a35cb 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"), @@ -73,9 +78,7 @@ module.exports = function( grunt ) { jshint: { dist: { src: [ "dist/jquery.js" ], - options: { - jshintrc: "src/.jshintrc" - } + options: srcHintOptions }, grunt: { src: [ "Gruntfile.js" ], |