Merge "build: Updating npm dependencies"

modules/.eslintrc.json

@@ -10,6 +10,7 @@
 	},
 	"rules": {
 		"max-len": "off",
-		"no-jquery/no-global-selector": "off"
+		"no-jquery/no-global-selector": "off",
+		"es-x/no-object-assign": "warn"
 	}
 }

modules/ext.wikiEditor.js

@@ -18,7 +18,7 @@ function logEditEvent( data ) {
 		// these cases, don't log anything.
 		return;
 	}
-	mw.track( 'editAttemptStep', $.extend( {
+	mw.track( 'editAttemptStep', Object.assign( {
 		// eslint-disable-next-line camelcase
 		editor_interface: 'wikitext',
 		platform: 'desktop', // FIXME T249944

modules/jquery.wikiEditor.dialogs.config.js

@@ -257,10 +257,10 @@ module.exports = {
 					},
 					open: function () {
 						// Obtain the server name without the protocol. wgServer may be protocol-relative
-						// eslint-disable-next-line security/detect-unsafe-regex
+
 						var serverName = mw.config.get( 'wgServer' ).replace( /^(https?:)?\/\//, '' );
 						// Cache the articlepath regex
-						// eslint-disable-next-line security/detect-non-literal-regexp
+
 						$( this ).data( 'articlePathRegex', new RegExp(
 							'^https?://' + mw.util.escapeRegExp( serverName + mw.config.get( 'wgArticlePath' ) )
 								.replace( /\\\$1/g, '(.*)' ) + '$'
@@ -555,7 +555,7 @@ module.exports = {
 
 						// Pre-fill the text fields based on the current selection
 						if ( selection !== '' ) {
-							fileData = $.extend( fileData, parseFileSyntax( selection ) );
+							fileData = Object.assign( fileData, parseFileSyntax( selection ) );
 						}
 
 						// Initialize the form fields

modules/jquery.wikiEditor.dialogs.js

@@ -137,7 +137,7 @@ var dialogsModule = {
 		$( '<div>' )
 			.text( body )
 			.appendTo( document.body )
-			.dialog( $.extend( {
+			.dialog( Object.assign( {
 				bgiframe: true,
 				modal: true
 			}, settings ) )

modules/jquery.wikiEditor.toolbar.js

@@ -230,7 +230,7 @@ var toolbarModule = {
 					}
 					context.$textarea.textSelection(
 						'encapsulateSelection',
-						$.extend( {}, action.options, parts, { replace: replace } )
+						Object.assign( {}, action.options, parts, { replace: replace } )
 					);
 					break;
 				case 'callback':

modules/realtimepreview/ManualWidget.js

@@ -14,7 +14,7 @@ function ManualWidget( realtimePreview, reloadHoverButton ) {
 
 	// Mixins.
 	OO.ui.mixin.AccessKeyedElement.call( this, {} );
-	OO.ui.mixin.ButtonElement.call( this, $.extend( {
+	OO.ui.mixin.ButtonElement.call( this, Object.assign( {
 		$button: this.$element
 	}, config ) );
 	OO.ui.mixin.IconElement.call( this, { icon: 'reload' } );

modules/realtimepreview/ResizingDragBar.js

@@ -6,7 +6,7 @@
  * @param {boolean} [config.isEW] Orientation of the drag bar, East-West (true) or North-South (false).
  */
 function ResizingDragBar( config ) {
-	config = $.extend( {}, {
+	config = Object.assign( {}, {
 		isEW: true,
 		classes: [ 'ext-WikiEditor-ResizingDragBar' ]
 	}, config );

package.json

@@ -6,13 +6,13 @@
 		"doc": "jsdoc -c jsdoc.json"
 	},
 	"devDependencies": {
-		"eslint-config-wikimedia": "0.27.0",
+		"eslint-config-wikimedia": "0.28.2",
 		"grunt": "1.6.1",
 		"grunt-banana-checker": "0.13.0",
 		"grunt-eslint": "24.3.0",
-		"grunt-stylelint": "0.19.0",
+		"grunt-stylelint": "0.20.1",
 		"jsdoc": "^4.0.3",
 		"jsdoc-wmf-theme": "1.0.1",
-		"stylelint-config-wikimedia": "0.16.1"
+		"stylelint-config-wikimedia": "0.17.2"
 	}
 }