jenkins-bot has submitted this change and it was merged. Change subject: Add jshint to npm ......................................................................
Add jshint to npm Change-Id: I8da5f300ee8201ab47233a665cd14ceafdef1804 --- A .jshintignore M .jshintrc M Gruntfile.js M package.json 4 files changed, 27 insertions(+), 19 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.jshintignore b/.jshintignore new file mode 100644 index 0000000..3c3629e --- /dev/null +++ b/.jshintignore @@ -0,0 +1 @@ +node_modules diff --git a/.jshintrc b/.jshintrc index dc5c624..04c3a97 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,27 +1,23 @@ { - /* Common */ - // Enforcing - "camelcase": true, - "curly": true, + "bitwise": true, "eqeqeq": true, - "immed": true, - "latedef": true, - "newcap": true, + "freeze": true, + "latedef": "nofunc", "noarg": true, - "noempty": true, "nonew": true, - "quotmark": "single", - "trailing": true, "undef": true, "unused": true, - // Legacy - "onevar": true, + "strict": false, - /* Local */ + // Relaxing + "es5": false, + + // Environment "browser": true, - "predef": [ - "mediaWiki", - "jQuery" - ] + "jquery": true, + + "globals": { + "mediaWiki": false + } } diff --git a/Gruntfile.js b/Gruntfile.js index 9c56558..36b6671 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,9 +1,19 @@ /*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: { + options: { + jshintrc: true + }, + all: [ + '**/*.js', + '!node_modules/**' + ] + }, banana: { all: 'i18n/' }, @@ -15,6 +25,6 @@ } } ); - grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] ); grunt.registerTask( 'default', 'test' ); }; diff --git a/package.json b/package.json index 72eb4aa..2b3860e 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "grunt": "0.4.5", "grunt-cli": "0.1.13", "grunt-banana-checker": "0.4.0", + "grunt-contrib-jshint": "1.0.0", "grunt-jsonlint": "1.0.7" } } -- To view, visit https://gerrit.wikimedia.org/r/276834 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8da5f300ee8201ab47233a665cd14ceafdef1804 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OpenStackManager Gerrit-Branch: master Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: Hashar <has...@free.fr> 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