Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354625 )
Change subject: build: Replace jshint and jscs with eslint; upgrade other
devDeps
......................................................................
build: Replace jshint and jscs with eslint; upgrade 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
Bug: T118941
Change-Id: I3b4c2e9620818dff6e90d782baf6636275f2f2d7
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M modules/ext.pageassessments.special.js
M package.json
7 files changed, 21 insertions(+), 49 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageAssessments
refs/changes/25/354625/1
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..db53d75
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,10 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "jquery": true
+ },
+ "globals": {
+ "mediaWiki": false,
+ "OO": false
+ }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index a2d7b13..0000000
--- a/.jscsrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "preset": "wikimedia"
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 3c3629e..0000000
--- a/.jshintignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 6c9a3d6..0000000
--- a/.jshintrc
+++ /dev/null
@@ -1,26 +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
- },
-
- "predef": [
- "jQuery",
- "mediaWiki",
- "OO"
- ]
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 56ff218..51388c8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,22 +1,16 @@
-/*jshint node:true */
+/* eslint-env node, es6 */
+
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.initConfig( {
- jshint: {
- options: {
- jshintrc: true
- },
+ eslint: {
all: [
'*.js',
'modules/**/*.js'
]
- },
- jscs: {
- src: '<%= jshint.all %>'
},
banana: {
all: 'i18n/'
@@ -30,6 +24,6 @@
}
} );
- grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
+ grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/modules/ext.pageassessments.special.js
b/modules/ext.pageassessments.special.js
index 310fa4f..58cb196 100644
--- a/modules/ext.pageassessments.special.js
+++ b/modules/ext.pageassessments.special.js
@@ -49,4 +49,4 @@
}
} );
-} )( jQuery, mediaWiki, OO );
+}( jQuery, mediaWiki, OO ) );
diff --git a/package.json b/package.json
index 243c8cc..32aca31 100644
--- a/package.json
+++ b/package.json
@@ -5,12 +5,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.5.0",
- "grunt-jsonlint": "1.0.7",
- "jscs-preset-wikimedia": "1.0.0"
+ "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/354625
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b4c2e9620818dff6e90d782baf6636275f2f2d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageAssessments
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
