jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355622 )
Change subject: build: Replace jshint and jscs with eslint; bump other devDeps
......................................................................
build: Replace jshint and jscs with eslint; bump other devDeps
grunt 0.4.5 → 1.0.1
grunt-banana-checker 0.5.0 → 0.6.0
grunt-jsonlint 1.0.7 → 1.1.0
Change-Id: I8e7a3ba775fb7106402bc75ed0ef0feaaf2c215b
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M package.json
6 files changed, 19 insertions(+), 63 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..4843240
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,10 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "browser": true,
+ "jquery": true
+ },
+ "globals": {
+ "mediaWiki": false
+ }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index 9d22e3f..0000000
--- a/.jscsrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "preset": "wikimedia"
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 420bf71..0000000
--- a/.jshintignore
+++ /dev/null
@@ -1,3 +0,0 @@
-extensions/**
-node_modules/**
-vendor/**
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index b6a0f58..0000000
--- a/.jshintrc
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- /* 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,
- "strict": true,
- // Relaxing
- "laxbreak": true,
- "smarttabs": true,
- "multistr": true,
- // Environment
- "browser": true,
-
- "predef": [
- "mediaWiki",
- "jQuery",
- "QUnit"
- ]
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 3534c1a..763904b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,25 +1,18 @@
-/*jshint node:true */
+/* eslint-env node, es6 */
module.exports = function ( grunt ) {
'use strict';
grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
- grunt.loadNpmTasks( 'grunt-jscs' );
grunt.initConfig( {
- jshint: {
- options: {
- jshintrc: true
- },
+ eslint: {
all: [
'**/*.js',
'!extensions/**',
'!node_modules/**',
'!vendor/**'
]
- },
- jscs: {
- src: '<%= jshint.all %>'
},
banana: {
all: 'i18n/'
@@ -34,6 +27,6 @@
}
} );
- grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
+ grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/package.json b/package.json
index a6fc221..86e1fa9 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,10 @@
"test": "grunt test"
},
"devDependencies": {
- "grunt": "0.4.5",
- "grunt-cli": "0.1.13",
- "grunt-contrib-jshint": "1.0.0",
- "grunt-banana-checker": "0.5.0",
- "grunt-jscs": "2.8.0",
- "grunt-jsonlint": "1.0.7"
+ "eslint-config-wikimedia": "0.4.0",
+ "grunt": "1.0.1",
+ "grunt-banana-checker": "0.6.0",
+ "grunt-eslint": "19.0.0",
+ "grunt-jsonlint": "1.1.0"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/355622
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e7a3ba775fb7106402bc75ed0ef0feaaf2c215b
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/TranslationNotifications
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
