Merge "build: Update devDependencies"

.eslintrc.json

@@ -6,7 +6,6 @@
 		"wikimedia/mediawiki"
 	],
 	"rules": {
-		"max-len": "off",
-		"mediawiki/class-doc": "warn"
+		"max-len": "off"
 	}
 }

Gruntfile.js

@@ -17,8 +17,8 @@ module.exports = function ( grunt ) {
 	grunt.initConfig( {
 		eslint: {
 			options: {
-				extensions: [ '.js', '.json' ],
-				cache: true
+				cache: true,
+				fix: grunt.option( 'fix' )
 			},
 			all: [
 				'**/*.{js,json}',

modules/ext.cite.highlighting.js

@@ -95,10 +95,9 @@
 		// We are going to use the ID in the code below, so better be sure one is there.
 		$content.find( '.reference[id] > a' ).on( 'click', function () {
 			var $backlink,
-				id = $( this ).parent().attr( 'id' ),
-				className = 'mw-cite-targeted-backlink';
+				id = $( this ).parent().attr( 'id' );
 
-			$content.find( '.' + className ).removeClass( className );
+			$content.find( '.mw-cite-targeted-backlink' ).removeClass( 'mw-cite-targeted-backlink' );
 
 			// Bail out if there is not at least a second backlink ("cite_references_link_many").
 			if ( !isReusedNamedReference( id, $content ) ) {
@@ -108,7 +107,7 @@
 			// The :not() skips the duplicate link created below. Relevant when double clicking.
 			$backlink = $content.find( '.references a[href="#' + $.escapeSelector( id ) + '"]:not(.mw-cite-up-arrow-backlink)' )
 				.first()
-				.addClass( className );
+				.addClass( 'mw-cite-targeted-backlink' );
 
 			if ( $backlink.length ) {
 				updateUpArrowLink( $backlink );

modules/ve-cite/.eslintrc.json

@@ -1,6 +1,5 @@
 {
 	"globals": {
-		"OO": false,
-		"ve": false
+		"ve": "readonly"
 	}
 }

modules/ve-cite/ve.dm.MWReferenceNode.js

@@ -52,6 +52,7 @@ ve.dm.MWReferenceNode.static.blacklistedAnnotationTypes = [ 'link' ];
 
 /**
  * Regular expression for parsing the listKey attribute
+ *
  * @static
  * @property {RegExp}
  * @inheritable

modules/ve-cite/ve.ui.MWReferenceDialog.js

@@ -235,7 +235,6 @@ ve.ui.MWReferenceDialog.prototype.getBodyHeight = function () {
 	);
 };
 
-// eslint-disable-next-line valid-jsdoc
 /**
  * Work on a specific reference.
  *

modules/ve-cite/ve.ui.MWReferenceGroupInputWidget.js

@@ -54,6 +54,7 @@ ve.ui.MWReferenceGroupInputWidget.prototype.populateMenu = function ( internalLi
 						return new OO.ui.MenuOptionWidget( { data: groupName, label: groupName } );
 					}
 				}
+				return null;
 			}
 		).filter( function ( item ) {
 			return item;

package.json

@@ -9,10 +9,10 @@
 		"test": "grunt test"
 	},
 	"devDependencies": {
-		"eslint-config-wikimedia": "0.15.3",
+		"eslint-config-wikimedia": "0.16.1",
 		"grunt": "1.1.0",
 		"grunt-banana-checker": "0.9.0",
-		"grunt-eslint": "22.0.0",
+		"grunt-eslint": "23.0.0",
 		"grunt-stylelint": "0.15.0",
 		"grunt-svgmin": "5.0.0",
 		"stylelint-config-wikimedia": "0.10.1",

tests/selenium/.eslintrc.json

@@ -1,13 +1,9 @@
 {
 	"root": true,
 	"extends": [
-		"wikimedia/server"
+		"wikimedia/selenium"
 	],
-	"env": {
-		"mocha": true
-	},
 	"globals": {
-		"browser": "readonly",
 		"mw": "readonly"
 	}
 }

tests/selenium/pageobjects/cite.page.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const Page = require( 'wdio-mediawiki/Page' ),
 	Util = require( 'wdio-mediawiki/Util' );
 

tests/selenium/specs/backlinks.js

@@ -1,10 +1,12 @@
-var assert = require( 'assert' ),
+'use strict';
+
+const assert = require( 'assert' ),
 	Api = require( 'wdio-mediawiki/Api' ),
 	CitePage = require( '../pageobjects/cite.page' ),
 	Util = require( 'wdio-mediawiki/Util' );
 
 describe( 'Cite backlinks', function () {
-	var title;
+	let title;
 
 	before( function () {
 		title = Util.getTestString( 'CiteTest-title-' );

tests/selenium/wdio.conf.js

@@ -1,6 +1,9 @@
 /**
  * See also: http://webdriver.io/guide/testrunner/configurationfile.html
  */
+
+'use strict';
+
 const fs = require( 'fs' ),
 	saveScreenshot = require( 'wdio-mediawiki' ).saveScreenshot;
 
@@ -79,9 +82,8 @@ exports.config = {
 	 * @param {Object} test Mocha Test object
 	 */
 	afterTest: function ( test ) {
-		var filePath;
 		if ( !test.passed ) {
-			filePath = saveScreenshot( test.title );
+			const filePath = saveScreenshot( test.title );
 			console.log( '\n\tScreenshot: ' + filePath + '\n' );
 		}
 	}