mirror of
https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue
synced 2024-11-15 18:29:50 +00:00
Merge "build: Updating npm dependencies"
This commit is contained in:
commit
a97b722bd7
|
@ -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: [
|
||||
{
|
||||
|
|
1003
package-lock.json
generated
1003
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -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",
|
||||
|
|
|
@ -1,13 +1,6 @@
|
|||
// "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 = {
|
||||
module.exports = {
|
||||
root: true,
|
||||
extends: [
|
||||
'wikimedia/client',
|
||||
|
@ -58,9 +51,3 @@ const merge = require( 'eslint-config-wikimedia/language/merge.js' ),
|
|||
}
|
||||
} ]
|
||||
};
|
||||
|
||||
// eslint-disable-next-line es/no-object-assign
|
||||
module.exports = Object.assign(
|
||||
config,
|
||||
merge( config, require( 'eslint-config-wikimedia/language/not-es5.js' ) )
|
||||
);
|
||||
|
|
Loading…
Reference in a new issue