[MediaWiki-commits] [Gerrit] mediawiki...Wikispeech[master]: build: Replace jshint and jscs with eslint; bump everything ...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/374401 )
Change subject: build: Replace jshint and jscs with eslint; bump everything else
..
build: Replace jshint and jscs with eslint; bump everything else
grunt-banana-checker 0.4.0 → 0.6.0
grunt-jsonlint 1.0.4 → 1.1.0
grunt-stylelint ^0.7.0 → 0.8.0
Change-Id: I331b05e963d8b61296f3633b409b914ee2399d38
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M modules/ext.wikispeech.js
M package.json
A tests/qunit/.eslintrc.json
M tests/qunit/ext.wikispeech.highlighter.test.js
M tests/qunit/ext.wikispeech.test.js
10 files changed, 86 insertions(+), 115 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..3931182
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,11 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "browser": true,
+ "jquery": true
+ },
+ "globals": {
+ "mediaWiki": false
+ },
+ "rules": {}
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index a031ea4..000
--- a/.jscsrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "preset": "wikimedia"
-}
\ No newline at end of file
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index b512c09..000
--- a/.jshintignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
\ No newline at end of file
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 95facb2..000
--- a/.jshintrc
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "predef": [
- "mediaWiki",
- "jQuery",
- "QUnit",
- "sinon",
- "JSON"
- ],
-
- // 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 f2d6f3b..1ded3a3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,27 +1,19 @@
-/*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-stylelint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-jscs' );
- grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
- jshint: {
- options: {
- jshintrc: true
- },
+ eslint: {
all: [
'*.js',
'modules/**/*.js',
'tests/**/*.js'
]
},
- jscs: {
- src: '<%= jshint.all %>'
- },
- banana: conf.MessagesDirs,
jsonlint: {
all: [
'*.json',
@@ -30,6 +22,7 @@
'!vendor/**'
]
},
+ banana: conf.MessagesDirs,
stylelint: {
options: {
formatter: 'string',
@@ -46,8 +39,7 @@
grunt.registerTask(
'test',
[
- 'jshint',
- 'jscs',
+ 'eslint',
'jsonlint',
'banana',
'stylelint'
diff --git a/modules/ext.wikispeech.js b/modules/ext.wikispeech.js
index edbc8e6..d7d9e86 100644
--- a/modules/ext.wikispeech.js
+++ b/modules/ext.wikispeech.js
@@ -270,7 +270,7 @@
$audio = $( currentUtterance.audio );
utterance.audio.play();
mw.wikispeech.highlighter.highlightUtterance( utterance
);
- if ( self.audioIsReady( $audio ) ) {
+ if ( self.audioIsReady( $audio ) ) {
$( '#ext-wikispeech-loader' ).css(
'visibility', 'hidden' );
} else {
self.addCanPlayListener( $audio );
@@ -786,11 +786,10 @@
url: serverUrl,
method: 'POST',
data: {
- // jscs:disable
[MediaWiki-commits] [Gerrit] mediawiki...Wikispeech[master]: build: Replace jshint and jscs with eslint; bump everything ...
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/374401 )
Change subject: build: Replace jshint and jscs with eslint; bump everything else
..
build: Replace jshint and jscs with eslint; bump everything else
grunt-banana-checker 0.4.0 → 0.6.0
grunt-jsonlint 1.0.4 → 1.1.0
grunt-stylelint ^0.7.0 → 0.8.0
Change-Id: I331b05e963d8b61296f3633b409b914ee2399d38
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M modules/ext.wikispeech.js
M package.json
A tests/qunit/.eslintrc.json
M tests/qunit/ext.wikispeech.highlighter.test.js
M tests/qunit/ext.wikispeech.test.js
10 files changed, 83 insertions(+), 112 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikispeech
refs/changes/01/374401/1
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..3931182
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,11 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "browser": true,
+ "jquery": true
+ },
+ "globals": {
+ "mediaWiki": false
+ },
+ "rules": {}
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index a031ea4..000
--- a/.jscsrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "preset": "wikimedia"
-}
\ No newline at end of file
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index b512c09..000
--- a/.jshintignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
\ No newline at end of file
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 95facb2..000
--- a/.jshintrc
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "predef": [
- "mediaWiki",
- "jQuery",
- "QUnit",
- "sinon",
- "JSON"
- ],
-
- // 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 f2d6f3b..1ded3a3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,27 +1,19 @@
-/*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-stylelint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-jscs' );
- grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
- jshint: {
- options: {
- jshintrc: true
- },
+ eslint: {
all: [
'*.js',
'modules/**/*.js',
'tests/**/*.js'
]
},
- jscs: {
- src: '<%= jshint.all %>'
- },
- banana: conf.MessagesDirs,
jsonlint: {
all: [
'*.json',
@@ -30,6 +22,7 @@
'!vendor/**'
]
},
+ banana: conf.MessagesDirs,
stylelint: {
options: {
formatter: 'string',
@@ -46,8 +39,7 @@
grunt.registerTask(
'test',
[
- 'jshint',
- 'jscs',
+ 'eslint',
'jsonlint',
'banana',
'stylelint'
diff --git a/modules/ext.wikispeech.js b/modules/ext.wikispeech.js
index 065399d..5380360 100644
--- a/modules/ext.wikispeech.js
+++ b/modules/ext.wikispeech.js
@@ -697,11 +697,10 @@
url: serverUrl,
method: 'POST',
data: {
- // jscs:disable
requireCamelCaseOrUpperCaseIdentifiers
lang: mw.config.get(
'wgPageContentLanguage' ),
+ // eslint-disable-next-line camelcase
input_type: 'text',
input: text
- // jscs:enable
requireCamelCaseOrUpperCaseIdentifiers
},
dataType: 'json',
