jenkins-bot has submitted this change and it was merged. Change subject: build: Run jshint through npm, set up phplint through composer ......................................................................
build: Run jshint through npm, set up phplint through composer Change-Id: Idbb3bfa19c506f76d954b23dac81e91425d18a63 --- M .gitignore A .jshintignore M Gruntfile.js A composer.json M package.json 5 files changed, 25 insertions(+), 4 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index c2658d7..8ec4b92 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ node_modules/ +vendor/ +composer.lock diff --git a/.jshintignore b/.jshintignore new file mode 100644 index 0000000..c2658d7 --- /dev/null +++ b/.jshintignore @@ -0,0 +1 @@ +node_modules/ diff --git a/Gruntfile.js b/Gruntfile.js index 9c56558..35ddbef 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,9 +1,16 @@ /*jshint node:true */ module.exports = function ( grunt ) { - grunt.loadNpmTasks( 'grunt-banana-checker' ); + grunt.loadNpmTasks( 'grunt-contrib-jshint' ); grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); grunt.initConfig( { + jshint: { + all: [ + '**/*.js', + '!node_modules/**' + ] + }, banana: { all: 'i18n/' }, @@ -15,6 +22,6 @@ } } ); - grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] ); grunt.registerTask( 'default', 'test' ); }; diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..f2883f7 --- /dev/null +++ b/composer.json @@ -0,0 +1,10 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor" + ] + } +} diff --git a/package.json b/package.json index 76e8a82..c3d4d83 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "devDependencies": { "grunt": "0.4.5", "grunt-cli": "0.1.13", - "grunt-banana-checker": "0.2.2", - "grunt-jsonlint": "1.0.4" + "grunt-contrib-jshint": "0.11.3", + "grunt-banana-checker": "0.4.0", + "grunt-jsonlint": "1.0.5" } } -- To view, visit https://gerrit.wikimedia.org/r/250306 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idbb3bfa19c506f76d954b23dac81e91425d18a63 Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/skins/Example Gerrit-Branch: master Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: Isarra <zhoris...@gmail.com> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com> Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits