jenkins-bot has submitted this change and it was merged.
Change subject: Add jshint to npm
......................................................................
Add jshint to npm
Change-Id: Icbeb3836e5aa12c3b3a9b8ea05e76c4b7a1f559c
---
A .jshintignore
M .jshintrc
M Gruntfile.js
M package.json
4 files changed, 28 insertions(+), 35 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 c4e265a..85b0eaa 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,42 +1,23 @@
{
- /* Common */
-
- // Enforcing
- "camelcase": true,
- "curly": true,
- "eqeqeq": true,
- "immed": true,
- "latedef": true,
- "newcap": true,
- "noarg": true,
- "noempty": true,
- "nonew": true,
- "quotmark": "single",
- "trailing": true,
- "undef": true,
- "unused": true,
- // Legacy
- "onevar": true,
-
- /* Local */
-
// Enforcing
"bitwise": true,
- "forin": false,
- "regexp": false,
+ "eqeqeq": true,
+ "freeze": true,
+ "latedef": "nofunc",
+ "noarg": true,
+ "nonew": true,
+ "undef": true,
+ "unused": true,
"strict": false,
+
// Relaxing
- "laxbreak": true,
- "smarttabs": true,
- "multistr": true,
+ "es5": false,
+
// Environment
"browser": true,
- // Legacy
- "nomen": true,
- "predef": [
- "mediaWiki",
- "jQuery",
- "QUnit"
- ]
+ "globals": {
+ "mediaWiki": false,
+ "jQuery": true
+ }
}
diff --git a/Gruntfile.js b/Gruntfile.js
index a4c3dcb..72b8e0d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,11 +6,21 @@
/*jshint node:true */
module.exports = function ( grunt ) {
+ var conf = grunt.file.readJSON( 'extension.json' );
+ grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
- var conf = grunt.file.readJSON( 'extension.json' );
grunt.initConfig( {
+ jshint: {
+ options: {
+ jshintrc: true
+ },
+ all: [
+ '**/*.js',
+ '!node_modules/**'
+ ]
+ },
banana: conf.MessagesDirs,
jsonlint: {
all: [
@@ -20,6 +30,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 42a50b9..9943a42 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,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/275180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icbeb3836e5aa12c3b3a9b8ea05e76c4b7a1f559c
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Edokter <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Jorm <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
