jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354973 )
Change subject: Use eslint to lint JavaScript instead of jscs and jshint
......................................................................
Use eslint to lint JavaScript instead of jscs and jshint
Bug: T165843
Change-Id: Icd63270c78558582d2dd23d3449f6cee2b359a53
---
R .eslintignore
A .eslintrc.json
M Gruntfile.js
M package.json
4 files changed, 20 insertions(+), 18 deletions(-)
Approvals:
Lucas Werkmeister (WMDE): Looks good to me, approved
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
diff --git a/.jshintignore b/.eslintignore
similarity index 100%
rename from .jshintignore
rename to .eslintignore
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..15268a4
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,12 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "browser": true,
+ "jquery": true
+ },
+ "rules": {
+ "keyword-spacing": "off",
+ "space-before-function-paren": "off",
+ "wrap-iife": "off"
+ }
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index c160c4d..10f645a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,24 +1,14 @@
-/* jshint node: true, strict: false */
+/* eslint-env node */
+
module.exports = function ( grunt ) {
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
- jshint: {
- options: {
- jshintrc: true
- },
- all: [
- '**/*.js',
- '!node_modules/**',
- '!vendor/**'
- ]
- },
- jscs: {
- src: '<%= jshint.all %>'
+ eslint: {
+ all: '.'
},
banana: {
options: {
@@ -44,5 +34,5 @@
}
} );
- grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana',
'stylelint' ] );
+ grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana',
'stylelint' ] );
};
diff --git a/package.json b/package.json
index 1a603b4..fe2116f 100644
--- a/package.json
+++ b/package.json
@@ -11,11 +11,11 @@
"author": "BP2014N1",
"license": "GPL-2.0+",
"devDependencies": {
+ "eslint-config-wikimedia": "0.4.0",
"grunt": "1.0.1",
"grunt-banana-checker": "0.3.0",
"grunt-jsonlint": "1.1.0",
- "grunt-contrib-jshint": "0.11.3",
- "grunt-jscs": "2.1.0",
+ "grunt-eslint": "19.0.0",
"grunt-stylelint": "0.6.0",
"stylelint-config-wikimedia": "0.4.1"
}
--
To view, visit https://gerrit.wikimedia.org/r/354973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icd63270c78558582d2dd23d3449f6cee2b359a53
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek <[email protected]>
Gerrit-Reviewer: Lucas Werkmeister (WMDE) <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
