Merge "build: Updating npm dependencies"

.svgo.config.js

@@ -4,6 +4,8 @@
  * Recommended options from:
  * https://www.mediawiki.org/wiki/Manual:Coding_conventions/SVG#Exemplified_safe_configuration
  */
+
+// eslint-disable-next-line strict
 module.exports = {
 	plugins: [
 		{

package.json

@@ -23,7 +23,7 @@
 		"@wdio/local-runner": "7.19.5",
 		"@wdio/mocha-framework": "7.16.4",
 		"@wdio/sync": "7.19.5",
-		"eslint-config-wikimedia": "0.22.1",
+		"eslint-config-wikimedia": "0.24.0",
 		"grunt-banana-checker": "0.10.0",
 		"jsdoc": "3.6.10",
 		"mwbot": "2.0.0",

resources/.eslintrc.js

@@ -1,66 +1,53 @@
-// "no-restricted-properties" rules are not properly merged when just using "extends".
-// Therefore we have to have this file which calls a custom merge function.
-// The merge function calls Object.assign with special handling for configuration such as
-// `no-restricted-properties` and `no-restricted-syntax` which are array based - ensuring the two
-// values being merged are concatenated.
-
 'use strict';
 
-const merge = require( 'eslint-config-wikimedia/language/merge.js' ),
-	config = {
-		root: true,
-		extends: [
-			'wikimedia/client',
-			'wikimedia/jquery',
-			'wikimedia/mediawiki'
-		],
-		env: {
-			commonjs: true
-		},
-		globals: {
-			require: 'readonly'
-		},
-		rules: {
-			'no-restricted-properties': [
-				'error',
-				{
-					property: 'mobileFrontend',
-					message: 'Minerva should only make use of core code. Any code using mobileFrontend should be placed inside the MobileFrontend extension'
-				},
-				{
-					property: 'define',
-					message: 'The method `define` if used with mw.mobileFrontend is deprecated. Please use `module.exports`.'
-				},
-				{
-					property: 'done',
-					message: 'The method `done` if used with Deferred objects is incompatible with ES6 Promises. Please use `then`.'
-				},
-				{
-					property: 'fail',
-					message: 'The method `fail` if used with Deferred objects is incompatible with ES6 Promises. Please use `then`.'
-				},
-				{
-					property: 'always',
-					message: 'The method `always` if used with Deferred objects is incompatible with ES6 Promises. Please use `then`.'
-				}
-			],
-			'object-property-newline': 'error',
-			'mediawiki/class-doc': 'off',
-			'no-use-before-define': 'off',
-			'no-underscore-dangle': 'off',
-			'jsdoc/no-undefined-types': 'off'
-		},
-		overrides: [ {
-			files: [ '.eslintrc.js' ],
-			extends: 'wikimedia/server',
-			rules: {
-				'compat/compat': 'off'
+module.exports = {
+	root: true,
+	extends: [
+		'wikimedia/client',
+		'wikimedia/jquery',
+		'wikimedia/mediawiki'
+	],
+	env: {
+		commonjs: true
+	},
+	globals: {
+		require: 'readonly'
+	},
+	rules: {
+		'no-restricted-properties': [
+			'error',
+			{
+				property: 'mobileFrontend',
+				message: 'Minerva should only make use of core code. Any code using mobileFrontend should be placed inside the MobileFrontend extension'
+			},
+			{
+				property: 'define',
+				message: 'The method `define` if used with mw.mobileFrontend is deprecated. Please use `module.exports`.'
+			},
+			{
+				property: 'done',
+				message: 'The method `done` if used with Deferred objects is incompatible with ES6 Promises. Please use `then`.'
+			},
+			{
+				property: 'fail',
+				message: 'The method `fail` if used with Deferred objects is incompatible with ES6 Promises. Please use `then`.'
+			},
+			{
+				property: 'always',
+				message: 'The method `always` if used with Deferred objects is incompatible with ES6 Promises. Please use `then`.'
 			}
-		} ]
-	};
-
-// eslint-disable-next-line es/no-object-assign
-module.exports = Object.assign(
-	config,
-	merge( config, require( 'eslint-config-wikimedia/language/not-es5.js' ) )
-);
+		],
+		'object-property-newline': 'error',
+		'mediawiki/class-doc': 'off',
+		'no-use-before-define': 'off',
+		'no-underscore-dangle': 'off',
+		'jsdoc/no-undefined-types': 'off'
+	},
+	overrides: [ {
+		files: [ '.eslintrc.js' ],
+		extends: 'wikimedia/server',
+		rules: {
+			'compat/compat': 'off'
+		}
+	} ]
+};