Merge "build: Configure jsonlint"

This commit is contained in:
jenkins-bot 2015-06-14 01:26:45 +00:00 committed by Gerrit Code Review
commit e4fdfd4951
2 changed files with 9 additions and 1 deletions

View file

@ -12,6 +12,7 @@ module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-contrib-csslint' ); grunt.loadNpmTasks( 'grunt-contrib-csslint' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' ); grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-contrib-watch' ); grunt.loadNpmTasks( 'grunt-contrib-watch' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' ); grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-jscs' ); grunt.loadNpmTasks( 'grunt-jscs' );
grunt.loadTasks( 'lib/ve/build/tasks' ); grunt.loadTasks( 'lib/ve/build/tasks' );
@ -80,6 +81,12 @@ module.exports = function ( grunt ) {
banana: { banana: {
all: 'modules/ve-{mw,wmf}/i18n/' all: 'modules/ve-{mw,wmf}/i18n/'
}, },
jsonlint: {
all: [
'**/*.json',
'!node_modules/**'
]
},
copy: { copy: {
jsduck: { jsduck: {
src: 'lib/ve/**/*', src: 'lib/ve/**/*',
@ -118,7 +125,7 @@ module.exports = function ( grunt ) {
} ); } );
grunt.registerTask( 'build', [ 'jsduckcatconfig', 'buildloader' ] ); grunt.registerTask( 'build', [ 'jsduckcatconfig', 'buildloader' ] );
grunt.registerTask( 'lint', [ 'jshint', 'jscs:main', 'csslint', 'banana' ] ); grunt.registerTask( 'lint', [ 'jshint', 'jscs:main', 'csslint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'fix', [ 'jscs:fix' ] ); grunt.registerTask( 'fix', [ 'jscs:fix' ] );
grunt.registerTask( 'test', [ 'build', 'lint' ] ); grunt.registerTask( 'test', [ 'build', 'lint' ] );
grunt.registerTask( 'test-ci', [ 'git-status' ] ); grunt.registerTask( 'test-ci', [ 'git-status' ] );

View file

@ -11,6 +11,7 @@
"devDependencies": { "devDependencies": {
"grunt": "0.4.5", "grunt": "0.4.5",
"grunt-cli": "0.1.13", "grunt-cli": "0.1.13",
"grunt-jsonlint": "1.0.4",
"grunt-banana-checker": "0.2.2", "grunt-banana-checker": "0.2.2",
"grunt-contrib-copy": "0.8.0", "grunt-contrib-copy": "0.8.0",
"grunt-contrib-csslint": "0.4.0", "grunt-contrib-csslint": "0.4.0",