diff options
Diffstat (limited to 'Gruntfile.js')
-rw-r--r-- | Gruntfile.js | 49 |
1 files changed, 17 insertions, 32 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 3e81b6161..5f101050a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -14,7 +14,6 @@ module.exports = function( grunt ) { var fs = require( "fs" ), gzip = require( "gzip-js" ), - srcHintOptions = readOptionalJSON( "src/.jshintrc" ), // Skip jsdom-related tests in Node.js 0.10 & 0.12 runJsdomTests = !/^v0/.test( process.version ); @@ -103,34 +102,14 @@ module.exports = function( grunt ) { src: [ "package.json" ] } }, - jshint: { - all: { - src: [ - "src/**/*.js", "Gruntfile.js", "test/**/*.js", "build/**/*.js" - ], - options: { - jshintrc: true - } + eslint: { + options: { + + // See https://github.com/sindresorhus/grunt-eslint/issues/119 + quiet: true }, - dist: { - src: "dist/jquery.js", - options: srcHintOptions - } - }, - jscs: { - src: "src", - gruntfile: "Gruntfile.js", - - // Check parts of tests that pass - test: [ - "test/data/testrunner.js", - "test/unit/animation.js", - "test/unit/basic.js", - "test/unit/support.js", - "test/unit/tween.js", - "test/unit/wrap.js" - ], - build: "build" + all: ".", + dev: [ "src/**/*.js", "Gruntfile.js", "test/**/*.js", "build/**/*.js" ] }, testswarm: { tests: [ @@ -164,7 +143,7 @@ module.exports = function( grunt ) { ] }, watch: { - files: [ "<%= jshint.all.src %>" ], + files: [ "<%= eslint.dev %>" ], tasks: [ "dev" ] }, uglify: { @@ -201,7 +180,7 @@ module.exports = function( grunt ) { // Integrate jQuery specific tasks grunt.loadTasks( "build/tasks" ); - grunt.registerTask( "lint", [ "jsonlint", "jshint", "jscs" ] ); + grunt.registerTask( "lint", [ "jsonlint" ] ); // Don't run Node-related tests in Node.js < 1.0.0 as they require an old // jsdom version that needs compiling, making it harder for people to compile @@ -213,9 +192,15 @@ module.exports = function( grunt ) { ) ); // Short list as a high frequency watch task - grunt.registerTask( "dev", [ "build:*:*", "lint", "uglify", "remove_map_comment", "dist:*" ] ); + grunt.registerTask( "dev", [ + "build:*:*", + "uglify", + "remove_map_comment", + "dist:*" + ] + ); grunt.registerTask( "default", [ "dev", "test_fast", "compare_size" ] ); - grunt.registerTask( "precommit_lint", [ "newer:jsonlint", "newer:jshint:all", "newer:jscs" ] ); + grunt.registerTask( "precommit_lint", [ "newer:jsonlint" ] ); }; |