Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354640 )
Change subject: build: Replace jshint and jscs with eslint, updata other devDeps
......................................................................
build: Replace jshint and jscs with eslint, updata 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: Ibb3e72bfe102461b00d29ac5a08b5f28b10c22a8
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M package.json
M resources/src/FileAnnotation.js
M resources/src/fileannotations.js
8 files changed, 24 insertions(+), 46 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FileAnnotations
refs/changes/40/354640/1
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..b5c2768
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,11 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "jquery": true,
+ "browser": true
+ },
+ "globals": {
+ "mediaWiki": false,
+ "OO": false
+ }
+}
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 0b8ae77..0000000
--- a/.jshintrc
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- // Enforcing
- "bitwise": true,
- "eqeqeq": true,
- "es3": true,
- "latedef": true,
- "noarg": true,
- "nonew": true,
- "undef": true,
- "unused": true,
- "strict": false,
-
- // Environment
- "browser": true,
- "jquery": true,
-
- "globals": {
- "mw": false,
- "mediaWiki": false,
- "JSON": false,
- "OO": false
- }
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 02aa997..232c808 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',
'resources/**/*.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/package.json b/package.json
index d6d0f28..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.5.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"
}
}
diff --git a/resources/src/FileAnnotation.js b/resources/src/FileAnnotation.js
index 1d823c2..f113381 100644
--- a/resources/src/FileAnnotation.js
+++ b/resources/src/FileAnnotation.js
@@ -243,6 +243,8 @@
/**
* Deletes the annotation and saves.
+ *
+ * @return {jQuery.Promise}
*/
FileAnnotation.prototype.deleteAnnotation = function () {
var annotation = this;
diff --git a/resources/src/fileannotations.js b/resources/src/fileannotations.js
index ffe8a42..32ce1c9 100644
--- a/resources/src/fileannotations.js
+++ b/resources/src/fileannotations.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-vars */
( function ( $, mw ) {
var pageAnnotator,
pageTitle = mw.Title.newFromText( mw.config.get( 'wgPageName' )
),
--
To view, visit https://gerrit.wikimedia.org/r/354640
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb3e72bfe102461b00d29ac5a08b5f28b10c22a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FileAnnotations
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
