jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338758 )
Change subject: Switch to eslint and update dependecies
......................................................................
Switch to eslint and update dependecies
Change-Id: I6f517c785d408c2d7d0729a9c607cc1b393689be
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M package.json
6 files changed, 26 insertions(+), 44 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..925611f
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,6 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "jquery": true
+ }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index 04baa68..0000000
--- a/.jscsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "preset": "wikimedia",
- "excludeFiles": [ "node_modules/**", "vendor/**" ]
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 82eaa05..0000000
--- a/.jshintignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules/**
-vendor/**
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index d43c482..0000000
--- a/.jshintrc
+++ /dev/null
@@ -1,20 +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": {
- "mw": false,
- "$": false
- }
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 36b41e8..6601ffa 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,22 +1,23 @@
-/*jshint node:true */
+/* eslint-env node */
module.exports = function ( grunt ) {
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- grunt.loadNpmTasks( 'grunt-jsonlint' );
+ var conf = grunt.file.readJSON( 'extension.json' );
+
grunt.loadNpmTasks( 'grunt-banana-checker' );
- 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'
]
},
- jscs: {
- src: '<%= jshint.all %>'
+ stylelint: {
+ all: [
+ 'modules/**/*.css',
+ '!node_modules/**'
+ ]
},
banana: {
all: 'i18n/'
@@ -30,6 +31,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 d6d0f28..1d1ff17 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,12 @@
"test": "grunt test"
},
"devDependencies": {
- "grunt": "0.4.5",
- "grunt-cli": "0.1.13",
- "grunt-contrib-jshint": "0.11.3",
- "grunt-banana-checker": "0.4.0",
- "grunt-jscs": "2.5.0",
- "grunt-jsonlint": "1.0.7"
+ "grunt": "1.0.1",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-eslint": "19.0.0",
+ "grunt-jsonlint": "1.1.0",
+ "grunt-stylelint": "0.7.0",
+ "eslint-config-wikimedia": "0.3.0",
+ "stylelint-config-wikimedia": "0.4.1"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/338758
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f517c785d408c2d7d0729a9c607cc1b393689be
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
