jenkins-bot has submitted this change and it was merged.
Change subject: Update Gruntfile.js and package.json and packages
......................................................................
Update Gruntfile.js and package.json and packages
This removes duplicate jsonlint task, also update somethings todo with js.
Updates packages:
grunt-banana-checker to 0.4.0
grunt-contrib-jshint to 1.0.0
grunt-jscs to 2.8.0
Also jshint will now search in all the js files.
Change-Id: Ifd638069d9367b356e606fa4ea557f6d05cb8883
---
M .jshintignore
M .jshintrc
M Gruntfile.js
M package.json
4 files changed, 12 insertions(+), 13 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jshintignore b/.jshintignore
index e69de29..a860310 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -0,0 +1 @@
+node_modules/**
diff --git a/.jshintrc b/.jshintrc
index 4c5e00f..22a4f47 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -5,7 +5,7 @@
"bitwise": true,
"eqeqeq": true,
"freeze": true,
- "latedef": true,
+ "latedef": "nofunc",
"noarg": true,
"nonew": true,
"undef": true,
@@ -22,8 +22,7 @@
/* Local */
- "predef": [
- "mediaWiki",
- "jQuery"
- ]
+ "globals": {
+ "mediaWiki": false
+ }
}
diff --git a/Gruntfile.js b/Gruntfile.js
index 0ec2649..4a3de2b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -7,12 +7,11 @@
/*jshint node:true */
module.exports = function ( grunt ) {
var conf = grunt.file.readJSON( 'extension.json' );
- grunt.loadNpmTasks( 'grunt-jsonlint' );
- grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
- grunt.loadNpmTasks( 'grunt-jscs' );
grunt.initConfig( {
jshint: {
@@ -20,8 +19,8 @@
jshintrc: true
},
all: [
- '*.js',
- 'resources/*.js'
+ '**/*.js',
+ '!node_modules/**'
]
},
jscs: {
diff --git a/package.json b/package.json
index 16b008f..548e84b 100644
--- a/package.json
+++ b/package.json
@@ -9,10 +9,10 @@
"devDependencies": {
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
- "grunt-banana-checker": "0.2.2",
- "grunt-contrib-jshint": "0.11.3",
+ "grunt-contrib-jshint": "1.0.0",
+ "grunt-banana-checker": "0.4.0",
+ "grunt-jscs": "2.8.0",
"grunt-contrib-watch": "0.6.1",
- "grunt-jscs": "2.1.0",
"grunt-jsonlint": "1.0.7"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/275183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd638069d9367b356e606fa4ea557f6d05cb8883
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: MarkTraceur <mtrac...@member.fsf.org>
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
