WMDE-leszek has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354952 )
Change subject: Lint JavaScript with eslint instead of jscs and jshint
......................................................................
Lint JavaScript with eslint instead of jscs and jshint
Bug: T165843
Change-Id: I810cb04c101f5667aae515e5f2f9fe4a25dd6026
---
R .eslintignore
A .eslintrc.json
D .jscsrc
D .jshintrc
M Gruntfile.js
M package.json
6 files changed, 25 insertions(+), 66 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseMediaInfo
refs/changes/52/354952/1
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..0246fe7
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,17 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "browser": true,
+ "jquery": true
+ },
+ "globals": {
+ "util": false,
+ "wikibase": false
+ },
+ "rules": {
+ "indent": "off",
+ "no-underscore-dangle": "off",
+ "one-var": "off",
+ "vars-on-top": "off"
+ }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index b110fb8..0000000
--- a/.jscsrc
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "preset": "wikimedia",
- "excludeFiles": [ "node_modules/**", "vendor/**" ],
-
- // wikimedia overwrites
-
- "disallowDanglingUnderscores": null,
- "requireMultipleVarDecl": null,
-
- "jsDoc": {
- // what we don't yet follow is commented out
- "checkAnnotations": {
- "preset": "jsduck5",
- "extra": {
- "license": "some"
- }
- },
- "checkParamNames": true,
- "requireParamTypes": true,
- "checkRedundantParams": true,
- "checkReturnTypes": true,
- "checkRedundantReturns": true,
- "requireReturnTypes": true,
- "checkTypes": "strictNativeCase",
- "checkRedundantAccess": true,
- "requireNewlineAfterDescription": true
- },
-
- "requireVarDeclFirst": null
-}
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 8de903d..0000000
--- a/.jshintrc
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- // Enforcing
- "bitwise": true,
- "eqeqeq": true,
- "es3": true,
- "latedef": true,
- "noarg": true,
- "nonew": true,
- "undef": true,
- "unused": true,
- "strict": false,
-
- // Environment
- "browser": true,
-
- "globals": {
- "jQuery": false,
- "module": false,
- "util": false,
- "wikibase": false
- }
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index ddcbbda..14793a1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,22 +1,14 @@
-/*jshint node:true */
+/* eslint-env node */
+
module.exports = function ( grunt ) {
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-jscs' );
grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
- jshint: {
- options: {
- jshintrc: true
- },
- all: [
- '**/*.js'
- ]
- },
- jscs: {
- src: '<%= jshint.all %>'
+ eslint: {
+ all: '.'
},
banana: {
all: 'i18n/'
@@ -38,6 +30,6 @@
}
} );
- grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana',
'stylelint' ] );
+ grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana',
'stylelint' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/package.json b/package.json
index 07a0ec4..c608723 100644
--- a/package.json
+++ b/package.json
@@ -4,9 +4,11 @@
"test": "grunt test"
},
"devDependencies": {
+ "eslint-config-wikimedia": "0.4.0",
"grunt": "1.0.1",
"grunt-contrib-jshint": "0.11.3",
"grunt-banana-checker": "0.4.0",
+ "grunt-eslint": "19.0.0",
"grunt-jscs": "2.5.0",
"grunt-jsonlint": "1.0.7",
"grunt-stylelint": "0.6.0",
--
To view, visit https://gerrit.wikimedia.org/r/354952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I810cb04c101f5667aae515e5f2f9fe4a25dd6026
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseMediaInfo
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek <leszek.mani...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
