jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/349355 )
Change subject: build: Replace jshint and jscs with eslint
......................................................................
build: Replace jshint and jscs with eslint
Bug: T118941
Change-Id: I4b73fb13f8f95f73714a6fc580e07ac320f937fc
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
D modules/ve-wikihiero/.jshintrc
M modules/ve-wikihiero/ve.ce.MWHieroNode.js
M modules/ve-wikihiero/ve.dm.MWHieroNode.js
M modules/ve-wikihiero/ve.ui.MWHieroInspector.js
M modules/ve-wikihiero/ve.ui.MWHieroInspectorTool.js
M package.json
11 files changed, 24 insertions(+), 92 deletions(-)
Approvals:
jenkins-bot: Verified
VolkerE: Looks good to me, approved
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..56fb9cb
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,16 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "browser": true,
+ "jquery": true,
+ "qunit": true
+ },
+ "globals": {
+ "mw": false,
+ "OO": false,
+ "ve": false
+ },
+ "rules": {
+ "dot-notation": [ "error", { "allowKeywords": true } ]
+ }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index 1959eea..0000000
--- a/.jscsrc
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "preset": "wikimedia",
-
- "jsDoc": {
- "checkAnnotations": {
- "preset": "jsduck5",
- "extra": {
- "this": true,
- "source": true,
- "see": true
- }
- },
- "checkTypes": "strictNativeCase",
- "checkParamNames": true,
- "checkRedundantAccess": true,
- "checkRedundantReturns": true,
- "requireNewlineAfterDescription": true,
- "requireParamTypes": true,
- "requireReturnTypes": true
- }
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index ea26ebd..0000000
--- a/.jshintignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Tooling
-node_modules/
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 032d01b..0000000
--- a/.jshintrc
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- // Enforcing
- "bitwise": true,
- "eqeqeq": true,
- "freeze": true,
- "latedef": true,
- "noarg": true,
- "nonew": true,
- "undef": true,
- "unused": true,
- "strict": false,
- "es3": true,
-
- // Environment
- "browser": true,
- "jquery": true,
-
- "globals": {
- "mw": false
- }
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index c9c273f..c6b7934 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,35 +1,28 @@
-/*jshint node:true */
+/* eslint-env node */
module.exports = function ( grunt ) {
var conf = grunt.file.readJSON( 'extension.json' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
- grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
- jshint: {
- options: {
- jshintrc: true
- },
+ eslint: {
all: [
'*.js',
'modules/*.js',
'modules/ve-wikihiero/**/*.js'
]
},
- jscs: {
- src: '<%= jshint.all %>'
- },
stylelint: {
all: 'modules/**/*.css'
},
watch: {
files: [
- '.{jscsrc,jshintignore,jshintrc,csslintrc}',
- '<%= jshint.all %>',
+ '.eslintrc.json',
+ '<%= eslint.all %>',
'<%= stylelint.all %>'
],
tasks: 'lint'
@@ -43,7 +36,7 @@
}
} );
- grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'stylelint',
'jsonlint', 'banana' ] );
+ grunt.registerTask( 'lint', [ 'eslint', 'stylelint', 'jsonlint',
'banana' ] );
grunt.registerTask( 'test', 'lint' );
grunt.registerTask( 'default', 'test' );
};
diff --git a/modules/ve-wikihiero/.jshintrc b/modules/ve-wikihiero/.jshintrc
deleted file mode 100644
index 0c2332e..0000000
--- a/modules/ve-wikihiero/.jshintrc
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- // Enforcing
- "bitwise": true,
- "eqeqeq": true,
- "freeze": true,
- "latedef": true,
- "noarg": true,
- "nonew": true,
- "undef": true,
- "unused": true,
- "strict": false,
-
- // Relaxing
- "es3": false,
-
- // Environment
- "browser": true,
- "jquery": true,
-
- "globals": {
- "mw": false,
- "OO": false,
- "ve": false
- }
-}
diff --git a/modules/ve-wikihiero/ve.ce.MWHieroNode.js
b/modules/ve-wikihiero/ve.ce.MWHieroNode.js
index 246fef6..bdd804c 100644
--- a/modules/ve-wikihiero/ve.ce.MWHieroNode.js
+++ b/modules/ve-wikihiero/ve.ce.MWHieroNode.js
@@ -1,5 +1,3 @@
-/*global ve, OO */
-
/**
* ContentEditable MediaWiki hieroglyphics node.
*
diff --git a/modules/ve-wikihiero/ve.dm.MWHieroNode.js
b/modules/ve-wikihiero/ve.dm.MWHieroNode.js
index d21e917..40ea0d2 100644
--- a/modules/ve-wikihiero/ve.dm.MWHieroNode.js
+++ b/modules/ve-wikihiero/ve.dm.MWHieroNode.js
@@ -1,5 +1,3 @@
-/*global ve, OO */
-
/**
* DataModel MediaWiki hieroglyphics node.
*
diff --git a/modules/ve-wikihiero/ve.ui.MWHieroInspector.js
b/modules/ve-wikihiero/ve.ui.MWHieroInspector.js
index 3ac1c00..241291c 100644
--- a/modules/ve-wikihiero/ve.ui.MWHieroInspector.js
+++ b/modules/ve-wikihiero/ve.ui.MWHieroInspector.js
@@ -1,5 +1,3 @@
-/*global ve, OO */
-
/**
* MediaWiki hieroglyphics inspector.
*
diff --git a/modules/ve-wikihiero/ve.ui.MWHieroInspectorTool.js
b/modules/ve-wikihiero/ve.ui.MWHieroInspectorTool.js
index db4d693..2d1a5c8 100644
--- a/modules/ve-wikihiero/ve.ui.MWHieroInspectorTool.js
+++ b/modules/ve-wikihiero/ve.ui.MWHieroInspectorTool.js
@@ -1,5 +1,3 @@
-/*global ve, OO */
-
/**
* MediaWiki UserInterface hieroglyphics tool.
*
diff --git a/package.json b/package.json
index ce1f0cd..baa0c7d 100644
--- a/package.json
+++ b/package.json
@@ -7,11 +7,11 @@
"test": "grunt test"
},
"devDependencies": {
+ "eslint-config-wikimedia": "0.3.0",
"grunt": "1.0.1",
"grunt-banana-checker": "0.5.0",
- "grunt-contrib-jshint": "1.0.0",
"grunt-contrib-watch": "1.0.0",
- "grunt-jscs": "2.8.0",
+ "grunt-eslint": "19.0.0",
"grunt-jsonlint": "1.0.7",
"grunt-stylelint": "0.7.0",
"stylelint-config-wikimedia": "0.4.1"
--
To view, visit https://gerrit.wikimedia.org/r/349355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b73fb13f8f95f73714a6fc580e07ac320f937fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/wikihiero
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: VolkerE <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
