Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354643 )
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.4.0 → 0.6.0
grunt-jsonlint 1.0.7 → 1.1.0
Change-Id: I9be7ee1eb23cded1e804237841654597c50ed9be
---
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M package.json
5 files changed, 9 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageViewInfo
refs/changes/43/354643/1
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 c2658d7..0000000
--- a/.jshintignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules/
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 66e3d48..0000000
--- a/.jshintrc
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- // Enforcing
- "bitwise": true,
- "eqeqeq": true,
- "freeze": true,
- "latedef": true,
- "noarg": true,
- "nonew": true,
- "undef": true,
- "unused": true,
- "strict": false,
-
- // Relaxing
- "es5": false,
-
- // Environment
- "browser": true,
- "jquery": true,
-
- "globals": {
- "mediaWiki": false,
- "OO": false
- }
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 5523196..3fcccfc 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,23 +1,16 @@
-/*jshint node:true */
+/* eslint-env node, es6 */
module.exports = function ( grunt ) {
var conf = grunt.file.readJSON( 'extension.json' );
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-jscs' );
grunt.initConfig( {
- jshint: {
- options: {
- jshintrc: true
- },
+ eslint: {
all: [
'resources/*.js',
'*.js'
]
- },
- jscs: {
- src: '<%= jshint.all %>'
},
banana: conf.MessagesDirs,
jsonlint: {
@@ -28,6 +21,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 ab30448..efe48f5 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": "0.11.3",
- "grunt-banana-checker": "0.4.0",
- "grunt-jscs": "2.1.0",
- "grunt-jsonlint": "1.0.7"
+ "eslint-config-wikimedia": "0.4.0",
+ "grunt": "1.0.1",
+ "grunt-eslint": "19.0.0",
+ "grunt-banana-checker": "0.6.0",
+ "grunt-jsonlint": "1.1.0"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/354643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9be7ee1eb23cded1e804237841654597c50ed9be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageViewInfo
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
