diff --git a/Gruntfile.js b/Gruntfile.js index dff4a0fd4..1b53e9249 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -5,7 +5,6 @@ module.exports = function ( grunt ) { grunt.loadNpmTasks( 'grunt-banana-checker' ); grunt.loadNpmTasks( 'grunt-contrib-watch' ); grunt.loadNpmTasks( 'grunt-eslint' ); - grunt.loadNpmTasks( 'grunt-jsonlint' ); grunt.loadNpmTasks( 'grunt-notify' ); grunt.loadNpmTasks( 'grunt-stylelint' ); @@ -13,11 +12,12 @@ module.exports = function ( grunt ) { eslint: { options: { cache: true, + extensions: [ '.js', '.json' ], maxWarnings: 0, reportUnusedDisableDirectives: true }, all: [ - '**/*.js', + '**/*.js{,on}', '!docs/**', '!libs/**', '!node_modules/**', @@ -39,15 +39,6 @@ module.exports = function ( grunt ) { '!vendor/**' ] }, - jsonlint: { - all: [ - '**/*.json', - '!docs/**', - '!libs/**', - '!node_modules/**', - '!vendor/**' - ] - }, banana: conf.MessagesDirs, watch: { lint: { @@ -67,7 +58,7 @@ module.exports = function ( grunt ) { } } ); - grunt.registerTask( 'lint', [ 'eslint', 'stylelint', 'jsonlint', 'banana' ] ); + grunt.registerTask( 'lint', [ 'eslint', 'stylelint', 'banana' ] ); grunt.registerTask( 'test', [ 'lint' ] ); grunt.registerTask( 'default', [ 'test' ] ); diff --git a/package.json b/package.json index ab1aed72b..f8331b2d7 100644 --- a/package.json +++ b/package.json @@ -9,12 +9,11 @@ }, "dependencies": {}, "devDependencies": { - "eslint-config-wikimedia": "0.11.0", + "eslint-config-wikimedia": "0.12.0", "grunt": "1.0.3", "grunt-banana-checker": "0.6.0", "grunt-contrib-watch": "1.1.0", "grunt-eslint": "21.0.0", - "grunt-jsonlint": "1.1.0", "grunt-notify": "0.4.5", "grunt-stylelint": "0.10.1", "jsdoc": "3.5.5",