diff options
author | Michał Gołębiowski <m.goleb@gmail.com> | 2013-07-11 12:52:07 -0400 |
---|---|---|
committer | Timmy Willison <timmywillisn@gmail.com> | 2013-07-11 12:52:48 -0400 |
commit | c33108cad16ba6ff831d5cbc45b9dfbf12650e0e (patch) | |
tree | fce67971e6e3be882a76207ea114fb94768a4fe6 /Gruntfile.js | |
parent | bc4e9763e217dfe237f24521a46412b7d52a9e0c (diff) | |
download | jquery-c33108cad16ba6ff831d5cbc45b9dfbf12650e0e.tar.gz jquery-c33108cad16ba6ff831d5cbc45b9dfbf12650e0e.zip |
Update devDependencies, adjust .jshintrc to jsHint 2.x, use .jshintignore. Close gh-1283.
Diffstat (limited to 'Gruntfile.js')
-rw-r--r-- | Gruntfile.js | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 0e782ff4b..adc3b7384 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -15,7 +15,8 @@ module.exports = function( grunt ) { } catch(e) {} return data; }, - srcHintOptions = readOptionalJSON("src/.jshintrc"); + fs = require( "fs" ), + srcHintOptions = readOptionalJSON( "src/.jshintrc" ); // The concatenated file won't pass onevar // But our modules can @@ -85,9 +86,7 @@ module.exports = function( grunt ) { } }, tests: { - // TODO: Once .jshintignore is supported, use that instead. - // issue located here: https://github.com/gruntjs/grunt-contrib-jshint/issues/1 - src: [ "test/data/{test,testinit,testrunner}.js", "test/unit/**/*.js" ], + src: [ "test/**/*.js" ], options: { jshintrc: "test/.jshintrc" } @@ -453,7 +452,7 @@ module.exports = function( grunt ) { // Process files for distribution grunt.registerTask( "dist", function() { - var stored, flags, paths, fs, nonascii; + var stored, flags, paths, nonascii; // Check for stored destination paths // ( set in dist/.destination.json ) @@ -468,7 +467,6 @@ module.exports = function( grunt ) { }); // Ensure the dist files are pure ASCII - fs = require( "fs" ); nonascii = false; distpaths.forEach(function( filename ) { @@ -559,8 +557,6 @@ module.exports = function( grunt ) { // The problem is caused by the pre-uglify task. // Also, remove temporary files. grunt.registerMultiTask( "post-uglify", function() { - var fs = require( "fs" ); - this.files.forEach(function( mapping ) { var mapFileName = mapping.src[ 0 ]; |