From 0af93ac601a23c531e42f2c97d244573042221a0 Mon Sep 17 00:00:00 2001
From: Christian Aistleitner <christian@quelltextlich.at>
Date: Mon, 3 Aug 2020 21:17:40 +0200
Subject: [PATCH 001/117] Add .gitreview

---
 .gitreview | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .gitreview

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..c12d3ee
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/extensions/DrawioEditor.git
+track=1
+defaultrebase=0

From d0afd64c08fd8f49856f354d168ee01efb1245aa Mon Sep 17 00:00:00 2001
From: Umherirrender <umherirrender_de.wp@web.de>
Date: Wed, 12 Aug 2020 18:47:20 +0200
Subject: [PATCH 002/117] Move description from extension.json to i18n file

Change-Id: I4104dcec6a2e8429799219e2593bc5955ae7d5b5
---
 extension.json | 7 ++++++-
 i18n/en.json   | 4 ++++
 i18n/qqq.json  | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 i18n/en.json
 create mode 100644 i18n/qqq.json

diff --git a/extension.json b/extension.json
index 84cc19a..0d99d0a 100644
--- a/extension.json
+++ b/extension.json
@@ -5,11 +5,16 @@
 	"author": [
 		"Markus Gebert"
 	],
-	"description": "draw.io flow chart creation and inline editing",
+	"descriptionmsg": "drawioeditor-desc",
 	"type": "parserhook",
 	"ExtensionMessagesFiles": {
 		"DrawioEditorMagic": "DrawioEditor.magic.php"
 	},
+	"MessagesDirs": {
+		"DrawioEditor": [
+			"i18n"
+		]
+	},
 	"AutoloadNamespaces": {
 		"MediaWiki\\Extension\\DrawioEditor\\": "src/"
 	},
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 0000000..c82e90c
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,4 @@
+{
+	"@metadata": {},
+	"drawioeditor-desc": "draw.io flow chart creation and inline editing"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 0000000..36351e6
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,4 @@
+{
+	"@metadata": {},
+	"drawioeditor-desc": "{{desc|name=DrawioEditor|url=https://www.mediawiki.org/wiki/Extension:DrawioEditor}}"
+}

From 2016b76c7511752dbc15c1590a8e6b1b61c7b950 Mon Sep 17 00:00:00 2001
From: Umherirrender <umherirrender_de.wp@web.de>
Date: Wed, 12 Aug 2020 22:22:58 +0200
Subject: [PATCH 003/117] build: Add php-parallel-lint, MinusX and
 banana-checker

banana-checker will test for valid i18n files
php-lint will test for valid php files
MinusX will test for executable bits

Change-Id: I1d24a9c50beb9cd5ff5fa2addc14562b7010a0e2
---
 .gitignore        |    3 +
 Gruntfile.js      |   11 +
 composer.json     |   26 +-
 package-lock.json | 1785 +++++++++++++++++++++++++++++++++++++++++++++
 package.json      |   10 +
 5 files changed, 1829 insertions(+), 6 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 Gruntfile.js
 create mode 100644 package-lock.json
 create mode 100644 package.json

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..db8a779
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/node_modules
+/vendor
+/composer.lock
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 0000000..a3aeb77
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,11 @@
+module.exports = function ( grunt ) {
+	grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+	var conf = grunt.file.readJSON( 'extension.json' );
+	grunt.initConfig( {
+		banana: conf.MessagesDirs
+	} );
+
+	grunt.registerTask( 'test', [ 'banana' ] );
+	grunt.registerTask( 'default', 'test' );
+};
diff --git a/composer.json b/composer.json
index 5395b89..da067e6 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,22 @@
 {
-  "name": "mediawiki/drawio-editor",
-  "type": "mediawiki-extension",
-  "description": "This is a MediaWiki extension that integrates the draw.io flow chart editor and allows inline editing of charts.",
-  "require": {
-    "composer/installers": "~1.0"
-  }
+	"name": "mediawiki/drawio-editor",
+	"type": "mediawiki-extension",
+	"description": "This is a MediaWiki extension that integrates the draw.io flow chart editor and allows inline editing of charts.",
+	"require": {
+		"composer/installers": "~1.0"
+	},
+	"require-dev": {
+		"mediawiki/minus-x": "1.1.0",
+		"php-parallel-lint/php-parallel-lint": "1.2.0",
+		"php-parallel-lint/php-console-highlighter": "0.5.0"
+	},
+	"scripts": {
+		"test": [
+			"parallel-lint . --exclude vendor --exclude node_modules",
+			"minus-x check ."
+		],
+		"fix": [
+			"minus-x fix ."
+		]
+	}
 }
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..0946241
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,1785 @@
+{
+	"requires": true,
+	"lockfileVersion": 1,
+	"dependencies": {
+		"abbrev": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+			"dev": true
+		},
+		"ansi-styles": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"dev": true,
+			"requires": {
+				"color-convert": "^1.9.0"
+			}
+		},
+		"argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"dev": true,
+			"requires": {
+				"sprintf-js": "~1.0.2"
+			},
+			"dependencies": {
+				"sprintf-js": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+					"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+					"dev": true
+				}
+			}
+		},
+		"arr-diff": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+			"integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+			"dev": true
+		},
+		"arr-flatten": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+			"integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+			"dev": true
+		},
+		"arr-union": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+			"integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+			"dev": true
+		},
+		"array-each": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+			"integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
+			"dev": true
+		},
+		"array-slice": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
+			"integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+			"dev": true
+		},
+		"array-unique": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+			"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+			"dev": true
+		},
+		"assign-symbols": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+			"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+			"dev": true
+		},
+		"async": {
+			"version": "1.5.2",
+			"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+			"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+			"dev": true
+		},
+		"atob": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+			"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+			"dev": true
+		},
+		"balanced-match": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+			"dev": true
+		},
+		"base": {
+			"version": "0.11.2",
+			"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+			"dev": true,
+			"requires": {
+				"cache-base": "^1.0.1",
+				"class-utils": "^0.3.5",
+				"component-emitter": "^1.2.1",
+				"define-property": "^1.0.0",
+				"isobject": "^3.0.1",
+				"mixin-deep": "^1.2.0",
+				"pascalcase": "^0.1.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+					"dev": true,
+					"requires": {
+						"is-descriptor": "^1.0.0"
+					}
+				},
+				"is-accessor-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-data-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-descriptor": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+					"dev": true,
+					"requires": {
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
+					}
+				}
+			}
+		},
+		"brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"requires": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"braces": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+			"dev": true,
+			"requires": {
+				"arr-flatten": "^1.1.0",
+				"array-unique": "^0.3.2",
+				"extend-shallow": "^2.0.1",
+				"fill-range": "^4.0.0",
+				"isobject": "^3.0.1",
+				"repeat-element": "^1.1.2",
+				"snapdragon": "^0.8.1",
+				"snapdragon-node": "^2.0.1",
+				"split-string": "^3.0.2",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"dev": true,
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
+				}
+			}
+		},
+		"cache-base": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+			"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+			"dev": true,
+			"requires": {
+				"collection-visit": "^1.0.0",
+				"component-emitter": "^1.2.1",
+				"get-value": "^2.0.6",
+				"has-value": "^1.0.0",
+				"isobject": "^3.0.1",
+				"set-value": "^2.0.0",
+				"to-object-path": "^0.3.0",
+				"union-value": "^1.0.0",
+				"unset-value": "^1.0.0"
+			}
+		},
+		"chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			}
+		},
+		"class-utils": {
+			"version": "0.3.6",
+			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+			"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+			"dev": true,
+			"requires": {
+				"arr-union": "^3.1.0",
+				"define-property": "^0.2.5",
+				"isobject": "^3.0.0",
+				"static-extend": "^0.1.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "0.2.5",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+					"dev": true,
+					"requires": {
+						"is-descriptor": "^0.1.0"
+					}
+				}
+			}
+		},
+		"collection-visit": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+			"integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+			"dev": true,
+			"requires": {
+				"map-visit": "^1.0.0",
+				"object-visit": "^1.0.0"
+			}
+		},
+		"color-convert": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"dev": true,
+			"requires": {
+				"color-name": "1.1.3"
+			}
+		},
+		"color-name": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+			"dev": true
+		},
+		"colors": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+			"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+			"dev": true
+		},
+		"component-emitter": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+			"integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+			"dev": true
+		},
+		"concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+			"dev": true
+		},
+		"copy-descriptor": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+			"dev": true
+		},
+		"dateformat": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
+			"integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
+			"dev": true
+		},
+		"debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"requires": {
+				"ms": "2.0.0"
+			}
+		},
+		"decode-uri-component": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+			"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+			"dev": true
+		},
+		"define-property": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+			"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+			"dev": true,
+			"requires": {
+				"is-descriptor": "^1.0.2",
+				"isobject": "^3.0.1"
+			},
+			"dependencies": {
+				"is-accessor-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-data-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-descriptor": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+					"dev": true,
+					"requires": {
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
+					}
+				}
+			}
+		},
+		"detect-file": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+			"integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+			"dev": true
+		},
+		"escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+			"dev": true
+		},
+		"esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true
+		},
+		"eventemitter2": {
+			"version": "0.4.14",
+			"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
+			"integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=",
+			"dev": true
+		},
+		"exit": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+			"dev": true
+		},
+		"expand-brackets": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+			"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+			"dev": true,
+			"requires": {
+				"debug": "^2.3.3",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"posix-character-classes": "^0.1.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "0.2.5",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+					"dev": true,
+					"requires": {
+						"is-descriptor": "^0.1.0"
+					}
+				},
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"dev": true,
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
+				}
+			}
+		},
+		"expand-tilde": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+			"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+			"dev": true,
+			"requires": {
+				"homedir-polyfill": "^1.0.1"
+			}
+		},
+		"extend": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+			"dev": true
+		},
+		"extend-shallow": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+			"dev": true,
+			"requires": {
+				"assign-symbols": "^1.0.0",
+				"is-extendable": "^1.0.1"
+			},
+			"dependencies": {
+				"is-extendable": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+					"dev": true,
+					"requires": {
+						"is-plain-object": "^2.0.4"
+					}
+				}
+			}
+		},
+		"extglob": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+			"dev": true,
+			"requires": {
+				"array-unique": "^0.3.2",
+				"define-property": "^1.0.0",
+				"expand-brackets": "^2.1.4",
+				"extend-shallow": "^2.0.1",
+				"fragment-cache": "^0.2.1",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+					"dev": true,
+					"requires": {
+						"is-descriptor": "^1.0.0"
+					}
+				},
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"dev": true,
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
+				},
+				"is-accessor-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-data-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-descriptor": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+					"dev": true,
+					"requires": {
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
+					}
+				}
+			}
+		},
+		"fill-range": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+			"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+			"dev": true,
+			"requires": {
+				"extend-shallow": "^2.0.1",
+				"is-number": "^3.0.0",
+				"repeat-string": "^1.6.1",
+				"to-regex-range": "^2.1.0"
+			},
+			"dependencies": {
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"dev": true,
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
+				}
+			}
+		},
+		"findup-sync": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
+			"integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
+			"dev": true,
+			"requires": {
+				"glob": "~5.0.0"
+			},
+			"dependencies": {
+				"glob": {
+					"version": "5.0.15",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+					"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+					"dev": true,
+					"requires": {
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "2 || 3",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
+					}
+				}
+			}
+		},
+		"fined": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
+			"integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+			"dev": true,
+			"requires": {
+				"expand-tilde": "^2.0.2",
+				"is-plain-object": "^2.0.3",
+				"object.defaults": "^1.1.0",
+				"object.pick": "^1.2.0",
+				"parse-filepath": "^1.0.1"
+			}
+		},
+		"flagged-respawn": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
+			"integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+			"dev": true
+		},
+		"for-in": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+			"dev": true
+		},
+		"for-own": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+			"integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+			"dev": true,
+			"requires": {
+				"for-in": "^1.0.1"
+			}
+		},
+		"fragment-cache": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+			"integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+			"dev": true,
+			"requires": {
+				"map-cache": "^0.2.2"
+			}
+		},
+		"fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+			"dev": true
+		},
+		"get-value": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+			"dev": true
+		},
+		"getobject": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz",
+			"integrity": "sha1-BHpEl4n6Fg0Bj1SG7ZEyC27HiFw=",
+			"dev": true
+		},
+		"glob": {
+			"version": "7.1.6",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+			"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+			"dev": true,
+			"requires": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			}
+		},
+		"global-modules": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+			"integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+			"dev": true,
+			"requires": {
+				"global-prefix": "^1.0.1",
+				"is-windows": "^1.0.1",
+				"resolve-dir": "^1.0.0"
+			}
+		},
+		"global-prefix": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+			"integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+			"dev": true,
+			"requires": {
+				"expand-tilde": "^2.0.2",
+				"homedir-polyfill": "^1.0.1",
+				"ini": "^1.3.4",
+				"is-windows": "^1.0.1",
+				"which": "^1.2.14"
+			}
+		},
+		"grunt": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.2.1.tgz",
+			"integrity": "sha512-zgJjn9N56tScvRt/y0+1QA+zDBnKTrkpyeSBqQPLcZvbqTD/oyGMrdZQXmm6I3828s+FmPvxc3Xv+lgKFtudOw==",
+			"dev": true,
+			"requires": {
+				"dateformat": "~3.0.3",
+				"eventemitter2": "~0.4.13",
+				"exit": "~0.1.2",
+				"findup-sync": "~0.3.0",
+				"glob": "~7.1.6",
+				"grunt-cli": "~1.3.2",
+				"grunt-known-options": "~1.1.0",
+				"grunt-legacy-log": "~2.0.0",
+				"grunt-legacy-util": "~1.1.1",
+				"iconv-lite": "~0.4.13",
+				"js-yaml": "~3.14.0",
+				"minimatch": "~3.0.4",
+				"mkdirp": "~1.0.4",
+				"nopt": "~3.0.6",
+				"rimraf": "~3.0.2"
+			},
+			"dependencies": {
+				"grunt-cli": {
+					"version": "1.3.2",
+					"resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.3.2.tgz",
+					"integrity": "sha512-8OHDiZZkcptxVXtMfDxJvmN7MVJNE8L/yIcPb4HB7TlyFD1kDvjHrb62uhySsU14wJx9ORMnTuhRMQ40lH/orQ==",
+					"dev": true,
+					"requires": {
+						"grunt-known-options": "~1.1.0",
+						"interpret": "~1.1.0",
+						"liftoff": "~2.5.0",
+						"nopt": "~4.0.1",
+						"v8flags": "~3.1.1"
+					},
+					"dependencies": {
+						"nopt": {
+							"version": "4.0.3",
+							"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+							"integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+							"dev": true,
+							"requires": {
+								"abbrev": "1",
+								"osenv": "^0.1.4"
+							}
+						}
+					}
+				}
+			}
+		},
+		"grunt-banana-checker": {
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/grunt-banana-checker/-/grunt-banana-checker-0.9.0.tgz",
+			"integrity": "sha512-SqPiB6OazWqR8USL0NymtuT5Br3mD9WBBsM1rHC/3wIi2SrZNM6/+j9CIeuEM5oCn+AtO2Y0+rzzFyOdC9afAg==",
+			"dev": true
+		},
+		"grunt-known-options": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.1.tgz",
+			"integrity": "sha512-cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ==",
+			"dev": true
+		},
+		"grunt-legacy-log": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-2.0.0.tgz",
+			"integrity": "sha512-1m3+5QvDYfR1ltr8hjiaiNjddxGdQWcH0rw1iKKiQnF0+xtgTazirSTGu68RchPyh1OBng1bBUjLmX8q9NpoCw==",
+			"dev": true,
+			"requires": {
+				"colors": "~1.1.2",
+				"grunt-legacy-log-utils": "~2.0.0",
+				"hooker": "~0.2.3",
+				"lodash": "~4.17.5"
+			}
+		},
+		"grunt-legacy-log-utils": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.0.1.tgz",
+			"integrity": "sha512-o7uHyO/J+i2tXG8r2bZNlVk20vlIFJ9IEYyHMCQGfWYru8Jv3wTqKZzvV30YW9rWEjq0eP3cflQ1qWojIe9VFA==",
+			"dev": true,
+			"requires": {
+				"chalk": "~2.4.1",
+				"lodash": "~4.17.10"
+			}
+		},
+		"grunt-legacy-util": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-1.1.1.tgz",
+			"integrity": "sha512-9zyA29w/fBe6BIfjGENndwoe1Uy31BIXxTH3s8mga0Z5Bz2Sp4UCjkeyv2tI449ymkx3x26B+46FV4fXEddl5A==",
+			"dev": true,
+			"requires": {
+				"async": "~1.5.2",
+				"exit": "~0.1.1",
+				"getobject": "~0.1.0",
+				"hooker": "~0.2.3",
+				"lodash": "~4.17.10",
+				"underscore.string": "~3.3.4",
+				"which": "~1.3.0"
+			}
+		},
+		"has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+			"dev": true
+		},
+		"has-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+			"dev": true,
+			"requires": {
+				"get-value": "^2.0.6",
+				"has-values": "^1.0.0",
+				"isobject": "^3.0.0"
+			}
+		},
+		"has-values": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+			"dev": true,
+			"requires": {
+				"is-number": "^3.0.0",
+				"kind-of": "^4.0.0"
+			},
+			"dependencies": {
+				"kind-of": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+					"dev": true,
+					"requires": {
+						"is-buffer": "^1.1.5"
+					}
+				}
+			}
+		},
+		"homedir-polyfill": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+			"integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+			"dev": true,
+			"requires": {
+				"parse-passwd": "^1.0.0"
+			}
+		},
+		"hooker": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
+			"integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=",
+			"dev": true
+		},
+		"iconv-lite": {
+			"version": "0.4.24",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+			"dev": true,
+			"requires": {
+				"safer-buffer": ">= 2.1.2 < 3"
+			}
+		},
+		"inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+			"dev": true,
+			"requires": {
+				"once": "^1.3.0",
+				"wrappy": "1"
+			}
+		},
+		"inherits": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+			"dev": true
+		},
+		"ini": {
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+			"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+			"dev": true
+		},
+		"interpret": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
+			"integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
+			"dev": true
+		},
+		"is-absolute": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+			"integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+			"dev": true,
+			"requires": {
+				"is-relative": "^1.0.0",
+				"is-windows": "^1.0.1"
+			}
+		},
+		"is-accessor-descriptor": {
+			"version": "0.1.6",
+			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+			"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+			"dev": true,
+			"requires": {
+				"kind-of": "^3.0.2"
+			},
+			"dependencies": {
+				"kind-of": {
+					"version": "3.2.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+					"dev": true,
+					"requires": {
+						"is-buffer": "^1.1.5"
+					}
+				}
+			}
+		},
+		"is-buffer": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+			"dev": true
+		},
+		"is-data-descriptor": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+			"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+			"dev": true,
+			"requires": {
+				"kind-of": "^3.0.2"
+			},
+			"dependencies": {
+				"kind-of": {
+					"version": "3.2.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+					"dev": true,
+					"requires": {
+						"is-buffer": "^1.1.5"
+					}
+				}
+			}
+		},
+		"is-descriptor": {
+			"version": "0.1.6",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+			"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+			"dev": true,
+			"requires": {
+				"is-accessor-descriptor": "^0.1.6",
+				"is-data-descriptor": "^0.1.4",
+				"kind-of": "^5.0.0"
+			},
+			"dependencies": {
+				"kind-of": {
+					"version": "5.1.0",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+					"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+					"dev": true
+				}
+			}
+		},
+		"is-extendable": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+			"dev": true
+		},
+		"is-extglob": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+			"dev": true
+		},
+		"is-glob": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+			"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+			"dev": true,
+			"requires": {
+				"is-extglob": "^2.1.0"
+			}
+		},
+		"is-number": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+			"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+			"dev": true,
+			"requires": {
+				"kind-of": "^3.0.2"
+			},
+			"dependencies": {
+				"kind-of": {
+					"version": "3.2.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+					"dev": true,
+					"requires": {
+						"is-buffer": "^1.1.5"
+					}
+				}
+			}
+		},
+		"is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+			"dev": true,
+			"requires": {
+				"isobject": "^3.0.1"
+			}
+		},
+		"is-relative": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+			"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+			"dev": true,
+			"requires": {
+				"is-unc-path": "^1.0.0"
+			}
+		},
+		"is-unc-path": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+			"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+			"dev": true,
+			"requires": {
+				"unc-path-regex": "^0.1.2"
+			}
+		},
+		"is-windows": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+			"dev": true
+		},
+		"isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+			"dev": true
+		},
+		"isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+			"dev": true
+		},
+		"isobject": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+			"dev": true
+		},
+		"js-yaml": {
+			"version": "3.14.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+			"integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+			"dev": true,
+			"requires": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			}
+		},
+		"kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"dev": true
+		},
+		"liftoff": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz",
+			"integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=",
+			"dev": true,
+			"requires": {
+				"extend": "^3.0.0",
+				"findup-sync": "^2.0.0",
+				"fined": "^1.0.1",
+				"flagged-respawn": "^1.0.0",
+				"is-plain-object": "^2.0.4",
+				"object.map": "^1.0.0",
+				"rechoir": "^0.6.2",
+				"resolve": "^1.1.7"
+			},
+			"dependencies": {
+				"findup-sync": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
+					"integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+					"dev": true,
+					"requires": {
+						"detect-file": "^1.0.0",
+						"is-glob": "^3.1.0",
+						"micromatch": "^3.0.4",
+						"resolve-dir": "^1.0.1"
+					}
+				}
+			}
+		},
+		"lodash": {
+			"version": "4.17.19",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+			"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+			"dev": true
+		},
+		"make-iterator": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+			"integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+			"dev": true,
+			"requires": {
+				"kind-of": "^6.0.2"
+			}
+		},
+		"map-cache": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+			"integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+			"dev": true
+		},
+		"map-visit": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+			"integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+			"dev": true,
+			"requires": {
+				"object-visit": "^1.0.0"
+			}
+		},
+		"micromatch": {
+			"version": "3.1.10",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+			"dev": true,
+			"requires": {
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"braces": "^2.3.1",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"extglob": "^2.0.4",
+				"fragment-cache": "^0.2.1",
+				"kind-of": "^6.0.2",
+				"nanomatch": "^1.2.9",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.2"
+			}
+		},
+		"minimatch": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"dev": true,
+			"requires": {
+				"brace-expansion": "^1.1.7"
+			}
+		},
+		"mixin-deep": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+			"integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+			"dev": true,
+			"requires": {
+				"for-in": "^1.0.2",
+				"is-extendable": "^1.0.1"
+			},
+			"dependencies": {
+				"is-extendable": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+					"dev": true,
+					"requires": {
+						"is-plain-object": "^2.0.4"
+					}
+				}
+			}
+		},
+		"mkdirp": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+			"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+			"dev": true
+		},
+		"ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+			"dev": true
+		},
+		"nanomatch": {
+			"version": "1.2.13",
+			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+			"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+			"dev": true,
+			"requires": {
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"fragment-cache": "^0.2.1",
+				"is-windows": "^1.0.2",
+				"kind-of": "^6.0.2",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			}
+		},
+		"nopt": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+			"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+			"dev": true,
+			"requires": {
+				"abbrev": "1"
+			}
+		},
+		"object-copy": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+			"integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+			"dev": true,
+			"requires": {
+				"copy-descriptor": "^0.1.0",
+				"define-property": "^0.2.5",
+				"kind-of": "^3.0.3"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "0.2.5",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+					"dev": true,
+					"requires": {
+						"is-descriptor": "^0.1.0"
+					}
+				},
+				"kind-of": {
+					"version": "3.2.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+					"dev": true,
+					"requires": {
+						"is-buffer": "^1.1.5"
+					}
+				}
+			}
+		},
+		"object-visit": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+			"integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+			"dev": true,
+			"requires": {
+				"isobject": "^3.0.0"
+			}
+		},
+		"object.defaults": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+			"integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
+			"dev": true,
+			"requires": {
+				"array-each": "^1.0.1",
+				"array-slice": "^1.0.0",
+				"for-own": "^1.0.0",
+				"isobject": "^3.0.0"
+			}
+		},
+		"object.map": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
+			"integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
+			"dev": true,
+			"requires": {
+				"for-own": "^1.0.0",
+				"make-iterator": "^1.0.0"
+			}
+		},
+		"object.pick": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+			"integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+			"dev": true,
+			"requires": {
+				"isobject": "^3.0.1"
+			}
+		},
+		"once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+			"dev": true,
+			"requires": {
+				"wrappy": "1"
+			}
+		},
+		"os-homedir": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+			"dev": true
+		},
+		"os-tmpdir": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+			"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+			"dev": true
+		},
+		"osenv": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+			"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+			"dev": true,
+			"requires": {
+				"os-homedir": "^1.0.0",
+				"os-tmpdir": "^1.0.0"
+			}
+		},
+		"parse-filepath": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
+			"integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
+			"dev": true,
+			"requires": {
+				"is-absolute": "^1.0.0",
+				"map-cache": "^0.2.0",
+				"path-root": "^0.1.1"
+			}
+		},
+		"parse-passwd": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+			"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+			"dev": true
+		},
+		"pascalcase": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+			"integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+			"dev": true
+		},
+		"path-is-absolute": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+			"dev": true
+		},
+		"path-parse": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+			"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+			"dev": true
+		},
+		"path-root": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
+			"integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
+			"dev": true,
+			"requires": {
+				"path-root-regex": "^0.1.0"
+			}
+		},
+		"path-root-regex": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
+			"integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
+			"dev": true
+		},
+		"posix-character-classes": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+			"integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+			"dev": true
+		},
+		"rechoir": {
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+			"integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+			"dev": true,
+			"requires": {
+				"resolve": "^1.1.6"
+			}
+		},
+		"regex-not": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+			"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+			"dev": true,
+			"requires": {
+				"extend-shallow": "^3.0.2",
+				"safe-regex": "^1.1.0"
+			}
+		},
+		"repeat-element": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+			"integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+			"dev": true
+		},
+		"repeat-string": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+			"integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+			"dev": true
+		},
+		"resolve": {
+			"version": "1.17.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+			"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+			"dev": true,
+			"requires": {
+				"path-parse": "^1.0.6"
+			}
+		},
+		"resolve-dir": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+			"integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+			"dev": true,
+			"requires": {
+				"expand-tilde": "^2.0.0",
+				"global-modules": "^1.0.0"
+			}
+		},
+		"resolve-url": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+			"integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+			"dev": true
+		},
+		"ret": {
+			"version": "0.1.15",
+			"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+			"integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+			"dev": true
+		},
+		"rimraf": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"dev": true,
+			"requires": {
+				"glob": "^7.1.3"
+			}
+		},
+		"safe-regex": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+			"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+			"dev": true,
+			"requires": {
+				"ret": "~0.1.10"
+			}
+		},
+		"safer-buffer": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+			"dev": true
+		},
+		"set-value": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+			"integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+			"dev": true,
+			"requires": {
+				"extend-shallow": "^2.0.1",
+				"is-extendable": "^0.1.1",
+				"is-plain-object": "^2.0.3",
+				"split-string": "^3.0.1"
+			},
+			"dependencies": {
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"dev": true,
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
+				}
+			}
+		},
+		"snapdragon": {
+			"version": "0.8.2",
+			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+			"dev": true,
+			"requires": {
+				"base": "^0.11.1",
+				"debug": "^2.2.0",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"map-cache": "^0.2.2",
+				"source-map": "^0.5.6",
+				"source-map-resolve": "^0.5.0",
+				"use": "^3.1.0"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "0.2.5",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+					"dev": true,
+					"requires": {
+						"is-descriptor": "^0.1.0"
+					}
+				},
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"dev": true,
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
+				}
+			}
+		},
+		"snapdragon-node": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+			"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+			"dev": true,
+			"requires": {
+				"define-property": "^1.0.0",
+				"isobject": "^3.0.0",
+				"snapdragon-util": "^3.0.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+					"dev": true,
+					"requires": {
+						"is-descriptor": "^1.0.0"
+					}
+				},
+				"is-accessor-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-data-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-descriptor": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+					"dev": true,
+					"requires": {
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
+					}
+				}
+			}
+		},
+		"snapdragon-util": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+			"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+			"dev": true,
+			"requires": {
+				"kind-of": "^3.2.0"
+			},
+			"dependencies": {
+				"kind-of": {
+					"version": "3.2.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+					"dev": true,
+					"requires": {
+						"is-buffer": "^1.1.5"
+					}
+				}
+			}
+		},
+		"source-map": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+			"dev": true
+		},
+		"source-map-resolve": {
+			"version": "0.5.3",
+			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+			"integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+			"dev": true,
+			"requires": {
+				"atob": "^2.1.2",
+				"decode-uri-component": "^0.2.0",
+				"resolve-url": "^0.2.1",
+				"source-map-url": "^0.4.0",
+				"urix": "^0.1.0"
+			}
+		},
+		"source-map-url": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+			"integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+			"dev": true
+		},
+		"split-string": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+			"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+			"dev": true,
+			"requires": {
+				"extend-shallow": "^3.0.0"
+			}
+		},
+		"sprintf-js": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+			"integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
+			"dev": true
+		},
+		"static-extend": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+			"integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+			"dev": true,
+			"requires": {
+				"define-property": "^0.2.5",
+				"object-copy": "^0.1.0"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "0.2.5",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+					"dev": true,
+					"requires": {
+						"is-descriptor": "^0.1.0"
+					}
+				}
+			}
+		},
+		"supports-color": {
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+			"dev": true,
+			"requires": {
+				"has-flag": "^3.0.0"
+			}
+		},
+		"to-object-path": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+			"dev": true,
+			"requires": {
+				"kind-of": "^3.0.2"
+			},
+			"dependencies": {
+				"kind-of": {
+					"version": "3.2.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+					"dev": true,
+					"requires": {
+						"is-buffer": "^1.1.5"
+					}
+				}
+			}
+		},
+		"to-regex": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+			"dev": true,
+			"requires": {
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"regex-not": "^1.0.2",
+				"safe-regex": "^1.1.0"
+			}
+		},
+		"to-regex-range": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+			"dev": true,
+			"requires": {
+				"is-number": "^3.0.0",
+				"repeat-string": "^1.6.1"
+			}
+		},
+		"unc-path-regex": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+			"dev": true
+		},
+		"underscore.string": {
+			"version": "3.3.5",
+			"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.5.tgz",
+			"integrity": "sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==",
+			"dev": true,
+			"requires": {
+				"sprintf-js": "^1.0.3",
+				"util-deprecate": "^1.0.2"
+			}
+		},
+		"union-value": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+			"integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+			"dev": true,
+			"requires": {
+				"arr-union": "^3.1.0",
+				"get-value": "^2.0.6",
+				"is-extendable": "^0.1.1",
+				"set-value": "^2.0.1"
+			}
+		},
+		"unset-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+			"dev": true,
+			"requires": {
+				"has-value": "^0.3.1",
+				"isobject": "^3.0.0"
+			},
+			"dependencies": {
+				"has-value": {
+					"version": "0.3.1",
+					"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+					"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+					"dev": true,
+					"requires": {
+						"get-value": "^2.0.3",
+						"has-values": "^0.1.4",
+						"isobject": "^2.0.0"
+					},
+					"dependencies": {
+						"isobject": {
+							"version": "2.1.0",
+							"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+							"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+							"dev": true,
+							"requires": {
+								"isarray": "1.0.0"
+							}
+						}
+					}
+				},
+				"has-values": {
+					"version": "0.1.4",
+					"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+					"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+					"dev": true
+				}
+			}
+		},
+		"urix": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+			"dev": true
+		},
+		"use": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+			"dev": true
+		},
+		"util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+			"dev": true
+		},
+		"v8flags": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz",
+			"integrity": "sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==",
+			"dev": true,
+			"requires": {
+				"homedir-polyfill": "^1.0.1"
+			}
+		},
+		"which": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+			"dev": true,
+			"requires": {
+				"isexe": "^2.0.0"
+			}
+		},
+		"wrappy": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+			"dev": true
+		}
+	}
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..242dc42
--- /dev/null
+++ b/package.json
@@ -0,0 +1,10 @@
+{
+	"private": true,
+	"scripts": {
+		"test": "grunt test"
+	},
+	"devDependencies": {
+		"grunt": "1.2.1",
+		"grunt-banana-checker": "0.9.0"
+	}
+}

From 31207644244300f3fc42503012d699d608b41208 Mon Sep 17 00:00:00 2001
From: Umherirrender <umherirrender_de.wp@web.de>
Date: Thu, 13 Aug 2020 11:27:31 +0200
Subject: [PATCH 004/117] Require MediaWiki 1.31 in extension.json for
 AutoloadNamespaces

AutoloadNamespaces is a new feature in 1.31
Cleanup some whitespaces

Change-Id: Id0a86da3337dea743ba5327a2c956f6ac28800eb
---
 extension.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/extension.json b/extension.json
index 0d99d0a..b1afde0 100644
--- a/extension.json
+++ b/extension.json
@@ -7,6 +7,9 @@
 	],
 	"descriptionmsg": "drawioeditor-desc",
 	"type": "parserhook",
+	"requires": {
+		"MediaWiki": ">= 1.31.0"
+	},
 	"ExtensionMessagesFiles": {
 		"DrawioEditorMagic": "DrawioEditor.magic.php"
 	},
@@ -23,8 +26,8 @@
 			"scripts": "ext.drawioeditor.js",
 			"styles": "ext.drawioeditor.css",
 			"dependencies": [
-			 	"jquery.ui",
-			 	"mediawiki.api"
+				"jquery.ui",
+				"mediawiki.api"
 			]
 		}
 	},

From 124b31bb1a95421a44e019f8a36f614e5295d360 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Sat, 5 Sep 2020 13:35:11 +0000
Subject: [PATCH 005/117] build: Updating grunt to 1.3.0

Change-Id: I07133be53a4bc0842568ff28db801c3fad4494db
---
 composer.json     |   4 +-
 package-lock.json | 106 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 3 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/composer.json b/composer.json
index da067e6..3c060b0 100644
--- a/composer.json
+++ b/composer.json
@@ -7,8 +7,8 @@
 	},
 	"require-dev": {
 		"mediawiki/minus-x": "1.1.0",
-		"php-parallel-lint/php-parallel-lint": "1.2.0",
-		"php-parallel-lint/php-console-highlighter": "0.5.0"
+		"php-parallel-lint/php-console-highlighter": "0.5.0",
+		"php-parallel-lint/php-parallel-lint": "1.2.0"
 	},
 	"scripts": {
 		"test": [
diff --git a/package-lock.json b/package-lock.json
index 0946241..9109880 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,6 +2,12 @@
 	"requires": true,
 	"lockfileVersion": 1,
 	"dependencies": {
+		"@types/color-name": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+			"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
+			"dev": true
+		},
 		"abbrev": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -9,12 +15,13 @@
 			"dev": true
 		},
 		"ansi-styles": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+			"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
 			"dev": true,
 			"requires": {
-				"color-convert": "^1.9.0"
+				"@types/color-name": "^1.1.1",
+				"color-convert": "^2.0.1"
 			}
 		},
 		"argparse": {
@@ -206,14 +213,13 @@
 			}
 		},
 		"chalk": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+			"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
 			"dev": true,
 			"requires": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
 			}
 		},
 		"class-utils": {
@@ -250,18 +256,18 @@
 			}
 		},
 		"color-convert": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
 			"requires": {
-				"color-name": "1.1.3"
+				"color-name": "~1.1.4"
 			}
 		},
 		"color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
 		"colors": {
@@ -356,12 +362,6 @@
 			"integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
 			"dev": true
 		},
-		"escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-			"dev": true
-		},
 		"esprima": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
@@ -663,9 +663,9 @@
 			}
 		},
 		"grunt": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.2.1.tgz",
-			"integrity": "sha512-zgJjn9N56tScvRt/y0+1QA+zDBnKTrkpyeSBqQPLcZvbqTD/oyGMrdZQXmm6I3828s+FmPvxc3Xv+lgKFtudOw==",
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.3.0.tgz",
+			"integrity": "sha512-6ILlMXv11/4cxuhSMfSU+SfvbxrPuqZrAtLN64+tZpQ3DAKfSQPQHRbTjSbdtxfyQhGZPtN0bDZJ/LdCM5WXXA==",
 			"dev": true,
 			"requires": {
 				"dateformat": "~3.0.3",
@@ -675,8 +675,8 @@
 				"glob": "~7.1.6",
 				"grunt-cli": "~1.3.2",
 				"grunt-known-options": "~1.1.0",
-				"grunt-legacy-log": "~2.0.0",
-				"grunt-legacy-util": "~1.1.1",
+				"grunt-legacy-log": "~3.0.0",
+				"grunt-legacy-util": "~2.0.0",
 				"iconv-lite": "~0.4.13",
 				"js-yaml": "~3.14.0",
 				"minimatch": "~3.0.4",
@@ -725,46 +725,46 @@
 			"dev": true
 		},
 		"grunt-legacy-log": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-2.0.0.tgz",
-			"integrity": "sha512-1m3+5QvDYfR1ltr8hjiaiNjddxGdQWcH0rw1iKKiQnF0+xtgTazirSTGu68RchPyh1OBng1bBUjLmX8q9NpoCw==",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz",
+			"integrity": "sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA==",
 			"dev": true,
 			"requires": {
 				"colors": "~1.1.2",
-				"grunt-legacy-log-utils": "~2.0.0",
+				"grunt-legacy-log-utils": "~2.1.0",
 				"hooker": "~0.2.3",
-				"lodash": "~4.17.5"
+				"lodash": "~4.17.19"
 			}
 		},
 		"grunt-legacy-log-utils": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.0.1.tgz",
-			"integrity": "sha512-o7uHyO/J+i2tXG8r2bZNlVk20vlIFJ9IEYyHMCQGfWYru8Jv3wTqKZzvV30YW9rWEjq0eP3cflQ1qWojIe9VFA==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz",
+			"integrity": "sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw==",
 			"dev": true,
 			"requires": {
-				"chalk": "~2.4.1",
-				"lodash": "~4.17.10"
+				"chalk": "~4.1.0",
+				"lodash": "~4.17.19"
 			}
 		},
 		"grunt-legacy-util": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-1.1.1.tgz",
-			"integrity": "sha512-9zyA29w/fBe6BIfjGENndwoe1Uy31BIXxTH3s8mga0Z5Bz2Sp4UCjkeyv2tI449ymkx3x26B+46FV4fXEddl5A==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.0.tgz",
+			"integrity": "sha512-ZEmYFB44bblwPE2oz3q3ygfF6hseQja9tx8I3UZIwbUik32FMWewA+d1qSFicMFB+8dNXDkh35HcDCWlpRsGlA==",
 			"dev": true,
 			"requires": {
 				"async": "~1.5.2",
 				"exit": "~0.1.1",
 				"getobject": "~0.1.0",
 				"hooker": "~0.2.3",
-				"lodash": "~4.17.10",
-				"underscore.string": "~3.3.4",
+				"lodash": "~4.17.20",
+				"underscore.string": "~3.3.5",
 				"which": "~1.3.0"
 			}
 		},
 		"has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true
 		},
 		"has-value": {
@@ -1065,9 +1065,9 @@
 			}
 		},
 		"lodash": {
-			"version": "4.17.19",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-			"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+			"version": "4.17.20",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+			"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
 			"dev": true
 		},
 		"make-iterator": {
@@ -1621,12 +1621,12 @@
 			}
 		},
 		"supports-color": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
 			"requires": {
-				"has-flag": "^3.0.0"
+				"has-flag": "^4.0.0"
 			}
 		},
 		"to-object-path": {
diff --git a/package.json b/package.json
index 242dc42..75ff017 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
 		"test": "grunt test"
 	},
 	"devDependencies": {
-		"grunt": "1.2.1",
+		"grunt": "1.3.0",
 		"grunt-banana-checker": "0.9.0"
 	}
 }

From cab0401b29521504a43c0b673c3d5f5532237656 Mon Sep 17 00:00:00 2001
From: zoranzoki21 <zorandori4444@gmail.com>
Date: Mon, 7 Sep 2020 21:50:29 +0200
Subject: [PATCH 006/117] Add phpcs and make it pass

Change-Id: Ibe8c3383dffd7c1194b55a779798384da19ebfb7
---
 .phpcs.xml                                    |  9 ++++++
 DrawioEditor.magic.php                        |  4 +--
 composer.json                                 |  7 +++--
 src/DrawioEditor.php                          | 29 ++++++++++++-------
 .../OutputPageParserOutput/AddModules.php     |  2 +-
 .../ParserFirstCallInit/SetFunctionHook.php   |  2 +-
 6 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 .phpcs.xml

diff --git a/.phpcs.xml b/.phpcs.xml
new file mode 100644
index 0000000..8dede84
--- /dev/null
+++ b/.phpcs.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<ruleset>
+	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+		<exclude name="Generic.Files.LineLength.TooLong" />
+	</rule>
+	<file>.</file>
+	<arg name="extensions" value="php,php5,inc" />
+	<arg name="encoding" value="UTF-8" />
+</ruleset>
diff --git a/DrawioEditor.magic.php b/DrawioEditor.magic.php
index 17cc4bd..9088efc 100644
--- a/DrawioEditor.magic.php
+++ b/DrawioEditor.magic.php
@@ -2,8 +2,6 @@
 
 $magicWords = [];
 
-
 $magicWords['en'] = [
-    'drawio' => [ 0, 'drawio' ],
+	'drawio' => [ 0, 'drawio' ],
 ];
-
diff --git a/composer.json b/composer.json
index 3c060b0..2d0f891 100644
--- a/composer.json
+++ b/composer.json
@@ -6,6 +6,7 @@
 		"composer/installers": "~1.0"
 	},
 	"require-dev": {
+		"mediawiki/mediawiki-codesniffer": "31.0.0",
 		"mediawiki/minus-x": "1.1.0",
 		"php-parallel-lint/php-console-highlighter": "0.5.0",
 		"php-parallel-lint/php-parallel-lint": "1.2.0"
@@ -13,10 +14,12 @@
 	"scripts": {
 		"test": [
 			"parallel-lint . --exclude vendor --exclude node_modules",
-			"minus-x check ."
+			"minus-x check .",
+			"phpcs -p -s"
 		],
 		"fix": [
-			"minus-x fix ."
+			"minus-x fix .",
+			"phpcbf"
 		]
 	}
 }
diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index c198425..9afe3fe 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -26,12 +26,11 @@ public function __construct() {
 	}
 
 	/**
-	 * @param Parser $parser
+	 * @param Parser &$parser
 	 * @param string|null $name
 	 * @return array
 	 */
 	public function parse( &$parser, $name = null ) {
-
 		/* disable caching before any output is generated */
 		$parser->getOutput()->updateCacheExpiry( 0 );
 
@@ -49,24 +48,30 @@ public function parse( &$parser, $name = null ) {
 		$opt_max_width = array_key_exists( 'max-width', $opts ) ? $opts[ 'max-width' ] : false;
 
 		/* process input */
-		if ( $name == null || !strlen( $name ) )
+		if ( $name == null || !strlen( $name ) ) {
 			return $this->errorMessage( 'Usage Error' );
-		if ( !in_array( $opt_type, [ 'svg', 'png' ] ) )
+		}
+		if ( !in_array( $opt_type, [ 'svg', 'png' ] ) ) {
 			return $this->errorMessage( 'Invalid type' );
+		}
 
 		$len_regex = '/^((0|auto|chart)|[0-9]+(\.[0-9]+)?(px|%|mm|cm|in|em|ex|pt|pc))$/';
 		$len_regex_max = '/^((0|none|chart)|[0-9]+(\.[0-9]+)?(px|%|mm|cm|in|em|ex|pt|pc))$/';
 
-		if ( !preg_match( $len_regex, $opt_height ) )
+		if ( !preg_match( $len_regex, $opt_height ) ) {
 			return $this->errorMessage( 'Invalid height' );
-		if ( !preg_match( $len_regex, $opt_width ) )
+		}
+		if ( !preg_match( $len_regex, $opt_width ) ) {
 			return self::errorMessage( 'Invalid width' );
+		}
 
 		if ( $opt_max_width ) {
-			if ( !preg_match( '/%$/', $opt_width ) )
+			if ( !preg_match( '/%$/', $opt_width ) ) {
 				return $this->errorMessage( 'max-width is only allowed when width is relative' );
-			if ( !preg_match( $len_regex_max, $opt_max_width ) )
+			}
+			if ( !preg_match( $len_regex_max, $opt_max_width ) ) {
 				return $this->errorMessage( 'Invalid max-width' );
+			}
 		} else {
 			$opt_max_width = 'chart';
 		}
@@ -176,7 +181,11 @@ public function parse( &$parser, $name = null ) {
 		return [ $output, 'isHTML' => true, 'noparse' => true ];
 	}
 
-	private function errorMessage( $msg ){
+	/**
+	 * @param string $msg
+	 * @return array
+	 */
+	private function errorMessage( $msg ) {
 		$output = '<div class="DrawioEditorInfoBox" style="border-color:red;">';
 		$output .= '<p style="color: red;">DrawioEditor Usage Error:<br/>' . htmlspecialchars( $msg ) . '</p>';
 		$output .= '</div>';
@@ -195,6 +204,6 @@ private function isReadOnly( $img ) {
 		return !$this->config->get( 'EnableUploads' ) ||
 			( !$img && !$this->services->getPermissionManager()->userHasRight( $user, 'upload' ) ) ||
 			( !$img && !$this->services->getPermissionManager()->userHasRight( $user, 'reupload' ) ) ||
-			( $parser->getTitle() ?  $parser->getTitle()->isProtected( 'edit' ) : false );
+			( $parser->getTitle() ? $parser->getTitle()->isProtected( 'edit' ) : false );
 	}
 }
diff --git a/src/Hook/OutputPageParserOutput/AddModules.php b/src/Hook/OutputPageParserOutput/AddModules.php
index d6e1e18..7418401 100644
--- a/src/Hook/OutputPageParserOutput/AddModules.php
+++ b/src/Hook/OutputPageParserOutput/AddModules.php
@@ -8,7 +8,7 @@
 class AddModules {
 
 	/**
-	 * @param OutputPage $outputPage
+	 * @param OutputPage &$outputPage
 	 * @param ParserOutput $parseroutput
 	 * @return bool
 	 */
diff --git a/src/Hook/ParserFirstCallInit/SetFunctionHook.php b/src/Hook/ParserFirstCallInit/SetFunctionHook.php
index cbfdba4..3d5d0fc 100644
--- a/src/Hook/ParserFirstCallInit/SetFunctionHook.php
+++ b/src/Hook/ParserFirstCallInit/SetFunctionHook.php
@@ -9,7 +9,7 @@
 class SetFunctionHook {
 
 	/**
-	 * @param Parser $parser
+	 * @param Parser &$parser
 	 * @return bool
 	 * @throws MWException
 	 */

From 78d3df99c91af1a54fc4acaabeb9bff36fecd818 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Fri, 18 Sep 2020 08:37:06 +0200
Subject: [PATCH 007/117] Localisation updates from https://translatewiki.net.

Change-Id: I73d505113f79ad320dfe2a97428936fad1b5ef61
---
 i18n/de.json    | 6 ++++++
 i18n/fr.json    | 8 ++++++++
 i18n/pt-br.json | 8 ++++++++
 i18n/qqq.json   | 4 +++-
 i18n/tr.json    | 8 ++++++++
 5 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 i18n/de.json
 create mode 100644 i18n/fr.json
 create mode 100644 i18n/pt-br.json
 create mode 100644 i18n/tr.json

diff --git a/i18n/de.json b/i18n/de.json
new file mode 100644
index 0000000..ada0362
--- /dev/null
+++ b/i18n/de.json
@@ -0,0 +1,6 @@
+{
+	"@metadata": {
+		"authors": []
+	},
+	"drawioeditor-desc": "draw.io Flussdiagramm-Erstellung und Inline-Bearbeitung"
+}
diff --git a/i18n/fr.json b/i18n/fr.json
new file mode 100644
index 0000000..61af14e
--- /dev/null
+++ b/i18n/fr.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Gomoko"
+		]
+	},
+	"drawioeditor-desc": "création du diagramme de flux draw.io et modification en ligne"
+}
diff --git a/i18n/pt-br.json b/i18n/pt-br.json
new file mode 100644
index 0000000..ddc5147
--- /dev/null
+++ b/i18n/pt-br.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Eduardo Addad de Oliveira"
+		]
+	},
+	"drawioeditor-desc": "Criação de fluxograma draw.io e edição em linha"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 36351e6..fbe1e34 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,4 +1,6 @@
 {
-	"@metadata": {},
+	"@metadata": {
+		"authors": []
+	},
 	"drawioeditor-desc": "{{desc|name=DrawioEditor|url=https://www.mediawiki.org/wiki/Extension:DrawioEditor}}"
 }
diff --git a/i18n/tr.json b/i18n/tr.json
new file mode 100644
index 0000000..bc8fb32
--- /dev/null
+++ b/i18n/tr.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"MuratTheTurkish"
+		]
+	},
+	"drawioeditor-desc": "draw.io akış şeması oluşturma ve satır içi düzenleme"
+}

From 0f54f6bfa06aad35c64045dc5d8040620d025cd5 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Mon, 21 Sep 2020 08:29:20 +0200
Subject: [PATCH 008/117] Localisation updates from https://translatewiki.net.

Change-Id: I057a0d62444404d6e849077d1943c632cb8dfcb6
---
 i18n/mk.json | 8 ++++++++
 i18n/nb.json | 8 ++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 i18n/mk.json
 create mode 100644 i18n/nb.json

diff --git a/i18n/mk.json b/i18n/mk.json
new file mode 100644
index 0000000..6986f5c
--- /dev/null
+++ b/i18n/mk.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Bjankuloski06"
+		]
+	},
+	"drawioeditor-desc": "Создавање на тековен диаграм со draw.io и негово уредување во редови"
+}
diff --git a/i18n/nb.json b/i18n/nb.json
new file mode 100644
index 0000000..d06ee40
--- /dev/null
+++ b/i18n/nb.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Jon Harald Søby"
+		]
+	},
+	"drawioeditor-desc": "Oppretting og redigering av flytkart via draw.io"
+}

From 8041b0de423943019124f53f7fb676fd062a3d34 Mon Sep 17 00:00:00 2001
From: alexpin <intracomof@gmail.com>
Date: Fri, 25 Sep 2020 09:55:53 +0300
Subject: [PATCH 009/117] Fix DrawIO iframe url

ERM20983

Change-Id: I1c8e0022464198644b505b3739ae89e609129ed1
---
 resources/ext.drawioeditor.js | 6 +++---
 src/DrawioEditor.php          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/ext.drawioeditor.js b/resources/ext.drawioeditor.js
index 114aa3d..e4ec703 100644
--- a/resources/ext.drawioeditor.js
+++ b/resources/ext.drawioeditor.js
@@ -46,7 +46,7 @@ function DrawioEditor(id, filename, type, interactive, updateHeight, updateWidth
     this.iframeOverlay.hide();
  
     this.iframe = $('<iframe>', {
-        src: 'https://www.draw.io/?embed=1&proto=json&spin=1&analytics=0&db=0&gapi=0&od=0&picker=0',
+        src: 'https://embed.diagrams.net/?embed=1&proto=json&spin=1&analytics=0&db=0&gapi=0&od=0&picker=0',
 	id: 'drawio-iframe-' + id,
 	class: 'DrawioEditorIframe'
     })
@@ -101,7 +101,7 @@ DrawioEditor.prototype.updateImage = function (imageinfo) {
 }
 
 DrawioEditor.prototype.sendMsgToIframe = function(data) {
-    this.iframeWindow.postMessage(JSON.stringify(data), 'https://www.draw.io');
+    this.iframeWindow.postMessage(JSON.stringify(data), 'https://embed.diagrams.net');
 }
 
 DrawioEditor.prototype.showDialog = function(title, message) {
@@ -298,7 +298,7 @@ window.editDrawio = function(id, filename, type, interactive, updateHeight, upda
 
 function drawioHandleMessage(e) {
     // we only act on event coming from draw.io iframes
-    if (e.origin != 'https://www.draw.io')
+    if (e.origin != 'https://embed.diagrams.net')
         return;
     
     if (!editor)
diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 9afe3fe..5d4f140 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -153,7 +153,7 @@ public function parse( &$parser, $name = null ) {
 		if ( !$img ) {
 			// show placeholder
 			$output .= sprintf( '<div id="drawio-placeholder-%s" class="DrawioEditorInfoBox">' .
-				'<b>%s</b><br/>empty draw.io chart</div> ',
+				'<b>%s</b><br/>empty app.diagrams.net chart</div> ',
 				$id, $dispname );
 		}
 		// the image or object element must be there' in any case (it's hidden as long as there is no content.

From 462d3771bbf4fa8fe31fbeafe9a6b272a39db704 Mon Sep 17 00:00:00 2001
From: rvogel <vogel@hallowelt.biz>
Date: Fri, 25 Sep 2020 10:48:46 +0200
Subject: [PATCH 010/117] Add CI tests and Gerrit file

* Also bump version number

NEEDS CHERRY-PICK TO `master`

Change-Id: If49cf6259f4f65d2a8744ec1ff3a61b11cad3254
---
 .phpcs.xml           |  5 ++---
 extension.json       |  2 +-
 src/DrawioEditor.php | 22 ++++++++++++++++------
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.phpcs.xml b/.phpcs.xml
index 8dede84..1723f4c 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 <ruleset>
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
-		<exclude name="Generic.Files.LineLength.TooLong" />
 	</rule>
 	<file>.</file>
-	<arg name="extensions" value="php,php5,inc" />
-	<arg name="encoding" value="UTF-8" />
+	<arg name="extensions" value="php,php5,inc"/>
+	<arg name="encoding" value="UTF-8"/>
 </ruleset>
diff --git a/extension.json b/extension.json
index b1afde0..29e1d3f 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
 {
 	"name": "DrawioEditor",
 	"license-name": "GPL-3.0-only",
-	"version": "1.0",
+	"version": "1.1",
 	"author": [
 		"Markus Gebert"
 	],
diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 5d4f140..3345e2f 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -41,8 +41,12 @@ public function parse( &$parser, $name = null ) {
 			$opts[ trim( $opt[ 0 ] ) ] = count( $opt ) === 2 ? trim( $opt[ 1 ] ) : true;
 		}
 
-		$opt_type = array_key_exists( 'type', $opts ) ? $opts[ 'type' ] : $this->config->get( 'DrawioEditorImageType' );
-		$opt_interactive = array_key_exists( 'interactive', $opts ) ? true : $this->config->get( 'DrawioEditorImageInteractive' );
+		$opt_type = array_key_exists( 'type', $opts )
+			? $opts[ 'type' ]
+			: $this->config->get( 'DrawioEditorImageType' );
+		$opt_interactive = array_key_exists( 'interactive', $opts )
+			? true
+			: $this->config->get( 'DrawioEditorImageInteractive' );
 		$opt_height = array_key_exists( 'height', $opts ) ? $opts[ 'height' ] : 'auto';
 		$opt_width = array_key_exists( 'width', $opts ) ? $opts[ 'width' ] : '100%';
 		$opt_max_width = array_key_exists( 'max-width', $opts ) ? $opts[ 'max-width' ] : false;
@@ -145,7 +149,10 @@ public function parse( &$parser, $name = null ) {
 		} else {
 			$img_fmt = '<img id="drawio-img-%s" src="%s" title="%s" alt="%s" style="%s"></img>';
 			$img_html = '<a id="drawio-img-href-' . $id . '" href="' . $img_desc_url . '">';
-			$img_html .= sprintf( $img_fmt, $id, $img_url_ts, 'drawio: ' . $dispname, 'drawio: ' . $dispname, $img_style );
+			$img_html .= sprintf(
+				$img_fmt, $id, $img_url_ts,
+				'drawio: ' . $dispname, 'drawio: ' . $dispname, $img_style
+			);
 			$img_html .= '</a>';
 		}
 
@@ -156,13 +163,15 @@ public function parse( &$parser, $name = null ) {
 				'<b>%s</b><br/>empty app.diagrams.net chart</div> ',
 				$id, $dispname );
 		}
-		// the image or object element must be there' in any case (it's hidden as long as there is no content.
+		// the image or object element must be there in any case
+		// (it's hidden as long as there is no content.)
 		$output .= $img_html;
 		$output .= '</div>';
 
 		/* editor and overlay divs, iframe is added by javascript on demand */
 		$output .= '<div id="drawio-iframe-box-' . $id . '" style="display:none;">';
-		$output .= '<div id="drawio-iframe-overlay-' . $id . '" class="DrawioEditorOverlay" style="display:none;"></div>';
+		$output .= '<div id="drawio-iframe-overlay-' . $id
+			. '" class="DrawioEditorOverlay" style="display:none;"></div>';
 		$output .= '</div>';
 
 		/* output end */
@@ -187,7 +196,8 @@ public function parse( &$parser, $name = null ) {
 	 */
 	private function errorMessage( $msg ) {
 		$output = '<div class="DrawioEditorInfoBox" style="border-color:red;">';
-		$output .= '<p style="color: red;">DrawioEditor Usage Error:<br/>' . htmlspecialchars( $msg ) . '</p>';
+		$output .= '<p style="color: red;">DrawioEditor Usage Error:<br/>'
+			. htmlspecialchars( $msg ) . '</p>';
 		$output .= '</div>';
 
 		return [ $output, 'isHTML' => true, 'noparse' => true ];

From d5f64f8faba2bc6f7c212788b8a0c8d660631b36 Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Thu, 8 Oct 2020 20:32:59 +0100
Subject: [PATCH 011/117] Fix README to use wfLoadExtension()

PHP entry point was deleted in Feb 2020

Change-Id: I769531e1c957d8ceca6b9c8baaeb43fc2a6b49b7
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 308761e..f1ef580 100644
--- a/README.md
+++ b/README.md
@@ -32,8 +32,8 @@ This is a MediaWiki extension that integrates the draw.io flow chart editor and
 
 2. Activate the plugin in LocalSettings.php:
 
-  ```
-  require_once "$IP/extensions/DrawioEditor/DrawioEditor.php";
+  ```php
+  wfLoadExtension( 'DrawioEditor' );
   ```
 3. If you want so use SVG (recommended) and the version of your MediaWiki is 1.26 or newer, you need to add the namespace ```http://www.w3.org/1999/xhtml``` to ```$validNamespaces```in  ```includes/upload/UploadBase.php```. See Requirements for more information on why this is currently needed.
 

From c924bb60dd447e1f0716211b8bf82b38a2b40536 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Thu, 29 Oct 2020 11:00:45 +0000
Subject: [PATCH 012/117] build: Updating mediawiki/mediawiki-codesniffer to
 32.0.0

Change-Id: I731be56932dab4b1b0c9f8735c0594d0ce77e989
---
 .phpcs.xml    | 3 +--
 composer.json | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.phpcs.xml b/.phpcs.xml
index 1723f4c..3c69313 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <ruleset>
-	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
-	</rule>
+	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki" />
 	<file>.</file>
 	<arg name="extensions" value="php,php5,inc"/>
 	<arg name="encoding" value="UTF-8"/>
diff --git a/composer.json b/composer.json
index 2d0f891..d1c8f6a 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
 		"composer/installers": "~1.0"
 	},
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "31.0.0",
+		"mediawiki/mediawiki-codesniffer": "32.0.0",
 		"mediawiki/minus-x": "1.1.0",
 		"php-parallel-lint/php-console-highlighter": "0.5.0",
 		"php-parallel-lint/php-parallel-lint": "1.2.0"

From 56306af9696b187bd3a7a42b0c55c21c4f5a0123 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Tue, 3 Nov 2020 17:54:03 +0000
Subject: [PATCH 013/117] build: Updating mediawiki/mediawiki-codesniffer to
 33.0.0

Change-Id: I722723d6d43aff1913016f5bbd094d29a2dc2ad2
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d1c8f6a..e5f2dba 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
 		"composer/installers": "~1.0"
 	},
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "32.0.0",
+		"mediawiki/mediawiki-codesniffer": "33.0.0",
 		"mediawiki/minus-x": "1.1.0",
 		"php-parallel-lint/php-console-highlighter": "0.5.0",
 		"php-parallel-lint/php-parallel-lint": "1.2.0"

From b1d8a694c74b2df332a5d8ed99a343ce3765d335 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Wed, 18 Nov 2020 08:56:02 +0100
Subject: [PATCH 014/117] Localisation updates from https://translatewiki.net.

Change-Id: Ie4db348f24a398077f8d6078697c64150a14147d
---
 i18n/roa-tara.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 i18n/roa-tara.json

diff --git a/i18n/roa-tara.json b/i18n/roa-tara.json
new file mode 100644
index 0000000..71d371c
--- /dev/null
+++ b/i18n/roa-tara.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Joetaras"
+		]
+	},
+	"drawioeditor-desc": "draw.io ccrejazione de diagramme de flusse e cangiaminde al vole"
+}

From de9ba0b22929386fa71bc0437b60fd04dfe7e4fa Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Sun, 6 Dec 2020 05:59:47 +0000
Subject: [PATCH 015/117] build: Updating mediawiki/mediawiki-codesniffer to
 34.0.0

Change-Id: I1a053b209bd1c89d7beceb558cfaf7f3a4d516e0
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index e5f2dba..b5da2bf 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
 		"composer/installers": "~1.0"
 	},
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "33.0.0",
+		"mediawiki/mediawiki-codesniffer": "34.0.0",
 		"mediawiki/minus-x": "1.1.0",
 		"php-parallel-lint/php-console-highlighter": "0.5.0",
 		"php-parallel-lint/php-parallel-lint": "1.2.0"

From 687631b03b692c90147c35a669a5af64982a39eb Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Mon, 7 Dec 2020 08:44:29 +0100
Subject: [PATCH 016/117] Localisation updates from https://translatewiki.net.

Change-Id: I008703dd4b783a3ac4d7448e907f10f2de9e1916
---
 i18n/pt.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 i18n/pt.json

diff --git a/i18n/pt.json b/i18n/pt.json
new file mode 100644
index 0000000..7f9f8cf
--- /dev/null
+++ b/i18n/pt.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Hamilton Abreu"
+		]
+	},
+	"drawioeditor-desc": "Criação e edição em linha de fluxogramas para draw.io"
+}

From c2c096f91518ea4c5d501a767a6d7f918cb46055 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Thu, 10 Dec 2020 08:34:36 +0100
Subject: [PATCH 017/117] Localisation updates from https://translatewiki.net.

Change-Id: I5b51ce117965d28f3813d0f67ba8787f238333aa
---
 i18n/zh-hant.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 i18n/zh-hant.json

diff --git a/i18n/zh-hant.json b/i18n/zh-hant.json
new file mode 100644
index 0000000..2e70bc3
--- /dev/null
+++ b/i18n/zh-hant.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Kly"
+		]
+	},
+	"drawioeditor-desc": "draw.io 流程圖建立與內文編輯"
+}

From 60b4ce3558ee9f934fa35c18a02f5bd2ab6ef698 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Sun, 13 Dec 2020 02:05:22 +0000
Subject: [PATCH 018/117] build: Updating ini to 1.3.8

* https://npmjs.com/advisories/1589

Change-Id: I7b74a22c23adc03f25744d52867d9f5cd6beb797
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9109880..bc2d842 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -840,9 +840,9 @@
 			"dev": true
 		},
 		"ini": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-			"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
 			"dev": true
 		},
 		"interpret": {

From ff9ed1c60cdc77f77bd07c3576617cf6e2a88153 Mon Sep 17 00:00:00 2001
From: Lucien Murray-Pitts <lucienmp_antispam@yahoo.com>
Date: Sun, 10 Jan 2021 05:15:29 +0900
Subject: [PATCH 019/117] Fixes img_timestamp exception for same charts

If the same chart appears on a page more than once then you will see the message:
PHP Notice:  Undefined property: stdClass::$img_timestamp in ...\DrawioEditor\src\DrawioEditor.php on line XX

This appears because findFile() returns an object that retains history, and calls to nextHistoryLine() returns the said files history.

Added a simple call to reset the history before accessing nextHistoryLine().

Bug: T271469
Change-Id: I7d2d6b80dfe8c560889fa84f57b00f9b4cb56605
---
 src/DrawioEditor.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 3345e2f..5f8312f 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -90,6 +90,9 @@ public function parse( &$parser, $name = null ) {
 		$img_name = $name . ".drawio." . $opt_type;
 		$img = $this->services->getRepoGroup()->findFile( $img_name );
 		if ( $img ) {
+			/* Resets file history to newest if there is more than one instance of same chart on a page */
+			$img->resetHistory();
+
 			$historyLine = $img->nextHistoryLine();
 			$img_url = $img->getViewUrl();
 			$img_url_ts = $img_url . '?ts=' . ( $historyLine !== false ? $historyLine->img_timestamp : '' );

From 54dbd5fcbd1471d5997a4aafabd68e0adbd5b3e0 Mon Sep 17 00:00:00 2001
From: Lucien Murray-Pitts <lucienmp_antispam@yahoo.com>
Date: Sun, 10 Jan 2021 02:26:29 +0900
Subject: [PATCH 020/117] Fix error handling

If the save event from drawio fails due to backend issues then the javascript will throw an exception and hang the save.
Fixing what looks like a typo by using passed in fail case data object.

Bug: T271623
Change-Id: Ied3aefce67be5726c2c9813fae78099c0cf32057
---
 resources/ext.drawioeditor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/ext.drawioeditor.js b/resources/ext.drawioeditor.js
index e4ec703..7ff7c0e 100644
--- a/resources/ext.drawioeditor.js
+++ b/resources/ext.drawioeditor.js
@@ -214,7 +214,7 @@ DrawioEditor.prototype.uploadToWiki = function(blob) {
 			} else {
 				that.showDialog('Save failed', 
 					'Upload to wiki failed!' +
-				'<br>Error: ' + error +
+				'<br>Error: ' + data.error.info +
 				'<br>Check javascript console for details.');
 			}
         });

From d292135c1ccc5a2f4174e0f91e1f1cc02748093b Mon Sep 17 00:00:00 2001
From: Lucien Murray-Pitts <lucienmp_antispam@yahoo.com>
Date: Sun, 10 Jan 2021 03:51:29 +0900
Subject: [PATCH 021/117] Adds Extension Tag for drawio

The existing extension is using parser-function {{drawio}} which is meant for template/translcusion or other in-page content manipulation.

This adds the extension tag support with <drawio></drawio> or preferably <drawio/> with all the same attributes as the original extension.

Both continue to be usable, but I would suggest promoting the extension tag as this is the intended tag format when adding extended capabilities to MW.
see: https://www.mediawiki.org/wiki/Manual:Tag_extensions

It also brings added benefit that Visual Editor can be extended easily to support this extension.

Bug: T271615
Change-Id: I8e59cd344a636632ceea6c806451225b00166854
---
 src/DrawioEditor.php                          | 56 +++++++++++++++++--
 .../ParserFirstCallInit/SetFunctionHook.php   |  7 ++-
 2 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 5f8312f..9350174 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -6,6 +6,7 @@
 use File;
 use MediaWiki\MediaWikiServices;
 use Parser;
+use PPFrame;
 use RequestContext;
 
 class DrawioEditor {
@@ -26,14 +27,37 @@ public function __construct() {
 	}
 
 	/**
-	 * @param Parser &$parser
-	 * @param string|null $name
-	 * @return array
+	 * Parser hook handler for <drawio>
+	 *
+	 * @param string|null $data A string with the content of the tag, or null.
+	 * @param array $attribs The attributes of the tag.
+	 * @param Parser $parser Parser instance available to render
+	 *                             wikitext into html, or parser methods.
+	 * @param PPFrame $frame Can be used to see what template
+	 *                             arguments ({{{1}}}) this hook was used with.
+	 *
+	 * @return string HTML to insert in the page.
 	 */
-	public function parse( &$parser, $name = null ) {
-		/* disable caching before any output is generated */
-		$parser->getOutput()->updateCacheExpiry( 0 );
+	public function parseExtension( $data, array $attribs, Parser $parser, PPFrame $frame ) {
+		// Extract name as option from tag <drawio name=FileName .../>
+		$name = array_key_exists( 'filename', $attribs )
+			? $attribs[ 'filename' ]
+			: null;
+
+		// Call general parse-generator routine
+		return $this->parse( $parser, $name, $attribs );
+	}
 
+	/**
+	 * Parser hook handler for {{drawio}}
+	 *
+	 * @param Parser &$parser Parser instance available to render
+	 *                             wikitext into html, or parser methods.
+	 * @param string|null $name File name of chart.
+	 *
+	 * @return array HTML to insert in the page.
+	 */
+	public function parseLegacyParserFunc( Parser &$parser, $name = null ) {
 		/* parse named arguments */
 		$opts = [];
 		foreach ( array_slice( func_get_args(), 2 ) as $rawopt ) {
@@ -41,6 +65,26 @@ public function parse( &$parser, $name = null ) {
 			$opts[ trim( $opt[ 0 ] ) ] = count( $opt ) === 2 ? trim( $opt[ 1 ] ) : true;
 		}
 
+		// Call general parse-generator routine
+		return $this->parse( $parser, $name, $opts );
+	}
+
+	/**
+	 * Generates the HTML required to embed a SVG/PNG DrawIO diagram, supports
+	 * a few formatting options to control with width/height, and image format.
+	 *
+	 * @param Parser &$parser Parser instance available to render
+	 *                             wikitext into html, or parser methods.
+	 * @param string|null $name File name of chart.
+	 * @param array $opts Further attributes as associative array:
+	 *                             width, height, max-height, type, interactive.
+	 *
+	 * @return array HTML to insert in the page.
+	 */
+	public function parse( &$parser, $name, $opts ) {
+		/* disable caching before any output is generated */
+		$parser->getOutput()->updateCacheExpiry( 0 );
+
 		$opt_type = array_key_exists( 'type', $opts )
 			? $opts[ 'type' ]
 			: $this->config->get( 'DrawioEditorImageType' );
diff --git a/src/Hook/ParserFirstCallInit/SetFunctionHook.php b/src/Hook/ParserFirstCallInit/SetFunctionHook.php
index 3d5d0fc..51b72de 100644
--- a/src/Hook/ParserFirstCallInit/SetFunctionHook.php
+++ b/src/Hook/ParserFirstCallInit/SetFunctionHook.php
@@ -15,7 +15,12 @@ class SetFunctionHook {
 	 */
 	public static function callback( &$parser ) {
 		$drawioEditor = new DrawioEditor();
-		$parser->setFunctionHook( 'drawio', [ $drawioEditor, 'parse' ] );
+
+		// Add hook for Legacy Parser Function {{#drawio:filename|param=...}}
+		$parser->setFunctionHook( 'drawio', [ $drawioEditor, 'parseLegacyParserFunc' ] );
+
+		// Add hook for Tag Extension; <drawio name=filename param=..../>
+		$parser->setHook( 'drawio', [ $drawioEditor, 'parseExtension' ] );
 
 		return true;
 	}

From 9031ce67fdf59a77027a2885ce7b219a99b7aa07 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Fri, 29 Jan 2021 08:04:38 +0000
Subject: [PATCH 022/117] build: Updating composer dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* mediawiki/mediawiki-codesniffer: 34.0.0 → 35.0.0
* mediawiki/minus-x: 1.1.0 → 1.1.1

Change-Id: I511b74f562f040db644ec2460006ebe829a9088f
---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index b5da2bf..8351361 100644
--- a/composer.json
+++ b/composer.json
@@ -6,8 +6,8 @@
 		"composer/installers": "~1.0"
 	},
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "34.0.0",
-		"mediawiki/minus-x": "1.1.0",
+		"mediawiki/mediawiki-codesniffer": "35.0.0",
+		"mediawiki/minus-x": "1.1.1",
 		"php-parallel-lint/php-console-highlighter": "0.5.0",
 		"php-parallel-lint/php-parallel-lint": "1.2.0"
 	},

From dd18c56eb02ceeb567f07d094cedfbe0a3005c53 Mon Sep 17 00:00:00 2001
From: alexpin <intracomof@gmail.com>
Date: Thu, 28 Jan 2021 10:03:39 +0200
Subject: [PATCH 023/117] REL1_31 (I630c4c3a5e5caddc13eb6faeccf4154a8bb91a86)
 changes applied to master & REL1_35

ERM22658

Change-Id: I658437f86b1008e240ff999d8e6717d8836b18a3
---
 README.md                                     |   9 +-
 extension.json                                |   3 +
 resources/ext.drawioeditor.js                 | 451 +++++++++---------
 src/DrawioEditor.php                          |  16 +-
 .../ParserFirstCallInit/SetFunctionHook.php   |   2 +-
 5 files changed, 254 insertions(+), 227 deletions(-)

diff --git a/README.md b/README.md
index f1ef580..3f7a8b0 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ This is a MediaWiki extension that integrates the draw.io flow chart editor and
 
 # Warnings
 **Please read these warnings carefully before use**:
-- The actual editor functionality is loaded from draw.io. This code only provides integration.
+- The default editor functionality is loaded from draw.io (for configuration options [see below](#Configuration)). This code only provides integration.
 - Be aware that draw.io is an online service and while this plugin integrates the editor using an iframe and communicates with it only locally in your browser (javascript postMessage), it cannot guarantee that the code loaded from draw.io will not upload any data to foreign servers. **This may be a privacy concern. Read the Privacy section for more information. When in doubt, don't use draw.io or this module. You have been warned!**
 - This plugin is quite new and probably still has bugs, so it may or may not work with your installation.
 
@@ -37,6 +37,13 @@ This is a MediaWiki extension that integrates the draw.io flow chart editor and
   ```
 3. If you want so use SVG (recommended) and the version of your MediaWiki is 1.26 or newer, you need to add the namespace ```http://www.w3.org/1999/xhtml``` to ```$validNamespaces```in  ```includes/upload/UploadBase.php```. See Requirements for more information on why this is currently needed.
 
+# Configuration
+
+  ```php
+  $wgDrawioEditorBackendUrl
+  ```
+To avoid the mentioned privacy concerns, you can change the URL of the editor using this setting in LocalSettings.php (i.e. use the officially provided docker image from [jgraph/docker-drawio](https://github.com/jgraph/docker-drawio) as server). The URL given here is used to load the draw.io/diagrams.net editor components embedded in an iframe, **WARNING: changing this URL is officially not supported, but works, only change this for testing purpose or if know what you are doing!** The default value is `https://embed.diagrams.net`.
+
 # Usage
 ## Add a chart
 1. Add the following tag to any wiki page to insert a draw.io chart:
diff --git a/extension.json b/extension.json
index 29e1d3f..de95ae0 100644
--- a/extension.json
+++ b/extension.json
@@ -45,6 +45,9 @@
 		},
 		"DrawioEditorImageInteractive": {
 			"value": false
+		},
+		"DrawioEditorBackendUrl": {
+			"value": "https://embed.diagrams.net"
 		}
 	},
 	"load_composer_autoloader" : true,
diff --git a/resources/ext.drawioeditor.js b/resources/ext.drawioeditor.js
index 7ff7c0e..46f26fe 100644
--- a/resources/ext.drawioeditor.js
+++ b/resources/ext.drawioeditor.js
@@ -1,195 +1,201 @@
 
-function DrawioEditor(id, filename, type, interactive, updateHeight, updateWidth, updateMaxWidth) {
-    var that = this;
-    
-    this.id = id;
-    this.filename = filename;
-    this.imgType = type;
-    this.interactive = interactive;
-    this.updateHeight = updateHeight;
-    this.updateWidth = updateWidth;
-    this.updateMaxWidth = updateMaxWidth;
-
-    if (this.imgType == 'svg') {
-        this.imgMimeType = 'image/svg+xml';
-    } else if (this.imgType == 'png') {
-        this.imgMimeType = 'image/png';
-    } else {
-        throw new Error('unkown file type');
-    }
-
-    this.imageBox = $("#drawio-img-box-" + id);
-    this.image = $("#drawio-img-" + id);
-    if (interactive) {
-        this.imageURL = this.image.attr('data');
-    } else {
-        this.imageURL = this.image.attr('src');
-    }
-    this.imageHref = $("#drawio-img-href-" + id);
-    this.placeholder = $("#drawio-placeholder-" + id);
-
-    this.iframeBox = $("#drawio-iframe-box-" + id);
-    this.iframeBox.resizable({
-        "handles": "s",
+function DrawioEditor(id, filename, type, interactive, updateHeight, updateWidth, updateMaxWidth, baseUrl) {
+	var that = this;
+
+	this.id = id;
+	this.filename = filename;
+	this.imgType = type;
+	this.interactive = interactive;
+	this.updateHeight = updateHeight;
+	this.updateWidth = updateWidth;
+	this.updateMaxWidth = updateMaxWidth;
+	this.baseUrl = baseUrl;
+
+	//Could be 'en', 'fr', 'de-formal', 'zh-hant', ...
+	var currentUserLanguage = mw.user.options.get( 'language', 'en' ).split( '-' );
+	this.language = currentUserLanguage[0];
+
+	if (this.imgType == 'svg') {
+		this.imgMimeType = 'image/svg+xml';
+	} else if (this.imgType == 'png') {
+		this.imgMimeType = 'image/png';
+	} else {
+		throw new Error('unkown file type');
+	}
+
+	this.imageBox = $("#drawio-img-box-" + id);
+	this.image = $("#drawio-img-" + id);
+	if (interactive) {
+		this.imageURL = this.image.attr('data');
+	} else {
+		this.imageURL = this.image.attr('src');
+	}
+	this.imageHref = $("#drawio-img-href-" + id);
+	this.placeholder = $("#drawio-placeholder-" + id);
+
+	this.iframeBox = $("#drawio-iframe-box-" + id);
+	this.iframeBox.resizable({
+		"handles": "s",
 	"distance": 0,
 	start: function(event, ui) {
-            that.showOverlay();
+			that.showOverlay();
 	},
-        stop: function(event, ui) {
-            $(this).css("width", '');
-            that.hideOverlay();
-        }
-    });
-    this.iframeBox.resizable("enable");
-
-    this.iframeOverlay = $("#drawio-iframe-overlay-" + id);
-    this.iframeOverlay.hide();
- 
-    this.iframe = $('<iframe>', {
-        src: 'https://embed.diagrams.net/?embed=1&proto=json&spin=1&analytics=0&db=0&gapi=0&od=0&picker=0',
+		stop: function(event, ui) {
+			$(this).css("width", '');
+			that.hideOverlay();
+		}
+	});
+	this.iframeBox.resizable("enable");
+
+	this.iframeOverlay = $("#drawio-iframe-overlay-" + id);
+	this.iframeOverlay.hide();
+
+	var localAttr = this.baseUrl !== 'https://embed.diagrams.net' ? "&local=1" : "";
+	this.iframe = $('<iframe>', {
+		src: this.baseUrl + '/?embed=1&proto=json&spin=1&analytics=0&offline=1&picker=0&lang=' + this.language + localAttr,
 	id: 'drawio-iframe-' + id,
 	class: 'DrawioEditorIframe'
-    })
-    this.iframe.appendTo(this.iframeBox);
-    
-    this.iframeWindow = this.iframe.prop('contentWindow');
+	})
+	this.iframe.appendTo(this.iframeBox);
 
-    this.show();
+	this.iframeWindow = this.iframe.prop('contentWindow');
+
+	this.show();
 }
 
 DrawioEditor.prototype.destroy = function() {
-    this.iframe.remove();
+	this.iframe.remove();
 }
 
 DrawioEditor.prototype.show = function() {
-    this.imageBox.hide();
-    this.iframeBox.height(Math.max(this.imageBox.height()+100, 800));
-    this.iframeBox.show();
+	this.imageBox.hide();
+	this.iframeBox.height(Math.max(this.imageBox.height()+100, 800));
+	this.iframeBox.show();
 }
 
 DrawioEditor.prototype.hide = function() {
-    this.iframeBox.hide();
-    this.imageBox.show();
+	this.iframeBox.hide();
+	this.imageBox.show();
 }
 
 DrawioEditor.prototype.showOverlay = function() {
-    this.iframeOverlay.show();
+	this.iframeOverlay.show();
 }
 
 DrawioEditor.prototype.hideOverlay = function() {
-    this.iframeOverlay.hide();
+	this.iframeOverlay.hide();
 }
 
 DrawioEditor.prototype.updateImage = function (imageinfo) {
-    this.imageURL = imageinfo.url + '?ts=' + imageinfo.timestamp;
-    if (this.interactive) {
-        this.image.attr("data", this.imageURL);
-    } else {
-        this.image.attr("src", this.imageURL);
-    }
-    this.imageHref.attr("href", imageinfo.descriptionurl);
-    if (this.updateHeight)
-        this.image.css('height', imageinfo.height);
-    if (this.updateWidth)
-        this.image.css('width', imageinfo.width);
-    if (this.updateMaxWidth)
-        this.image.css('max-width', imageinfo.width);
-    if (this.placeholder) {
-        this.placeholder.hide();
-        this.image.show();
-    }
+	this.imageURL = imageinfo.url + '?ts=' + imageinfo.timestamp;
+	if (this.interactive) {
+		this.image.attr("data", this.imageURL);
+	} else {
+		this.image.attr("src", this.imageURL);
+	}
+	this.imageHref.attr("href", imageinfo.descriptionurl);
+	if (this.updateHeight)
+		this.image.css('height', imageinfo.height);
+	if (this.updateWidth)
+		this.image.css('width', imageinfo.width);
+	if (this.updateMaxWidth)
+		this.image.css('max-width', imageinfo.width);
+	if (this.placeholder) {
+		this.placeholder.hide();
+		this.image.show();
+	}
 }
 
 DrawioEditor.prototype.sendMsgToIframe = function(data) {
-    this.iframeWindow.postMessage(JSON.stringify(data), 'https://embed.diagrams.net');
+	this.iframeWindow.postMessage(JSON.stringify(data), this.baseUrl);
 }
 
 DrawioEditor.prototype.showDialog = function(title, message) {
-    this.hideSpinner();
-    this.sendMsgToIframe({
-        'action': 'dialog',
-        'title': title,
-        'message': message,
-        'button': 'Discard',
-        'modified': true
-    });
+	this.hideSpinner();
+	this.sendMsgToIframe({
+		'action': 'dialog',
+		'title': title,
+		'message': message,
+		'button': 'Discard',
+		'modified': true
+	});
 }
 
 DrawioEditor.prototype.showSpinner = function() {
-    this.iframeBox.resizable("disable");
-    this.showOverlay();
-    this.sendMsgToIframe({
-        'action': 'spinner',
+	this.iframeBox.resizable("disable");
+	this.showOverlay();
+	this.sendMsgToIframe({
+		'action': 'spinner',
 	'show': true
-    });
+	});
 }
 
 DrawioEditor.prototype.hideSpinner = function() {
-    this.iframeBox.resizable("enable");
-    this.hideOverlay();
-    this.sendMsgToIframe({
-        'action': 'spinner',
-        'show': false
-    });
+	this.iframeBox.resizable("enable");
+	this.hideOverlay();
+	this.sendMsgToIframe({
+		'action': 'spinner',
+		'show': false
+	});
 }
 
 DrawioEditor.prototype.downloadFromWiki = function() {
-    var that = this;
-    var xhr = new XMLHttpRequest();
-    xhr.onreadystatechange = function() {
-        if (this.readyState == 4) {
-	    if (this.status == 200) {
-                var res = this.response;
-                var fr = new FileReader();
-                fr.onload = function(ev) { that.loadImageFromDataURL(res.type, ev.target.result); };
-                fr.readAsDataURL(res);
-	    } else {
-	        that.showDialog('Load failed',
-	            'HTTP request to fetch image failed: ' + this.status +
-		    '<br>Image: ' + that.imageURL);
-	    }
-        }
-    }
-    xhr.onload = function() {
-
-    }
-    xhr.open('GET', this.imageURL);
-    xhr.responseType = 'blob';
-    xhr.send();
+	var that = this;
+	var xhr = new XMLHttpRequest();
+	xhr.onreadystatechange = function() {
+		if (this.readyState == 4) {
+		if (this.status == 200) {
+				var res = this.response;
+				var fr = new FileReader();
+				fr.onload = function(ev) { that.loadImageFromDataURL(res.type, ev.target.result); };
+				fr.readAsDataURL(res);
+		} else {
+			that.showDialog('Load failed',
+				'HTTP request to fetch image failed: ' + this.status +
+			'<br>Image: ' + that.imageURL);
+		}
+		}
+	}
+	xhr.onload = function() {
+
+	}
+	xhr.open('GET', this.imageURL);
+	xhr.responseType = 'blob';
+	xhr.send();
 }
 
 DrawioEditor.prototype.loadImageFromDataURL = function(type, dataurl) {
-        if (type != this.imgMimeType) {
-	    this.showDialog('Load failed',
-	        'Invalid mime type when loading image from wiki:' +
+		if (type != this.imgMimeType) {
+		this.showDialog('Load failed',
+			'Invalid mime type when loading image from wiki:' +
 		'<br>Actual: ' + type + ' / Expected: ' + this.imgMimeType +
 		'<br>Image: ' + this.imageURL);
-	    return;
-        }
-        if (this.imgType == 'svg') {
-            this.sendMsgToIframe({ action: 'load', xml: dataurl});
-        } else if (this.imgType == 'png') {
-            this.sendMsgToIframe({ action: 'load', xmlpng: dataurl});
-        }
+		return;
+		}
+		if (this.imgType == 'svg') {
+			this.sendMsgToIframe({ action: 'load', xml: dataurl});
+		} else if (this.imgType == 'png') {
+			this.sendMsgToIframe({ action: 'load', xmlpng: dataurl});
+		}
 }
 
 DrawioEditor.prototype.loadImage = function() {
-    if (!this.imageURL.length) {
-        // just load without data if there's no current image
-        this.sendMsgToIframe({ action: 'load' });
+	if (!this.imageURL.length) {
+		// just load without data if there's no current image
+		this.sendMsgToIframe({ action: 'load' });
 	return;
-    }
-    // fetch image from wiki. it must contain both image data and
-    // draw.io xml data. see DrawioEditor.saveCallback()
-    this.downloadFromWiki();
+	}
+	// fetch image from wiki. it must contain both image data and
+	// draw.io xml data. see DrawioEditor.saveCallback()
+	this.downloadFromWiki();
 }
- 
+
 DrawioEditor.prototype.uploadToWiki = function(blob) {
-    var that = this;
+	var that = this;
 
 	var api = new mw.Api();
-    api.upload(blob, { filename: this.filename, ignorewarnings: true, format: 'json' } )
-        .done( function(data) {
+	api.upload(blob, { filename: this.filename, ignorewarnings: true, format: 'json' } )
+		.done( function(data) {
 			if (!data.upload) {
 				if (data.error) {
 						that.showDialog('Save failed',
@@ -206,130 +212,131 @@ DrawioEditor.prototype.uploadToWiki = function(blob) {
 				that.updateImage(data.upload.imageinfo);
 				that.hideSpinner();
 			}
-        })
+		})
 		.fail( function(retStatus, data) {
 			if( retStatus == "exists" ){
 				that.updateImage(data.upload.imageinfo);
 				that.hideSpinner();
 			} else {
-				that.showDialog('Save failed', 
+				that.showDialog('Save failed',
 					'Upload to wiki failed!' +
 				'<br>Error: ' + data.error.info +
 				'<br>Check javascript console for details.');
 			}
-        });
-    
+		});
+
 }
 
 DrawioEditor.prototype.save = function(datauri) {
-    // the data in the data uri contains both the image _and_ draw.io XML, see
-    // this.saveCallback()
-
-    parts = /^data:([^;,=]+\/[^;,=]+)?((?:;[^;,=]+=[^;,=]+)+)?(?:;(base64))?,(.+)$/.exec(datauri);
-    
-    // currently this save/upload to wiki code assumes that drawio passes data
-    // URIs with base64 encoded data. this is currently the case but may not be
-    // true forever. the check below errors out if the URI data is not base64
-    // encoded (and if the data URI is otherwise deemed invalid.
-    if (!parts || parts[1] != this.imgMimeType || parts[3] != 'base64' ||
-            typeof parts[4] !== 'string' || parts[4].length < 1) {
+	// the data in the data uri contains both the image _and_ draw.io XML, see
+	// this.saveCallback()
+
+	parts = /^data:([^;,=]+\/[^;,=]+)?((?:;[^;,=]+=[^;,=]+)+)?(?:;(base64))?,(.+)$/.exec(datauri);
+
+	// currently this save/upload to wiki code assumes that drawio passes data
+	// URIs with base64 encoded data. this is currently the case but may not be
+	// true forever. the check below errors out if the URI data is not base64
+	// encoded (and if the data URI is otherwise deemed invalid.
+	if (!parts || parts[1] != this.imgMimeType || parts[3] != 'base64' ||
+			typeof parts[4] !== 'string' || parts[4].length < 1) {
 	that.showDialog('Save failed', 'Got unexpected data from drawio export.');
 	return;
-    }
-
-    // convert base64 to uint8 array
-    datastr = atob(parts[4]);
-    var expr = /"http:\/\/[^"]*?1999[^"]*?"/gmi;
-    datastr = datastr.replace( expr, '"http://www.w3.org/2000/svg"' );
-    data = new Uint8Array(datastr.length)
-    for (i = 0; i < datastr.length; i++) {
-        data[i] = datastr.charCodeAt(i);
-    }
-    
-    this.uploadToWiki(new Blob([data], {type: this.imgMimeType}));
+	}
+
+	// convert base64 to uint8 array
+	datastr = atob(parts[4]);
+	var expr = /"http:\/\/[^"]*?1999[^"]*?"/gmi;
+	datastr = datastr.replace( expr, '"http://www.w3.org/2000/svg"' );
+	data = new Uint8Array(datastr.length)
+	for (i = 0; i < datastr.length; i++) {
+		data[i] = datastr.charCodeAt(i);
+	}
+
+	this.uploadToWiki(new Blob([data], {type: this.imgMimeType}));
 }
 
 DrawioEditor.prototype.exit = function() {
-    this.hide();
-    editor = null;
-    this.destroy();
+	this.hide();
+	editor = null;
+	this.destroy();
 }
 
 DrawioEditor.prototype.saveCallback = function() {
-    this.showSpinner();
+	this.showSpinner();
 
-    // xmlsvg and xmlpng are known to work. the xml prefix causes the original
-    // chart.io xml data to be added to the file, so it can be reimported later
-    // without any data loss.
-    var format = 'xml'+ this.imgType;
+	// xmlsvg and xmlpng are known to work. the xml prefix causes the original
+	// chart.io xml data to be added to the file, so it can be reimported later
+	// without any data loss.
+	var format = 'xml'+ this.imgType;
 
-    this.sendMsgToIframe({
-        'action': 'export',
-        'embedImages': true,
-        'format': format,
-    });
+	this.sendMsgToIframe({
+		'action': 'export',
+		'embedImages': true,
+		'format': format,
+	});
 
-    // TODO: prevent exit while saving
+	// TODO: prevent exit while saving
 }
 
 DrawioEditor.prototype.exportCallback = function(type, data) {
-    this.showSpinner();
-    this.save(data);
+	this.showSpinner();
+	this.save(data);
 }
 
 DrawioEditor.prototype.exitCallback = function() {
-    this.exit();
+	this.exit();
 }
 
 DrawioEditor.prototype.initCallback = function () {
-    this.loadImage();
+	this.loadImage();
 }
 
 
 var editor;
 
-window.editDrawio = function(id, filename, type, interactive, updateHeight, updateWidth, updateMaxWidth) {
-    if (!editor) {
-        editor = new DrawioEditor(id, filename, type, interactive, updateHeight, updateWidth, updateMaxWidth);
-    } else {
-        alert("Only one DrawioEditor can be open at the same time!");
-    }
+window.editDrawio = function(id, filename, type, interactive, updateHeight, updateWidth, updateMaxWidth, baseUrl) {
+	if (!editor) {
+		window.drawioEditorBaseUrl = baseUrl;
+		editor = new DrawioEditor(id, filename, type, interactive, updateHeight, updateWidth, updateMaxWidth, baseUrl);
+	} else {
+		alert("Only one DrawioEditor can be open at the same time!");
+	}
 };
 
 function drawioHandleMessage(e) {
-    // we only act on event coming from draw.io iframes
-    if (e.origin != 'https://embed.diagrams.net')
-        return;
-    
-    if (!editor)
-        return;
-       
-    evdata = JSON.parse(e.data);
-
-    switch(evdata['event']) {
-        case 'init':
-            editor.initCallback();
-            break;
-
-        case 'load':
-            break;
-
-        case 'save':
-            editor.saveCallback();
-            break;
-
-        case 'export':
-            editor.exportCallback(evdata['format'], evdata['data']);
-            break;
-
-        case 'exit':
-            editor.exitCallback();
-	    // editor is null after this callback
-            break;
-
-        default:
-            alert('Received unknown event from drawio iframe: ' + evdata['event']);
-    }
+	// we only act on event coming from "baseUrl" iframes
+	if (e.origin != window.drawioEditorBaseUrl)
+		return;
+
+	if (!editor)
+		return;
+
+	evdata = JSON.parse(e.data);
+
+	switch(evdata['event']) {
+		case 'init':
+			editor.initCallback();
+			break;
+
+		case 'load':
+			break;
+
+		case 'save':
+			editor.saveCallback();
+			break;
+
+		case 'export':
+			editor.exportCallback(evdata['format'], evdata['data']);
+			break;
+
+		case 'exit':
+			editor.exitCallback();
+		// editor is null after this callback
+			break;
+
+		default:
+			alert('Received unknown event from drawio iframe: ' + evdata['event']);
+	}
 };
 
 window.addEventListener('message', drawioHandleMessage);
diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 9350174..b3d182d 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -39,7 +39,7 @@ public function __construct() {
 	 * @return string HTML to insert in the page.
 	 */
 	public function parseExtension( $data, array $attribs, Parser $parser, PPFrame $frame ) {
-		// Extract name as option from tag <drawio name=FileName .../>
+		// Extract name as option from tag <drawio filename=FileName .../>
 		$name = array_key_exists( 'filename', $attribs )
 			? $attribs[ 'filename' ]
 			: null;
@@ -155,15 +155,25 @@ public function parse( &$parser, $name, $opts ) {
 		$css_img_width = $opt_width === 'chart' ? $img_width : $opt_width;
 		$css_img_max_width = $opt_max_width === 'chart' ? $img_width : $opt_max_width;
 
+		/* get and check base url */
+		$base_url = filter_var( $this->config->get( 'DrawioEditorBackendUrl' ),
+			FILTER_VALIDATE_URL,
+			FILTER_FLAG_SCHEME_REQUIRED & FILTER_FLAG_HOST_REQUIRED );
+		if ( !$base_url ) {
+			return $this->errorMessage( 'Invalid base url' );
+		}
+
 		/* prepare edit href */
-		$edit_ahref = sprintf( "<a href='javascript:editDrawio(\"%s\", %s, \"%s\", %s, %s, %s, %s)'>",
+		$edit_ahref = sprintf( "<a href='javascript:editDrawio(\"%s\", %s, \"%s\", %s, %s, %s, %s, \"%s\")'>",
 			$id,
 			json_encode( $img_name, JSON_HEX_QUOT | JSON_HEX_APOS ),
 			$opt_type,
 			$opt_interactive ? 'true' : 'false',
 			$opt_height === 'chart' ? 'true' : 'false',
 			$opt_width === 'chart' ? 'true' : 'false',
-			$opt_max_width === 'chart' ? 'true' : 'false' );
+			$opt_max_width === 'chart' ? 'true' : 'false',
+			$base_url
+		);
 
 		/* output begin */
 		$output = '<div>';
diff --git a/src/Hook/ParserFirstCallInit/SetFunctionHook.php b/src/Hook/ParserFirstCallInit/SetFunctionHook.php
index 51b72de..d8bc790 100644
--- a/src/Hook/ParserFirstCallInit/SetFunctionHook.php
+++ b/src/Hook/ParserFirstCallInit/SetFunctionHook.php
@@ -19,7 +19,7 @@ public static function callback( &$parser ) {
 		// Add hook for Legacy Parser Function {{#drawio:filename|param=...}}
 		$parser->setFunctionHook( 'drawio', [ $drawioEditor, 'parseLegacyParserFunc' ] );
 
-		// Add hook for Tag Extension; <drawio name=filename param=..../>
+		// Add hook for Tag Extension; <drawio filename=filename param=..../>
 		$parser->setHook( 'drawio', [ $drawioEditor, 'parseExtension' ] );
 
 		return true;

From 424efe03c55fa0957042dfbbdd50e22d975db835 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Mon, 8 Feb 2021 08:40:28 +0100
Subject: [PATCH 024/117] Localisation updates from https://translatewiki.net.

Change-Id: I51ca595d1b205b60951e7e977bf51660bb581907
---
 i18n/pt-br.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i18n/pt-br.json b/i18n/pt-br.json
index ddc5147..d157110 100644
--- a/i18n/pt-br.json
+++ b/i18n/pt-br.json
@@ -1,7 +1,8 @@
 {
 	"@metadata": {
 		"authors": [
-			"Eduardo Addad de Oliveira"
+			"Eduardo Addad de Oliveira",
+			"Eduardoaddad"
 		]
 	},
 	"drawioeditor-desc": "Criação de fluxograma draw.io e edição em linha"

From 39af3329799a55d19076b4fad43a5986c285cd1a Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Wed, 17 Feb 2021 08:42:29 +0100
Subject: [PATCH 025/117] Localisation updates from https://translatewiki.net.

Change-Id: I1d76c3793a0264772e4889cf7bf2127d8a5bf600
---
 i18n/fr.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/i18n/fr.json b/i18n/fr.json
index 61af14e..3f0e6e5 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -1,8 +1,9 @@
 {
 	"@metadata": {
 		"authors": [
-			"Gomoko"
+			"Gomoko",
+			"Verdy p"
 		]
 	},
-	"drawioeditor-desc": "création du diagramme de flux draw.io et modification en ligne"
+	"drawioeditor-desc": "Création et modification en ligne de diagrammes de flux pour draw.io"
 }

From 6e44f626bf6d604e751f7071f7dcc023507fc4a2 Mon Sep 17 00:00:00 2001
From: Umherirrender <umherirrender_de.wp@web.de>
Date: Tue, 6 Apr 2021 16:01:19 +0200
Subject: [PATCH 026/117] build: Add eslint to lint json files

Change-Id: I48f55150f6464c9df0908168254297dca3e16068
---
 .eslintrc.json    |    7 +
 .gitignore        |    1 +
 Gruntfile.js      |   19 +-
 extension.json    |    2 +-
 package-lock.json | 1274 +++++++++++++++++++++++++++++++++++++++++++++
 package.json      |    4 +-
 6 files changed, 1302 insertions(+), 5 deletions(-)
 create mode 100644 .eslintrc.json

diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..8a0a7eb
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,7 @@
+{
+	"root": true,
+	"extends": [
+		"wikimedia/client-es5",
+		"wikimedia/mediawiki"
+	]
+}
diff --git a/.gitignore b/.gitignore
index db8a779..3484c6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /node_modules
 /vendor
 /composer.lock
+/.eslintcache
diff --git a/Gruntfile.js b/Gruntfile.js
index a3aeb77..49cd73e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,11 +1,24 @@
+/* eslint-env node, es6 */
 module.exports = function ( grunt ) {
+	var conf = grunt.file.readJSON( 'extension.json' );
+
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
+	grunt.loadNpmTasks( 'grunt-eslint' );
 
-	var conf = grunt.file.readJSON( 'extension.json' );
 	grunt.initConfig( {
-		banana: conf.MessagesDirs
+		banana: conf.MessagesDirs,
+		eslint: {
+			options: {
+				cache: true
+			},
+			all: [
+				'**/*.json',
+				'!node_modules/**',
+				'!vendor/**'
+			]
+		}
 	} );
 
-	grunt.registerTask( 'test', [ 'banana' ] );
+	grunt.registerTask( 'test', [ 'eslint', 'banana' ] );
 	grunt.registerTask( 'default', 'test' );
 };
diff --git a/extension.json b/extension.json
index de95ae0..da3d27e 100644
--- a/extension.json
+++ b/extension.json
@@ -50,6 +50,6 @@
 			"value": "https://embed.diagrams.net"
 		}
 	},
-	"load_composer_autoloader" : true,
+	"load_composer_autoloader": true,
 	"manifest_version": 2
 }
diff --git a/package-lock.json b/package-lock.json
index bc2d842..d8cec94 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,6 +2,136 @@
 	"requires": true,
 	"lockfileVersion": 1,
 	"dependencies": {
+		"@babel/code-frame": {
+			"version": "7.12.11",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+			"integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+			"dev": true,
+			"requires": {
+				"@babel/highlight": "^7.10.4"
+			}
+		},
+		"@babel/helper-validator-identifier": {
+			"version": "7.12.11",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+			"integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+			"dev": true
+		},
+		"@babel/highlight": {
+			"version": "7.13.10",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
+			"integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-validator-identifier": "^7.12.11",
+				"chalk": "^2.0.0",
+				"js-tokens": "^4.0.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "3.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^1.9.0"
+					}
+				},
+				"chalk": {
+					"version": "2.4.2",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^3.2.1",
+						"escape-string-regexp": "^1.0.5",
+						"supports-color": "^5.3.0"
+					}
+				},
+				"color-convert": {
+					"version": "1.9.3",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+					"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+					"dev": true,
+					"requires": {
+						"color-name": "1.1.3"
+					}
+				},
+				"color-name": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+					"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+					"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^3.0.0"
+					}
+				}
+			}
+		},
+		"@eslint/eslintrc": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz",
+			"integrity": "sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==",
+			"dev": true,
+			"requires": {
+				"ajv": "^6.12.4",
+				"debug": "^4.1.1",
+				"espree": "^7.3.0",
+				"globals": "^12.1.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^3.13.1",
+				"minimatch": "^3.0.4",
+				"strip-json-comments": "^3.1.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.3.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+					"dev": true,
+					"requires": {
+						"ms": "2.1.2"
+					}
+				},
+				"globals": {
+					"version": "12.4.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+					"integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+					"dev": true,
+					"requires": {
+						"type-fest": "^0.8.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+					"dev": true
+				}
+			}
+		},
+		"@mdn/browser-compat-data": {
+			"version": "2.0.7",
+			"resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-2.0.7.tgz",
+			"integrity": "sha512-GeeM827DlzFFidn1eKkMBiqXFD2oLsnZbaiGhByPl0vcapsRzUL+t9hDoov1swc9rB2jw64R+ihtzC8qOE9wXw==",
+			"dev": true,
+			"requires": {
+				"extend": "3.0.2"
+			}
+		},
 		"@types/color-name": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
@@ -14,6 +144,42 @@
 			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
 			"dev": true
 		},
+		"acorn": {
+			"version": "7.4.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+			"dev": true
+		},
+		"acorn-jsx": {
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
+			"integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+			"dev": true
+		},
+		"ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dev": true,
+			"requires": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			}
+		},
+		"ansi-colors": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+			"dev": true
+		},
+		"ansi-regex": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+			"integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+			"dev": true
+		},
 		"ansi-styles": {
 			"version": "4.2.1",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -83,6 +249,18 @@
 			"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
 			"dev": true
 		},
+		"ast-metadata-inferer": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/ast-metadata-inferer/-/ast-metadata-inferer-0.4.0.tgz",
+			"integrity": "sha512-tKHdBe8N/Vq2nLAm4YPBVREVZjMux6KrqyPfNQgIbDl0t7HaNSmy8w4OyVHYg/cvyn5BW7o7pVwpjPte89Zhcg==",
+			"dev": true
+		},
+		"astral-regex": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+			"dev": true
+		},
 		"async": {
 			"version": "1.5.2",
 			"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
@@ -195,6 +373,19 @@
 				}
 			}
 		},
+		"browserslist": {
+			"version": "4.16.3",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
+			"integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
+			"dev": true,
+			"requires": {
+				"caniuse-lite": "^1.0.30001181",
+				"colorette": "^1.2.1",
+				"electron-to-chromium": "^1.3.649",
+				"escalade": "^3.1.1",
+				"node-releases": "^1.1.70"
+			}
+		},
 		"cache-base": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
@@ -212,6 +403,28 @@
 				"unset-value": "^1.0.0"
 			}
 		},
+		"call-bind": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+			"dev": true,
+			"requires": {
+				"function-bind": "^1.1.1",
+				"get-intrinsic": "^1.0.2"
+			}
+		},
+		"callsites": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+			"dev": true
+		},
+		"caniuse-lite": {
+			"version": "1.0.30001207",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001207.tgz",
+			"integrity": "sha512-UPQZdmAsyp2qfCTiMU/zqGSWOYaY9F9LL61V8f+8MrubsaDGpaHD9HRV/EWZGULZn0Hxu48SKzI5DgFwTvHuYw==",
+			"dev": true
+		},
 		"chalk": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
@@ -270,12 +483,24 @@
 			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
+		"colorette": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+			"integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+			"dev": true
+		},
 		"colors": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
 			"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
 			"dev": true
 		},
+		"comment-parser": {
+			"version": "0.7.6",
+			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-0.7.6.tgz",
+			"integrity": "sha512-GKNxVA7/iuTnAqGADlTWX4tkhzxZKXp5fLJqKTlQLHkE65XDUKutZ3BHaJC5IGcper2tT3QRD1xr4o3jNpgXXg==",
+			"dev": true
+		},
 		"component-emitter": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
@@ -294,6 +519,34 @@
 			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
 			"dev": true
 		},
+		"core-js": {
+			"version": "3.10.0",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.10.0.tgz",
+			"integrity": "sha512-MQx/7TLgmmDVamSyfE+O+5BHvG1aUGj/gHhLn1wVtm2B5u1eVIPvh7vkfjwWKNCjrTJB8+He99IntSQ1qP+vYQ==",
+			"dev": true
+		},
+		"cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"requires": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"dependencies": {
+				"which": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+					"dev": true,
+					"requires": {
+						"isexe": "^2.0.0"
+					}
+				}
+			}
+		},
 		"dateformat": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
@@ -315,6 +568,12 @@
 			"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
 			"dev": true
 		},
+		"deep-is": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+			"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+			"dev": true
+		},
 		"define-property": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -362,12 +621,417 @@
 			"integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
 			"dev": true
 		},
+		"doctrine": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+			"dev": true,
+			"requires": {
+				"esutils": "^2.0.2"
+			}
+		},
+		"electron-to-chromium": {
+			"version": "1.3.708",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.708.tgz",
+			"integrity": "sha512-+A8ggYZ5riOLMcVAuzHx6bforaPzaiLnW1QOMD2SlMYQVi7QQTyQ/WrlZoebIH9ikmgr+tLJGpNITFFCUiQcPw==",
+			"dev": true
+		},
+		"emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true
+		},
+		"enquirer": {
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+			"dev": true,
+			"requires": {
+				"ansi-colors": "^4.1.1"
+			}
+		},
+		"escalade": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"dev": true
+		},
+		"escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+			"dev": true
+		},
+		"eslint": {
+			"version": "7.23.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.23.0.tgz",
+			"integrity": "sha512-kqvNVbdkjzpFy0XOszNwjkKzZ+6TcwCQ/h+ozlcIWwaimBBuhlQ4nN6kbiM2L+OjDcznkTJxzYfRFH92sx4a0Q==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "7.12.11",
+				"@eslint/eslintrc": "^0.4.0",
+				"ajv": "^6.10.0",
+				"chalk": "^4.0.0",
+				"cross-spawn": "^7.0.2",
+				"debug": "^4.0.1",
+				"doctrine": "^3.0.0",
+				"enquirer": "^2.3.5",
+				"eslint-scope": "^5.1.1",
+				"eslint-utils": "^2.1.0",
+				"eslint-visitor-keys": "^2.0.0",
+				"espree": "^7.3.1",
+				"esquery": "^1.4.0",
+				"esutils": "^2.0.2",
+				"file-entry-cache": "^6.0.1",
+				"functional-red-black-tree": "^1.0.1",
+				"glob-parent": "^5.0.0",
+				"globals": "^13.6.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.0.0",
+				"imurmurhash": "^0.1.4",
+				"is-glob": "^4.0.0",
+				"js-yaml": "^3.13.1",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"levn": "^0.4.1",
+				"lodash": "^4.17.21",
+				"minimatch": "^3.0.4",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.9.1",
+				"progress": "^2.0.0",
+				"regexpp": "^3.1.0",
+				"semver": "^7.2.1",
+				"strip-ansi": "^6.0.0",
+				"strip-json-comments": "^3.1.0",
+				"table": "^6.0.4",
+				"text-table": "^0.2.0",
+				"v8-compile-cache": "^2.0.3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.3.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+					"dev": true,
+					"requires": {
+						"ms": "2.1.2"
+					}
+				},
+				"is-glob": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+					"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+					"dev": true,
+					"requires": {
+						"is-extglob": "^2.1.1"
+					}
+				},
+				"lodash": {
+					"version": "4.17.21",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+					"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+					"dev": true
+				},
+				"ms": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+					"dev": true
+				}
+			}
+		},
+		"eslint-config-wikimedia": {
+			"version": "0.19.0",
+			"resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.19.0.tgz",
+			"integrity": "sha512-zCa5IFT9lTcyF6w0OTmhPVXwrU+mcASGi74gdzuVOgvO7YVNzQzA+yyGh2Q8vIzvEt+i72/BcsGF5Y8/mOrStw==",
+			"dev": true,
+			"requires": {
+				"eslint": "^7.17.0",
+				"eslint-plugin-compat": "^3.9.0",
+				"eslint-plugin-es": "^4.1.0",
+				"eslint-plugin-jsdoc": "^30.7.13",
+				"eslint-plugin-json-es": "^1.5.1",
+				"eslint-plugin-mediawiki": "^0.2.7",
+				"eslint-plugin-mocha": "^8.0.0",
+				"eslint-plugin-no-jquery": "^2.5.0",
+				"eslint-plugin-node": "^11.1.0",
+				"eslint-plugin-qunit": "^5.2.0",
+				"eslint-plugin-vue": "^7.7.0",
+				"eslint-plugin-wdio": "^6.0.12"
+			}
+		},
+		"eslint-plugin-compat": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-3.9.0.tgz",
+			"integrity": "sha512-lt3l5PHFHVEYSZ5zijcoYvtQJPsBifRiH5N0Et57KwVu7l/yxmHhSG6VJiLMa/lXrg93Qu8049RNQOMn0+yJBg==",
+			"dev": true,
+			"requires": {
+				"@mdn/browser-compat-data": "^2.0.7",
+				"ast-metadata-inferer": "^0.4.0",
+				"browserslist": "^4.12.2",
+				"caniuse-lite": "^1.0.30001166",
+				"core-js": "^3.6.5",
+				"find-up": "^4.1.0",
+				"lodash.memoize": "4.1.2",
+				"semver": "7.3.2"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "7.3.2",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+					"integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+					"dev": true
+				}
+			}
+		},
+		"eslint-plugin-es": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
+			"integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
+			"dev": true,
+			"requires": {
+				"eslint-utils": "^2.0.0",
+				"regexpp": "^3.0.0"
+			}
+		},
+		"eslint-plugin-jsdoc": {
+			"version": "30.7.13",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.13.tgz",
+			"integrity": "sha512-YM4WIsmurrp0rHX6XiXQppqKB8Ne5ATiZLJe2+/fkp9l9ExXFr43BbAbjZaVrpCT+tuPYOZ8k1MICARHnURUNQ==",
+			"dev": true,
+			"requires": {
+				"comment-parser": "^0.7.6",
+				"debug": "^4.3.1",
+				"jsdoctypeparser": "^9.0.0",
+				"lodash": "^4.17.20",
+				"regextras": "^0.7.1",
+				"semver": "^7.3.4",
+				"spdx-expression-parse": "^3.0.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.3.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+					"dev": true,
+					"requires": {
+						"ms": "2.1.2"
+					}
+				},
+				"ms": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+					"dev": true
+				}
+			}
+		},
+		"eslint-plugin-json-es": {
+			"version": "1.5.3",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-json-es/-/eslint-plugin-json-es-1.5.3.tgz",
+			"integrity": "sha512-9wWjwhoN+ipMel70ktkWy0H7jj9sm5OAbAy3N3F3AT0swpIofVsIjDXyjGZJwSzy9tZzDtI/aKIj2WsqMHw2QA==",
+			"dev": true,
+			"requires": {
+				"eslint-visitor-keys": "^2.0.0",
+				"espree": "^7.3.1"
+			}
+		},
+		"eslint-plugin-mediawiki": {
+			"version": "0.2.7",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-mediawiki/-/eslint-plugin-mediawiki-0.2.7.tgz",
+			"integrity": "sha512-2ZvPvLEwCIqrJxV1349bdX5Q03c30WccuUMCfB1Gh2IVxbBSrY0gbzOk/gPZeYigVhODt9xoFWUCIz8jwTWfrA==",
+			"dev": true,
+			"requires": {
+				"eslint-plugin-vue": "^7.7.0",
+				"upath": "^1.2.0"
+			}
+		},
+		"eslint-plugin-mocha": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-8.1.0.tgz",
+			"integrity": "sha512-1EgHvXKRl7W3mq3sntZAi5T24agRMyiTPL4bSXe+B4GksYOjAPEWYx+J3eJg4It1l2NMNZJtk0gQyQ6mfiPhQg==",
+			"dev": true,
+			"requires": {
+				"eslint-utils": "^2.1.0",
+				"ramda": "^0.27.1"
+			}
+		},
+		"eslint-plugin-no-jquery": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.5.0.tgz",
+			"integrity": "sha512-RrQ380mUJJKdjgpQ/tZAJ3B3W1n3LbVmULooS2Pv5pUDcc5uVHVSJMTdUlsbvQyfo6hWP2LJ4FbOoDzENWcF7A==",
+			"dev": true
+		},
+		"eslint-plugin-node": {
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
+			"integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
+			"dev": true,
+			"requires": {
+				"eslint-plugin-es": "^3.0.0",
+				"eslint-utils": "^2.0.0",
+				"ignore": "^5.1.1",
+				"minimatch": "^3.0.4",
+				"resolve": "^1.10.1",
+				"semver": "^6.1.0"
+			},
+			"dependencies": {
+				"eslint-plugin-es": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
+					"integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
+					"dev": true,
+					"requires": {
+						"eslint-utils": "^2.0.0",
+						"regexpp": "^3.0.0"
+					}
+				},
+				"ignore": {
+					"version": "5.1.8",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+					"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+					"dev": true
+				},
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"eslint-plugin-qunit": {
+			"version": "5.4.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-qunit/-/eslint-plugin-qunit-5.4.0.tgz",
+			"integrity": "sha512-vdqMW+YfZOH9AW7U1xc82UwKAdz2xlyuh0Hl+kTXj1E8JPy1B6K+/SBIqRNJUFyuPXHwzKb5Q/kr9i/sU7oMZA==",
+			"dev": true,
+			"requires": {
+				"eslint-utils": "^2.1.0",
+				"requireindex": "^1.2.0"
+			}
+		},
+		"eslint-plugin-vue": {
+			"version": "7.8.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.8.0.tgz",
+			"integrity": "sha512-OGrnPz+PuYL2HmVyBHxm4mRjxW2kfFCQE6Hw9G6qOHs/Pcu0srOlCCW0FMa8SLzIEqxl8WuKoBSPcMnrjUG2vw==",
+			"dev": true,
+			"requires": {
+				"eslint-utils": "^2.1.0",
+				"natural-compare": "^1.4.0",
+				"semver": "^7.3.2",
+				"vue-eslint-parser": "^7.6.0"
+			}
+		},
+		"eslint-plugin-wdio": {
+			"version": "6.6.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-wdio/-/eslint-plugin-wdio-6.6.0.tgz",
+			"integrity": "sha512-6nhKL5pt1/btKrqJWZ4qqaRtrPspXJYJNIkuYLyXGOvla2Ey55iuegbnP29Gb7XTq5B9MXOPTg9CQhk2qqMJ6Q==",
+			"dev": true
+		},
+		"eslint-scope": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"dev": true,
+			"requires": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^4.1.1"
+			}
+		},
+		"eslint-utils": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+			"integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+			"dev": true,
+			"requires": {
+				"eslint-visitor-keys": "^1.1.0"
+			},
+			"dependencies": {
+				"eslint-visitor-keys": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+					"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+					"dev": true
+				}
+			}
+		},
+		"eslint-visitor-keys": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
+			"integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
+			"dev": true
+		},
+		"espree": {
+			"version": "7.3.1",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+			"integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+			"dev": true,
+			"requires": {
+				"acorn": "^7.4.0",
+				"acorn-jsx": "^5.3.1",
+				"eslint-visitor-keys": "^1.3.0"
+			},
+			"dependencies": {
+				"eslint-visitor-keys": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+					"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+					"dev": true
+				}
+			}
+		},
 		"esprima": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
 			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
 			"dev": true
 		},
+		"esquery": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+			"dev": true,
+			"requires": {
+				"estraverse": "^5.1.0"
+			},
+			"dependencies": {
+				"estraverse": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+					"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+					"dev": true
+				}
+			}
+		},
+		"esrecurse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+			"dev": true,
+			"requires": {
+				"estraverse": "^5.2.0"
+			},
+			"dependencies": {
+				"estraverse": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+					"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+					"dev": true
+				}
+			}
+		},
+		"estraverse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"dev": true
+		},
+		"esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+			"dev": true
+		},
 		"eventemitter2": {
 			"version": "0.4.14",
 			"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
@@ -516,6 +1180,33 @@
 				}
 			}
 		},
+		"fast-deep-equal": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+			"dev": true
+		},
+		"fast-json-stable-stringify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+			"dev": true
+		},
+		"fast-levenshtein": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+			"dev": true
+		},
+		"file-entry-cache": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+			"dev": true,
+			"requires": {
+				"flat-cache": "^3.0.4"
+			}
+		},
 		"fill-range": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -539,6 +1230,16 @@
 				}
 			}
 		},
+		"find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
+			"requires": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			}
+		},
 		"findup-sync": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
@@ -582,6 +1283,22 @@
 			"integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
 			"dev": true
 		},
+		"flat-cache": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+			"dev": true,
+			"requires": {
+				"flatted": "^3.1.0",
+				"rimraf": "^3.0.2"
+			}
+		},
+		"flatted": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
+			"integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
+			"dev": true
+		},
 		"for-in": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -612,6 +1329,29 @@
 			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
 			"dev": true
 		},
+		"function-bind": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+			"dev": true
+		},
+		"functional-red-black-tree": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+			"dev": true
+		},
+		"get-intrinsic": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+			"integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+			"dev": true,
+			"requires": {
+				"function-bind": "^1.1.1",
+				"has": "^1.0.3",
+				"has-symbols": "^1.0.1"
+			}
+		},
 		"get-value": {
 			"version": "2.0.6",
 			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
@@ -638,6 +1378,26 @@
 				"path-is-absolute": "^1.0.0"
 			}
 		},
+		"glob-parent": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+			"dev": true,
+			"requires": {
+				"is-glob": "^4.0.1"
+			},
+			"dependencies": {
+				"is-glob": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+					"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+					"dev": true,
+					"requires": {
+						"is-extglob": "^2.1.1"
+					}
+				}
+			}
+		},
 		"global-modules": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
@@ -662,6 +1422,23 @@
 				"which": "^1.2.14"
 			}
 		},
+		"globals": {
+			"version": "13.7.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.7.0.tgz",
+			"integrity": "sha512-Aipsz6ZKRxa/xQkZhNg0qIWXT6x6rD46f6x/PCnBomlttdIyAPak4YD9jTmKpZ72uROSMU87qJtcgpgHaVchiA==",
+			"dev": true,
+			"requires": {
+				"type-fest": "^0.20.2"
+			},
+			"dependencies": {
+				"type-fest": {
+					"version": "0.20.2",
+					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+					"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+					"dev": true
+				}
+			}
+		},
 		"grunt": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.3.0.tgz",
@@ -718,6 +1495,16 @@
 			"integrity": "sha512-SqPiB6OazWqR8USL0NymtuT5Br3mD9WBBsM1rHC/3wIi2SrZNM6/+j9CIeuEM5oCn+AtO2Y0+rzzFyOdC9afAg==",
 			"dev": true
 		},
+		"grunt-eslint": {
+			"version": "23.0.0",
+			"resolved": "https://registry.npmjs.org/grunt-eslint/-/grunt-eslint-23.0.0.tgz",
+			"integrity": "sha512-QqHSAiGF08EVD7YlD4OSRWuLRaDvpsRdTptwy9WaxUXE+03mCLVA/lEaR6SHWehF7oUwIqCEjaNONeeeWlB4LQ==",
+			"dev": true,
+			"requires": {
+				"chalk": "^4.0.0",
+				"eslint": "^7.0.0"
+			}
+		},
 		"grunt-known-options": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.1.tgz",
@@ -761,12 +1548,27 @@
 				"which": "~1.3.0"
 			}
 		},
+		"has": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"dev": true,
+			"requires": {
+				"function-bind": "^1.1.1"
+			}
+		},
 		"has-flag": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true
 		},
+		"has-symbols": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+			"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+			"dev": true
+		},
 		"has-value": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -823,6 +1625,28 @@
 				"safer-buffer": ">= 2.1.2 < 3"
 			}
 		},
+		"ignore": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+			"dev": true
+		},
+		"import-fresh": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+			"dev": true,
+			"requires": {
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
+			}
+		},
+		"imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+			"dev": true
+		},
 		"inflight": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -881,6 +1705,15 @@
 				}
 			}
 		},
+		"is-boolean-object": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
+			"integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
+			"dev": true,
+			"requires": {
+				"call-bind": "^1.0.0"
+			}
+		},
 		"is-buffer": {
 			"version": "1.1.6",
 			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
@@ -938,6 +1771,12 @@
 			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
 			"dev": true
 		},
+		"is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"dev": true
+		},
 		"is-glob": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
@@ -967,6 +1806,12 @@
 				}
 			}
 		},
+		"is-number-object": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
+			"integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==",
+			"dev": true
+		},
 		"is-plain-object": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -985,6 +1830,12 @@
 				"is-unc-path": "^1.0.0"
 			}
 		},
+		"is-string": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
+			"integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
+			"dev": true
+		},
 		"is-unc-path": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
@@ -1018,6 +1869,12 @@
 			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
 			"dev": true
 		},
+		"js-tokens": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+			"dev": true
+		},
 		"js-yaml": {
 			"version": "3.14.0",
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
@@ -1028,12 +1885,40 @@
 				"esprima": "^4.0.0"
 			}
 		},
+		"jsdoctypeparser": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz",
+			"integrity": "sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==",
+			"dev": true
+		},
+		"json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+			"dev": true
+		},
+		"json-stable-stringify-without-jsonify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+			"dev": true
+		},
 		"kind-of": {
 			"version": "6.0.3",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
 			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
 			"dev": true
 		},
+		"levn": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+			"dev": true,
+			"requires": {
+				"prelude-ls": "^1.2.1",
+				"type-check": "~0.4.0"
+			}
+		},
 		"liftoff": {
 			"version": "2.5.0",
 			"resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz",
@@ -1064,12 +1949,54 @@
 				}
 			}
 		},
+		"locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"requires": {
+				"p-locate": "^4.1.0"
+			}
+		},
 		"lodash": {
 			"version": "4.17.20",
 			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
 			"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
 			"dev": true
 		},
+		"lodash.clonedeep": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+			"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+			"dev": true
+		},
+		"lodash.flatten": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+			"integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
+			"dev": true
+		},
+		"lodash.memoize": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+			"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+			"dev": true
+		},
+		"lodash.truncate": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+			"integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+			"dev": true
+		},
+		"lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dev": true,
+			"requires": {
+				"yallist": "^4.0.0"
+			}
+		},
 		"make-iterator": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
@@ -1176,6 +2103,18 @@
 				"to-regex": "^3.0.1"
 			}
 		},
+		"natural-compare": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+			"dev": true
+		},
+		"node-releases": {
+			"version": "1.1.71",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
+			"integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
+			"dev": true
+		},
 		"nopt": {
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -1265,6 +2204,20 @@
 				"wrappy": "1"
 			}
 		},
+		"optionator": {
+			"version": "0.9.1",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+			"dev": true,
+			"requires": {
+				"deep-is": "^0.1.3",
+				"fast-levenshtein": "^2.0.6",
+				"levn": "^0.4.1",
+				"prelude-ls": "^1.2.1",
+				"type-check": "^0.4.0",
+				"word-wrap": "^1.2.3"
+			}
+		},
 		"os-homedir": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
@@ -1287,6 +2240,39 @@
 				"os-tmpdir": "^1.0.0"
 			}
 		},
+		"p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"dev": true,
+			"requires": {
+				"p-try": "^2.0.0"
+			}
+		},
+		"p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"requires": {
+				"p-limit": "^2.2.0"
+			}
+		},
+		"p-try": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"dev": true
+		},
+		"parent-module": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+			"dev": true,
+			"requires": {
+				"callsites": "^3.0.0"
+			}
+		},
 		"parse-filepath": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
@@ -1310,12 +2296,24 @@
 			"integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
 			"dev": true
 		},
+		"path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true
+		},
 		"path-is-absolute": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
 			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
 			"dev": true
 		},
+		"path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true
+		},
 		"path-parse": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
@@ -1343,6 +2341,30 @@
 			"integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
 			"dev": true
 		},
+		"prelude-ls": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+			"dev": true
+		},
+		"progress": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+			"dev": true
+		},
+		"punycode": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+			"dev": true
+		},
+		"ramda": {
+			"version": "0.27.1",
+			"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.1.tgz",
+			"integrity": "sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw==",
+			"dev": true
+		},
 		"rechoir": {
 			"version": "0.6.2",
 			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
@@ -1362,6 +2384,18 @@
 				"safe-regex": "^1.1.0"
 			}
 		},
+		"regexpp": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
+			"integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+			"dev": true
+		},
+		"regextras": {
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz",
+			"integrity": "sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==",
+			"dev": true
+		},
 		"repeat-element": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
@@ -1374,6 +2408,18 @@
 			"integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
 			"dev": true
 		},
+		"require-from-string": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+			"dev": true
+		},
+		"requireindex": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
+			"integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
+			"dev": true
+		},
 		"resolve": {
 			"version": "1.17.0",
 			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
@@ -1393,6 +2439,12 @@
 				"global-modules": "^1.0.0"
 			}
 		},
+		"resolve-from": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+			"dev": true
+		},
 		"resolve-url": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -1429,6 +2481,15 @@
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
 			"dev": true
 		},
+		"semver": {
+			"version": "7.3.5",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+			"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+			"dev": true,
+			"requires": {
+				"lru-cache": "^6.0.0"
+			}
+		},
 		"set-value": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
@@ -1452,6 +2513,32 @@
 				}
 			}
 		},
+		"shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"requires": {
+				"shebang-regex": "^3.0.0"
+			}
+		},
+		"shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true
+		},
+		"slice-ansi": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+			"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+			"dev": true,
+			"requires": {
+				"ansi-styles": "^4.0.0",
+				"astral-regex": "^2.0.0",
+				"is-fullwidth-code-point": "^3.0.0"
+			}
+		},
 		"snapdragon": {
 			"version": "0.8.2",
 			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -1584,6 +2671,28 @@
 			"integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
 			"dev": true
 		},
+		"spdx-exceptions": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+			"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+			"dev": true
+		},
+		"spdx-expression-parse": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+			"dev": true,
+			"requires": {
+				"spdx-exceptions": "^2.1.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"spdx-license-ids": {
+			"version": "3.0.7",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz",
+			"integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
+			"dev": true
+		},
 		"split-string": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -1620,6 +2729,32 @@
 				}
 			}
 		},
+		"string-width": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+			"integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+			"dev": true,
+			"requires": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.0"
+			}
+		},
+		"strip-ansi": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+			"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+			"dev": true,
+			"requires": {
+				"ansi-regex": "^5.0.0"
+			}
+		},
+		"strip-json-comments": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+			"dev": true
+		},
 		"supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -1629,6 +2764,49 @@
 				"has-flag": "^4.0.0"
 			}
 		},
+		"table": {
+			"version": "6.0.9",
+			"resolved": "https://registry.npmjs.org/table/-/table-6.0.9.tgz",
+			"integrity": "sha512-F3cLs9a3hL1Z7N4+EkSscsel3z55XT950AvB05bwayrNg5T1/gykXtigioTAjbltvbMSJvvhFCbnf6mX+ntnJQ==",
+			"dev": true,
+			"requires": {
+				"ajv": "^8.0.1",
+				"is-boolean-object": "^1.1.0",
+				"is-number-object": "^1.0.4",
+				"is-string": "^1.0.5",
+				"lodash.clonedeep": "^4.5.0",
+				"lodash.flatten": "^4.4.0",
+				"lodash.truncate": "^4.4.2",
+				"slice-ansi": "^4.0.0",
+				"string-width": "^4.2.0"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "8.0.5",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.0.5.tgz",
+					"integrity": "sha512-RkiLa/AeJx7+9OvniQ/qeWu0w74A8DiPPBclQ6ji3ZQkv5KamO+QGpqmi7O4JIw3rHGUXZ6CoP9tsAkn3gyazg==",
+					"dev": true,
+					"requires": {
+						"fast-deep-equal": "^3.1.1",
+						"json-schema-traverse": "^1.0.0",
+						"require-from-string": "^2.0.2",
+						"uri-js": "^4.2.2"
+					}
+				},
+				"json-schema-traverse": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+					"dev": true
+				}
+			}
+		},
+		"text-table": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+			"dev": true
+		},
 		"to-object-path": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
@@ -1671,6 +2849,21 @@
 				"repeat-string": "^1.6.1"
 			}
 		},
+		"type-check": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+			"dev": true,
+			"requires": {
+				"prelude-ls": "^1.2.1"
+			}
+		},
+		"type-fest": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+			"dev": true
+		},
 		"unc-path-regex": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
@@ -1739,6 +2932,21 @@
 				}
 			}
 		},
+		"upath": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+			"integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+			"dev": true
+		},
+		"uri-js": {
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+			"dev": true,
+			"requires": {
+				"punycode": "^2.1.0"
+			}
+		},
 		"urix": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
@@ -1757,6 +2965,12 @@
 			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
 			"dev": true
 		},
+		"v8-compile-cache": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+			"dev": true
+		},
 		"v8flags": {
 			"version": "3.1.3",
 			"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz",
@@ -1766,6 +2980,54 @@
 				"homedir-polyfill": "^1.0.1"
 			}
 		},
+		"vue-eslint-parser": {
+			"version": "7.6.0",
+			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.6.0.tgz",
+			"integrity": "sha512-QXxqH8ZevBrtiZMZK0LpwaMfevQi9UL7lY6Kcp+ogWHC88AuwUPwwCIzkOUc1LR4XsYAt/F9yHXAB/QoD17QXA==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.1.1",
+				"eslint-scope": "^5.0.0",
+				"eslint-visitor-keys": "^1.1.0",
+				"espree": "^6.2.1",
+				"esquery": "^1.4.0",
+				"lodash": "^4.17.15"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.3.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+					"dev": true,
+					"requires": {
+						"ms": "2.1.2"
+					}
+				},
+				"eslint-visitor-keys": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+					"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+					"dev": true
+				},
+				"espree": {
+					"version": "6.2.1",
+					"resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
+					"integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
+					"dev": true,
+					"requires": {
+						"acorn": "^7.1.1",
+						"acorn-jsx": "^5.2.0",
+						"eslint-visitor-keys": "^1.1.0"
+					}
+				},
+				"ms": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+					"dev": true
+				}
+			}
+		},
 		"which": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -1775,11 +3037,23 @@
 				"isexe": "^2.0.0"
 			}
 		},
+		"word-wrap": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+			"dev": true
+		},
 		"wrappy": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
 			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
 			"dev": true
+		},
+		"yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+			"dev": true
 		}
 	}
 }
diff --git a/package.json b/package.json
index 75ff017..1e9ed51 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,9 @@
 		"test": "grunt test"
 	},
 	"devDependencies": {
+		"eslint-config-wikimedia": "0.19.0",
 		"grunt": "1.3.0",
-		"grunt-banana-checker": "0.9.0"
+		"grunt-banana-checker": "0.9.0",
+		"grunt-eslint": "23.0.0"
 	}
 }

From 39013f2b8b2abc411b4085bfcd05289b10250191 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Thu, 15 Apr 2021 17:49:52 +0000
Subject: [PATCH 027/117] build: Updating eslint-config-wikimedia to 0.20.0

Additional changes:
* Dropped .php5 and .inc files from .phpcs.xml (T200956).

Change-Id: If7ea6a3813ce49755ccff056faa7b67c73ee6963
---
 .phpcs.xml        |   2 +-
 package-lock.json | 116 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 3 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/.phpcs.xml b/.phpcs.xml
index 3c69313..b915cf8 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,6 +2,6 @@
 <ruleset>
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki" />
 	<file>.</file>
-	<arg name="extensions" value="php,php5,inc"/>
+	<arg name="extensions" value="php"/>
 	<arg name="encoding" value="UTF-8"/>
 </ruleset>
diff --git a/package-lock.json b/package-lock.json
index d8cec94..b7a1754 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -374,16 +374,16 @@
 			}
 		},
 		"browserslist": {
-			"version": "4.16.3",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
-			"integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
+			"version": "4.16.4",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.4.tgz",
+			"integrity": "sha512-d7rCxYV8I9kj41RH8UKYnvDYCRENUlHRgyXy/Rhr/1BaeLGfiCptEdFE8MIrvGfWbBFNjVYx76SQWvNX1j+/cQ==",
 			"dev": true,
 			"requires": {
-				"caniuse-lite": "^1.0.30001181",
-				"colorette": "^1.2.1",
-				"electron-to-chromium": "^1.3.649",
+				"caniuse-lite": "^1.0.30001208",
+				"colorette": "^1.2.2",
+				"electron-to-chromium": "^1.3.712",
 				"escalade": "^3.1.1",
-				"node-releases": "^1.1.70"
+				"node-releases": "^1.1.71"
 			}
 		},
 		"cache-base": {
@@ -420,9 +420,9 @@
 			"dev": true
 		},
 		"caniuse-lite": {
-			"version": "1.0.30001207",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001207.tgz",
-			"integrity": "sha512-UPQZdmAsyp2qfCTiMU/zqGSWOYaY9F9LL61V8f+8MrubsaDGpaHD9HRV/EWZGULZn0Hxu48SKzI5DgFwTvHuYw==",
+			"version": "1.0.30001208",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001208.tgz",
+			"integrity": "sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA==",
 			"dev": true
 		},
 		"chalk": {
@@ -496,9 +496,9 @@
 			"dev": true
 		},
 		"comment-parser": {
-			"version": "0.7.6",
-			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-0.7.6.tgz",
-			"integrity": "sha512-GKNxVA7/iuTnAqGADlTWX4tkhzxZKXp5fLJqKTlQLHkE65XDUKutZ3BHaJC5IGcper2tT3QRD1xr4o3jNpgXXg==",
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.2.tgz",
+			"integrity": "sha512-AOdq0i8ghZudnYv8RUnHrhTgafUGs61Rdz9jemU5x2lnZwAWyOq7vySo626K59e1fVKH1xSRorJwPVRLSWOoAQ==",
 			"dev": true
 		},
 		"component-emitter": {
@@ -520,9 +520,9 @@
 			"dev": true
 		},
 		"core-js": {
-			"version": "3.10.0",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.10.0.tgz",
-			"integrity": "sha512-MQx/7TLgmmDVamSyfE+O+5BHvG1aUGj/gHhLn1wVtm2B5u1eVIPvh7vkfjwWKNCjrTJB8+He99IntSQ1qP+vYQ==",
+			"version": "3.10.1",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.10.1.tgz",
+			"integrity": "sha512-pwCxEXnj27XG47mu7SXAwhLP3L5CrlvCB91ANUkIz40P27kUcvNfSdvyZJ9CLHiVoKSp+TTChMQMSKQEH/IQxA==",
 			"dev": true
 		},
 		"cross-spawn": {
@@ -631,9 +631,9 @@
 			}
 		},
 		"electron-to-chromium": {
-			"version": "1.3.708",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.708.tgz",
-			"integrity": "sha512-+A8ggYZ5riOLMcVAuzHx6bforaPzaiLnW1QOMD2SlMYQVi7QQTyQ/WrlZoebIH9ikmgr+tLJGpNITFFCUiQcPw==",
+			"version": "1.3.717",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.717.tgz",
+			"integrity": "sha512-OfzVPIqD1MkJ7fX+yTl2nKyOE4FReeVfMCzzxQS+Kp43hZYwHwThlGP+EGIZRXJsxCM7dqo8Y65NOX/HP12iXQ==",
 			"dev": true
 		},
 		"emoji-regex": {
@@ -664,9 +664,9 @@
 			"dev": true
 		},
 		"eslint": {
-			"version": "7.23.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.23.0.tgz",
-			"integrity": "sha512-kqvNVbdkjzpFy0XOszNwjkKzZ+6TcwCQ/h+ozlcIWwaimBBuhlQ4nN6kbiM2L+OjDcznkTJxzYfRFH92sx4a0Q==",
+			"version": "7.24.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.24.0.tgz",
+			"integrity": "sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ==",
 			"dev": true,
 			"requires": {
 				"@babel/code-frame": "7.12.11",
@@ -741,23 +741,23 @@
 			}
 		},
 		"eslint-config-wikimedia": {
-			"version": "0.19.0",
-			"resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.19.0.tgz",
-			"integrity": "sha512-zCa5IFT9lTcyF6w0OTmhPVXwrU+mcASGi74gdzuVOgvO7YVNzQzA+yyGh2Q8vIzvEt+i72/BcsGF5Y8/mOrStw==",
+			"version": "0.20.0",
+			"resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.20.0.tgz",
+			"integrity": "sha512-F2dm+S6aCDDb99Fr6KD9L7u1gOK819deG6xAG4EIVaLsHdQhjbcpNUuzUkUmGmpEHIYHqSpwkZ1EvBMc9Pxn+w==",
 			"dev": true,
 			"requires": {
-				"eslint": "^7.17.0",
+				"eslint": "^7.23.0",
 				"eslint-plugin-compat": "^3.9.0",
 				"eslint-plugin-es": "^4.1.0",
-				"eslint-plugin-jsdoc": "^30.7.13",
-				"eslint-plugin-json-es": "^1.5.1",
+				"eslint-plugin-jsdoc": "^32.3.0",
+				"eslint-plugin-json-es": "^1.5.3",
 				"eslint-plugin-mediawiki": "^0.2.7",
-				"eslint-plugin-mocha": "^8.0.0",
-				"eslint-plugin-no-jquery": "^2.5.0",
+				"eslint-plugin-mocha": "^8.1.0",
+				"eslint-plugin-no-jquery": "^2.6.0",
 				"eslint-plugin-node": "^11.1.0",
-				"eslint-plugin-qunit": "^5.2.0",
-				"eslint-plugin-vue": "^7.7.0",
-				"eslint-plugin-wdio": "^6.0.12"
+				"eslint-plugin-qunit": "^6.0.0",
+				"eslint-plugin-vue": "^7.8.0",
+				"eslint-plugin-wdio": "^7.0.0"
 			}
 		},
 		"eslint-plugin-compat": {
@@ -795,12 +795,12 @@
 			}
 		},
 		"eslint-plugin-jsdoc": {
-			"version": "30.7.13",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.13.tgz",
-			"integrity": "sha512-YM4WIsmurrp0rHX6XiXQppqKB8Ne5ATiZLJe2+/fkp9l9ExXFr43BbAbjZaVrpCT+tuPYOZ8k1MICARHnURUNQ==",
+			"version": "32.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.0.tgz",
+			"integrity": "sha512-zyx7kajDK+tqS1bHuY5sapkad8P8KT0vdd/lE55j47VPG2MeenSYuIY/M/Pvmzq5g0+3JB+P3BJGUXmHxtuKPQ==",
 			"dev": true,
 			"requires": {
-				"comment-parser": "^0.7.6",
+				"comment-parser": "1.1.2",
 				"debug": "^4.3.1",
 				"jsdoctypeparser": "^9.0.0",
 				"lodash": "^4.17.20",
@@ -857,9 +857,9 @@
 			}
 		},
 		"eslint-plugin-no-jquery": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.5.0.tgz",
-			"integrity": "sha512-RrQ380mUJJKdjgpQ/tZAJ3B3W1n3LbVmULooS2Pv5pUDcc5uVHVSJMTdUlsbvQyfo6hWP2LJ4FbOoDzENWcF7A==",
+			"version": "2.6.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.6.0.tgz",
+			"integrity": "sha512-xC7pbNHJMdyxqhzcNMRrmC5/tbt1T4KCKXjOqUpKm/CaRryGKS5iWztzWPrL0KwyI3R3ub6goHFmIQS19f+mZA==",
 			"dev": true
 		},
 		"eslint-plugin-node": {
@@ -901,9 +901,9 @@
 			}
 		},
 		"eslint-plugin-qunit": {
-			"version": "5.4.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-qunit/-/eslint-plugin-qunit-5.4.0.tgz",
-			"integrity": "sha512-vdqMW+YfZOH9AW7U1xc82UwKAdz2xlyuh0Hl+kTXj1E8JPy1B6K+/SBIqRNJUFyuPXHwzKb5Q/kr9i/sU7oMZA==",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-qunit/-/eslint-plugin-qunit-6.0.0.tgz",
+			"integrity": "sha512-+R8z2umSTIiWcxmTQ9nGoML8DL0VQJg4C+E9OpJ2KF9QL4WL/FoayROeTG5Z9zhlZ2qqa+9WkZ1YD6mx89io8w==",
 			"dev": true,
 			"requires": {
 				"eslint-utils": "^2.1.0",
@@ -911,9 +911,9 @@
 			}
 		},
 		"eslint-plugin-vue": {
-			"version": "7.8.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.8.0.tgz",
-			"integrity": "sha512-OGrnPz+PuYL2HmVyBHxm4mRjxW2kfFCQE6Hw9G6qOHs/Pcu0srOlCCW0FMa8SLzIEqxl8WuKoBSPcMnrjUG2vw==",
+			"version": "7.9.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.9.0.tgz",
+			"integrity": "sha512-2Q0qQp5+5h+pZvJKCbG1/jCRUYrdgAz5BYKGyTlp2NU8mx09u3Hp7PsH6d5qef6ojuPoCXMnrbbDxeoplihrSw==",
 			"dev": true,
 			"requires": {
 				"eslint-utils": "^2.1.0",
@@ -923,9 +923,9 @@
 			}
 		},
 		"eslint-plugin-wdio": {
-			"version": "6.6.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-wdio/-/eslint-plugin-wdio-6.6.0.tgz",
-			"integrity": "sha512-6nhKL5pt1/btKrqJWZ4qqaRtrPspXJYJNIkuYLyXGOvla2Ey55iuegbnP29Gb7XTq5B9MXOPTg9CQhk2qqMJ6Q==",
+			"version": "7.4.2",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-wdio/-/eslint-plugin-wdio-7.4.2.tgz",
+			"integrity": "sha512-tkISFycJmRFMKsEjetRcAmWSHKJKnw5rKHDxfE7Ob3tF5lbmYlCLfNKH0UwanOpSdulpe52s3K+CBHSd6qUUNQ==",
 			"dev": true
 		},
 		"eslint-scope": {
@@ -1423,9 +1423,9 @@
 			}
 		},
 		"globals": {
-			"version": "13.7.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-13.7.0.tgz",
-			"integrity": "sha512-Aipsz6ZKRxa/xQkZhNg0qIWXT6x6rD46f6x/PCnBomlttdIyAPak4YD9jTmKpZ72uROSMU87qJtcgpgHaVchiA==",
+			"version": "13.8.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz",
+			"integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==",
 			"dev": true,
 			"requires": {
 				"type-fest": "^0.20.2"
@@ -2765,9 +2765,9 @@
 			}
 		},
 		"table": {
-			"version": "6.0.9",
-			"resolved": "https://registry.npmjs.org/table/-/table-6.0.9.tgz",
-			"integrity": "sha512-F3cLs9a3hL1Z7N4+EkSscsel3z55XT950AvB05bwayrNg5T1/gykXtigioTAjbltvbMSJvvhFCbnf6mX+ntnJQ==",
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/table/-/table-6.1.0.tgz",
+			"integrity": "sha512-T4G5KMmqIk6X87gLKWyU5exPpTjLjY5KyrFWaIjv3SvgaIUGXV7UEzGEnZJdTA38/yUS6f9PlKezQ0bYXG3iIQ==",
 			"dev": true,
 			"requires": {
 				"ajv": "^8.0.1",
@@ -2782,9 +2782,9 @@
 			},
 			"dependencies": {
 				"ajv": {
-					"version": "8.0.5",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.0.5.tgz",
-					"integrity": "sha512-RkiLa/AeJx7+9OvniQ/qeWu0w74A8DiPPBclQ6ji3ZQkv5KamO+QGpqmi7O4JIw3rHGUXZ6CoP9tsAkn3gyazg==",
+					"version": "8.1.0",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.1.0.tgz",
+					"integrity": "sha512-B/Sk2Ix7A36fs/ZkuGLIR86EdjbgR6fsAcbx9lOP/QBSXujDNbVmIS/U4Itz5k8fPFDeVZl/zQ/gJW4Jrq6XjQ==",
 					"dev": true,
 					"requires": {
 						"fast-deep-equal": "^3.1.1",
diff --git a/package.json b/package.json
index 1e9ed51..60c10e6 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
 		"test": "grunt test"
 	},
 	"devDependencies": {
-		"eslint-config-wikimedia": "0.19.0",
+		"eslint-config-wikimedia": "0.20.0",
 		"grunt": "1.3.0",
 		"grunt-banana-checker": "0.9.0",
 		"grunt-eslint": "23.0.0"

From 4510975082506e5fd2c5bd07d04a9c042108e140 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Mon, 3 May 2021 07:25:17 +0000
Subject: [PATCH 028/117] build: Updating composer dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* mediawiki/mediawiki-codesniffer: 35.0.0 → 36.0.0
* php-parallel-lint/php-parallel-lint: 1.2.0 → 1.3.0

Change-Id: I111161cf08a97f5181f3d40e9f1d10e18eaf7b8f
---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 8351361..8840dfc 100644
--- a/composer.json
+++ b/composer.json
@@ -6,10 +6,10 @@
 		"composer/installers": "~1.0"
 	},
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "35.0.0",
+		"mediawiki/mediawiki-codesniffer": "36.0.0",
 		"mediawiki/minus-x": "1.1.1",
 		"php-parallel-lint/php-console-highlighter": "0.5.0",
-		"php-parallel-lint/php-parallel-lint": "1.2.0"
+		"php-parallel-lint/php-parallel-lint": "1.3.0"
 	},
 	"scripts": {
 		"test": [

From c8dd9df70b71d5382a574311cfe616ff9bb55154 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Sun, 9 May 2021 18:32:37 +0000
Subject: [PATCH 029/117] build: Updating npm dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* grunt: 1.3.0 → 1.4.0
* lodash: 4.17.20 → 4.17.21
  * https://npmjs.com/advisories/1673 (CVE-2021-23337)

Change-Id: Ibb0805e3082eba163c6cda93817a859f2b6b9d54
---
 package-lock.json | 1135 +++++----------------------------------------
 package.json      |    2 +-
 2 files changed, 117 insertions(+), 1020 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b7a1754..a58c6ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -207,24 +207,6 @@
 				}
 			}
 		},
-		"arr-diff": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-			"integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-			"dev": true
-		},
-		"arr-flatten": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-			"integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-			"dev": true
-		},
-		"arr-union": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-			"integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-			"dev": true
-		},
 		"array-each": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
@@ -237,18 +219,6 @@
 			"integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
 			"dev": true
 		},
-		"array-unique": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-			"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-			"dev": true
-		},
-		"assign-symbols": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-			"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-			"dev": true
-		},
 		"ast-metadata-inferer": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/ast-metadata-inferer/-/ast-metadata-inferer-0.4.0.tgz",
@@ -262,15 +232,9 @@
 			"dev": true
 		},
 		"async": {
-			"version": "1.5.2",
-			"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-			"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-			"dev": true
-		},
-		"atob": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-			"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
+			"integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==",
 			"dev": true
 		},
 		"balanced-match": {
@@ -279,61 +243,6 @@
 			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
 			"dev": true
 		},
-		"base": {
-			"version": "0.11.2",
-			"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-			"dev": true,
-			"requires": {
-				"cache-base": "^1.0.1",
-				"class-utils": "^0.3.5",
-				"component-emitter": "^1.2.1",
-				"define-property": "^1.0.0",
-				"isobject": "^3.0.1",
-				"mixin-deep": "^1.2.0",
-				"pascalcase": "^0.1.1"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^1.0.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				}
-			}
-		},
 		"brace-expansion": {
 			"version": "1.1.11",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -345,32 +254,12 @@
 			}
 		},
 		"braces": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-			"dev": true,
-			"requires": {
-				"arr-flatten": "^1.1.0",
-				"array-unique": "^0.3.2",
-				"extend-shallow": "^2.0.1",
-				"fill-range": "^4.0.0",
-				"isobject": "^3.0.1",
-				"repeat-element": "^1.1.2",
-				"snapdragon": "^0.8.1",
-				"snapdragon-node": "^2.0.1",
-				"split-string": "^3.0.2",
-				"to-regex": "^3.0.1"
-			},
-			"dependencies": {
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				}
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"requires": {
+				"fill-range": "^7.0.1"
 			}
 		},
 		"browserslist": {
@@ -386,23 +275,6 @@
 				"node-releases": "^1.1.71"
 			}
 		},
-		"cache-base": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-			"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-			"dev": true,
-			"requires": {
-				"collection-visit": "^1.0.0",
-				"component-emitter": "^1.2.1",
-				"get-value": "^2.0.6",
-				"has-value": "^1.0.0",
-				"isobject": "^3.0.1",
-				"set-value": "^2.0.0",
-				"to-object-path": "^0.3.0",
-				"union-value": "^1.0.0",
-				"unset-value": "^1.0.0"
-			}
-		},
 		"call-bind": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -435,39 +307,6 @@
 				"supports-color": "^7.1.0"
 			}
 		},
-		"class-utils": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-			"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-			"dev": true,
-			"requires": {
-				"arr-union": "^3.1.0",
-				"define-property": "^0.2.5",
-				"isobject": "^3.0.0",
-				"static-extend": "^0.1.1"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				}
-			}
-		},
-		"collection-visit": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-			"integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-			"dev": true,
-			"requires": {
-				"map-visit": "^1.0.0",
-				"object-visit": "^1.0.0"
-			}
-		},
 		"color-convert": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -501,24 +340,12 @@
 			"integrity": "sha512-AOdq0i8ghZudnYv8RUnHrhTgafUGs61Rdz9jemU5x2lnZwAWyOq7vySo626K59e1fVKH1xSRorJwPVRLSWOoAQ==",
 			"dev": true
 		},
-		"component-emitter": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-			"integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-			"dev": true
-		},
 		"concat-map": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
 			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
 			"dev": true
 		},
-		"copy-descriptor": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-			"dev": true
-		},
 		"core-js": {
 			"version": "3.10.1",
 			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.10.1.tgz",
@@ -553,68 +380,12 @@
 			"integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
 			"dev": true
 		},
-		"debug": {
-			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"dev": true,
-			"requires": {
-				"ms": "2.0.0"
-			}
-		},
-		"decode-uri-component": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-			"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-			"dev": true
-		},
 		"deep-is": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
 			"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
 			"dev": true
 		},
-		"define-property": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-			"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-			"dev": true,
-			"requires": {
-				"is-descriptor": "^1.0.2",
-				"isobject": "^3.0.1"
-			},
-			"dependencies": {
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				}
-			}
-		},
 		"detect-file": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
@@ -1044,41 +815,6 @@
 			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
 			"dev": true
 		},
-		"expand-brackets": {
-			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-			"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-			"dev": true,
-			"requires": {
-				"debug": "^2.3.3",
-				"define-property": "^0.2.5",
-				"extend-shallow": "^2.0.1",
-				"posix-character-classes": "^0.1.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				}
-			}
-		},
 		"expand-tilde": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
@@ -1094,92 +830,6 @@
 			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
 			"dev": true
 		},
-		"extend-shallow": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-			"dev": true,
-			"requires": {
-				"assign-symbols": "^1.0.0",
-				"is-extendable": "^1.0.1"
-			},
-			"dependencies": {
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"dev": true,
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				}
-			}
-		},
-		"extglob": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-			"dev": true,
-			"requires": {
-				"array-unique": "^0.3.2",
-				"define-property": "^1.0.0",
-				"expand-brackets": "^2.1.4",
-				"extend-shallow": "^2.0.1",
-				"fragment-cache": "^0.2.1",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^1.0.0"
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				}
-			}
-		},
 		"fast-deep-equal": {
 			"version": "3.1.3",
 			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -1208,26 +858,12 @@
 			}
 		},
 		"fill-range": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-			"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
 			"dev": true,
 			"requires": {
-				"extend-shallow": "^2.0.1",
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1",
-				"to-regex-range": "^2.1.0"
-			},
-			"dependencies": {
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				}
+				"to-regex-range": "^5.0.1"
 			}
 		},
 		"find-up": {
@@ -1314,15 +950,6 @@
 				"for-in": "^1.0.1"
 			}
 		},
-		"fragment-cache": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-			"integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-			"dev": true,
-			"requires": {
-				"map-cache": "^0.2.2"
-			}
-		},
 		"fs.realpath": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -1352,16 +979,10 @@
 				"has-symbols": "^1.0.1"
 			}
 		},
-		"get-value": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-			"dev": true
-		},
 		"getobject": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz",
-			"integrity": "sha1-BHpEl4n6Fg0Bj1SG7ZEyC27HiFw=",
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/getobject/-/getobject-1.0.0.tgz",
+			"integrity": "sha512-tbUz6AKKKr2YiMB+fLWIgq5ZeBOobop9YMMAU9dC54/ot2ksMXt3DOFyBuhZw6ptcVszEykgByK20j7W9jHFag==",
 			"dev": true
 		},
 		"glob": {
@@ -1440,9 +1061,9 @@
 			}
 		},
 		"grunt": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.3.0.tgz",
-			"integrity": "sha512-6ILlMXv11/4cxuhSMfSU+SfvbxrPuqZrAtLN64+tZpQ3DAKfSQPQHRbTjSbdtxfyQhGZPtN0bDZJ/LdCM5WXXA==",
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.4.0.tgz",
+			"integrity": "sha512-yRFc0GVCDu9yxqOFzpuXQ2pEdgtLDnFv5Qz54jfIcNnpJ8Z7B7P7kPkT4VMuRvm+N+QOsI8C4v/Q0DSaoj3LgQ==",
 			"dev": true,
 			"requires": {
 				"dateformat": "~3.0.3",
@@ -1450,10 +1071,10 @@
 				"exit": "~0.1.2",
 				"findup-sync": "~0.3.0",
 				"glob": "~7.1.6",
-				"grunt-cli": "~1.3.2",
-				"grunt-known-options": "~1.1.0",
+				"grunt-cli": "~1.4.2",
+				"grunt-known-options": "~1.1.1",
 				"grunt-legacy-log": "~3.0.0",
-				"grunt-legacy-util": "~2.0.0",
+				"grunt-legacy-util": "~2.0.1",
 				"iconv-lite": "~0.4.13",
 				"js-yaml": "~3.14.0",
 				"minimatch": "~3.0.4",
@@ -1463,16 +1084,16 @@
 			},
 			"dependencies": {
 				"grunt-cli": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.3.2.tgz",
-					"integrity": "sha512-8OHDiZZkcptxVXtMfDxJvmN7MVJNE8L/yIcPb4HB7TlyFD1kDvjHrb62uhySsU14wJx9ORMnTuhRMQ40lH/orQ==",
+					"version": "1.4.2",
+					"resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.2.tgz",
+					"integrity": "sha512-wsu6BZh7KCnfeaSkDrKIAvOlqGKxNRTZjc8xfZlvxCByQIqUfZ31kh5uHpPnhQ4NdVgvaWaVxa1LUbVU80nACw==",
 					"dev": true,
 					"requires": {
-						"grunt-known-options": "~1.1.0",
+						"grunt-known-options": "~1.1.1",
 						"interpret": "~1.1.0",
-						"liftoff": "~2.5.0",
+						"liftup": "~3.0.1",
 						"nopt": "~4.0.1",
-						"v8flags": "~3.1.1"
+						"v8flags": "~3.2.0"
 					},
 					"dependencies": {
 						"nopt": {
@@ -1534,18 +1155,35 @@
 			}
 		},
 		"grunt-legacy-util": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.0.tgz",
-			"integrity": "sha512-ZEmYFB44bblwPE2oz3q3ygfF6hseQja9tx8I3UZIwbUik32FMWewA+d1qSFicMFB+8dNXDkh35HcDCWlpRsGlA==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz",
+			"integrity": "sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w==",
 			"dev": true,
 			"requires": {
-				"async": "~1.5.2",
-				"exit": "~0.1.1",
-				"getobject": "~0.1.0",
+				"async": "~3.2.0",
+				"exit": "~0.1.2",
+				"getobject": "~1.0.0",
 				"hooker": "~0.2.3",
-				"lodash": "~4.17.20",
+				"lodash": "~4.17.21",
 				"underscore.string": "~3.3.5",
-				"which": "~1.3.0"
+				"which": "~2.0.2"
+			},
+			"dependencies": {
+				"lodash": {
+					"version": "4.17.21",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+					"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+					"dev": true
+				},
+				"which": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+					"dev": true,
+					"requires": {
+						"isexe": "^2.0.0"
+					}
+				}
 			}
 		},
 		"has": {
@@ -1569,38 +1207,6 @@
 			"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
 			"dev": true
 		},
-		"has-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-			"dev": true,
-			"requires": {
-				"get-value": "^2.0.6",
-				"has-values": "^1.0.0",
-				"isobject": "^3.0.0"
-			}
-		},
-		"has-values": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-			"dev": true,
-			"requires": {
-				"is-number": "^3.0.0",
-				"kind-of": "^4.0.0"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
-		},
 		"homedir-polyfill": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
@@ -1685,26 +1291,6 @@
 				"is-windows": "^1.0.1"
 			}
 		},
-		"is-accessor-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-			"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-			"dev": true,
-			"requires": {
-				"kind-of": "^3.0.2"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
-		},
 		"is-boolean-object": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
@@ -1714,57 +1300,15 @@
 				"call-bind": "^1.0.0"
 			}
 		},
-		"is-buffer": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-			"dev": true
-		},
-		"is-data-descriptor": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-			"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-			"dev": true,
-			"requires": {
-				"kind-of": "^3.0.2"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
-		},
-		"is-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-			"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+		"is-core-module": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.3.0.tgz",
+			"integrity": "sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==",
 			"dev": true,
 			"requires": {
-				"is-accessor-descriptor": "^0.1.6",
-				"is-data-descriptor": "^0.1.4",
-				"kind-of": "^5.0.0"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-					"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-					"dev": true
-				}
+				"has": "^1.0.3"
 			}
 		},
-		"is-extendable": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-			"integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-			"dev": true
-		},
 		"is-extglob": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -1778,33 +1322,19 @@
 			"dev": true
 		},
 		"is-glob": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-			"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+			"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
 			"dev": true,
 			"requires": {
-				"is-extglob": "^2.1.0"
+				"is-extglob": "^2.1.1"
 			}
 		},
 		"is-number": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-			"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-			"dev": true,
-			"requires": {
-				"kind-of": "^3.0.2"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true
 		},
 		"is-number-object": {
 			"version": "1.0.4",
@@ -1851,12 +1381,6 @@
 			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
 			"dev": true
 		},
-		"isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-			"dev": true
-		},
 		"isexe": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -1919,33 +1443,43 @@
 				"type-check": "~0.4.0"
 			}
 		},
-		"liftoff": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz",
-			"integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=",
+		"liftup": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz",
+			"integrity": "sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==",
 			"dev": true,
 			"requires": {
-				"extend": "^3.0.0",
-				"findup-sync": "^2.0.0",
-				"fined": "^1.0.1",
-				"flagged-respawn": "^1.0.0",
+				"extend": "^3.0.2",
+				"findup-sync": "^4.0.0",
+				"fined": "^1.2.0",
+				"flagged-respawn": "^1.0.1",
 				"is-plain-object": "^2.0.4",
-				"object.map": "^1.0.0",
-				"rechoir": "^0.6.2",
-				"resolve": "^1.1.7"
+				"object.map": "^1.0.1",
+				"rechoir": "^0.7.0",
+				"resolve": "^1.19.0"
 			},
 			"dependencies": {
 				"findup-sync": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-					"integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz",
+					"integrity": "sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==",
 					"dev": true,
 					"requires": {
 						"detect-file": "^1.0.0",
-						"is-glob": "^3.1.0",
-						"micromatch": "^3.0.4",
+						"is-glob": "^4.0.0",
+						"micromatch": "^4.0.2",
 						"resolve-dir": "^1.0.1"
 					}
+				},
+				"resolve": {
+					"version": "1.20.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+					"integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+					"dev": true,
+					"requires": {
+						"is-core-module": "^2.2.0",
+						"path-parse": "^1.0.6"
+					}
 				}
 			}
 		},
@@ -1959,9 +1493,9 @@
 			}
 		},
 		"lodash": {
-			"version": "4.17.20",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-			"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
 			"dev": true
 		},
 		"lodash.clonedeep": {
@@ -2012,34 +1546,14 @@
 			"integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
 			"dev": true
 		},
-		"map-visit": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-			"integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+		"micromatch": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+			"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
 			"dev": true,
 			"requires": {
-				"object-visit": "^1.0.0"
-			}
-		},
-		"micromatch": {
-			"version": "3.1.10",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-			"dev": true,
-			"requires": {
-				"arr-diff": "^4.0.0",
-				"array-unique": "^0.3.2",
-				"braces": "^2.3.1",
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"extglob": "^2.0.4",
-				"fragment-cache": "^0.2.1",
-				"kind-of": "^6.0.2",
-				"nanomatch": "^1.2.9",
-				"object.pick": "^1.3.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.2"
+				"braces": "^3.0.1",
+				"picomatch": "^2.2.3"
 			}
 		},
 		"minimatch": {
@@ -2051,58 +1565,12 @@
 				"brace-expansion": "^1.1.7"
 			}
 		},
-		"mixin-deep": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-			"integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-			"dev": true,
-			"requires": {
-				"for-in": "^1.0.2",
-				"is-extendable": "^1.0.1"
-			},
-			"dependencies": {
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"dev": true,
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				}
-			}
-		},
 		"mkdirp": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
 			"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
 			"dev": true
 		},
-		"ms": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-			"dev": true
-		},
-		"nanomatch": {
-			"version": "1.2.13",
-			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-			"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-			"dev": true,
-			"requires": {
-				"arr-diff": "^4.0.0",
-				"array-unique": "^0.3.2",
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"fragment-cache": "^0.2.1",
-				"is-windows": "^1.0.2",
-				"kind-of": "^6.0.2",
-				"object.pick": "^1.3.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
-			}
-		},
 		"natural-compare": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -2124,46 +1592,6 @@
 				"abbrev": "1"
 			}
 		},
-		"object-copy": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-			"integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-			"dev": true,
-			"requires": {
-				"copy-descriptor": "^0.1.0",
-				"define-property": "^0.2.5",
-				"kind-of": "^3.0.3"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				},
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
-		},
-		"object-visit": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-			"integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-			"dev": true,
-			"requires": {
-				"isobject": "^3.0.0"
-			}
-		},
 		"object.defaults": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
@@ -2290,12 +1718,6 @@
 			"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
 			"dev": true
 		},
-		"pascalcase": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-			"integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-			"dev": true
-		},
 		"path-exists": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -2335,10 +1757,10 @@
 			"integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
 			"dev": true
 		},
-		"posix-character-classes": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-			"integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+		"picomatch": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+			"integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
 			"dev": true
 		},
 		"prelude-ls": {
@@ -2366,22 +1788,12 @@
 			"dev": true
 		},
 		"rechoir": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-			"integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-			"dev": true,
-			"requires": {
-				"resolve": "^1.1.6"
-			}
-		},
-		"regex-not": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-			"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
+			"integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==",
 			"dev": true,
 			"requires": {
-				"extend-shallow": "^3.0.2",
-				"safe-regex": "^1.1.0"
+				"resolve": "^1.9.0"
 			}
 		},
 		"regexpp": {
@@ -2396,18 +1808,6 @@
 			"integrity": "sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==",
 			"dev": true
 		},
-		"repeat-element": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-			"integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
-			"dev": true
-		},
-		"repeat-string": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-			"integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-			"dev": true
-		},
 		"require-from-string": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -2445,18 +1845,6 @@
 			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
 			"dev": true
 		},
-		"resolve-url": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-			"integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-			"dev": true
-		},
-		"ret": {
-			"version": "0.1.15",
-			"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-			"integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-			"dev": true
-		},
 		"rimraf": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -2466,15 +1854,6 @@
 				"glob": "^7.1.3"
 			}
 		},
-		"safe-regex": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-			"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-			"dev": true,
-			"requires": {
-				"ret": "~0.1.10"
-			}
-		},
 		"safer-buffer": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -2490,29 +1869,6 @@
 				"lru-cache": "^6.0.0"
 			}
 		},
-		"set-value": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-			"integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-			"dev": true,
-			"requires": {
-				"extend-shallow": "^2.0.1",
-				"is-extendable": "^0.1.1",
-				"is-plain-object": "^2.0.3",
-				"split-string": "^3.0.1"
-			},
-			"dependencies": {
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				}
-			}
-		},
 		"shebang-command": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -2539,138 +1895,6 @@
 				"is-fullwidth-code-point": "^3.0.0"
 			}
 		},
-		"snapdragon": {
-			"version": "0.8.2",
-			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-			"dev": true,
-			"requires": {
-				"base": "^0.11.1",
-				"debug": "^2.2.0",
-				"define-property": "^0.2.5",
-				"extend-shallow": "^2.0.1",
-				"map-cache": "^0.2.2",
-				"source-map": "^0.5.6",
-				"source-map-resolve": "^0.5.0",
-				"use": "^3.1.0"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				}
-			}
-		},
-		"snapdragon-node": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-			"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-			"dev": true,
-			"requires": {
-				"define-property": "^1.0.0",
-				"isobject": "^3.0.0",
-				"snapdragon-util": "^3.0.1"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^1.0.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				}
-			}
-		},
-		"snapdragon-util": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-			"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-			"dev": true,
-			"requires": {
-				"kind-of": "^3.2.0"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
-		},
-		"source-map": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-			"dev": true
-		},
-		"source-map-resolve": {
-			"version": "0.5.3",
-			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-			"integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-			"dev": true,
-			"requires": {
-				"atob": "^2.1.2",
-				"decode-uri-component": "^0.2.0",
-				"resolve-url": "^0.2.1",
-				"source-map-url": "^0.4.0",
-				"urix": "^0.1.0"
-			}
-		},
-		"source-map-url": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-			"integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-			"dev": true
-		},
 		"spdx-exceptions": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
@@ -2693,42 +1917,12 @@
 			"integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
 			"dev": true
 		},
-		"split-string": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-			"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-			"dev": true,
-			"requires": {
-				"extend-shallow": "^3.0.0"
-			}
-		},
 		"sprintf-js": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
 			"integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
 			"dev": true
 		},
-		"static-extend": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-			"integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-			"dev": true,
-			"requires": {
-				"define-property": "^0.2.5",
-				"object-copy": "^0.1.0"
-			},
-			"dependencies": {
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				}
-			}
-		},
 		"string-width": {
 			"version": "4.2.2",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
@@ -2807,46 +2001,13 @@
 			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
 			"dev": true
 		},
-		"to-object-path": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-			"dev": true,
-			"requires": {
-				"kind-of": "^3.0.2"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
-			}
-		},
-		"to-regex": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-			"dev": true,
-			"requires": {
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"regex-not": "^1.0.2",
-				"safe-regex": "^1.1.0"
-			}
-		},
 		"to-regex-range": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
 			"dev": true,
 			"requires": {
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1"
+				"is-number": "^7.0.0"
 			}
 		},
 		"type-check": {
@@ -2880,58 +2041,6 @@
 				"util-deprecate": "^1.0.2"
 			}
 		},
-		"union-value": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-			"integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-			"dev": true,
-			"requires": {
-				"arr-union": "^3.1.0",
-				"get-value": "^2.0.6",
-				"is-extendable": "^0.1.1",
-				"set-value": "^2.0.1"
-			}
-		},
-		"unset-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-			"dev": true,
-			"requires": {
-				"has-value": "^0.3.1",
-				"isobject": "^3.0.0"
-			},
-			"dependencies": {
-				"has-value": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-					"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-					"dev": true,
-					"requires": {
-						"get-value": "^2.0.3",
-						"has-values": "^0.1.4",
-						"isobject": "^2.0.0"
-					},
-					"dependencies": {
-						"isobject": {
-							"version": "2.1.0",
-							"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-							"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-							"dev": true,
-							"requires": {
-								"isarray": "1.0.0"
-							}
-						}
-					}
-				},
-				"has-values": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-					"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-					"dev": true
-				}
-			}
-		},
 		"upath": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
@@ -2947,18 +2056,6 @@
 				"punycode": "^2.1.0"
 			}
 		},
-		"urix": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-			"dev": true
-		},
-		"use": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-			"dev": true
-		},
 		"util-deprecate": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -2972,9 +2069,9 @@
 			"dev": true
 		},
 		"v8flags": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz",
-			"integrity": "sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
+			"integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
 			"dev": true,
 			"requires": {
 				"homedir-polyfill": "^1.0.1"
diff --git a/package.json b/package.json
index 60c10e6..c4315c5 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
 	},
 	"devDependencies": {
 		"eslint-config-wikimedia": "0.20.0",
-		"grunt": "1.3.0",
+		"grunt": "1.4.0",
 		"grunt-banana-checker": "0.9.0",
 		"grunt-eslint": "23.0.0"
 	}

From 8d98fc499e5cae96f25f04bdfa14b06557dd77bf Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Tue, 25 May 2021 07:25:24 +0000
Subject: [PATCH 030/117] build: Updating browserslist to 4.16.6

* https://npmjs.com/advisories/1747 (CVE-2021-23364)

Change-Id: Ifd6fe98060e65177f7a23edd386ce657872f539c
---
 package-lock.json | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a58c6ec..1770e6e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -263,16 +263,24 @@
 			}
 		},
 		"browserslist": {
-			"version": "4.16.4",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.4.tgz",
-			"integrity": "sha512-d7rCxYV8I9kj41RH8UKYnvDYCRENUlHRgyXy/Rhr/1BaeLGfiCptEdFE8MIrvGfWbBFNjVYx76SQWvNX1j+/cQ==",
+			"version": "4.16.6",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+			"integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
 			"dev": true,
 			"requires": {
-				"caniuse-lite": "^1.0.30001208",
+				"caniuse-lite": "^1.0.30001219",
 				"colorette": "^1.2.2",
-				"electron-to-chromium": "^1.3.712",
+				"electron-to-chromium": "^1.3.723",
 				"escalade": "^3.1.1",
 				"node-releases": "^1.1.71"
+			},
+			"dependencies": {
+				"caniuse-lite": {
+					"version": "1.0.30001228",
+					"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz",
+					"integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==",
+					"dev": true
+				}
 			}
 		},
 		"call-bind": {
@@ -402,9 +410,9 @@
 			}
 		},
 		"electron-to-chromium": {
-			"version": "1.3.717",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.717.tgz",
-			"integrity": "sha512-OfzVPIqD1MkJ7fX+yTl2nKyOE4FReeVfMCzzxQS+Kp43hZYwHwThlGP+EGIZRXJsxCM7dqo8Y65NOX/HP12iXQ==",
+			"version": "1.3.737",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.737.tgz",
+			"integrity": "sha512-P/B84AgUSQXaum7a8m11HUsYL8tj9h/Pt5f7Hg7Ty6bm5DxlFq+e5+ouHUoNQMsKDJ7u4yGfI8mOErCmSH9wyg==",
 			"dev": true
 		},
 		"emoji-regex": {
@@ -1578,9 +1586,9 @@
 			"dev": true
 		},
 		"node-releases": {
-			"version": "1.1.71",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
-			"integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
+			"version": "1.1.72",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz",
+			"integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==",
 			"dev": true
 		},
 		"nopt": {

From 11572ce7fcec944f24b0b6870deaac0a2ff0f0c2 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Thu, 22 Jul 2021 07:48:02 +0000
Subject: [PATCH 031/117] build: Updating mediawiki/mediawiki-codesniffer to
 37.0.0

Change-Id: I46a66d036be7b6e1f8d975942aac47b7248be518
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8840dfc..f2f84e9 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
 		"composer/installers": "~1.0"
 	},
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "36.0.0",
+		"mediawiki/mediawiki-codesniffer": "37.0.0",
 		"mediawiki/minus-x": "1.1.1",
 		"php-parallel-lint/php-console-highlighter": "0.5.0",
 		"php-parallel-lint/php-parallel-lint": "1.3.0"

From 968e477f31e5fa8045da3485e8202e74a669fd74 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Mon, 2 Aug 2021 08:36:40 +0200
Subject: [PATCH 032/117] Localisation updates from https://translatewiki.net.

Change-Id: I053274a3da1699f9b306fa0ae50a256c1fc8b0e0
---
 i18n/uk.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 i18n/uk.json

diff --git a/i18n/uk.json b/i18n/uk.json
new file mode 100644
index 0000000..301807f
--- /dev/null
+++ b/i18n/uk.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"DDPAT"
+		]
+	},
+	"drawioeditor-desc": "draw.io створення блок-схеми та вбудованого редагування"
+}

From 523e11bf18606f374bdfb3b47d49964e1a30afe8 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Wed, 11 Aug 2021 08:37:00 +0000
Subject: [PATCH 033/117] build: Updating path-parse to 1.0.7

* https://npmjs.com/advisories/1773 (CVE-2021-23343)

Change-Id: I79866ba8513c2c69ea4ca8c25e347b22cd66c53d
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1770e6e..43d9806 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1745,9 +1745,9 @@
 			"dev": true
 		},
 		"path-parse": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-			"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
 			"dev": true
 		},
 		"path-root": {

From 2b98abf0837eb7d1a74ca8d81bac0b075dcf24c8 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Mon, 4 Oct 2021 08:55:42 +0200
Subject: [PATCH 034/117] Localisation updates from https://translatewiki.net.

Change-Id: I6f7c76f74f86cd4537815888349b138bb9e4c57b
---
 i18n/ia.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 i18n/ia.json

diff --git a/i18n/ia.json b/i18n/ia.json
new file mode 100644
index 0000000..ebe981e
--- /dev/null
+++ b/i18n/ia.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"McDutchie"
+		]
+	},
+	"drawioeditor-desc": "Creation e modification in linea de diagrammas de fluxo pro draw.io"
+}

From a0fd971eab1a47603c56872c7ec66cda1e0ea60c Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Mon, 4 Oct 2021 08:56:34 +0000
Subject: [PATCH 035/117] build: Updating dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

composer:
* php-parallel-lint/php-parallel-lint: 1.3.0 → 1.3.1

npm:
* ansi-regex: 5.0.0 → 5.0.1
  * https://npmjs.com/advisories/5197 (CVE-2021-3807)

Additional changes:
* composer.json: Updated phpcs command in composer test (T280592).
* composer.json: Added phpcs command to scripts (T280592).

Change-Id: Id1ab496ad7cc042011c812b0f122b9c83b176baa
---
 composer.json     | 7 ++++---
 package-lock.json | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index f2f84e9..e1d2750 100644
--- a/composer.json
+++ b/composer.json
@@ -9,17 +9,18 @@
 		"mediawiki/mediawiki-codesniffer": "37.0.0",
 		"mediawiki/minus-x": "1.1.1",
 		"php-parallel-lint/php-console-highlighter": "0.5.0",
-		"php-parallel-lint/php-parallel-lint": "1.3.0"
+		"php-parallel-lint/php-parallel-lint": "1.3.1"
 	},
 	"scripts": {
 		"test": [
 			"parallel-lint . --exclude vendor --exclude node_modules",
 			"minus-x check .",
-			"phpcs -p -s"
+			"@phpcs"
 		],
 		"fix": [
 			"minus-x fix .",
 			"phpcbf"
-		]
+		],
+		"phpcs": "phpcs -sp --cache"
 	}
 }
diff --git a/package-lock.json b/package-lock.json
index 43d9806..ea0a523 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -175,9 +175,9 @@
 			"dev": true
 		},
 		"ansi-regex": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-			"integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
 			"dev": true
 		},
 		"ansi-styles": {

From 653031aff35685ca3514a26c3ebd1743910083b1 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Sat, 23 Oct 2021 21:55:32 +0000
Subject: [PATCH 036/117] build: Updating mediawiki/mediawiki-codesniffer to
 38.0.0

Change-Id: I33e30e50201752ede81873f9a10034d08c6b4e87
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index e1d2750..1cb4f5f 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
 		"composer/installers": "~1.0"
 	},
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "37.0.0",
+		"mediawiki/mediawiki-codesniffer": "38.0.0",
 		"mediawiki/minus-x": "1.1.1",
 		"php-parallel-lint/php-console-highlighter": "0.5.0",
 		"php-parallel-lint/php-parallel-lint": "1.3.1"

From dfc92a8212122d0b763df8884ddaeedc2959689e Mon Sep 17 00:00:00 2001
From: miriam schlindwein <schlindwein@hallowelt.com>
Date: Wed, 26 Jan 2022 11:27:28 +0100
Subject: [PATCH 037/117] Fix edit link only visible with right

ERM27354

Change-Id: I5b6bed6fb487cc3984d5fd31125b9a32dae56dea
---
 src/DrawioEditor.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index b3d182d..792619c 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -269,6 +269,8 @@ private function isReadOnly( $img ) {
 		$parser = $this->services->getParser();
 
 		return !$this->config->get( 'EnableUploads' ) ||
+				!$this->services->getPermissionManager()->userHasRight( $user, 'upload' ) ||
+				!$this->services->getPermissionManager()->userHasRight( $user, 'reupload' ) ||
 			( !$img && !$this->services->getPermissionManager()->userHasRight( $user, 'upload' ) ) ||
 			( !$img && !$this->services->getPermissionManager()->userHasRight( $user, 'reupload' ) ) ||
 			( $parser->getTitle() ? $parser->getTitle()->isProtected( 'edit' ) : false );

From e25aca37a6ee5473d1f25f128624a42aaec65229 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Sun, 6 Feb 2022 09:30:13 +0000
Subject: [PATCH 038/117] build: Updating npm dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* eslint-config-wikimedia: 0.20.0 → 0.21.0
* grunt: 1.4.0 → 1.4.1

Additional changes:
* Set `name` in package.json.

Change-Id: Idc36c099afd6ecda5d6bdf08e4d5f38d787a6f81
---
 package-lock.json | 5092 ++++++++++++++++++++++++++++++++++++++++++---
 package.json      |    5 +-
 2 files changed, 4824 insertions(+), 273 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ea0a523..528f7b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,7 +1,3808 @@
 {
+	"name": "DrawioEditor",
+	"lockfileVersion": 2,
 	"requires": true,
-	"lockfileVersion": 1,
+	"packages": {
+		"": {
+			"name": "DrawioEditor",
+			"devDependencies": {
+				"eslint-config-wikimedia": "0.21.0",
+				"grunt": "1.4.1",
+				"grunt-banana-checker": "0.9.0",
+				"grunt-eslint": "23.0.0"
+			}
+		},
+		"node_modules/@ampproject/remapping": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.0.4.tgz",
+			"integrity": "sha512-zU3pj3pf//YhaoozRTYKaL20KopXrzuZFc/8Ylc49AuV8grYKH23TTq9JJoR70F8zQbil58KjSchZTWeX+jrIQ==",
+			"dev": true,
+			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.0"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@babel/code-frame": {
+			"version": "7.12.11",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+			"integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/highlight": "^7.10.4"
+			}
+		},
+		"node_modules/@babel/compat-data": {
+			"version": "7.17.0",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.0.tgz",
+			"integrity": "sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/core": {
+			"version": "7.17.0",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.0.tgz",
+			"integrity": "sha512-x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA==",
+			"dev": true,
+			"dependencies": {
+				"@ampproject/remapping": "^2.0.0",
+				"@babel/code-frame": "^7.16.7",
+				"@babel/generator": "^7.17.0",
+				"@babel/helper-compilation-targets": "^7.16.7",
+				"@babel/helper-module-transforms": "^7.16.7",
+				"@babel/helpers": "^7.17.0",
+				"@babel/parser": "^7.17.0",
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.17.0",
+				"@babel/types": "^7.17.0",
+				"convert-source-map": "^1.7.0",
+				"debug": "^4.1.0",
+				"gensync": "^1.0.0-beta.2",
+				"json5": "^2.1.2",
+				"semver": "^6.3.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/babel"
+			}
+		},
+		"node_modules/@babel/core/node_modules/@babel/code-frame": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+			"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/highlight": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/core/node_modules/semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@babel/eslint-parser": {
+			"version": "7.17.0",
+			"resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz",
+			"integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
+			"dev": true,
+			"dependencies": {
+				"eslint-scope": "^5.1.1",
+				"eslint-visitor-keys": "^2.1.0",
+				"semver": "^6.3.0"
+			},
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || >=14.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": ">=7.11.0",
+				"eslint": "^7.5.0 || ^8.0.0"
+			}
+		},
+		"node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/@babel/eslint-parser/node_modules/semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@babel/generator": {
+			"version": "7.17.0",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.0.tgz",
+			"integrity": "sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.17.0",
+				"jsesc": "^2.5.1",
+				"source-map": "^0.5.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-compilation-targets": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz",
+			"integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/compat-data": "^7.16.4",
+				"@babel/helper-validator-option": "^7.16.7",
+				"browserslist": "^4.17.5",
+				"semver": "^6.3.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@babel/helper-environment-visitor": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
+			"integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-function-name": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
+			"integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-get-function-arity": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-get-function-arity": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
+			"integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-hoist-variables": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
+			"integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-module-imports": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
+			"integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-module-transforms": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
+			"integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-environment-visitor": "^7.16.7",
+				"@babel/helper-module-imports": "^7.16.7",
+				"@babel/helper-simple-access": "^7.16.7",
+				"@babel/helper-split-export-declaration": "^7.16.7",
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-simple-access": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz",
+			"integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-split-export-declaration": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
+			"integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-validator-identifier": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+			"integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-validator-option": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+			"integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helpers": {
+			"version": "7.17.0",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.0.tgz",
+			"integrity": "sha512-Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.17.0",
+				"@babel/types": "^7.17.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/highlight": {
+			"version": "7.16.10",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
+			"integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"chalk": "^2.0.0",
+				"js-tokens": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/ansi-styles": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^1.9.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/color-convert": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "1.1.3"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/color-name": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+			"dev": true
+		},
+		"node_modules/@babel/highlight/node_modules/has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/supports-color": {
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/parser": {
+			"version": "7.17.0",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz",
+			"integrity": "sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==",
+			"dev": true,
+			"bin": {
+				"parser": "bin/babel-parser.js"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@babel/template": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
+			"integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/parser": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/template/node_modules/@babel/code-frame": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+			"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/highlight": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/traverse": {
+			"version": "7.17.0",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.0.tgz",
+			"integrity": "sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/generator": "^7.17.0",
+				"@babel/helper-environment-visitor": "^7.16.7",
+				"@babel/helper-function-name": "^7.16.7",
+				"@babel/helper-hoist-variables": "^7.16.7",
+				"@babel/helper-split-export-declaration": "^7.16.7",
+				"@babel/parser": "^7.17.0",
+				"@babel/types": "^7.17.0",
+				"debug": "^4.1.0",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/traverse/node_modules/@babel/code-frame": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+			"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/highlight": "^7.16.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/traverse/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/types": {
+			"version": "7.17.0",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
+			"integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"to-fast-properties": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@es-joy/jsdoccomment": {
+			"version": "0.18.0",
+			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.18.0.tgz",
+			"integrity": "sha512-TjT8KJULV4I6ZiwIoKr6eMs+XpRejqwJ/VA+QPDeFGe9j6bZFKmMJ81EeFsGm6JNZhnzm37aoxVROmTh2PZoyA==",
+			"dev": true,
+			"dependencies": {
+				"comment-parser": "1.3.0",
+				"esquery": "^1.4.0",
+				"jsdoc-type-pratt-parser": "~2.2.2"
+			},
+			"engines": {
+				"node": "^12 || ^14 || ^16 || ^17"
+			}
+		},
+		"node_modules/@eslint/eslintrc": {
+			"version": "0.4.3",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+			"integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+			"dev": true,
+			"dependencies": {
+				"ajv": "^6.12.4",
+				"debug": "^4.1.1",
+				"espree": "^7.3.0",
+				"globals": "^13.9.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^3.13.1",
+				"minimatch": "^3.0.4",
+				"strip-json-comments": "^3.1.1"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/@humanwhocodes/config-array": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+			"integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+			"dev": true,
+			"dependencies": {
+				"@humanwhocodes/object-schema": "^1.2.0",
+				"debug": "^4.1.1",
+				"minimatch": "^3.0.4"
+			},
+			"engines": {
+				"node": ">=10.10.0"
+			}
+		},
+		"node_modules/@humanwhocodes/object-schema": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+			"dev": true
+		},
+		"node_modules/@jridgewell/resolve-uri": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz",
+			"integrity": "sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@jridgewell/sourcemap-codec": {
+			"version": "1.4.10",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz",
+			"integrity": "sha512-Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg==",
+			"dev": true
+		},
+		"node_modules/@jridgewell/trace-mapping": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.2.tgz",
+			"integrity": "sha512-9KzzH4kMjA2XmBRHfqG2/Vtl7s92l6uNDd0wW7frDE+EUvQFGqNXhWp0UGJjSkt3v2AYjzOZn1QO9XaTNJIt1Q==",
+			"dev": true,
+			"dependencies": {
+				"@jridgewell/resolve-uri": "^3.0.3",
+				"@jridgewell/sourcemap-codec": "^1.4.10"
+			}
+		},
+		"node_modules/@mdn/browser-compat-data": {
+			"version": "3.3.14",
+			"resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-3.3.14.tgz",
+			"integrity": "sha512-n2RC9d6XatVbWFdHLimzzUJxJ1KY8LdjqrW6YvGPiRmsHkhOUx74/Ct10x5Yo7bC/Jvqx7cDEW8IMPv/+vwEzA==",
+			"dev": true
+		},
+		"node_modules/@types/color-name": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+			"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
+			"dev": true
+		},
+		"node_modules/@types/normalize-package-data": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+			"integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+			"dev": true
+		},
+		"node_modules/abbrev": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+			"dev": true
+		},
+		"node_modules/acorn": {
+			"version": "7.4.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+			"dev": true,
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/acorn-jsx": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+			"dev": true,
+			"peerDependencies": {
+				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			}
+		},
+		"node_modules/ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/ansi-colors": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/ansi-styles": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+			"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+			"dev": true,
+			"dependencies": {
+				"@types/color-name": "^1.1.1",
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"dev": true,
+			"dependencies": {
+				"sprintf-js": "~1.0.2"
+			}
+		},
+		"node_modules/argparse/node_modules/sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+			"dev": true
+		},
+		"node_modules/array-each": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+			"integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/array-slice": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
+			"integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/ast-metadata-inferer": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/ast-metadata-inferer/-/ast-metadata-inferer-0.7.0.tgz",
+			"integrity": "sha512-OkMLzd8xelb3gmnp6ToFvvsHLtS6CbagTkFQvQ+ZYFe3/AIl9iKikNR9G7pY3GfOR/2Xc222hwBjzI7HLkE76Q==",
+			"dev": true,
+			"dependencies": {
+				"@mdn/browser-compat-data": "^3.3.14"
+			}
+		},
+		"node_modules/astral-regex": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/async": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
+			"integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==",
+			"dev": true
+		},
+		"node_modules/balanced-match": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+			"dev": true
+		},
+		"node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"dependencies": {
+				"fill-range": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/browserslist": {
+			"version": "4.19.1",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
+			"integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
+			"dev": true,
+			"dependencies": {
+				"caniuse-lite": "^1.0.30001286",
+				"electron-to-chromium": "^1.4.17",
+				"escalade": "^3.1.1",
+				"node-releases": "^2.0.1",
+				"picocolors": "^1.0.0"
+			},
+			"bin": {
+				"browserslist": "cli.js"
+			},
+			"engines": {
+				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/browserslist"
+			}
+		},
+		"node_modules/builtin-modules": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
+			"integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/call-bind": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+			"dev": true,
+			"dependencies": {
+				"function-bind": "^1.1.1",
+				"get-intrinsic": "^1.0.2"
+			}
+		},
+		"node_modules/callsites": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/caniuse-lite": {
+			"version": "1.0.30001307",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001307.tgz",
+			"integrity": "sha512-+MXEMczJ4FuxJAUp0jvAl6Df0NI/OfW1RWEE61eSmzS7hw6lz4IKutbhbXendwq8BljfFuHtu26VWsg4afQ7Ng==",
+			"dev": true,
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/browserslist"
+			}
+		},
+		"node_modules/chalk": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+			"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/ci-info": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
+			"integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
+			"dev": true
+		},
+		"node_modules/clean-regexp": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz",
+			"integrity": "sha1-jffHquUf02h06PjQW5GAvBGj/tc=",
+			"dev": true,
+			"dependencies": {
+				"escape-string-regexp": "^1.0.5"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/colors": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+			"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.1.90"
+			}
+		},
+		"node_modules/comment-parser": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.0.tgz",
+			"integrity": "sha512-hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 12.0.0"
+			}
+		},
+		"node_modules/concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+			"dev": true
+		},
+		"node_modules/convert-source-map": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+			"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+			"dev": true,
+			"dependencies": {
+				"safe-buffer": "~5.1.1"
+			}
+		},
+		"node_modules/core-js": {
+			"version": "3.21.0",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.21.0.tgz",
+			"integrity": "sha512-YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ==",
+			"dev": true,
+			"hasInstallScript": true,
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/core-js"
+			}
+		},
+		"node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/cross-spawn/node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/dateformat": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
+			"integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
+			"dev": true,
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/debug": {
+			"version": "4.3.3",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+			"integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+			"dev": true,
+			"dependencies": {
+				"ms": "2.1.2"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/deep-is": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+			"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+			"dev": true
+		},
+		"node_modules/detect-file": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+			"integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/doctrine": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+			"dev": true,
+			"dependencies": {
+				"esutils": "^2.0.2"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/electron-to-chromium": {
+			"version": "1.4.65",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.65.tgz",
+			"integrity": "sha512-0/d8Skk8sW3FxXP0Dd6MnBlrwx7Qo9cqQec3BlIAlvKnrmS3pHsIbaroEi+nd0kZkGpQ6apMEre7xndzjlEnLw==",
+			"dev": true
+		},
+		"node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true
+		},
+		"node_modules/enquirer": {
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+			"dev": true,
+			"dependencies": {
+				"ansi-colors": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=8.6"
+			}
+		},
+		"node_modules/error-ex": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+			"dev": true,
+			"dependencies": {
+				"is-arrayish": "^0.2.1"
+			}
+		},
+		"node_modules/escalade": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/eslint": {
+			"version": "7.32.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+			"integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "7.12.11",
+				"@eslint/eslintrc": "^0.4.3",
+				"@humanwhocodes/config-array": "^0.5.0",
+				"ajv": "^6.10.0",
+				"chalk": "^4.0.0",
+				"cross-spawn": "^7.0.2",
+				"debug": "^4.0.1",
+				"doctrine": "^3.0.0",
+				"enquirer": "^2.3.5",
+				"escape-string-regexp": "^4.0.0",
+				"eslint-scope": "^5.1.1",
+				"eslint-utils": "^2.1.0",
+				"eslint-visitor-keys": "^2.0.0",
+				"espree": "^7.3.1",
+				"esquery": "^1.4.0",
+				"esutils": "^2.0.2",
+				"fast-deep-equal": "^3.1.3",
+				"file-entry-cache": "^6.0.1",
+				"functional-red-black-tree": "^1.0.1",
+				"glob-parent": "^5.1.2",
+				"globals": "^13.6.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.0.0",
+				"imurmurhash": "^0.1.4",
+				"is-glob": "^4.0.0",
+				"js-yaml": "^3.13.1",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"levn": "^0.4.1",
+				"lodash.merge": "^4.6.2",
+				"minimatch": "^3.0.4",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.9.1",
+				"progress": "^2.0.0",
+				"regexpp": "^3.1.0",
+				"semver": "^7.2.1",
+				"strip-ansi": "^6.0.0",
+				"strip-json-comments": "^3.1.0",
+				"table": "^6.0.9",
+				"text-table": "^0.2.0",
+				"v8-compile-cache": "^2.0.3"
+			},
+			"bin": {
+				"eslint": "bin/eslint.js"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/eslint-config-wikimedia": {
+			"version": "0.21.0",
+			"resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.21.0.tgz",
+			"integrity": "sha512-+KoUKaWSKTgIx+Run9gdbGXi6Uox2/JxgROTVmA6yi4mnMuFWwpBXzYFjqZPUT7dzmJSTO3uxwsR44F8GnZhpg==",
+			"dev": true,
+			"dependencies": {
+				"eslint": "^7.32.0",
+				"eslint-plugin-compat": "^3.13.0",
+				"eslint-plugin-es": "^4.1.0",
+				"eslint-plugin-jsdoc": "^37.0.3",
+				"eslint-plugin-json-es": "^1.5.4",
+				"eslint-plugin-mediawiki": "^0.3.0",
+				"eslint-plugin-mocha": "^9.0.0",
+				"eslint-plugin-no-jquery": "^2.7.0",
+				"eslint-plugin-node": "^11.1.0",
+				"eslint-plugin-qunit": "^7.0.0",
+				"eslint-plugin-unicorn": "^37.0.1",
+				"eslint-plugin-vue": "^8.0.2",
+				"eslint-plugin-wdio": "^7.4.2"
+			}
+		},
+		"node_modules/eslint-plugin-compat": {
+			"version": "3.13.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-3.13.0.tgz",
+			"integrity": "sha512-cv8IYMuTXm7PIjMVDN2y4k/KVnKZmoNGHNq27/9dLstOLydKblieIv+oe2BN2WthuXnFNhaNvv3N1Bvl4dbIGA==",
+			"dev": true,
+			"dependencies": {
+				"@mdn/browser-compat-data": "^3.3.14",
+				"ast-metadata-inferer": "^0.7.0",
+				"browserslist": "^4.16.8",
+				"caniuse-lite": "^1.0.30001251",
+				"core-js": "^3.16.2",
+				"find-up": "^5.0.0",
+				"lodash.memoize": "4.1.2",
+				"semver": "7.3.5"
+			},
+			"engines": {
+				"node": ">=9.x"
+			},
+			"peerDependencies": {
+				"eslint": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
+			}
+		},
+		"node_modules/eslint-plugin-es": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
+			"integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
+			"dev": true,
+			"dependencies": {
+				"eslint-utils": "^2.0.0",
+				"regexpp": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8.10.0"
+			}
+		},
+		"node_modules/eslint-plugin-jsdoc": {
+			"version": "37.7.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-37.7.1.tgz",
+			"integrity": "sha512-ySxDTedl6qKXT/VeTwcZlhsRtvNQZGPklyVnaL5+ge20vowzFA9CKvrY0NXRqvdIz6JBVMFpxX9DSmS3OyAUOQ==",
+			"dev": true,
+			"dependencies": {
+				"@es-joy/jsdoccomment": "~0.18.0",
+				"comment-parser": "1.3.0",
+				"debug": "^4.3.3",
+				"escape-string-regexp": "^4.0.0",
+				"esquery": "^1.4.0",
+				"regextras": "^0.8.0",
+				"semver": "^7.3.5",
+				"spdx-expression-parse": "^3.0.1"
+			},
+			"engines": {
+				"node": "^12 || ^14 || ^16 || ^17"
+			},
+			"peerDependencies": {
+				"eslint": "^7.0.0 || ^8.0.0"
+			}
+		},
+		"node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint-plugin-json-es": {
+			"version": "1.5.4",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-json-es/-/eslint-plugin-json-es-1.5.4.tgz",
+			"integrity": "sha512-DdjnNMUZ1iMrUXfxUQrTU7IyoEOsa4Kg0Zd6nOyOq1mUb75deK7NrcbI1FlWGdGVgqX99bUOD27i81EYiG794Q==",
+			"dev": true,
+			"dependencies": {
+				"eslint-visitor-keys": "^3.0.0",
+				"espree": "^9.0.0"
+			},
+			"peerDependencies": {
+				"eslint": ">= 7"
+			}
+		},
+		"node_modules/eslint-plugin-json-es/node_modules/acorn": {
+			"version": "8.7.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+			"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+			"dev": true,
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/eslint-plugin-json-es/node_modules/eslint-visitor-keys": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
+			"integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/eslint-plugin-json-es/node_modules/espree": {
+			"version": "9.3.0",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz",
+			"integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^8.7.0",
+				"acorn-jsx": "^5.3.1",
+				"eslint-visitor-keys": "^3.1.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/eslint-plugin-mediawiki": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-mediawiki/-/eslint-plugin-mediawiki-0.3.0.tgz",
+			"integrity": "sha512-Lhyj2PSkhDzYSc1PNbURysY/WoqvY0brw558ZInT3erzf5KUlro18MTKFdV+nlht475ZgnsfHsgfg6Ut2w1SVg==",
+			"dev": true,
+			"dependencies": {
+				"eslint-plugin-vue": "^7.20.0",
+				"upath": "^2.0.1"
+			},
+			"peerDependencies": {
+				"eslint": ">=5.0.0"
+			}
+		},
+		"node_modules/eslint-plugin-mediawiki/node_modules/eslint-plugin-vue": {
+			"version": "7.20.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.20.0.tgz",
+			"integrity": "sha512-oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw==",
+			"dev": true,
+			"dependencies": {
+				"eslint-utils": "^2.1.0",
+				"natural-compare": "^1.4.0",
+				"semver": "^6.3.0",
+				"vue-eslint-parser": "^7.10.0"
+			},
+			"engines": {
+				"node": ">=8.10"
+			},
+			"peerDependencies": {
+				"eslint": "^6.2.0 || ^7.0.0 || ^8.0.0"
+			}
+		},
+		"node_modules/eslint-plugin-mediawiki/node_modules/eslint-visitor-keys": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+			"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/eslint-plugin-mediawiki/node_modules/espree": {
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
+			"integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^7.1.1",
+				"acorn-jsx": "^5.2.0",
+				"eslint-visitor-keys": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/eslint-plugin-mediawiki/node_modules/semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/eslint-plugin-mediawiki/node_modules/vue-eslint-parser": {
+			"version": "7.11.0",
+			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",
+			"integrity": "sha512-qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg==",
+			"dev": true,
+			"dependencies": {
+				"debug": "^4.1.1",
+				"eslint-scope": "^5.1.1",
+				"eslint-visitor-keys": "^1.1.0",
+				"espree": "^6.2.1",
+				"esquery": "^1.4.0",
+				"lodash": "^4.17.21",
+				"semver": "^6.3.0"
+			},
+			"engines": {
+				"node": ">=8.10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			},
+			"peerDependencies": {
+				"eslint": ">=5.0.0"
+			}
+		},
+		"node_modules/eslint-plugin-mocha": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-9.0.0.tgz",
+			"integrity": "sha512-d7knAcQj1jPCzZf3caeBIn3BnW6ikcvfz0kSqQpwPYcVGLoJV5sz0l0OJB2LR8I7dvTDbqq1oV6ylhSgzA10zg==",
+			"dev": true,
+			"dependencies": {
+				"eslint-utils": "^3.0.0",
+				"ramda": "^0.27.1"
+			},
+			"engines": {
+				"node": ">=12.0.0"
+			},
+			"peerDependencies": {
+				"eslint": ">=7.0.0"
+			}
+		},
+		"node_modules/eslint-plugin-mocha/node_modules/eslint-utils": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+			"dev": true,
+			"dependencies": {
+				"eslint-visitor-keys": "^2.0.0"
+			},
+			"engines": {
+				"node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			},
+			"peerDependencies": {
+				"eslint": ">=5"
+			}
+		},
+		"node_modules/eslint-plugin-no-jquery": {
+			"version": "2.7.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.7.0.tgz",
+			"integrity": "sha512-Aeg7dA6GTH1AcWLlBtWNzOU9efK5KpNi7b0EhBO0o0M+awyzguUUo8gF6hXGjQ9n5h8/uRtYv9zOqQkeC5CG0w==",
+			"dev": true,
+			"peerDependencies": {
+				"eslint": ">=2.3.0"
+			}
+		},
+		"node_modules/eslint-plugin-node": {
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
+			"integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
+			"dev": true,
+			"dependencies": {
+				"eslint-plugin-es": "^3.0.0",
+				"eslint-utils": "^2.0.0",
+				"ignore": "^5.1.1",
+				"minimatch": "^3.0.4",
+				"resolve": "^1.10.1",
+				"semver": "^6.1.0"
+			},
+			"engines": {
+				"node": ">=8.10.0"
+			}
+		},
+		"node_modules/eslint-plugin-node/node_modules/eslint-plugin-es": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
+			"integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
+			"dev": true,
+			"dependencies": {
+				"eslint-utils": "^2.0.0",
+				"regexpp": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8.10.0"
+			}
+		},
+		"node_modules/eslint-plugin-node/node_modules/ignore": {
+			"version": "5.1.8",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+			"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/eslint-plugin-node/node_modules/semver": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/eslint-plugin-qunit": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-qunit/-/eslint-plugin-qunit-7.2.0.tgz",
+			"integrity": "sha512-ebT6aOpmMj4vchG0hVw9Ukbutk/lgywrc8gc9w9hH2/4WjKqwMlyM7iVwqB7OAXv6gtQMJZuziT0wNjjymAuWA==",
+			"dev": true,
+			"dependencies": {
+				"eslint-utils": "^3.0.0",
+				"requireindex": "^1.2.0"
+			},
+			"engines": {
+				"node": "12.x || 14.x || >=16.0.0"
+			}
+		},
+		"node_modules/eslint-plugin-qunit/node_modules/eslint-utils": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+			"dev": true,
+			"dependencies": {
+				"eslint-visitor-keys": "^2.0.0"
+			},
+			"engines": {
+				"node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			},
+			"peerDependencies": {
+				"eslint": ">=5"
+			}
+		},
+		"node_modules/eslint-plugin-unicorn": {
+			"version": "37.0.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-37.0.1.tgz",
+			"integrity": "sha512-E1jq5u9ojnadisJcPi+hMXTGSiIzkIUMDvWsBudsCGXvKUB2aNSU2TcfyW2/jAS5A4ryBXfzxLykMxX1EdluSQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-validator-identifier": "^7.14.9",
+				"ci-info": "^3.2.0",
+				"clean-regexp": "^1.0.0",
+				"eslint-template-visitor": "^2.3.2",
+				"eslint-utils": "^3.0.0",
+				"esquery": "^1.4.0",
+				"indent-string": "4",
+				"is-builtin-module": "^3.1.0",
+				"lodash": "^4.17.21",
+				"pluralize": "^8.0.0",
+				"read-pkg-up": "^7.0.1",
+				"regexp-tree": "^0.1.23",
+				"safe-regex": "^2.1.1",
+				"semver": "^7.3.5",
+				"strip-indent": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1"
+			},
+			"peerDependencies": {
+				"eslint": ">=7.32.0"
+			}
+		},
+		"node_modules/eslint-plugin-unicorn/node_modules/eslint-utils": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+			"dev": true,
+			"dependencies": {
+				"eslint-visitor-keys": "^2.0.0"
+			},
+			"engines": {
+				"node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			},
+			"peerDependencies": {
+				"eslint": ">=5"
+			}
+		},
+		"node_modules/eslint-plugin-vue": {
+			"version": "8.4.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.4.1.tgz",
+			"integrity": "sha512-nmWOhNmDx9TZ+yP9ZhezTkZUupSHsYA2TocRm+efPSXMOyFrVczVlaIuQcLBjCtI8CbkBiUQ3VcyQsjlIhDrhA==",
+			"dev": true,
+			"dependencies": {
+				"eslint-utils": "^3.0.0",
+				"natural-compare": "^1.4.0",
+				"semver": "^7.3.5",
+				"vue-eslint-parser": "^8.0.1"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"peerDependencies": {
+				"eslint": "^6.2.0 || ^7.0.0 || ^8.0.0"
+			}
+		},
+		"node_modules/eslint-plugin-vue/node_modules/eslint-utils": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+			"dev": true,
+			"dependencies": {
+				"eslint-visitor-keys": "^2.0.0"
+			},
+			"engines": {
+				"node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			},
+			"peerDependencies": {
+				"eslint": ">=5"
+			}
+		},
+		"node_modules/eslint-plugin-wdio": {
+			"version": "7.4.2",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-wdio/-/eslint-plugin-wdio-7.4.2.tgz",
+			"integrity": "sha512-tkISFycJmRFMKsEjetRcAmWSHKJKnw5rKHDxfE7Ob3tF5lbmYlCLfNKH0UwanOpSdulpe52s3K+CBHSd6qUUNQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=12.0.0"
+			}
+		},
+		"node_modules/eslint-scope": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"dev": true,
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/eslint-template-visitor": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/eslint-template-visitor/-/eslint-template-visitor-2.3.2.tgz",
+			"integrity": "sha512-3ydhqFpuV7x1M9EK52BPNj6V0Kwu0KKkcIAfpUhwHbR8ocRln/oUHgfxQupY8O1h4Qv/POHDumb/BwwNfxbtnA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.12.16",
+				"@babel/eslint-parser": "^7.12.16",
+				"eslint-visitor-keys": "^2.0.0",
+				"esquery": "^1.3.1",
+				"multimap": "^1.1.0"
+			},
+			"peerDependencies": {
+				"eslint": ">=7.0.0"
+			}
+		},
+		"node_modules/eslint-utils": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+			"integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+			"dev": true,
+			"dependencies": {
+				"eslint-visitor-keys": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+			"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/eslint-visitor-keys": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
+			"integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/eslint/node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint/node_modules/is-glob": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+			"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+			"dev": true,
+			"dependencies": {
+				"is-extglob": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/espree": {
+			"version": "7.3.1",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+			"integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^7.4.0",
+				"acorn-jsx": "^5.3.1",
+				"eslint-visitor-keys": "^1.3.0"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/espree/node_modules/eslint-visitor-keys": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+			"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true,
+			"bin": {
+				"esparse": "bin/esparse.js",
+				"esvalidate": "bin/esvalidate.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/esquery": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+			"dev": true,
+			"dependencies": {
+				"estraverse": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/esquery/node_modules/estraverse": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+			"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esrecurse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+			"dev": true,
+			"dependencies": {
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esrecurse/node_modules/estraverse": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+			"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/estraverse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/eventemitter2": {
+			"version": "0.4.14",
+			"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
+			"integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=",
+			"dev": true
+		},
+		"node_modules/exit": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/expand-tilde": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+			"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+			"dev": true,
+			"dependencies": {
+				"homedir-polyfill": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/extend": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+			"dev": true
+		},
+		"node_modules/fast-deep-equal": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+			"dev": true
+		},
+		"node_modules/fast-json-stable-stringify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+			"dev": true
+		},
+		"node_modules/fast-levenshtein": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+			"dev": true
+		},
+		"node_modules/file-entry-cache": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+			"dev": true,
+			"dependencies": {
+				"flat-cache": "^3.0.4"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/find-up": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+			"dev": true,
+			"dependencies": {
+				"locate-path": "^6.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/findup-sync": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
+			"integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
+			"dev": true,
+			"dependencies": {
+				"glob": "~5.0.0"
+			},
+			"engines": {
+				"node": ">= 0.6.0"
+			}
+		},
+		"node_modules/findup-sync/node_modules/glob": {
+			"version": "5.0.15",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+			"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+			"dev": true,
+			"dependencies": {
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "2 || 3",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/fined": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
+			"integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+			"dev": true,
+			"dependencies": {
+				"expand-tilde": "^2.0.2",
+				"is-plain-object": "^2.0.3",
+				"object.defaults": "^1.1.0",
+				"object.pick": "^1.2.0",
+				"parse-filepath": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/flagged-respawn": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
+			"integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/flat-cache": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+			"dev": true,
+			"dependencies": {
+				"flatted": "^3.1.0",
+				"rimraf": "^3.0.2"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/flatted": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
+			"integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
+			"dev": true
+		},
+		"node_modules/for-in": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/for-own": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+			"integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+			"dev": true,
+			"dependencies": {
+				"for-in": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+			"dev": true
+		},
+		"node_modules/function-bind": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+			"dev": true
+		},
+		"node_modules/functional-red-black-tree": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+			"dev": true
+		},
+		"node_modules/gensync": {
+			"version": "1.0.0-beta.2",
+			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/get-intrinsic": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+			"integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+			"dev": true,
+			"dependencies": {
+				"function-bind": "^1.1.1",
+				"has": "^1.0.3",
+				"has-symbols": "^1.0.1"
+			}
+		},
+		"node_modules/getobject": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/getobject/-/getobject-1.0.0.tgz",
+			"integrity": "sha512-tbUz6AKKKr2YiMB+fLWIgq5ZeBOobop9YMMAU9dC54/ot2ksMXt3DOFyBuhZw6ptcVszEykgByK20j7W9jHFag==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/glob": {
+			"version": "7.1.6",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+			"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+			"dev": true,
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/glob-parent": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+			"dev": true,
+			"dependencies": {
+				"is-glob": "^4.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/glob-parent/node_modules/is-glob": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+			"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+			"dev": true,
+			"dependencies": {
+				"is-extglob": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/global-modules": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+			"integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+			"dev": true,
+			"dependencies": {
+				"global-prefix": "^1.0.1",
+				"is-windows": "^1.0.1",
+				"resolve-dir": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/global-prefix": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+			"integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+			"dev": true,
+			"dependencies": {
+				"expand-tilde": "^2.0.2",
+				"homedir-polyfill": "^1.0.1",
+				"ini": "^1.3.4",
+				"is-windows": "^1.0.1",
+				"which": "^1.2.14"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/globals": {
+			"version": "13.12.1",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz",
+			"integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
+			"dev": true,
+			"dependencies": {
+				"type-fest": "^0.20.2"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/globals/node_modules/type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/grunt": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.4.1.tgz",
+			"integrity": "sha512-ZXIYXTsAVrA7sM+jZxjQdrBOAg7DyMUplOMhTaspMRExei+fD0BTwdWXnn0W5SXqhb/Q/nlkzXclSi3IH55PIA==",
+			"dev": true,
+			"dependencies": {
+				"dateformat": "~3.0.3",
+				"eventemitter2": "~0.4.13",
+				"exit": "~0.1.2",
+				"findup-sync": "~0.3.0",
+				"glob": "~7.1.6",
+				"grunt-cli": "~1.4.2",
+				"grunt-known-options": "~2.0.0",
+				"grunt-legacy-log": "~3.0.0",
+				"grunt-legacy-util": "~2.0.1",
+				"iconv-lite": "~0.4.13",
+				"js-yaml": "~3.14.0",
+				"minimatch": "~3.0.4",
+				"mkdirp": "~1.0.4",
+				"nopt": "~3.0.6",
+				"rimraf": "~3.0.2"
+			},
+			"bin": {
+				"grunt": "bin/grunt"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/grunt-banana-checker": {
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/grunt-banana-checker/-/grunt-banana-checker-0.9.0.tgz",
+			"integrity": "sha512-SqPiB6OazWqR8USL0NymtuT5Br3mD9WBBsM1rHC/3wIi2SrZNM6/+j9CIeuEM5oCn+AtO2Y0+rzzFyOdC9afAg==",
+			"dev": true,
+			"bin": {
+				"banana-checker": "src/cli.js"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/grunt-eslint": {
+			"version": "23.0.0",
+			"resolved": "https://registry.npmjs.org/grunt-eslint/-/grunt-eslint-23.0.0.tgz",
+			"integrity": "sha512-QqHSAiGF08EVD7YlD4OSRWuLRaDvpsRdTptwy9WaxUXE+03mCLVA/lEaR6SHWehF7oUwIqCEjaNONeeeWlB4LQ==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"eslint": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/grunt-legacy-log": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz",
+			"integrity": "sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA==",
+			"dev": true,
+			"dependencies": {
+				"colors": "~1.1.2",
+				"grunt-legacy-log-utils": "~2.1.0",
+				"hooker": "~0.2.3",
+				"lodash": "~4.17.19"
+			},
+			"engines": {
+				"node": ">= 0.10.0"
+			}
+		},
+		"node_modules/grunt-legacy-log-utils": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz",
+			"integrity": "sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "~4.1.0",
+				"lodash": "~4.17.19"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/grunt-legacy-util": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz",
+			"integrity": "sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w==",
+			"dev": true,
+			"dependencies": {
+				"async": "~3.2.0",
+				"exit": "~0.1.2",
+				"getobject": "~1.0.0",
+				"hooker": "~0.2.3",
+				"lodash": "~4.17.21",
+				"underscore.string": "~3.3.5",
+				"which": "~2.0.2"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/grunt-legacy-util/node_modules/lodash": {
+			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+			"dev": true
+		},
+		"node_modules/grunt-legacy-util/node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/grunt/node_modules/grunt-cli": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.2.tgz",
+			"integrity": "sha512-wsu6BZh7KCnfeaSkDrKIAvOlqGKxNRTZjc8xfZlvxCByQIqUfZ31kh5uHpPnhQ4NdVgvaWaVxa1LUbVU80nACw==",
+			"dev": true,
+			"dependencies": {
+				"grunt-known-options": "~1.1.1",
+				"interpret": "~1.1.0",
+				"liftup": "~3.0.1",
+				"nopt": "~4.0.1",
+				"v8flags": "~3.2.0"
+			},
+			"bin": {
+				"grunt": "bin/grunt"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/grunt/node_modules/grunt-cli/node_modules/nopt": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+			"integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+			"dev": true,
+			"dependencies": {
+				"abbrev": "1",
+				"osenv": "^0.1.4"
+			},
+			"bin": {
+				"nopt": "bin/nopt.js"
+			}
+		},
+		"node_modules/grunt/node_modules/grunt-known-options": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz",
+			"integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/has": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"dev": true,
+			"dependencies": {
+				"function-bind": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.4.0"
+			}
+		},
+		"node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/has-symbols": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+			"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/homedir-polyfill": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+			"integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+			"dev": true,
+			"dependencies": {
+				"parse-passwd": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/hooker": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
+			"integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=",
+			"dev": true,
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/hosted-git-info": {
+			"version": "2.8.9",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+			"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+			"dev": true
+		},
+		"node_modules/iconv-lite": {
+			"version": "0.4.24",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+			"dev": true,
+			"dependencies": {
+				"safer-buffer": ">= 2.1.2 < 3"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/ignore": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/import-fresh": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+			"dev": true,
+			"dependencies": {
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.19"
+			}
+		},
+		"node_modules/indent-string": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+			"dev": true,
+			"dependencies": {
+				"once": "^1.3.0",
+				"wrappy": "1"
+			}
+		},
+		"node_modules/inherits": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+			"dev": true
+		},
+		"node_modules/ini": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+			"dev": true
+		},
+		"node_modules/interpret": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
+			"integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
+			"dev": true
+		},
+		"node_modules/is-absolute": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+			"integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+			"dev": true,
+			"dependencies": {
+				"is-relative": "^1.0.0",
+				"is-windows": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-arrayish": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+			"dev": true
+		},
+		"node_modules/is-boolean-object": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
+			"integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
+			"dev": true,
+			"dependencies": {
+				"call-bind": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/is-builtin-module": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.1.0.tgz",
+			"integrity": "sha512-OV7JjAgOTfAFJmHZLvpSTb4qi0nIILDV1gWPYDnDJUTNFM5aGlRAhk4QcT8i7TuAleeEV5Fdkqn3t4mS+Q11fg==",
+			"dev": true,
+			"dependencies": {
+				"builtin-modules": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/is-core-module": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.3.0.tgz",
+			"integrity": "sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==",
+			"dev": true,
+			"dependencies": {
+				"has": "^1.0.3"
+			}
+		},
+		"node_modules/is-extglob": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-glob": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+			"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+			"dev": true,
+			"dependencies": {
+				"is-extglob": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.12.0"
+			}
+		},
+		"node_modules/is-number-object": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
+			"integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+			"dev": true,
+			"dependencies": {
+				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-relative": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+			"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+			"dev": true,
+			"dependencies": {
+				"is-unc-path": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-string": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
+			"integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/is-unc-path": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+			"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+			"dev": true,
+			"dependencies": {
+				"unc-path-regex": "^0.1.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-windows": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+			"dev": true
+		},
+		"node_modules/isobject": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/js-tokens": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+			"dev": true
+		},
+		"node_modules/js-yaml": {
+			"version": "3.14.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+			"integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/jsdoc-type-pratt-parser": {
+			"version": "2.2.2",
+			"resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.2.tgz",
+			"integrity": "sha512-zRokSWcPLSWkoNzsWn9pq7YYSwDhKyEe+cJYT2qaPqLOOJb5sFSi46BPj81vP+e8chvCNdQL9RG86Bi9EI6MDw==",
+			"dev": true,
+			"engines": {
+				"node": ">=12.0.0"
+			}
+		},
+		"node_modules/jsesc": {
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+			"dev": true,
+			"bin": {
+				"jsesc": "bin/jsesc"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/json-parse-even-better-errors": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+			"dev": true
+		},
+		"node_modules/json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+			"dev": true
+		},
+		"node_modules/json-stable-stringify-without-jsonify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+			"dev": true
+		},
+		"node_modules/json5": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+			"dev": true,
+			"dependencies": {
+				"minimist": "^1.2.5"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/levn": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "^1.2.1",
+				"type-check": "~0.4.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/liftup": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz",
+			"integrity": "sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==",
+			"dev": true,
+			"dependencies": {
+				"extend": "^3.0.2",
+				"findup-sync": "^4.0.0",
+				"fined": "^1.2.0",
+				"flagged-respawn": "^1.0.1",
+				"is-plain-object": "^2.0.4",
+				"object.map": "^1.0.1",
+				"rechoir": "^0.7.0",
+				"resolve": "^1.19.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/liftup/node_modules/findup-sync": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz",
+			"integrity": "sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==",
+			"dev": true,
+			"dependencies": {
+				"detect-file": "^1.0.0",
+				"is-glob": "^4.0.0",
+				"micromatch": "^4.0.2",
+				"resolve-dir": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/liftup/node_modules/resolve": {
+			"version": "1.20.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+			"integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+			"dev": true,
+			"dependencies": {
+				"is-core-module": "^2.2.0",
+				"path-parse": "^1.0.6"
+			}
+		},
+		"node_modules/lines-and-columns": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+			"dev": true
+		},
+		"node_modules/locate-path": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+			"dev": true,
+			"dependencies": {
+				"p-locate": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/lodash": {
+			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+			"dev": true
+		},
+		"node_modules/lodash.clonedeep": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+			"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+			"dev": true
+		},
+		"node_modules/lodash.flatten": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+			"integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
+			"dev": true
+		},
+		"node_modules/lodash.memoize": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+			"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+			"dev": true
+		},
+		"node_modules/lodash.merge": {
+			"version": "4.6.2",
+			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+			"dev": true
+		},
+		"node_modules/lodash.truncate": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+			"integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+			"dev": true
+		},
+		"node_modules/lru-cache": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"dev": true,
+			"dependencies": {
+				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/make-iterator": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+			"integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+			"dev": true,
+			"dependencies": {
+				"kind-of": "^6.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/map-cache": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+			"integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/micromatch": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+			"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+			"dev": true,
+			"dependencies": {
+				"braces": "^3.0.1",
+				"picomatch": "^2.2.3"
+			},
+			"engines": {
+				"node": ">=8.6"
+			}
+		},
+		"node_modules/min-indent": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+			"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/minimatch": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"dev": true,
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/minimist": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+			"dev": true
+		},
+		"node_modules/mkdirp": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+			"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+			"dev": true,
+			"bin": {
+				"mkdirp": "bin/cmd.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"dev": true
+		},
+		"node_modules/multimap": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/multimap/-/multimap-1.1.0.tgz",
+			"integrity": "sha512-0ZIR9PasPxGXmRsEF8jsDzndzHDj7tIav+JUmvIFB/WHswliFnquxECT/De7GR4yg99ky/NlRKJT82G1y271bw==",
+			"dev": true
+		},
+		"node_modules/natural-compare": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+			"dev": true
+		},
+		"node_modules/node-releases": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
+			"integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
+			"dev": true
+		},
+		"node_modules/nopt": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+			"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+			"dev": true,
+			"dependencies": {
+				"abbrev": "1"
+			},
+			"bin": {
+				"nopt": "bin/nopt.js"
+			}
+		},
+		"node_modules/normalize-package-data": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+			"dev": true,
+			"dependencies": {
+				"hosted-git-info": "^2.1.4",
+				"resolve": "^1.10.0",
+				"semver": "2 || 3 || 4 || 5",
+				"validate-npm-package-license": "^3.0.1"
+			}
+		},
+		"node_modules/normalize-package-data/node_modules/semver": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/object.defaults": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+			"integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
+			"dev": true,
+			"dependencies": {
+				"array-each": "^1.0.1",
+				"array-slice": "^1.0.0",
+				"for-own": "^1.0.0",
+				"isobject": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object.map": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
+			"integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
+			"dev": true,
+			"dependencies": {
+				"for-own": "^1.0.0",
+				"make-iterator": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object.pick": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+			"integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+			"dev": true,
+			"dependencies": {
+				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+			"dev": true,
+			"dependencies": {
+				"wrappy": "1"
+			}
+		},
+		"node_modules/optionator": {
+			"version": "0.9.1",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+			"dev": true,
+			"dependencies": {
+				"deep-is": "^0.1.3",
+				"fast-levenshtein": "^2.0.6",
+				"levn": "^0.4.1",
+				"prelude-ls": "^1.2.1",
+				"type-check": "^0.4.0",
+				"word-wrap": "^1.2.3"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/os-homedir": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/os-tmpdir": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+			"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/osenv": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+			"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+			"dev": true,
+			"dependencies": {
+				"os-homedir": "^1.0.0",
+				"os-tmpdir": "^1.0.0"
+			}
+		},
+		"node_modules/p-limit": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+			"dev": true,
+			"dependencies": {
+				"yocto-queue": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/p-locate": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+			"dev": true,
+			"dependencies": {
+				"p-limit": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/p-try": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/parent-module": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+			"dev": true,
+			"dependencies": {
+				"callsites": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/parse-filepath": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
+			"integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
+			"dev": true,
+			"dependencies": {
+				"is-absolute": "^1.0.0",
+				"map-cache": "^0.2.0",
+				"path-root": "^0.1.1"
+			},
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/parse-json": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/code-frame": "^7.0.0",
+				"error-ex": "^1.3.1",
+				"json-parse-even-better-errors": "^2.3.0",
+				"lines-and-columns": "^1.1.6"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/parse-passwd": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+			"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/path-is-absolute": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/path-parse": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+			"dev": true
+		},
+		"node_modules/path-root": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
+			"integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
+			"dev": true,
+			"dependencies": {
+				"path-root-regex": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/path-root-regex": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
+			"integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/picocolors": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+			"dev": true
+		},
+		"node_modules/picomatch": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+			"integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8.6"
+			}
+		},
+		"node_modules/pluralize": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
+			"integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/prelude-ls": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/progress": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/punycode": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/ramda": {
+			"version": "0.27.2",
+			"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.2.tgz",
+			"integrity": "sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA==",
+			"dev": true
+		},
+		"node_modules/read-pkg": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+			"dev": true,
+			"dependencies": {
+				"@types/normalize-package-data": "^2.4.0",
+				"normalize-package-data": "^2.5.0",
+				"parse-json": "^5.0.0",
+				"type-fest": "^0.6.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/read-pkg-up": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+			"dev": true,
+			"dependencies": {
+				"find-up": "^4.1.0",
+				"read-pkg": "^5.2.0",
+				"type-fest": "^0.8.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/read-pkg-up/node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
+			"dependencies": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/read-pkg-up/node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"dependencies": {
+				"p-locate": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/read-pkg-up/node_modules/p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"dev": true,
+			"dependencies": {
+				"p-try": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/read-pkg-up/node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/read-pkg/node_modules/type-fest": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+			"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/rechoir": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
+			"integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==",
+			"dev": true,
+			"dependencies": {
+				"resolve": "^1.9.0"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/regexp-tree": {
+			"version": "0.1.24",
+			"resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.24.tgz",
+			"integrity": "sha512-s2aEVuLhvnVJW6s/iPgEGK6R+/xngd2jNQ+xy4bXNDKxZKJH6jpPHY6kVeVv1IeLCHgswRj+Kl3ELaDjG6V1iw==",
+			"dev": true,
+			"bin": {
+				"regexp-tree": "bin/regexp-tree"
+			}
+		},
+		"node_modules/regexpp": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
+			"integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/regextras": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz",
+			"integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.1.14"
+			}
+		},
+		"node_modules/require-from-string": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/requireindex": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
+			"integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.5"
+			}
+		},
+		"node_modules/resolve": {
+			"version": "1.17.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+			"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+			"dev": true,
+			"dependencies": {
+				"path-parse": "^1.0.6"
+			}
+		},
+		"node_modules/resolve-dir": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+			"integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+			"dev": true,
+			"dependencies": {
+				"expand-tilde": "^2.0.0",
+				"global-modules": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/resolve-from": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/rimraf": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"dev": true,
+			"dependencies": {
+				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
+			}
+		},
+		"node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true
+		},
+		"node_modules/safe-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-2.1.1.tgz",
+			"integrity": "sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==",
+			"dev": true,
+			"dependencies": {
+				"regexp-tree": "~0.1.1"
+			}
+		},
+		"node_modules/safer-buffer": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+			"dev": true
+		},
+		"node_modules/semver": {
+			"version": "7.3.5",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+			"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/slice-ansi": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+			"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"astral-regex": "^2.0.0",
+				"is-fullwidth-code-point": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/source-map": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/spdx-correct": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+			"dev": true,
+			"dependencies": {
+				"spdx-expression-parse": "^3.0.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"node_modules/spdx-exceptions": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+			"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+			"dev": true
+		},
+		"node_modules/spdx-expression-parse": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+			"dev": true,
+			"dependencies": {
+				"spdx-exceptions": "^2.1.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"node_modules/spdx-license-ids": {
+			"version": "3.0.11",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
+			"integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
+			"dev": true
+		},
+		"node_modules/sprintf-js": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+			"integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
+			"dev": true
+		},
+		"node_modules/string-width": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+			"integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+			"dev": true,
+			"dependencies": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-ansi": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+			"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+			"dev": true,
+			"dependencies": {
+				"ansi-regex": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-indent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+			"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+			"dev": true,
+			"dependencies": {
+				"min-indent": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-json-comments": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/table": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/table/-/table-6.1.0.tgz",
+			"integrity": "sha512-T4G5KMmqIk6X87gLKWyU5exPpTjLjY5KyrFWaIjv3SvgaIUGXV7UEzGEnZJdTA38/yUS6f9PlKezQ0bYXG3iIQ==",
+			"dev": true,
+			"dependencies": {
+				"ajv": "^8.0.1",
+				"is-boolean-object": "^1.1.0",
+				"is-number-object": "^1.0.4",
+				"is-string": "^1.0.5",
+				"lodash.clonedeep": "^4.5.0",
+				"lodash.flatten": "^4.4.0",
+				"lodash.truncate": "^4.4.2",
+				"slice-ansi": "^4.0.0",
+				"string-width": "^4.2.0"
+			},
+			"engines": {
+				"node": ">=10.0.0"
+			}
+		},
+		"node_modules/table/node_modules/ajv": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.1.0.tgz",
+			"integrity": "sha512-B/Sk2Ix7A36fs/ZkuGLIR86EdjbgR6fsAcbx9lOP/QBSXujDNbVmIS/U4Itz5k8fPFDeVZl/zQ/gJW4Jrq6XjQ==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2",
+				"uri-js": "^4.2.2"
+			}
+		},
+		"node_modules/table/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true
+		},
+		"node_modules/text-table": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+			"dev": true
+		},
+		"node_modules/to-fast-properties": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+			"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
+			}
+		},
+		"node_modules/type-check": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+			"dev": true,
+			"dependencies": {
+				"prelude-ls": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/type-fest": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/unc-path-regex": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/underscore.string": {
+			"version": "3.3.5",
+			"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.5.tgz",
+			"integrity": "sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==",
+			"dev": true,
+			"dependencies": {
+				"sprintf-js": "^1.0.3",
+				"util-deprecate": "^1.0.2"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/upath": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz",
+			"integrity": "sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==",
+			"dev": true,
+			"engines": {
+				"node": ">=4",
+				"yarn": "*"
+			}
+		},
+		"node_modules/uri-js": {
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+			"dev": true,
+			"dependencies": {
+				"punycode": "^2.1.0"
+			}
+		},
+		"node_modules/util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+			"dev": true
+		},
+		"node_modules/v8-compile-cache": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+			"dev": true
+		},
+		"node_modules/v8flags": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
+			"integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
+			"dev": true,
+			"dependencies": {
+				"homedir-polyfill": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/validate-npm-package-license": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+			"dev": true,
+			"dependencies": {
+				"spdx-correct": "^3.0.0",
+				"spdx-expression-parse": "^3.0.0"
+			}
+		},
+		"node_modules/vue-eslint-parser": {
+			"version": "8.2.0",
+			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.2.0.tgz",
+			"integrity": "sha512-hvl8OVT8imlKk/lQyhkshqwQQChzHETcBd5abiO4ePw7ib7QUZLfW+2TUrJHKUvFOCFRJrDin5KJO9OHzB5bRQ==",
+			"dev": true,
+			"dependencies": {
+				"debug": "^4.3.2",
+				"eslint-scope": "^7.0.0",
+				"eslint-visitor-keys": "^3.1.0",
+				"espree": "^9.0.0",
+				"esquery": "^1.4.0",
+				"lodash": "^4.17.21",
+				"semver": "^7.3.5"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			},
+			"peerDependencies": {
+				"eslint": ">=6.0.0"
+			}
+		},
+		"node_modules/vue-eslint-parser/node_modules/acorn": {
+			"version": "8.7.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+			"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+			"dev": true,
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/vue-eslint-parser/node_modules/eslint-scope": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz",
+			"integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==",
+			"dev": true,
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/vue-eslint-parser/node_modules/eslint-visitor-keys": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
+			"integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/vue-eslint-parser/node_modules/espree": {
+			"version": "9.3.0",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz",
+			"integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^8.7.0",
+				"acorn-jsx": "^5.3.1",
+				"eslint-visitor-keys": "^3.1.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/vue-eslint-parser/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/which": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+			"dev": true,
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"which": "bin/which"
+			}
+		},
+		"node_modules/word-wrap": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/wrappy": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+			"dev": true
+		},
+		"node_modules/yallist": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+			"dev": true
+		},
+		"node_modules/yocto-queue": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		}
+	},
 	"dependencies": {
+		"@ampproject/remapping": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.0.4.tgz",
+			"integrity": "sha512-zU3pj3pf//YhaoozRTYKaL20KopXrzuZFc/8Ylc49AuV8grYKH23TTq9JJoR70F8zQbil58KjSchZTWeX+jrIQ==",
+			"dev": true,
+			"requires": {
+				"@jridgewell/trace-mapping": "^0.3.0"
+			}
+		},
 		"@babel/code-frame": {
 			"version": "7.12.11",
 			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
@@ -11,19 +3812,219 @@
 				"@babel/highlight": "^7.10.4"
 			}
 		},
+		"@babel/compat-data": {
+			"version": "7.17.0",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.0.tgz",
+			"integrity": "sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==",
+			"dev": true
+		},
+		"@babel/core": {
+			"version": "7.17.0",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.0.tgz",
+			"integrity": "sha512-x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA==",
+			"dev": true,
+			"requires": {
+				"@ampproject/remapping": "^2.0.0",
+				"@babel/code-frame": "^7.16.7",
+				"@babel/generator": "^7.17.0",
+				"@babel/helper-compilation-targets": "^7.16.7",
+				"@babel/helper-module-transforms": "^7.16.7",
+				"@babel/helpers": "^7.17.0",
+				"@babel/parser": "^7.17.0",
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.17.0",
+				"@babel/types": "^7.17.0",
+				"convert-source-map": "^1.7.0",
+				"debug": "^4.1.0",
+				"gensync": "^1.0.0-beta.2",
+				"json5": "^2.1.2",
+				"semver": "^6.3.0"
+			},
+			"dependencies": {
+				"@babel/code-frame": {
+					"version": "7.16.7",
+					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+					"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+					"dev": true,
+					"requires": {
+						"@babel/highlight": "^7.16.7"
+					}
+				},
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/eslint-parser": {
+			"version": "7.17.0",
+			"resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz",
+			"integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
+			"dev": true,
+			"requires": {
+				"eslint-scope": "^5.1.1",
+				"eslint-visitor-keys": "^2.1.0",
+				"semver": "^6.3.0"
+			},
+			"dependencies": {
+				"eslint-visitor-keys": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+					"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+					"dev": true
+				},
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/generator": {
+			"version": "7.17.0",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.0.tgz",
+			"integrity": "sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.17.0",
+				"jsesc": "^2.5.1",
+				"source-map": "^0.5.0"
+			}
+		},
+		"@babel/helper-compilation-targets": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz",
+			"integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
+			"dev": true,
+			"requires": {
+				"@babel/compat-data": "^7.16.4",
+				"@babel/helper-validator-option": "^7.16.7",
+				"browserslist": "^4.17.5",
+				"semver": "^6.3.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/helper-environment-visitor": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
+			"integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-function-name": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
+			"integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-get-function-arity": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-get-function-arity": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
+			"integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-hoist-variables": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
+			"integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-module-imports": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
+			"integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-module-transforms": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
+			"integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-environment-visitor": "^7.16.7",
+				"@babel/helper-module-imports": "^7.16.7",
+				"@babel/helper-simple-access": "^7.16.7",
+				"@babel/helper-split-export-declaration": "^7.16.7",
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.16.7",
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-simple-access": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz",
+			"integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
+		"@babel/helper-split-export-declaration": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
+			"integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.16.7"
+			}
+		},
 		"@babel/helper-validator-identifier": {
-			"version": "7.12.11",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-			"integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+			"integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+			"dev": true
+		},
+		"@babel/helper-validator-option": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+			"integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
 			"dev": true
 		},
+		"@babel/helpers": {
+			"version": "7.17.0",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.0.tgz",
+			"integrity": "sha512-Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ==",
+			"dev": true,
+			"requires": {
+				"@babel/template": "^7.16.7",
+				"@babel/traverse": "^7.17.0",
+				"@babel/types": "^7.17.0"
+			}
+		},
 		"@babel/highlight": {
-			"version": "7.13.10",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
-			"integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
+			"version": "7.16.10",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
+			"integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-validator-identifier": "^7.12.11",
+				"@babel/helper-validator-identifier": "^7.16.7",
 				"chalk": "^2.0.0",
 				"js-tokens": "^4.0.0"
 			},
@@ -80,64 +4081,164 @@
 				}
 			}
 		},
-		"@eslint/eslintrc": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz",
-			"integrity": "sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==",
+		"@babel/parser": {
+			"version": "7.17.0",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz",
+			"integrity": "sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==",
+			"dev": true
+		},
+		"@babel/template": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
+			"integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
 			"dev": true,
 			"requires": {
-				"ajv": "^6.12.4",
-				"debug": "^4.1.1",
-				"espree": "^7.3.0",
-				"globals": "^12.1.0",
-				"ignore": "^4.0.6",
-				"import-fresh": "^3.2.1",
-				"js-yaml": "^3.13.1",
-				"minimatch": "^3.0.4",
-				"strip-json-comments": "^3.1.1"
+				"@babel/code-frame": "^7.16.7",
+				"@babel/parser": "^7.16.7",
+				"@babel/types": "^7.16.7"
 			},
 			"dependencies": {
-				"debug": {
-					"version": "4.3.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+				"@babel/code-frame": {
+					"version": "7.16.7",
+					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+					"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
 					"dev": true,
 					"requires": {
-						"ms": "2.1.2"
+						"@babel/highlight": "^7.16.7"
 					}
-				},
-				"globals": {
-					"version": "12.4.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
-					"integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+				}
+			}
+		},
+		"@babel/traverse": {
+			"version": "7.17.0",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.0.tgz",
+			"integrity": "sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.16.7",
+				"@babel/generator": "^7.17.0",
+				"@babel/helper-environment-visitor": "^7.16.7",
+				"@babel/helper-function-name": "^7.16.7",
+				"@babel/helper-hoist-variables": "^7.16.7",
+				"@babel/helper-split-export-declaration": "^7.16.7",
+				"@babel/parser": "^7.17.0",
+				"@babel/types": "^7.17.0",
+				"debug": "^4.1.0",
+				"globals": "^11.1.0"
+			},
+			"dependencies": {
+				"@babel/code-frame": {
+					"version": "7.16.7",
+					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+					"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
 					"dev": true,
 					"requires": {
-						"type-fest": "^0.8.1"
+						"@babel/highlight": "^7.16.7"
 					}
 				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+				"globals": {
+					"version": "11.12.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
 					"dev": true
 				}
 			}
 		},
-		"@mdn/browser-compat-data": {
-			"version": "2.0.7",
-			"resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-2.0.7.tgz",
-			"integrity": "sha512-GeeM827DlzFFidn1eKkMBiqXFD2oLsnZbaiGhByPl0vcapsRzUL+t9hDoov1swc9rB2jw64R+ihtzC8qOE9wXw==",
+		"@babel/types": {
+			"version": "7.17.0",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
+			"integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
 			"dev": true,
 			"requires": {
-				"extend": "3.0.2"
+				"@babel/helper-validator-identifier": "^7.16.7",
+				"to-fast-properties": "^2.0.0"
 			}
 		},
+		"@es-joy/jsdoccomment": {
+			"version": "0.18.0",
+			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.18.0.tgz",
+			"integrity": "sha512-TjT8KJULV4I6ZiwIoKr6eMs+XpRejqwJ/VA+QPDeFGe9j6bZFKmMJ81EeFsGm6JNZhnzm37aoxVROmTh2PZoyA==",
+			"dev": true,
+			"requires": {
+				"comment-parser": "1.3.0",
+				"esquery": "^1.4.0",
+				"jsdoc-type-pratt-parser": "~2.2.2"
+			}
+		},
+		"@eslint/eslintrc": {
+			"version": "0.4.3",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+			"integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+			"dev": true,
+			"requires": {
+				"ajv": "^6.12.4",
+				"debug": "^4.1.1",
+				"espree": "^7.3.0",
+				"globals": "^13.9.0",
+				"ignore": "^4.0.6",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^3.13.1",
+				"minimatch": "^3.0.4",
+				"strip-json-comments": "^3.1.1"
+			}
+		},
+		"@humanwhocodes/config-array": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+			"integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+			"dev": true,
+			"requires": {
+				"@humanwhocodes/object-schema": "^1.2.0",
+				"debug": "^4.1.1",
+				"minimatch": "^3.0.4"
+			}
+		},
+		"@humanwhocodes/object-schema": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+			"dev": true
+		},
+		"@jridgewell/resolve-uri": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz",
+			"integrity": "sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg==",
+			"dev": true
+		},
+		"@jridgewell/sourcemap-codec": {
+			"version": "1.4.10",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz",
+			"integrity": "sha512-Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg==",
+			"dev": true
+		},
+		"@jridgewell/trace-mapping": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.2.tgz",
+			"integrity": "sha512-9KzzH4kMjA2XmBRHfqG2/Vtl7s92l6uNDd0wW7frDE+EUvQFGqNXhWp0UGJjSkt3v2AYjzOZn1QO9XaTNJIt1Q==",
+			"dev": true,
+			"requires": {
+				"@jridgewell/resolve-uri": "^3.0.3",
+				"@jridgewell/sourcemap-codec": "^1.4.10"
+			}
+		},
+		"@mdn/browser-compat-data": {
+			"version": "3.3.14",
+			"resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-3.3.14.tgz",
+			"integrity": "sha512-n2RC9d6XatVbWFdHLimzzUJxJ1KY8LdjqrW6YvGPiRmsHkhOUx74/Ct10x5Yo7bC/Jvqx7cDEW8IMPv/+vwEzA==",
+			"dev": true
+		},
 		"@types/color-name": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
 			"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
 			"dev": true
 		},
+		"@types/normalize-package-data": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+			"integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+			"dev": true
+		},
 		"abbrev": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -151,10 +4252,11 @@
 			"dev": true
 		},
 		"acorn-jsx": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-			"integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-			"dev": true
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+			"dev": true,
+			"requires": {}
 		},
 		"ajv": {
 			"version": "6.12.6",
@@ -220,10 +4322,13 @@
 			"dev": true
 		},
 		"ast-metadata-inferer": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/ast-metadata-inferer/-/ast-metadata-inferer-0.4.0.tgz",
-			"integrity": "sha512-tKHdBe8N/Vq2nLAm4YPBVREVZjMux6KrqyPfNQgIbDl0t7HaNSmy8w4OyVHYg/cvyn5BW7o7pVwpjPte89Zhcg==",
-			"dev": true
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/ast-metadata-inferer/-/ast-metadata-inferer-0.7.0.tgz",
+			"integrity": "sha512-OkMLzd8xelb3gmnp6ToFvvsHLtS6CbagTkFQvQ+ZYFe3/AIl9iKikNR9G7pY3GfOR/2Xc222hwBjzI7HLkE76Q==",
+			"dev": true,
+			"requires": {
+				"@mdn/browser-compat-data": "^3.3.14"
+			}
 		},
 		"astral-regex": {
 			"version": "2.0.0",
@@ -263,26 +4368,24 @@
 			}
 		},
 		"browserslist": {
-			"version": "4.16.6",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-			"integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+			"version": "4.19.1",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
+			"integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
 			"dev": true,
 			"requires": {
-				"caniuse-lite": "^1.0.30001219",
-				"colorette": "^1.2.2",
-				"electron-to-chromium": "^1.3.723",
+				"caniuse-lite": "^1.0.30001286",
+				"electron-to-chromium": "^1.4.17",
 				"escalade": "^3.1.1",
-				"node-releases": "^1.1.71"
-			},
-			"dependencies": {
-				"caniuse-lite": {
-					"version": "1.0.30001228",
-					"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz",
-					"integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==",
-					"dev": true
-				}
+				"node-releases": "^2.0.1",
+				"picocolors": "^1.0.0"
 			}
 		},
+		"builtin-modules": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
+			"integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
+			"dev": true
+		},
 		"call-bind": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -300,9 +4403,9 @@
 			"dev": true
 		},
 		"caniuse-lite": {
-			"version": "1.0.30001208",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001208.tgz",
-			"integrity": "sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA==",
+			"version": "1.0.30001307",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001307.tgz",
+			"integrity": "sha512-+MXEMczJ4FuxJAUp0jvAl6Df0NI/OfW1RWEE61eSmzS7hw6lz4IKutbhbXendwq8BljfFuHtu26VWsg4afQ7Ng==",
 			"dev": true
 		},
 		"chalk": {
@@ -315,6 +4418,21 @@
 				"supports-color": "^7.1.0"
 			}
 		},
+		"ci-info": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
+			"integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
+			"dev": true
+		},
+		"clean-regexp": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz",
+			"integrity": "sha1-jffHquUf02h06PjQW5GAvBGj/tc=",
+			"dev": true,
+			"requires": {
+				"escape-string-regexp": "^1.0.5"
+			}
+		},
 		"color-convert": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -330,12 +4448,6 @@
 			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"colorette": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-			"integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
-			"dev": true
-		},
 		"colors": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
@@ -343,9 +4455,9 @@
 			"dev": true
 		},
 		"comment-parser": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.2.tgz",
-			"integrity": "sha512-AOdq0i8ghZudnYv8RUnHrhTgafUGs61Rdz9jemU5x2lnZwAWyOq7vySo626K59e1fVKH1xSRorJwPVRLSWOoAQ==",
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.0.tgz",
+			"integrity": "sha512-hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA==",
 			"dev": true
 		},
 		"concat-map": {
@@ -354,10 +4466,19 @@
 			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
 			"dev": true
 		},
+		"convert-source-map": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+			"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "~5.1.1"
+			}
+		},
 		"core-js": {
-			"version": "3.10.1",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.10.1.tgz",
-			"integrity": "sha512-pwCxEXnj27XG47mu7SXAwhLP3L5CrlvCB91ANUkIz40P27kUcvNfSdvyZJ9CLHiVoKSp+TTChMQMSKQEH/IQxA==",
+			"version": "3.21.0",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.21.0.tgz",
+			"integrity": "sha512-YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ==",
 			"dev": true
 		},
 		"cross-spawn": {
@@ -388,6 +4509,15 @@
 			"integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
 			"dev": true
 		},
+		"debug": {
+			"version": "4.3.3",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+			"integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+			"dev": true,
+			"requires": {
+				"ms": "2.1.2"
+			}
+		},
 		"deep-is": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
@@ -410,9 +4540,9 @@
 			}
 		},
 		"electron-to-chromium": {
-			"version": "1.3.737",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.737.tgz",
-			"integrity": "sha512-P/B84AgUSQXaum7a8m11HUsYL8tj9h/Pt5f7Hg7Ty6bm5DxlFq+e5+ouHUoNQMsKDJ7u4yGfI8mOErCmSH9wyg==",
+			"version": "1.4.65",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.65.tgz",
+			"integrity": "sha512-0/d8Skk8sW3FxXP0Dd6MnBlrwx7Qo9cqQec3BlIAlvKnrmS3pHsIbaroEi+nd0kZkGpQ6apMEre7xndzjlEnLw==",
 			"dev": true
 		},
 		"emoji-regex": {
@@ -430,6 +4560,15 @@
 				"ansi-colors": "^4.1.1"
 			}
 		},
+		"error-ex": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+			"dev": true,
+			"requires": {
+				"is-arrayish": "^0.2.1"
+			}
+		},
 		"escalade": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -443,28 +4582,31 @@
 			"dev": true
 		},
 		"eslint": {
-			"version": "7.24.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.24.0.tgz",
-			"integrity": "sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ==",
+			"version": "7.32.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+			"integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
 			"dev": true,
 			"requires": {
 				"@babel/code-frame": "7.12.11",
-				"@eslint/eslintrc": "^0.4.0",
+				"@eslint/eslintrc": "^0.4.3",
+				"@humanwhocodes/config-array": "^0.5.0",
 				"ajv": "^6.10.0",
 				"chalk": "^4.0.0",
 				"cross-spawn": "^7.0.2",
 				"debug": "^4.0.1",
 				"doctrine": "^3.0.0",
 				"enquirer": "^2.3.5",
+				"escape-string-regexp": "^4.0.0",
 				"eslint-scope": "^5.1.1",
 				"eslint-utils": "^2.1.0",
 				"eslint-visitor-keys": "^2.0.0",
 				"espree": "^7.3.1",
 				"esquery": "^1.4.0",
 				"esutils": "^2.0.2",
+				"fast-deep-equal": "^3.1.3",
 				"file-entry-cache": "^6.0.1",
 				"functional-red-black-tree": "^1.0.1",
-				"glob-parent": "^5.0.0",
+				"glob-parent": "^5.1.2",
 				"globals": "^13.6.0",
 				"ignore": "^4.0.6",
 				"import-fresh": "^3.0.0",
@@ -473,7 +4615,7 @@
 				"js-yaml": "^3.13.1",
 				"json-stable-stringify-without-jsonify": "^1.0.1",
 				"levn": "^0.4.1",
-				"lodash": "^4.17.21",
+				"lodash.merge": "^4.6.2",
 				"minimatch": "^3.0.4",
 				"natural-compare": "^1.4.0",
 				"optionator": "^0.9.1",
@@ -482,19 +4624,16 @@
 				"semver": "^7.2.1",
 				"strip-ansi": "^6.0.0",
 				"strip-json-comments": "^3.1.0",
-				"table": "^6.0.4",
+				"table": "^6.0.9",
 				"text-table": "^0.2.0",
 				"v8-compile-cache": "^2.0.3"
 			},
 			"dependencies": {
-				"debug": {
-					"version": "4.3.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
+				"escape-string-regexp": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+					"dev": true
 				},
 				"is-glob": {
 					"version": "4.0.1",
@@ -504,63 +4643,44 @@
 					"requires": {
 						"is-extglob": "^2.1.1"
 					}
-				},
-				"lodash": {
-					"version": "4.17.21",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-					"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-					"dev": true
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
 				}
 			}
 		},
 		"eslint-config-wikimedia": {
-			"version": "0.20.0",
-			"resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.20.0.tgz",
-			"integrity": "sha512-F2dm+S6aCDDb99Fr6KD9L7u1gOK819deG6xAG4EIVaLsHdQhjbcpNUuzUkUmGmpEHIYHqSpwkZ1EvBMc9Pxn+w==",
+			"version": "0.21.0",
+			"resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.21.0.tgz",
+			"integrity": "sha512-+KoUKaWSKTgIx+Run9gdbGXi6Uox2/JxgROTVmA6yi4mnMuFWwpBXzYFjqZPUT7dzmJSTO3uxwsR44F8GnZhpg==",
 			"dev": true,
 			"requires": {
-				"eslint": "^7.23.0",
-				"eslint-plugin-compat": "^3.9.0",
+				"eslint": "^7.32.0",
+				"eslint-plugin-compat": "^3.13.0",
 				"eslint-plugin-es": "^4.1.0",
-				"eslint-plugin-jsdoc": "^32.3.0",
-				"eslint-plugin-json-es": "^1.5.3",
-				"eslint-plugin-mediawiki": "^0.2.7",
-				"eslint-plugin-mocha": "^8.1.0",
-				"eslint-plugin-no-jquery": "^2.6.0",
+				"eslint-plugin-jsdoc": "^37.0.3",
+				"eslint-plugin-json-es": "^1.5.4",
+				"eslint-plugin-mediawiki": "^0.3.0",
+				"eslint-plugin-mocha": "^9.0.0",
+				"eslint-plugin-no-jquery": "^2.7.0",
 				"eslint-plugin-node": "^11.1.0",
-				"eslint-plugin-qunit": "^6.0.0",
-				"eslint-plugin-vue": "^7.8.0",
-				"eslint-plugin-wdio": "^7.0.0"
+				"eslint-plugin-qunit": "^7.0.0",
+				"eslint-plugin-unicorn": "^37.0.1",
+				"eslint-plugin-vue": "^8.0.2",
+				"eslint-plugin-wdio": "^7.4.2"
 			}
 		},
 		"eslint-plugin-compat": {
-			"version": "3.9.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-3.9.0.tgz",
-			"integrity": "sha512-lt3l5PHFHVEYSZ5zijcoYvtQJPsBifRiH5N0Et57KwVu7l/yxmHhSG6VJiLMa/lXrg93Qu8049RNQOMn0+yJBg==",
+			"version": "3.13.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-3.13.0.tgz",
+			"integrity": "sha512-cv8IYMuTXm7PIjMVDN2y4k/KVnKZmoNGHNq27/9dLstOLydKblieIv+oe2BN2WthuXnFNhaNvv3N1Bvl4dbIGA==",
 			"dev": true,
 			"requires": {
-				"@mdn/browser-compat-data": "^2.0.7",
-				"ast-metadata-inferer": "^0.4.0",
-				"browserslist": "^4.12.2",
-				"caniuse-lite": "^1.0.30001166",
-				"core-js": "^3.6.5",
-				"find-up": "^4.1.0",
+				"@mdn/browser-compat-data": "^3.3.14",
+				"ast-metadata-inferer": "^0.7.0",
+				"browserslist": "^4.16.8",
+				"caniuse-lite": "^1.0.30001251",
+				"core-js": "^3.16.2",
+				"find-up": "^5.0.0",
 				"lodash.memoize": "4.1.2",
-				"semver": "7.3.2"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "7.3.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-					"integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-					"dev": true
-				}
+				"semver": "7.3.5"
 			}
 		},
 		"eslint-plugin-es": {
@@ -574,72 +4694,153 @@
 			}
 		},
 		"eslint-plugin-jsdoc": {
-			"version": "32.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.0.tgz",
-			"integrity": "sha512-zyx7kajDK+tqS1bHuY5sapkad8P8KT0vdd/lE55j47VPG2MeenSYuIY/M/Pvmzq5g0+3JB+P3BJGUXmHxtuKPQ==",
+			"version": "37.7.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-37.7.1.tgz",
+			"integrity": "sha512-ySxDTedl6qKXT/VeTwcZlhsRtvNQZGPklyVnaL5+ge20vowzFA9CKvrY0NXRqvdIz6JBVMFpxX9DSmS3OyAUOQ==",
+			"dev": true,
+			"requires": {
+				"@es-joy/jsdoccomment": "~0.18.0",
+				"comment-parser": "1.3.0",
+				"debug": "^4.3.3",
+				"escape-string-regexp": "^4.0.0",
+				"esquery": "^1.4.0",
+				"regextras": "^0.8.0",
+				"semver": "^7.3.5",
+				"spdx-expression-parse": "^3.0.1"
+			},
+			"dependencies": {
+				"escape-string-regexp": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+					"dev": true
+				}
+			}
+		},
+		"eslint-plugin-json-es": {
+			"version": "1.5.4",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-json-es/-/eslint-plugin-json-es-1.5.4.tgz",
+			"integrity": "sha512-DdjnNMUZ1iMrUXfxUQrTU7IyoEOsa4Kg0Zd6nOyOq1mUb75deK7NrcbI1FlWGdGVgqX99bUOD27i81EYiG794Q==",
+			"dev": true,
+			"requires": {
+				"eslint-visitor-keys": "^3.0.0",
+				"espree": "^9.0.0"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "8.7.0",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+					"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+					"dev": true
+				},
+				"eslint-visitor-keys": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
+					"integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
+					"dev": true
+				},
+				"espree": {
+					"version": "9.3.0",
+					"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz",
+					"integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==",
+					"dev": true,
+					"requires": {
+						"acorn": "^8.7.0",
+						"acorn-jsx": "^5.3.1",
+						"eslint-visitor-keys": "^3.1.0"
+					}
+				}
+			}
+		},
+		"eslint-plugin-mediawiki": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-mediawiki/-/eslint-plugin-mediawiki-0.3.0.tgz",
+			"integrity": "sha512-Lhyj2PSkhDzYSc1PNbURysY/WoqvY0brw558ZInT3erzf5KUlro18MTKFdV+nlht475ZgnsfHsgfg6Ut2w1SVg==",
 			"dev": true,
 			"requires": {
-				"comment-parser": "1.1.2",
-				"debug": "^4.3.1",
-				"jsdoctypeparser": "^9.0.0",
-				"lodash": "^4.17.20",
-				"regextras": "^0.7.1",
-				"semver": "^7.3.4",
-				"spdx-expression-parse": "^3.0.1"
+				"eslint-plugin-vue": "^7.20.0",
+				"upath": "^2.0.1"
 			},
 			"dependencies": {
-				"debug": {
-					"version": "4.3.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+				"eslint-plugin-vue": {
+					"version": "7.20.0",
+					"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.20.0.tgz",
+					"integrity": "sha512-oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw==",
+					"dev": true,
+					"requires": {
+						"eslint-utils": "^2.1.0",
+						"natural-compare": "^1.4.0",
+						"semver": "^6.3.0",
+						"vue-eslint-parser": "^7.10.0"
+					}
+				},
+				"eslint-visitor-keys": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+					"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+					"dev": true
+				},
+				"espree": {
+					"version": "6.2.1",
+					"resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
+					"integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
 					"dev": true,
 					"requires": {
-						"ms": "2.1.2"
+						"acorn": "^7.1.1",
+						"acorn-jsx": "^5.2.0",
+						"eslint-visitor-keys": "^1.1.0"
 					}
 				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
 					"dev": true
+				},
+				"vue-eslint-parser": {
+					"version": "7.11.0",
+					"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",
+					"integrity": "sha512-qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg==",
+					"dev": true,
+					"requires": {
+						"debug": "^4.1.1",
+						"eslint-scope": "^5.1.1",
+						"eslint-visitor-keys": "^1.1.0",
+						"espree": "^6.2.1",
+						"esquery": "^1.4.0",
+						"lodash": "^4.17.21",
+						"semver": "^6.3.0"
+					}
 				}
 			}
 		},
-		"eslint-plugin-json-es": {
-			"version": "1.5.3",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-json-es/-/eslint-plugin-json-es-1.5.3.tgz",
-			"integrity": "sha512-9wWjwhoN+ipMel70ktkWy0H7jj9sm5OAbAy3N3F3AT0swpIofVsIjDXyjGZJwSzy9tZzDtI/aKIj2WsqMHw2QA==",
-			"dev": true,
-			"requires": {
-				"eslint-visitor-keys": "^2.0.0",
-				"espree": "^7.3.1"
-			}
-		},
-		"eslint-plugin-mediawiki": {
-			"version": "0.2.7",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-mediawiki/-/eslint-plugin-mediawiki-0.2.7.tgz",
-			"integrity": "sha512-2ZvPvLEwCIqrJxV1349bdX5Q03c30WccuUMCfB1Gh2IVxbBSrY0gbzOk/gPZeYigVhODt9xoFWUCIz8jwTWfrA==",
-			"dev": true,
-			"requires": {
-				"eslint-plugin-vue": "^7.7.0",
-				"upath": "^1.2.0"
-			}
-		},
 		"eslint-plugin-mocha": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-8.1.0.tgz",
-			"integrity": "sha512-1EgHvXKRl7W3mq3sntZAi5T24agRMyiTPL4bSXe+B4GksYOjAPEWYx+J3eJg4It1l2NMNZJtk0gQyQ6mfiPhQg==",
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-9.0.0.tgz",
+			"integrity": "sha512-d7knAcQj1jPCzZf3caeBIn3BnW6ikcvfz0kSqQpwPYcVGLoJV5sz0l0OJB2LR8I7dvTDbqq1oV6ylhSgzA10zg==",
 			"dev": true,
 			"requires": {
-				"eslint-utils": "^2.1.0",
+				"eslint-utils": "^3.0.0",
 				"ramda": "^0.27.1"
+			},
+			"dependencies": {
+				"eslint-utils": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+					"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+					"dev": true,
+					"requires": {
+						"eslint-visitor-keys": "^2.0.0"
+					}
+				}
 			}
 		},
 		"eslint-plugin-no-jquery": {
-			"version": "2.6.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.6.0.tgz",
-			"integrity": "sha512-xC7pbNHJMdyxqhzcNMRrmC5/tbt1T4KCKXjOqUpKm/CaRryGKS5iWztzWPrL0KwyI3R3ub6goHFmIQS19f+mZA==",
-			"dev": true
+			"version": "2.7.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.7.0.tgz",
+			"integrity": "sha512-Aeg7dA6GTH1AcWLlBtWNzOU9efK5KpNi7b0EhBO0o0M+awyzguUUo8gF6hXGjQ9n5h8/uRtYv9zOqQkeC5CG0w==",
+			"dev": true,
+			"requires": {}
 		},
 		"eslint-plugin-node": {
 			"version": "11.1.0",
@@ -680,25 +4881,81 @@
 			}
 		},
 		"eslint-plugin-qunit": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-qunit/-/eslint-plugin-qunit-6.0.0.tgz",
-			"integrity": "sha512-+R8z2umSTIiWcxmTQ9nGoML8DL0VQJg4C+E9OpJ2KF9QL4WL/FoayROeTG5Z9zhlZ2qqa+9WkZ1YD6mx89io8w==",
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-qunit/-/eslint-plugin-qunit-7.2.0.tgz",
+			"integrity": "sha512-ebT6aOpmMj4vchG0hVw9Ukbutk/lgywrc8gc9w9hH2/4WjKqwMlyM7iVwqB7OAXv6gtQMJZuziT0wNjjymAuWA==",
 			"dev": true,
 			"requires": {
-				"eslint-utils": "^2.1.0",
+				"eslint-utils": "^3.0.0",
 				"requireindex": "^1.2.0"
+			},
+			"dependencies": {
+				"eslint-utils": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+					"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+					"dev": true,
+					"requires": {
+						"eslint-visitor-keys": "^2.0.0"
+					}
+				}
+			}
+		},
+		"eslint-plugin-unicorn": {
+			"version": "37.0.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-37.0.1.tgz",
+			"integrity": "sha512-E1jq5u9ojnadisJcPi+hMXTGSiIzkIUMDvWsBudsCGXvKUB2aNSU2TcfyW2/jAS5A4ryBXfzxLykMxX1EdluSQ==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-validator-identifier": "^7.14.9",
+				"ci-info": "^3.2.0",
+				"clean-regexp": "^1.0.0",
+				"eslint-template-visitor": "^2.3.2",
+				"eslint-utils": "^3.0.0",
+				"esquery": "^1.4.0",
+				"indent-string": "4",
+				"is-builtin-module": "^3.1.0",
+				"lodash": "^4.17.21",
+				"pluralize": "^8.0.0",
+				"read-pkg-up": "^7.0.1",
+				"regexp-tree": "^0.1.23",
+				"safe-regex": "^2.1.1",
+				"semver": "^7.3.5",
+				"strip-indent": "^3.0.0"
+			},
+			"dependencies": {
+				"eslint-utils": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+					"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+					"dev": true,
+					"requires": {
+						"eslint-visitor-keys": "^2.0.0"
+					}
+				}
 			}
 		},
 		"eslint-plugin-vue": {
-			"version": "7.9.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.9.0.tgz",
-			"integrity": "sha512-2Q0qQp5+5h+pZvJKCbG1/jCRUYrdgAz5BYKGyTlp2NU8mx09u3Hp7PsH6d5qef6ojuPoCXMnrbbDxeoplihrSw==",
+			"version": "8.4.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.4.1.tgz",
+			"integrity": "sha512-nmWOhNmDx9TZ+yP9ZhezTkZUupSHsYA2TocRm+efPSXMOyFrVczVlaIuQcLBjCtI8CbkBiUQ3VcyQsjlIhDrhA==",
 			"dev": true,
 			"requires": {
-				"eslint-utils": "^2.1.0",
+				"eslint-utils": "^3.0.0",
 				"natural-compare": "^1.4.0",
-				"semver": "^7.3.2",
-				"vue-eslint-parser": "^7.6.0"
+				"semver": "^7.3.5",
+				"vue-eslint-parser": "^8.0.1"
+			},
+			"dependencies": {
+				"eslint-utils": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+					"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+					"dev": true,
+					"requires": {
+						"eslint-visitor-keys": "^2.0.0"
+					}
+				}
 			}
 		},
 		"eslint-plugin-wdio": {
@@ -717,6 +4974,19 @@
 				"estraverse": "^4.1.1"
 			}
 		},
+		"eslint-template-visitor": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/eslint-template-visitor/-/eslint-template-visitor-2.3.2.tgz",
+			"integrity": "sha512-3ydhqFpuV7x1M9EK52BPNj6V0Kwu0KKkcIAfpUhwHbR8ocRln/oUHgfxQupY8O1h4Qv/POHDumb/BwwNfxbtnA==",
+			"dev": true,
+			"requires": {
+				"@babel/core": "^7.12.16",
+				"@babel/eslint-parser": "^7.12.16",
+				"eslint-visitor-keys": "^2.0.0",
+				"esquery": "^1.3.1",
+				"multimap": "^1.1.0"
+			}
+		},
 		"eslint-utils": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
@@ -875,12 +5145,12 @@
 			}
 		},
 		"find-up": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
 			"dev": true,
 			"requires": {
-				"locate-path": "^5.0.0",
+				"locate-path": "^6.0.0",
 				"path-exists": "^4.0.0"
 			}
 		},
@@ -976,6 +5246,12 @@
 			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
 			"dev": true
 		},
+		"gensync": {
+			"version": "1.0.0-beta.2",
+			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+			"dev": true
+		},
 		"get-intrinsic": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
@@ -1052,9 +5328,9 @@
 			}
 		},
 		"globals": {
-			"version": "13.8.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz",
-			"integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==",
+			"version": "13.12.1",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz",
+			"integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
 			"dev": true,
 			"requires": {
 				"type-fest": "^0.20.2"
@@ -1069,9 +5345,9 @@
 			}
 		},
 		"grunt": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.4.0.tgz",
-			"integrity": "sha512-yRFc0GVCDu9yxqOFzpuXQ2pEdgtLDnFv5Qz54jfIcNnpJ8Z7B7P7kPkT4VMuRvm+N+QOsI8C4v/Q0DSaoj3LgQ==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.4.1.tgz",
+			"integrity": "sha512-ZXIYXTsAVrA7sM+jZxjQdrBOAg7DyMUplOMhTaspMRExei+fD0BTwdWXnn0W5SXqhb/Q/nlkzXclSi3IH55PIA==",
 			"dev": true,
 			"requires": {
 				"dateformat": "~3.0.3",
@@ -1080,7 +5356,7 @@
 				"findup-sync": "~0.3.0",
 				"glob": "~7.1.6",
 				"grunt-cli": "~1.4.2",
-				"grunt-known-options": "~1.1.1",
+				"grunt-known-options": "~2.0.0",
 				"grunt-legacy-log": "~3.0.0",
 				"grunt-legacy-util": "~2.0.1",
 				"iconv-lite": "~0.4.13",
@@ -1115,6 +5391,12 @@
 							}
 						}
 					}
+				},
+				"grunt-known-options": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz",
+					"integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==",
+					"dev": true
 				}
 			}
 		},
@@ -1134,12 +5416,6 @@
 				"eslint": "^7.0.0"
 			}
 		},
-		"grunt-known-options": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.1.tgz",
-			"integrity": "sha512-cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ==",
-			"dev": true
-		},
 		"grunt-legacy-log": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz",
@@ -1230,6 +5506,12 @@
 			"integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=",
 			"dev": true
 		},
+		"hosted-git-info": {
+			"version": "2.8.9",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+			"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+			"dev": true
+		},
 		"iconv-lite": {
 			"version": "0.4.24",
 			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -1261,6 +5543,12 @@
 			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
 			"dev": true
 		},
+		"indent-string": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+			"dev": true
+		},
 		"inflight": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -1299,6 +5587,12 @@
 				"is-windows": "^1.0.1"
 			}
 		},
+		"is-arrayish": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+			"dev": true
+		},
 		"is-boolean-object": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
@@ -1308,6 +5602,15 @@
 				"call-bind": "^1.0.0"
 			}
 		},
+		"is-builtin-module": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.1.0.tgz",
+			"integrity": "sha512-OV7JjAgOTfAFJmHZLvpSTb4qi0nIILDV1gWPYDnDJUTNFM5aGlRAhk4QcT8i7TuAleeEV5Fdkqn3t4mS+Q11fg==",
+			"dev": true,
+			"requires": {
+				"builtin-modules": "^3.0.0"
+			}
+		},
 		"is-core-module": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.3.0.tgz",
@@ -1417,10 +5720,22 @@
 				"esprima": "^4.0.0"
 			}
 		},
-		"jsdoctypeparser": {
-			"version": "9.0.0",
-			"resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz",
-			"integrity": "sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==",
+		"jsdoc-type-pratt-parser": {
+			"version": "2.2.2",
+			"resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.2.tgz",
+			"integrity": "sha512-zRokSWcPLSWkoNzsWn9pq7YYSwDhKyEe+cJYT2qaPqLOOJb5sFSi46BPj81vP+e8chvCNdQL9RG86Bi9EI6MDw==",
+			"dev": true
+		},
+		"jsesc": {
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+			"dev": true
+		},
+		"json-parse-even-better-errors": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
 			"dev": true
 		},
 		"json-schema-traverse": {
@@ -1435,6 +5750,15 @@
 			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
 			"dev": true
 		},
+		"json5": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+			"dev": true,
+			"requires": {
+				"minimist": "^1.2.5"
+			}
+		},
 		"kind-of": {
 			"version": "6.0.3",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -1491,13 +5815,19 @@
 				}
 			}
 		},
+		"lines-and-columns": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+			"dev": true
+		},
 		"locate-path": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
 			"dev": true,
 			"requires": {
-				"p-locate": "^4.1.0"
+				"p-locate": "^5.0.0"
 			}
 		},
 		"lodash": {
@@ -1524,6 +5854,12 @@
 			"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
 			"dev": true
 		},
+		"lodash.merge": {
+			"version": "4.6.2",
+			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+			"dev": true
+		},
 		"lodash.truncate": {
 			"version": "4.4.2",
 			"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
@@ -1564,6 +5900,12 @@
 				"picomatch": "^2.2.3"
 			}
 		},
+		"min-indent": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+			"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+			"dev": true
+		},
 		"minimatch": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -1573,12 +5915,30 @@
 				"brace-expansion": "^1.1.7"
 			}
 		},
+		"minimist": {
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+			"dev": true
+		},
 		"mkdirp": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
 			"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
 			"dev": true
 		},
+		"ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"dev": true
+		},
+		"multimap": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/multimap/-/multimap-1.1.0.tgz",
+			"integrity": "sha512-0ZIR9PasPxGXmRsEF8jsDzndzHDj7tIav+JUmvIFB/WHswliFnquxECT/De7GR4yg99ky/NlRKJT82G1y271bw==",
+			"dev": true
+		},
 		"natural-compare": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -1586,9 +5946,9 @@
 			"dev": true
 		},
 		"node-releases": {
-			"version": "1.1.72",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz",
-			"integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
+			"integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
 			"dev": true
 		},
 		"nopt": {
@@ -1600,6 +5960,26 @@
 				"abbrev": "1"
 			}
 		},
+		"normalize-package-data": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+			"dev": true,
+			"requires": {
+				"hosted-git-info": "^2.1.4",
+				"resolve": "^1.10.0",
+				"semver": "2 || 3 || 4 || 5",
+				"validate-npm-package-license": "^3.0.1"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "5.7.1",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+					"dev": true
+				}
+			}
+		},
 		"object.defaults": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
@@ -1677,21 +6057,21 @@
 			}
 		},
 		"p-limit": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
 			"dev": true,
 			"requires": {
-				"p-try": "^2.0.0"
+				"yocto-queue": "^0.1.0"
 			}
 		},
 		"p-locate": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
 			"dev": true,
 			"requires": {
-				"p-limit": "^2.2.0"
+				"p-limit": "^3.0.2"
 			}
 		},
 		"p-try": {
@@ -1720,6 +6100,18 @@
 				"path-root": "^0.1.1"
 			}
 		},
+		"parse-json": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.0.0",
+				"error-ex": "^1.3.1",
+				"json-parse-even-better-errors": "^2.3.0",
+				"lines-and-columns": "^1.1.6"
+			}
+		},
 		"parse-passwd": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
@@ -1765,12 +6157,24 @@
 			"integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
 			"dev": true
 		},
+		"picocolors": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+			"dev": true
+		},
 		"picomatch": {
 			"version": "2.2.3",
 			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
 			"integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
 			"dev": true
 		},
+		"pluralize": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
+			"integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
+			"dev": true
+		},
 		"prelude-ls": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -1790,11 +6194,81 @@
 			"dev": true
 		},
 		"ramda": {
-			"version": "0.27.1",
-			"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.1.tgz",
-			"integrity": "sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw==",
+			"version": "0.27.2",
+			"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.2.tgz",
+			"integrity": "sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA==",
 			"dev": true
 		},
+		"read-pkg": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+			"dev": true,
+			"requires": {
+				"@types/normalize-package-data": "^2.4.0",
+				"normalize-package-data": "^2.5.0",
+				"parse-json": "^5.0.0",
+				"type-fest": "^0.6.0"
+			},
+			"dependencies": {
+				"type-fest": {
+					"version": "0.6.0",
+					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+					"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+					"dev": true
+				}
+			}
+		},
+		"read-pkg-up": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+			"dev": true,
+			"requires": {
+				"find-up": "^4.1.0",
+				"read-pkg": "^5.2.0",
+				"type-fest": "^0.8.1"
+			},
+			"dependencies": {
+				"find-up": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+					"dev": true,
+					"requires": {
+						"locate-path": "^5.0.0",
+						"path-exists": "^4.0.0"
+					}
+				},
+				"locate-path": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+					"dev": true,
+					"requires": {
+						"p-locate": "^4.1.0"
+					}
+				},
+				"p-limit": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+					"dev": true,
+					"requires": {
+						"p-try": "^2.0.0"
+					}
+				},
+				"p-locate": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+					"dev": true,
+					"requires": {
+						"p-limit": "^2.2.0"
+					}
+				}
+			}
+		},
 		"rechoir": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
@@ -1804,6 +6278,12 @@
 				"resolve": "^1.9.0"
 			}
 		},
+		"regexp-tree": {
+			"version": "0.1.24",
+			"resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.24.tgz",
+			"integrity": "sha512-s2aEVuLhvnVJW6s/iPgEGK6R+/xngd2jNQ+xy4bXNDKxZKJH6jpPHY6kVeVv1IeLCHgswRj+Kl3ELaDjG6V1iw==",
+			"dev": true
+		},
 		"regexpp": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
@@ -1811,9 +6291,9 @@
 			"dev": true
 		},
 		"regextras": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz",
-			"integrity": "sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==",
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz",
+			"integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==",
 			"dev": true
 		},
 		"require-from-string": {
@@ -1862,6 +6342,21 @@
 				"glob": "^7.1.3"
 			}
 		},
+		"safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true
+		},
+		"safe-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-2.1.1.tgz",
+			"integrity": "sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==",
+			"dev": true,
+			"requires": {
+				"regexp-tree": "~0.1.1"
+			}
+		},
 		"safer-buffer": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -1903,6 +6398,22 @@
 				"is-fullwidth-code-point": "^3.0.0"
 			}
 		},
+		"source-map": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+			"dev": true
+		},
+		"spdx-correct": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+			"dev": true,
+			"requires": {
+				"spdx-expression-parse": "^3.0.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
 		"spdx-exceptions": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
@@ -1920,9 +6431,9 @@
 			}
 		},
 		"spdx-license-ids": {
-			"version": "3.0.7",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz",
-			"integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
+			"version": "3.0.11",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
+			"integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
 			"dev": true
 		},
 		"sprintf-js": {
@@ -1951,6 +6462,15 @@
 				"ansi-regex": "^5.0.0"
 			}
 		},
+		"strip-indent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+			"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+			"dev": true,
+			"requires": {
+				"min-indent": "^1.0.0"
+			}
+		},
 		"strip-json-comments": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -2009,6 +6529,12 @@
 			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
 			"dev": true
 		},
+		"to-fast-properties": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+			"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+			"dev": true
+		},
 		"to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -2050,9 +6576,9 @@
 			}
 		},
 		"upath": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-			"integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz",
+			"integrity": "sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==",
 			"dev": true
 		},
 		"uri-js": {
@@ -2085,50 +6611,68 @@
 				"homedir-polyfill": "^1.0.1"
 			}
 		},
+		"validate-npm-package-license": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+			"dev": true,
+			"requires": {
+				"spdx-correct": "^3.0.0",
+				"spdx-expression-parse": "^3.0.0"
+			}
+		},
 		"vue-eslint-parser": {
-			"version": "7.6.0",
-			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.6.0.tgz",
-			"integrity": "sha512-QXxqH8ZevBrtiZMZK0LpwaMfevQi9UL7lY6Kcp+ogWHC88AuwUPwwCIzkOUc1LR4XsYAt/F9yHXAB/QoD17QXA==",
+			"version": "8.2.0",
+			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.2.0.tgz",
+			"integrity": "sha512-hvl8OVT8imlKk/lQyhkshqwQQChzHETcBd5abiO4ePw7ib7QUZLfW+2TUrJHKUvFOCFRJrDin5KJO9OHzB5bRQ==",
 			"dev": true,
 			"requires": {
-				"debug": "^4.1.1",
-				"eslint-scope": "^5.0.0",
-				"eslint-visitor-keys": "^1.1.0",
-				"espree": "^6.2.1",
+				"debug": "^4.3.2",
+				"eslint-scope": "^7.0.0",
+				"eslint-visitor-keys": "^3.1.0",
+				"espree": "^9.0.0",
 				"esquery": "^1.4.0",
-				"lodash": "^4.17.15"
+				"lodash": "^4.17.21",
+				"semver": "^7.3.5"
 			},
 			"dependencies": {
-				"debug": {
-					"version": "4.3.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+				"acorn": {
+					"version": "8.7.0",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+					"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+					"dev": true
+				},
+				"eslint-scope": {
+					"version": "7.1.0",
+					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz",
+					"integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==",
 					"dev": true,
 					"requires": {
-						"ms": "2.1.2"
+						"esrecurse": "^4.3.0",
+						"estraverse": "^5.2.0"
 					}
 				},
 				"eslint-visitor-keys": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-					"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
+					"integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
 					"dev": true
 				},
 				"espree": {
-					"version": "6.2.1",
-					"resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
-					"integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
+					"version": "9.3.0",
+					"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz",
+					"integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==",
 					"dev": true,
 					"requires": {
-						"acorn": "^7.1.1",
-						"acorn-jsx": "^5.2.0",
-						"eslint-visitor-keys": "^1.1.0"
+						"acorn": "^8.7.0",
+						"acorn-jsx": "^5.3.1",
+						"eslint-visitor-keys": "^3.1.0"
 					}
 				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+				"estraverse": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
 					"dev": true
 				}
 			}
@@ -2159,6 +6703,12 @@
 			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
 			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
 			"dev": true
+		},
+		"yocto-queue": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+			"dev": true
 		}
 	}
 }
diff --git a/package.json b/package.json
index c4315c5..012e1e4 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,12 @@
 {
+	"name": "DrawioEditor",
 	"private": true,
 	"scripts": {
 		"test": "grunt test"
 	},
 	"devDependencies": {
-		"eslint-config-wikimedia": "0.20.0",
-		"grunt": "1.4.0",
+		"eslint-config-wikimedia": "0.21.0",
+		"grunt": "1.4.1",
 		"grunt-banana-checker": "0.9.0",
 		"grunt-eslint": "23.0.0"
 	}

From 069a96171bfcec17250030b1f71eb6db24698c5f Mon Sep 17 00:00:00 2001
From: Techwizzie <sanjayipscoc@gmail.com>
Date: Mon, 27 Dec 2021 19:44:08 +0530
Subject: [PATCH 039/117] Add Approved Revs support for diagrams

Changes:
1) Display the approved revision instead of the latest revision
2) Add approval link above the diagram if no rev is approved
3) Add note in editing interface - latest revision is being edited and not the approved revision
4) Add prefix exemption rule for "eg" prefixed variables

Change-Id: I6506d9e696a0118923f7ed07334ad91144e2b175
---
 .phpcs.xml                    |   9 ++-
 extension.json                |   7 ++
 i18n/en.json                  |   7 +-
 i18n/qqq.json                 |   7 +-
 resources/ext.drawioeditor.js |  28 +++++---
 src/DrawioEditor.php          | 127 ++++++++++++++++++++++++++++++----
 6 files changed, 159 insertions(+), 26 deletions(-)

diff --git a/.phpcs.xml b/.phpcs.xml
index b915cf8..633949f 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0"?>
 <ruleset>
-	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki" />
 	<file>.</file>
 	<arg name="extensions" value="php"/>
 	<arg name="encoding" value="UTF-8"/>
+	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+		<properties>
+			<property name="allowedPrefixes" type="array">
+				<element value="eg" />
+				<element value="wg" />
+			</property>
+		</properties>
+	</rule>
 </ruleset>
diff --git a/extension.json b/extension.json
index da3d27e..69d2282 100644
--- a/extension.json
+++ b/extension.json
@@ -28,6 +28,13 @@
 			"dependencies": [
 				"jquery.ui",
 				"mediawiki.api"
+			],
+			"messages": [
+				"drawioeditor-approved-editwarning",
+				"drawioeditor-approved-displaywarning",
+				"drawioeditor-noapproved",
+				"drawioeditor-approve-link",
+				"drawioeditor-changeapprove-link"
 			]
 		}
 	},
diff --git a/i18n/en.json b/i18n/en.json
index c82e90c..fe4c9b1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,4 +1,9 @@
 {
 	"@metadata": {},
-	"drawioeditor-desc": "draw.io flow chart creation and inline editing"
+	"drawioeditor-desc": "draw.io flow chart creation and inline editing",
+	"drawioeditor-approved-editwarning": "Please note that you are now editing the latest revision of this diagram, which is not the approved one shown by default.",
+	"drawioeditor-approved-displaywarning": "This is the approved revision of the diagram and not the latest revision.",
+	"drawioeditor-noapproved": "The diagram $1 has no approved revision.",
+	"drawioeditor-approve-link": "Click here to approve a revision",
+	"drawioeditor-changeapprove-link": "Click here to change the approved revision for this diagram"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index fbe1e34..370d77c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -2,5 +2,10 @@
 	"@metadata": {
 		"authors": []
 	},
-	"drawioeditor-desc": "{{desc|name=DrawioEditor|url=https://www.mediawiki.org/wiki/Extension:DrawioEditor}}"
+	"drawioeditor-desc": "{{desc|name=DrawioEditor|url=https://www.mediawiki.org/wiki/Extension:DrawioEditor}}",
+	"drawioeditor-approved-editwarning": "Used as warning shown in '''bold'''.",
+	"drawioeditor-approved-displaywarning": "Used as warning shown in '''bold'''.",
+	"drawioeditor-noapproved": "Displayed when $1 has no approved revision",
+	"drawioeditor-approve-link": "Link to approve a revision of the diagram",
+	"drawioeditor-changeapprove-link": "Link to change the approved revision of the diagram"
 }
diff --git a/resources/ext.drawioeditor.js b/resources/ext.drawioeditor.js
index 46f26fe..39f234b 100644
--- a/resources/ext.drawioeditor.js
+++ b/resources/ext.drawioeditor.js
@@ -1,5 +1,6 @@
 
-function DrawioEditor(id, filename, type, interactive, updateHeight, updateWidth, updateMaxWidth, baseUrl) {
+function DrawioEditor( id, filename, type, interactive, updateHeight, updateWidth,
+	updateMaxWidth, baseUrl, latestIsApproved, imageURL ) {
 	var that = this;
 
 	this.id = id;
@@ -10,6 +11,7 @@ function DrawioEditor(id, filename, type, interactive, updateHeight, updateWidth
 	this.updateWidth = updateWidth;
 	this.updateMaxWidth = updateMaxWidth;
 	this.baseUrl = baseUrl;
+	this.latestIsApproved = latestIsApproved;
 
 	//Could be 'en', 'fr', 'de-formal', 'zh-hant', ...
 	var currentUserLanguage = mw.user.options.get( 'language', 'en' ).split( '-' );
@@ -26,9 +28,9 @@ function DrawioEditor(id, filename, type, interactive, updateHeight, updateWidth
 	this.imageBox = $("#drawio-img-box-" + id);
 	this.image = $("#drawio-img-" + id);
 	if (interactive) {
-		this.imageURL = this.image.attr('data');
+		this.imageURL = this.image.attr('data-editurl');
 	} else {
-		this.imageURL = this.image.attr('src');
+		this.imageURL = imageURL;
 	}
 	this.imageHref = $("#drawio-img-href-" + id);
 	this.placeholder = $("#drawio-placeholder-" + id);
@@ -71,6 +73,11 @@ DrawioEditor.prototype.show = function() {
 	this.imageBox.hide();
 	this.iframeBox.height(Math.max(this.imageBox.height()+100, 800));
 	this.iframeBox.show();
+	$( '#approved-displaywarning' ).remove();
+	if ( !this.latestIsApproved ) {
+		$msg = mw.message( "drawioeditor-approved-editwarning" ).text();
+		$('#bodyContent').before("<p id=\"warningmsg\" class=\"successbox\">" + $msg + "</p>");
+	}
 }
 
 DrawioEditor.prototype.hide = function() {
@@ -89,7 +96,7 @@ DrawioEditor.prototype.hideOverlay = function() {
 DrawioEditor.prototype.updateImage = function (imageinfo) {
 	this.imageURL = imageinfo.url + '?ts=' + imageinfo.timestamp;
 	if (this.interactive) {
-		this.image.attr("data", this.imageURL);
+		this.image.attr("data-editurl", this.imageURL);
 	} else {
 		this.image.attr("src", this.imageURL);
 	}
@@ -180,7 +187,7 @@ DrawioEditor.prototype.loadImageFromDataURL = function(type, dataurl) {
 }
 
 DrawioEditor.prototype.loadImage = function() {
-	if (!this.imageURL.length) {
+	if (this.imageURL == undefined) {
 		// just load without data if there's no current image
 		this.sendMsgToIframe({ action: 'load' });
 	return;
@@ -214,14 +221,16 @@ DrawioEditor.prototype.uploadToWiki = function(blob) {
 			}
 		})
 		.fail( function(retStatus, data) {
+			that.hideSpinner();
 			if( retStatus == "exists" ){
 				that.updateImage(data.upload.imageinfo);
-				that.hideSpinner();
 			} else {
-				that.showDialog('Save failed',
+				if ( data.error ) {
+					that.showDialog('Save failed',
 					'Upload to wiki failed!' +
 				'<br>Error: ' + data.error.info +
 				'<br>Check javascript console for details.');
+				}
 			}
 		});
 
@@ -258,6 +267,7 @@ DrawioEditor.prototype.save = function(datauri) {
 DrawioEditor.prototype.exit = function() {
 	this.hide();
 	editor = null;
+	$('#warningmsg').hide();
 	this.destroy();
 }
 
@@ -294,10 +304,10 @@ DrawioEditor.prototype.initCallback = function () {
 
 var editor;
 
-window.editDrawio = function(id, filename, type, interactive, updateHeight, updateWidth, updateMaxWidth, baseUrl) {
+window.editDrawio = function(id, filename, type, interactive, updateHeight, updateWidth, updateMaxWidth, baseUrl, latestIsApproved, imageURL) {
 	if (!editor) {
 		window.drawioEditorBaseUrl = baseUrl;
-		editor = new DrawioEditor(id, filename, type, interactive, updateHeight, updateWidth, updateMaxWidth, baseUrl);
+		editor = new DrawioEditor(id, filename, type, interactive, updateHeight, updateWidth, updateMaxWidth, baseUrl, latestIsApproved, imageURL);
 	} else {
 		alert("Only one DrawioEditor can be open at the same time!");
 	}
diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 792619c..55c42f5 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -132,19 +132,25 @@ public function parse( &$parser, $name, $opts ) {
 
 		/* prepare image information */
 		$img_name = $name . ".drawio." . $opt_type;
-		$img = $this->services->getRepoGroup()->findFile( $img_name );
+		$repo = $this->services->getRepoGroup();
+		$img = $repo->findFile( $img_name );
+		$noApproved = false;
+		$latest_is_approved = true;
 		if ( $img ) {
 			/* Resets file history to newest if there is more than one instance of same chart on a page */
 			$img->resetHistory();
-
-			$historyLine = $img->nextHistoryLine();
-			$img_url = $img->getViewUrl();
-			$img_url_ts = $img_url . '?ts=' . ( $historyLine !== false ? $historyLine->img_timestamp : '' );
+			$img_url_ts = null;
+			if ( class_exists( 'ApprovedRevs' ) ) {
+				$img_url_ts = $this->fetchApprovedTimestampURL( $img, $repo, $latest_is_approved );
+				$noApproved = ( $img_url_ts === null );
+			}
+			if ( $img_url_ts == null ) {
+				$img_url_ts = $img->getUrl();
+			}
 			$img_desc_url = $img->getDescriptionUrl();
 			$img_height = $img->getHeight() . 'px';
 			$img_width = $img->getWidth() . 'px';
 		} else {
-			$img_url = '';
 			$img_url_ts = '';
 			$img_desc_url = '';
 			$img_height = 0;
@@ -164,7 +170,8 @@ public function parse( &$parser, $name, $opts ) {
 		}
 
 		/* prepare edit href */
-		$edit_ahref = sprintf( "<a href='javascript:editDrawio(\"%s\", %s, \"%s\", %s, %s, %s, %s, \"%s\")'>",
+		$edit_ahref = sprintf( "<a href='javascript:editDrawio(\"%s\", %s, \"%s\", %s, %s, %s, %s,
+		\"%s\", %s, \"%s\")'>",
 			$id,
 			json_encode( $img_name, JSON_HEX_QUOT | JSON_HEX_APOS ),
 			$opt_type,
@@ -172,12 +179,37 @@ public function parse( &$parser, $name, $opts ) {
 			$opt_height === 'chart' ? 'true' : 'false',
 			$opt_width === 'chart' ? 'true' : 'false',
 			$opt_max_width === 'chart' ? 'true' : 'false',
-			$base_url
+			$base_url,
+			$latest_is_approved ? 'true' : 'false',
+			$img ? $img->getUrl() : ""
 		);
 
 		/* output begin */
 		$output = '<div>';
-
+		$user = RequestContext::getMain()->getUser();
+		if ( $noApproved ) {
+			$output .= '<p class="successbox">' .
+			wfMessage( "drawioeditor-noapproved", $name )->text();
+			if ( $user->isAllowed( 'approverevisions' ) ) {
+				$output .= ' <a href="' . $img_desc_url . '">'
+				. wfMessage( "drawioeditor-approve-link" ) . '</a>';
+			}
+			global $egApprovedRevsBlankFileIfUnapproved;
+			if ( $egApprovedRevsBlankFileIfUnapproved ) {
+				$img = null;
+			}
+		} else {
+			if ( $img ) {
+				if ( !$latest_is_approved ) {
+					$output .= '<p class="successbox" id="approved-displaywarning">' .
+				wfMessage( "drawioeditor-approved-displaywarning" )->text();
+				}
+				if ( $user->isAllowed( 'approverevisions' ) ) {
+					$output .= ' <a href="' . $img_desc_url . '">'
+					. wfMessage( "drawioeditor-changeapprove-link" ) . '</a>';
+				}
+			}
+		}
 		/* div around the image */
 		$output .= '<div id="drawio-img-box-' . $id . '">';
 
@@ -201,8 +233,14 @@ public function parse( &$parser, $name, $opts ) {
 		}
 
 		if ( $opt_interactive ) {
-			$img_fmt = '<object id="drawio-img-%s" data="%s" type="text/svg+xml" style="%s"></object>';
-			$img_html = sprintf( $img_fmt, $id, $img_url_ts, $img_style );
+			if ( !$img ) {
+				$img = $repo->findFile( $img_name );
+			}
+			if ( $img ) {
+				$img_fmt = '<object id="drawio-img-%s" data="%s" data-editurl="%s" type="text/svg+xml"
+				style="%s"></object>';
+				$img_html = sprintf( $img_fmt, $id, $img_url_ts, $img->getUrl(),  $img_style );
+			}
 		} else {
 			$img_fmt = '<img id="drawio-img-%s" src="%s" title="%s" alt="%s" style="%s"></img>';
 			$img_html = '<a id="drawio-img-href-' . $id . '" href="' . $img_desc_url . '">';
@@ -219,10 +257,11 @@ public function parse( &$parser, $name, $opts ) {
 			$output .= sprintf( '<div id="drawio-placeholder-%s" class="DrawioEditorInfoBox">' .
 				'<b>%s</b><br/>empty app.diagrams.net chart</div> ',
 				$id, $dispname );
+		} else {
+			// the image or object element must be there in any case
+			// (it's hidden as long as there is no content.)
+			$output .= $img_html;
 		}
-		// the image or object element must be there in any case
-		// (it's hidden as long as there is no content.)
-		$output .= $img_html;
 		$output .= '</div>';
 
 		/* editor and overlay divs, iframe is added by javascript on demand */
@@ -275,4 +314,64 @@ private function isReadOnly( $img ) {
 			( !$img && !$this->services->getPermissionManager()->userHasRight( $user, 'reupload' ) ) ||
 			( $parser->getTitle() ? $parser->getTitle()->isProtected( 'edit' ) : false );
 	}
+
+	/**
+	 * @param File $img
+	 * @param RepoGroup $repo
+	 * @param bool &$latest_is_approved
+	 * @return string|null $img_url_ts
+	 */
+	private function fetchApprovedTimestampURL( $img, $repo, &$latest_is_approved ) {
+		list( $approvedRevTimestamp, $approvedRevSha1 ) = $this->getApprovedFileInfo( $img->getTitle() );
+		$img_url_ts = null;
+		if ( ( !$approvedRevTimestamp ) || ( !$approvedRevSha1 ) ) {
+			return $img_url_ts;
+		} else {
+			$title = $img->getTitle();
+			$displayFile = $repo->findFile(
+				$title, [ 'time' => $approvedRevTimestamp ]
+			);
+			# If none found, try current
+			if ( !$displayFile ) {
+				wfDebug( __METHOD__ . ": {$title->getPrefixedDBkey()}: " .
+					"$approvedRevTimestamp not found, using current\n" );
+				$displayFile = $repo->findFile( $title );
+				if ( !$displayFile ) {
+					$displayFile = $repo->getLocalRepo()->newFile( $title );
+				}
+				$normalFile = $displayFile;
+			# If found, set $normalFile
+			} else {
+				wfDebug( __METHOD__ . ": {$title->getPrefixedDBkey()}: " .
+					"using timestamp $approvedRevTimestamp\n" );
+				$normalFile = $displayFile;
+			}
+			$img_url_ts = $normalFile->getUrl();
+			if ( $img->getTimestamp() !== $approvedRevTimestamp ) {
+				$latest_is_approved = false;
+			}
+			return $img_url_ts;
+		}
+	}
+
+	/**
+	 * @param Title $fileTitle
+	 * @return array $return
+	 */
+	private function getApprovedFileInfo( $fileTitle ) {
+		$dbr = wfGetDB( DB_REPLICA );
+		$row = $dbr->selectRow(
+			'approved_revs_files',
+			[ 'approved_timestamp', 'approved_sha1' ],
+			[ 'file_title' => $fileTitle->getDBkey() ],
+			__METHOD__
+		);
+		if ( $row ) {
+			$return = [ $row->approved_timestamp, $row->approved_sha1 ];
+		} else {
+			$return = [ false, false ];
+		}
+
+		return $return;
+	}
 }

From f2c144cb6eee1804b360c260d9b5b98a81f620ee Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Tue, 22 Feb 2022 08:11:32 +0100
Subject: [PATCH 040/117] Localisation updates from https://translatewiki.net.

Change-Id: I1d468b754870ec018cf63857558b14024103985c
---
 i18n/de.json | 7 ++++++-
 i18n/mk.json | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/i18n/de.json b/i18n/de.json
index ada0362..0b4f078 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -2,5 +2,10 @@
 	"@metadata": {
 		"authors": []
 	},
-	"drawioeditor-desc": "draw.io Flussdiagramm-Erstellung und Inline-Bearbeitung"
+	"drawioeditor-desc": "draw.io Flussdiagramm-Erstellung und Inline-Bearbeitung",
+	"drawioeditor-approved-editwarning": "Bitte beachte, dass du jetzt die letzte Version dieses Diagramms bearbeitest, die nicht die standardmäßig angezeigte genehmigte Version ist.",
+	"drawioeditor-approved-displaywarning": "Dies ist die genehmigte Version des Diagramms und nicht die letzte Version.",
+	"drawioeditor-noapproved": "Das Diagramm $1 hat keine genehmigte Version.",
+	"drawioeditor-approve-link": "Klicke hier, um eine Version zu genehmigen",
+	"drawioeditor-changeapprove-link": "Klicke hier, um die genehmigte Version für dieses Diagramm zu ändern"
 }
diff --git a/i18n/mk.json b/i18n/mk.json
index 6986f5c..57f4891 100644
--- a/i18n/mk.json
+++ b/i18n/mk.json
@@ -4,5 +4,10 @@
 			"Bjankuloski06"
 		]
 	},
-	"drawioeditor-desc": "Создавање на тековен диаграм со draw.io и негово уредување во редови"
+	"drawioeditor-desc": "Создавање на тековен диаграм со draw.io и негово уредување во редови",
+	"drawioeditor-approved-editwarning": "Имајте предвид дека сега ја уредувате најновата преработка на овој дијаграм, која не е одобрената што се прикажува по основно.",
+	"drawioeditor-approved-displaywarning": "Ова е одобрената преработка на дијаграмот, а не последната преработка.",
+	"drawioeditor-noapproved": "Дијаграмот $1 нема одобрена преработка.",
+	"drawioeditor-approve-link": "Стиснете тука за да одобрите преработка",
+	"drawioeditor-changeapprove-link": "Стискете тука за да ја смените одобрената преработка за дијаграмов"
 }

From 36d811844daf8343bd45777f25ea6656651b5f11 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Tue, 22 Feb 2022 14:20:18 +0100
Subject: [PATCH 041/117] Localisation updates from https://translatewiki.net.

Change-Id: If8bf6c7e2f324f2550b6c96e47aafb61683480bd
---
 i18n/fr.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/i18n/fr.json b/i18n/fr.json
index 3f0e6e5..4a5e518 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -5,5 +5,10 @@
 			"Verdy p"
 		]
 	},
-	"drawioeditor-desc": "Création et modification en ligne de diagrammes de flux pour draw.io"
+	"drawioeditor-desc": "Création et modification en ligne de diagrammes de flux pour draw.io",
+	"drawioeditor-approved-editwarning": "Veuillez noter que vous modifiez actuellement la dernière version de ce diagramme, qui n’est pas cellle approuvée et affichée par défaut.",
+	"drawioeditor-approved-displaywarning": "Ceci est la version approuvée du diagramme mais pas la dernière version.",
+	"drawioeditor-noapproved": "Le diagramme $1 n’a pas de version approuvée.",
+	"drawioeditor-approve-link": "Cliquez ici pour approuver une version",
+	"drawioeditor-changeapprove-link": "Cliquer ici pour modifier la version approuvée de ce diagramme"
 }

From 0a05ce1cbb457b60702e2775e3f39f3d7b5a1fa3 Mon Sep 17 00:00:00 2001
From: "d.savuljesku" <d.savuljesku@gmail.com>
Date: Thu, 24 Feb 2022 12:21:29 +0100
Subject: [PATCH 042/117] Do not fail when editing empty diagrams

This will not try to retrieve the image from empty URL - quickfix

[all]

Change-Id: I64d0d5d846aee4ef1a80c01a714cff9e67241008
---
 resources/ext.drawioeditor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/ext.drawioeditor.js b/resources/ext.drawioeditor.js
index 39f234b..c4db566 100644
--- a/resources/ext.drawioeditor.js
+++ b/resources/ext.drawioeditor.js
@@ -30,7 +30,7 @@ function DrawioEditor( id, filename, type, interactive, updateHeight, updateWidt
 	if (interactive) {
 		this.imageURL = this.image.attr('data-editurl');
 	} else {
-		this.imageURL = imageURL;
+		this.imageURL = this.imageURL || undefined;
 	}
 	this.imageHref = $("#drawio-img-href-" + id);
 	this.placeholder = $("#drawio-placeholder-" + id);

From 7e341ebb2ea81e8e76809a2674774f5bf7189958 Mon Sep 17 00:00:00 2001
From: "d.savuljesku" <d.savuljesku@gmail.com>
Date: Thu, 24 Feb 2022 13:44:19 +0100
Subject: [PATCH 043/117] Fix wrong variable name

[all]

Change-Id: Ibb97cf32dea841c4122cb8f452268173ea5ea994
---
 resources/ext.drawioeditor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/ext.drawioeditor.js b/resources/ext.drawioeditor.js
index c4db566..b81877f 100644
--- a/resources/ext.drawioeditor.js
+++ b/resources/ext.drawioeditor.js
@@ -30,7 +30,7 @@ function DrawioEditor( id, filename, type, interactive, updateHeight, updateWidt
 	if (interactive) {
 		this.imageURL = this.image.attr('data-editurl');
 	} else {
-		this.imageURL = this.imageURL || undefined;
+		this.imageURL = imageURL || undefined;
 	}
 	this.imageHref = $("#drawio-img-href-" + id);
 	this.placeholder = $("#drawio-placeholder-" + id);

From 2003bba851cfaf2d91f3e41d2caed21a53ec3446 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Fri, 25 Feb 2022 09:43:23 +0100
Subject: [PATCH 044/117] Localisation updates from https://translatewiki.net.

Change-Id: Ic4aacd0c78c391ebb798c51298511d40abe692ab
---
 i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i18n/uk.json b/i18n/uk.json
index 301807f..60f9753 100644
--- a/i18n/uk.json
+++ b/i18n/uk.json
@@ -1,7 +1,8 @@
 {
 	"@metadata": {
 		"authors": [
-			"DDPAT"
+			"DDPAT",
+			"Ice bulldog"
 		]
 	},
 	"drawioeditor-desc": "draw.io створення блок-схеми та вбудованого редагування"

From f736f9d4ba2b133b22d5b3ad6f9edb3e84ea9132 Mon Sep 17 00:00:00 2001
From: "d.savuljesku" <d.savuljesku@gmail.com>
Date: Thu, 24 Feb 2022 16:26:50 +0100
Subject: [PATCH 045/117] Allow changing version of the file displayed

[3.2.x]

ERM 27738

Change-Id: I91411f44f7a7f9a920833dd0dcc5d8ab33904710
---
 extension.json                         |  9 ++-
 src/DrawioEditor.php                   | 74 ++----------------------
 src/Hook/ApprovedRevsSetStableFile.php | 79 ++++++++++++++++++++++++++
 src/Hook/DrawioGetFileHook.php         | 17 ++++++
 4 files changed, 109 insertions(+), 70 deletions(-)
 create mode 100644 src/Hook/ApprovedRevsSetStableFile.php
 create mode 100644 src/Hook/DrawioGetFileHook.php

diff --git a/extension.json b/extension.json
index 69d2282..7673b8f 100644
--- a/extension.json
+++ b/extension.json
@@ -44,7 +44,14 @@
 	},
 	"Hooks": {
 		"OutputPageParserOutput": "MediaWiki\\Extension\\DrawioEditor\\Hook\\OutputPageParserOutput\\AddModules::callback",
-		"ParserFirstCallInit": "MediaWiki\\Extension\\DrawioEditor\\Hook\\ParserFirstCallInit\\SetFunctionHook::callback"
+		"ParserFirstCallInit": "MediaWiki\\Extension\\DrawioEditor\\Hook\\ParserFirstCallInit\\SetFunctionHook::callback",
+		"DrawioGetFile": "approveRevsSetStableFile"
+	},
+	"HookHandlers": {
+		"approveRevsSetStableFile": {
+			"class": "MediaWiki\\Extension\\DrawioEditor\\Hook\\ApprovedRevsSetStableFile",
+			"services": [ "DBLoadBalancer", "RepoGroup" ]
+		}
 	},
 	"config": {
 		"DrawioEditorImageType": {
diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 55c42f5..637ff38 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -137,16 +137,12 @@ public function parse( &$parser, $name, $opts ) {
 		$noApproved = false;
 		$latest_is_approved = true;
 		if ( $img ) {
-			/* Resets file history to newest if there is more than one instance of same chart on a page */
-			$img->resetHistory();
 			$img_url_ts = null;
-			if ( class_exists( 'ApprovedRevs' ) ) {
-				$img_url_ts = $this->fetchApprovedTimestampURL( $img, $repo, $latest_is_approved );
-				$noApproved = ( $img_url_ts === null );
-			}
-			if ( $img_url_ts == null ) {
-				$img_url_ts = $img->getUrl();
-			}
+			$hookRunner = MediaWikiServices::getInstance()->getHookContainer();
+			$hookRunner->run( 'DrawioGetFile', [ &$img, &$latest_is_approved, $parser->getUser() ] );
+			$noApproved = $img === null;
+
+			$img_url_ts = $img->getUrl();
 			$img_desc_url = $img->getDescriptionUrl();
 			$img_height = $img->getHeight() . 'px';
 			$img_width = $img->getWidth() . 'px';
@@ -314,64 +310,4 @@ private function isReadOnly( $img ) {
 			( !$img && !$this->services->getPermissionManager()->userHasRight( $user, 'reupload' ) ) ||
 			( $parser->getTitle() ? $parser->getTitle()->isProtected( 'edit' ) : false );
 	}
-
-	/**
-	 * @param File $img
-	 * @param RepoGroup $repo
-	 * @param bool &$latest_is_approved
-	 * @return string|null $img_url_ts
-	 */
-	private function fetchApprovedTimestampURL( $img, $repo, &$latest_is_approved ) {
-		list( $approvedRevTimestamp, $approvedRevSha1 ) = $this->getApprovedFileInfo( $img->getTitle() );
-		$img_url_ts = null;
-		if ( ( !$approvedRevTimestamp ) || ( !$approvedRevSha1 ) ) {
-			return $img_url_ts;
-		} else {
-			$title = $img->getTitle();
-			$displayFile = $repo->findFile(
-				$title, [ 'time' => $approvedRevTimestamp ]
-			);
-			# If none found, try current
-			if ( !$displayFile ) {
-				wfDebug( __METHOD__ . ": {$title->getPrefixedDBkey()}: " .
-					"$approvedRevTimestamp not found, using current\n" );
-				$displayFile = $repo->findFile( $title );
-				if ( !$displayFile ) {
-					$displayFile = $repo->getLocalRepo()->newFile( $title );
-				}
-				$normalFile = $displayFile;
-			# If found, set $normalFile
-			} else {
-				wfDebug( __METHOD__ . ": {$title->getPrefixedDBkey()}: " .
-					"using timestamp $approvedRevTimestamp\n" );
-				$normalFile = $displayFile;
-			}
-			$img_url_ts = $normalFile->getUrl();
-			if ( $img->getTimestamp() !== $approvedRevTimestamp ) {
-				$latest_is_approved = false;
-			}
-			return $img_url_ts;
-		}
-	}
-
-	/**
-	 * @param Title $fileTitle
-	 * @return array $return
-	 */
-	private function getApprovedFileInfo( $fileTitle ) {
-		$dbr = wfGetDB( DB_REPLICA );
-		$row = $dbr->selectRow(
-			'approved_revs_files',
-			[ 'approved_timestamp', 'approved_sha1' ],
-			[ 'file_title' => $fileTitle->getDBkey() ],
-			__METHOD__
-		);
-		if ( $row ) {
-			$return = [ $row->approved_timestamp, $row->approved_sha1 ];
-		} else {
-			$return = [ false, false ];
-		}
-
-		return $return;
-	}
 }
diff --git a/src/Hook/ApprovedRevsSetStableFile.php b/src/Hook/ApprovedRevsSetStableFile.php
new file mode 100644
index 0000000..45866a9
--- /dev/null
+++ b/src/Hook/ApprovedRevsSetStableFile.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace MediaWiki\Extension\DrawioEditor\Hook;
+
+use File;
+use RepoGroup;
+use Title;
+use User;
+use Wikimedia\Rdbms\ILoadBalancer;
+
+class ApprovedRevsSetStableFile implements DrawioGetFileHook {
+	/** @var ILoadBalancer */
+	private $lb;
+	/** @var RepoGroup */
+	private $repoGroup;
+
+	/**
+	 * @param ILoadBalancer $loadBalancer
+	 * @param RepoGroup $repoGroup
+	 */
+	public function __construct( ILoadBalancer $loadBalancer, RepoGroup $repoGroup ) {
+		$this->lb = $loadBalancer;
+		$this->repoGroup = $repoGroup;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function onDrawioGetFile( File &$file, &$latestIsStable, User $user ) {
+		if ( !class_exists( 'ApprovedRevs' ) ) {
+			return true;
+		}
+		list( $approvedRevTimestamp, $approvedRevSha1 ) = $this->getApprovedFileInfo( $file->getTitle() );
+		$img_url_ts = null;
+		if ( ( !$approvedRevTimestamp ) || ( !$approvedRevSha1 ) ) {
+			return true;
+		} else {
+			$title = $file->getTitle();
+			$displayFile = $this->repoGroup->findFile(
+				$title, [ 'time' => $approvedRevTimestamp ]
+			);
+			# If none found, try current
+			if ( !$displayFile ) {
+				wfDebug( __METHOD__ . ": {$title->getPrefixedDBkey()}: " .
+					"$approvedRevTimestamp not found, using current\n" );
+				return true;
+			} else {
+				wfDebug( __METHOD__ . ": {$title->getPrefixedDBkey()}: " .
+					"using timestamp $approvedRevTimestamp\n" );
+			}
+			if ( $file->getTimestamp() !== $approvedRevTimestamp ) {
+				$latestIsStable = false;
+			}
+			$file = $displayFile;
+			return true;
+		}
+	}
+
+	/**
+	 * @param Title $fileTitle
+	 * @return array $return
+	 */
+	private function getApprovedFileInfo( $fileTitle ) {
+		$dbr = $this->lb->getConnection( DB_REPLICA );
+		$row = $dbr->selectRow(
+			'approved_revs_files',
+			[ 'approved_timestamp', 'approved_sha1' ],
+			[ 'file_title' => $fileTitle->getDBkey() ],
+			__METHOD__
+		);
+		if ( $row ) {
+			$return = [ $row->approved_timestamp, $row->approved_sha1 ];
+		} else {
+			$return = [ false, false ];
+		}
+
+		return $return;
+	}
+}
diff --git a/src/Hook/DrawioGetFileHook.php b/src/Hook/DrawioGetFileHook.php
new file mode 100644
index 0000000..94f545a
--- /dev/null
+++ b/src/Hook/DrawioGetFileHook.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace MediaWiki\Extension\DrawioEditor\Hook;
+
+use File;
+use User;
+
+interface DrawioGetFileHook {
+
+	/**
+	 * @param File &$file
+	 * @param bool &$latestIsStable
+	 * @param User $user
+	 * @return mixed
+	 */
+	public function onDrawioGetFile( File &$file, &$latestIsStable, User $user );
+}

From c9d1c06aba5742085c5796f6e3a9a465ce0c0fb5 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Mon, 28 Feb 2022 14:28:37 +0100
Subject: [PATCH 046/117] Localisation updates from https://translatewiki.net.

Change-Id: I47e6425fde6017cdbe2e3889378b0d855b5fbf06
---
 i18n/lb.json | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 i18n/lb.json

diff --git a/i18n/lb.json b/i18n/lb.json
new file mode 100644
index 0000000..f3e7df8
--- /dev/null
+++ b/i18n/lb.json
@@ -0,0 +1,9 @@
+{
+	"@metadata": {
+		"authors": [
+			"Robby"
+		]
+	},
+	"drawioeditor-noapproved": "Den Diagramm $1 huet keng akzeptéiert Versioun.",
+	"drawioeditor-approve-link": "Klickt hei fir eng Versioun z'akzeptéieren"
+}

From e0b8b92a6b96abf17920bfec2210d75e3c54feb4 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Thu, 3 Mar 2022 08:22:32 +0100
Subject: [PATCH 047/117] Localisation updates from https://translatewiki.net.

Change-Id: Ib2946e8d66499a2f9f609c328055e88026ae6841
---
 i18n/fr.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/i18n/fr.json b/i18n/fr.json
index 4a5e518..9ff6be2 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -2,11 +2,13 @@
 	"@metadata": {
 		"authors": [
 			"Gomoko",
+			"GrandEscogriffe",
+			"Thibaut120094",
 			"Verdy p"
 		]
 	},
 	"drawioeditor-desc": "Création et modification en ligne de diagrammes de flux pour draw.io",
-	"drawioeditor-approved-editwarning": "Veuillez noter que vous modifiez actuellement la dernière version de ce diagramme, qui n’est pas cellle approuvée et affichée par défaut.",
+	"drawioeditor-approved-editwarning": "Veuillez noter que vous modifiez actuellement la dernière version de ce diagramme, qui n’est pas celle qui est approuvée et affichée par défaut.",
 	"drawioeditor-approved-displaywarning": "Ceci est la version approuvée du diagramme mais pas la dernière version.",
 	"drawioeditor-noapproved": "Le diagramme $1 n’a pas de version approuvée.",
 	"drawioeditor-approve-link": "Cliquez ici pour approuver une version",

From 9f51dfe20d3b0939e89fde17fb4141cfe9fdf419 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Fri, 11 Mar 2022 08:32:27 +0100
Subject: [PATCH 048/117] Localisation updates from https://translatewiki.net.

Change-Id: I180a62e67bcb79802812ff2797f690e62ee9e5cd
---
 i18n/ko.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 i18n/ko.json

diff --git a/i18n/ko.json b/i18n/ko.json
new file mode 100644
index 0000000..8fbee31
--- /dev/null
+++ b/i18n/ko.json
@@ -0,0 +1,12 @@
+{
+	"@metadata": {
+		"authors": [
+			"Ykhwong"
+		]
+	},
+	"drawioeditor-approved-editwarning": "현재 편집하고 있는 다이어그램은 이 다이어그램의 최신 판이며, 기본으로 보이는 승인된 판과는 다름에 주의하세요.",
+	"drawioeditor-approved-displaywarning": "이것은 다이어그램의 승인된 판이며 최신판은 아닙니다.",
+	"drawioeditor-noapproved": "$1 다이어그램에 승인된 판이 없습니다.",
+	"drawioeditor-approve-link": "판을 승인하려면 여기를 클릭하십시오",
+	"drawioeditor-changeapprove-link": "이 다이어그램의 승인된 판을 변경하려면 여기를 클릭하십시오"
+}

From 017dba499f3306072f776c7ae7a8c36b0f4108c7 Mon Sep 17 00:00:00 2001
From: rvogel <vogel@hallowelt.biz>
Date: Tue, 22 Mar 2022 17:56:24 +0100
Subject: [PATCH 049/117] Load resources only when tag is used on a page

ERM28134

[4.1.x]

Change-Id: I32e4e02a1b5b411bf7eea117144306657165005a
---
 extension.json                                |  1 -
 src/DrawioEditor.php                          |  2 ++
 .../OutputPageParserOutput/AddModules.php     | 20 -------------------
 3 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 src/Hook/OutputPageParserOutput/AddModules.php

diff --git a/extension.json b/extension.json
index 7673b8f..30fa1df 100644
--- a/extension.json
+++ b/extension.json
@@ -43,7 +43,6 @@
 		"remoteExtPath": "DrawioEditor/resources"
 	},
 	"Hooks": {
-		"OutputPageParserOutput": "MediaWiki\\Extension\\DrawioEditor\\Hook\\OutputPageParserOutput\\AddModules::callback",
 		"ParserFirstCallInit": "MediaWiki\\Extension\\DrawioEditor\\Hook\\ParserFirstCallInit\\SetFunctionHook::callback",
 		"DrawioGetFile": "approveRevsSetStableFile"
 	},
diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 637ff38..287f929 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -279,6 +279,8 @@ public function parse( &$parser, $name, $opts ) {
 			$parser->getOutput()->addImage( $img->getTitle()->getDBkey() );
 		}
 
+		$parser->getOutput()->addModules( 'ext.drawioeditor' );
+
 		return [ $output, 'isHTML' => true, 'noparse' => true ];
 	}
 
diff --git a/src/Hook/OutputPageParserOutput/AddModules.php b/src/Hook/OutputPageParserOutput/AddModules.php
deleted file mode 100644
index 7418401..0000000
--- a/src/Hook/OutputPageParserOutput/AddModules.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace MediaWiki\Extension\DrawioEditor\Hook\OutputPageParserOutput;
-
-use OutputPage;
-use ParserOutput;
-
-class AddModules {
-
-	/**
-	 * @param OutputPage &$outputPage
-	 * @param ParserOutput $parseroutput
-	 * @return bool
-	 */
-	public static function callback( &$outputPage, $parseroutput ) {
-		$outputPage->addModules( 'ext.drawioeditor' );
-
-		return true;
-	}
-}

From ea440a7f2bfb6fd37c6f3e71a97bbff95c8b2e29 Mon Sep 17 00:00:00 2001
From: Richard Armstrong <richardstrongarm@icloud.com>
Date: Wed, 30 Mar 2022 11:36:33 +0100
Subject: [PATCH 050/117] Fix call to deprecated `Parser::getUser`

Now using `Parser::getUserIdentity`. This change requires MediaWiki 1.36+

Change-Id: Ia79ad28acbebb0f15388e6d627491f9388fcd19b
---
 src/DrawioEditor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 287f929..8871f26 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -139,7 +139,7 @@ public function parse( &$parser, $name, $opts ) {
 		if ( $img ) {
 			$img_url_ts = null;
 			$hookRunner = MediaWikiServices::getInstance()->getHookContainer();
-			$hookRunner->run( 'DrawioGetFile', [ &$img, &$latest_is_approved, $parser->getUser() ] );
+			$hookRunner->run( 'DrawioGetFile', [ &$img, &$latest_is_approved, $parser->getUserIdentity() ] );
 			$noApproved = $img === null;
 
 			$img_url_ts = $img->getUrl();

From 738acaaf3d7a5cf8cecd0e24dabc67c25b508280 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Thu, 31 Mar 2022 08:35:43 +0200
Subject: [PATCH 051/117] Localisation updates from https://translatewiki.net.

Change-Id: Icba32268a4e227cfa794bd572b0a758d9d4193c8
---
 i18n/pt-br.json | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/i18n/pt-br.json b/i18n/pt-br.json
index d157110..620e740 100644
--- a/i18n/pt-br.json
+++ b/i18n/pt-br.json
@@ -2,8 +2,14 @@
 	"@metadata": {
 		"authors": [
 			"Eduardo Addad de Oliveira",
-			"Eduardoaddad"
+			"Eduardoaddad",
+			"YuriNikolai"
 		]
 	},
-	"drawioeditor-desc": "Criação de fluxograma draw.io e edição em linha"
+	"drawioeditor-desc": "Criação de fluxograma draw.io e edição em linha",
+	"drawioeditor-approved-editwarning": "Note, por favor, que agora você está editando a revisão mais recente deste diagrama, e não a versão aprovada que é mostrada por padrão.",
+	"drawioeditor-approved-displaywarning": "Esta é a versão aprovada do diagrama, e não a versão mais recente.",
+	"drawioeditor-noapproved": "O diagrama $1 não possui revisão aprovada.",
+	"drawioeditor-approve-link": "Clique aqui para aprovar uma revisão",
+	"drawioeditor-changeapprove-link": "Clique aqui para alterar a revisão aprovada para este diagrama"
 }

From eeecd5bac788d29ace911e16abce6b335ce11ff5 Mon Sep 17 00:00:00 2001
From: Umherirrender <umherirrender_de.wp@web.de>
Date: Thu, 14 Apr 2022 21:19:58 +0200
Subject: [PATCH 052/117] Remove usage of protection related deprecated Title
 function

Bug: T306131
Change-Id: I8ddd892b4cc46e2a28502ddde869870e0c44e827
---
 src/DrawioEditor.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 8871f26..0d5fb0c 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -305,11 +305,19 @@ private function isReadOnly( $img ) {
 		$user = RequestContext::getMain()->getUser();
 		$parser = $this->services->getParser();
 
+		if ( method_exists( $this->services, 'getRestrictionStore' ) ) {
+			// MW 1.37+
+			$isProtected = $parser->getTitle() ?
+				$this->services->getRestrictionStore()->isProtected( $parser->getTitle(), 'edit' ) : false;
+		} else {
+			$isProtected = $parser->getTitle() ? $parser->getTitle()->isProtected( 'edit' ) : false;
+		}
+
 		return !$this->config->get( 'EnableUploads' ) ||
 				!$this->services->getPermissionManager()->userHasRight( $user, 'upload' ) ||
 				!$this->services->getPermissionManager()->userHasRight( $user, 'reupload' ) ||
 			( !$img && !$this->services->getPermissionManager()->userHasRight( $user, 'upload' ) ) ||
 			( !$img && !$this->services->getPermissionManager()->userHasRight( $user, 'reupload' ) ) ||
-			( $parser->getTitle() ? $parser->getTitle()->isProtected( 'edit' ) : false );
+			( $isProtected );
 	}
 }

From eedeb146091468b99e7ce5da792e53b2a878c179 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Fri, 15 Apr 2022 09:56:17 +0200
Subject: [PATCH 053/117] Localisation updates from https://translatewiki.net.

Change-Id: Ifb8874a20e963d07d78b1aba0404bd081322cc50
---
 i18n/es.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 i18n/es.json

diff --git a/i18n/es.json b/i18n/es.json
new file mode 100644
index 0000000..70d8565
--- /dev/null
+++ b/i18n/es.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"DiegoAmbrocio"
+		]
+	},
+	"drawioeditor-approved-editwarning": "Tenga en cuenta que ahora está editando la última revisión de este diagrama, que no es la aprobada que se muestra por defecto."
+}

From 1218a4fd6c2de4c6b2814eda4698fed55e4fe4ab Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Mon, 18 Apr 2022 10:05:55 +0200
Subject: [PATCH 054/117] Localisation updates from https://translatewiki.net.

Change-Id: Ic735d200987fb6b0e4fd6e25e2cabe01b080624d
---
 i18n/es.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/i18n/es.json b/i18n/es.json
index 70d8565..14b9b2d 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -4,5 +4,10 @@
 			"DiegoAmbrocio"
 		]
 	},
-	"drawioeditor-approved-editwarning": "Tenga en cuenta que ahora está editando la última revisión de este diagrama, que no es la aprobada que se muestra por defecto."
+	"drawioeditor-desc": "Creación de diagramas de flujo en draw.io y edición en línea",
+	"drawioeditor-approved-editwarning": "Tenga en cuenta que ahora está editando la última revisión de este diagrama, que no es la aprobada que se muestra por defecto.",
+	"drawioeditor-approved-displaywarning": "Esta es la revisión aprobada del diagrama y no la última revisión.",
+	"drawioeditor-noapproved": "El diagrama $1 no tiene ninguna revisión aprobada.",
+	"drawioeditor-approve-link": "Haga clic aquí para aprobar una revisión",
+	"drawioeditor-changeapprove-link": "Haga clic aquí para cambiar la revisión aprobada para este diagrama"
 }

From 5b91c366f74880104898de7b19723b7e81a37068 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Thu, 21 Apr 2022 08:12:03 +0200
Subject: [PATCH 055/117] Localisation updates from https://translatewiki.net.

Change-Id: I0ccede114ea9262e28f0090729bd5f09f9abbc61
---
 i18n/ia.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/i18n/ia.json b/i18n/ia.json
index ebe981e..3ca907e 100644
--- a/i18n/ia.json
+++ b/i18n/ia.json
@@ -4,5 +4,10 @@
 			"McDutchie"
 		]
 	},
-	"drawioeditor-desc": "Creation e modification in linea de diagrammas de fluxo pro draw.io"
+	"drawioeditor-desc": "Creation e modification in linea de diagrammas de fluxo pro draw.io",
+	"drawioeditor-approved-editwarning": "Nota ben que tu modifica ora le ultime version de iste diagramma, le qual non es le version approbate que es monstrate normalmente.",
+	"drawioeditor-approved-displaywarning": "Iste es le version approbate del diagramma e non le ultime version.",
+	"drawioeditor-noapproved": "Le diagramma $1 non ha un version approbate.",
+	"drawioeditor-approve-link": "Clicca hic pro approbar un version",
+	"drawioeditor-changeapprove-link": "Clicca hic pro cambiar le version approbate de iste diagramma"
 }

From 43f01ab2af3630a14970374289a78007fd537cd5 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Wed, 27 Apr 2022 07:18:16 +0000
Subject: [PATCH 056/117] build: Updating npm dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* eslint-config-wikimedia: 0.21.0 → 0.22.1
* grunt: 1.4.1 → 1.5.2
* async: 3.2.0 → 3.2.3
  * https://github.com/advisories/GHSA-fwr7-v2mv-hh25

Change-Id: I1e80b23e2eef2aa7550b9a25b86631bb34d6fd4d
---
 package-lock.json | 1976 ++++++++++++++++++---------------------------
 package.json      |    4 +-
 2 files changed, 792 insertions(+), 1188 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 528f7b0..7ad6163 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,24 +6,12 @@
 		"": {
 			"name": "DrawioEditor",
 			"devDependencies": {
-				"eslint-config-wikimedia": "0.21.0",
-				"grunt": "1.4.1",
+				"eslint-config-wikimedia": "0.22.1",
+				"grunt": "1.5.2",
 				"grunt-banana-checker": "0.9.0",
 				"grunt-eslint": "23.0.0"
 			}
 		},
-		"node_modules/@ampproject/remapping": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.0.4.tgz",
-			"integrity": "sha512-zU3pj3pf//YhaoozRTYKaL20KopXrzuZFc/8Ylc49AuV8grYKH23TTq9JJoR70F8zQbil58KjSchZTWeX+jrIQ==",
-			"dev": true,
-			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.0"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
 		"node_modules/@babel/code-frame": {
 			"version": "7.12.11",
 			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
@@ -33,248 +21,6 @@
 				"@babel/highlight": "^7.10.4"
 			}
 		},
-		"node_modules/@babel/compat-data": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.0.tgz",
-			"integrity": "sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/core": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.0.tgz",
-			"integrity": "sha512-x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA==",
-			"dev": true,
-			"dependencies": {
-				"@ampproject/remapping": "^2.0.0",
-				"@babel/code-frame": "^7.16.7",
-				"@babel/generator": "^7.17.0",
-				"@babel/helper-compilation-targets": "^7.16.7",
-				"@babel/helper-module-transforms": "^7.16.7",
-				"@babel/helpers": "^7.17.0",
-				"@babel/parser": "^7.17.0",
-				"@babel/template": "^7.16.7",
-				"@babel/traverse": "^7.17.0",
-				"@babel/types": "^7.17.0",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.1.2",
-				"semver": "^6.3.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/@babel/core/node_modules/@babel/code-frame": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-			"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/highlight": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/core/node_modules/semver": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/@babel/eslint-parser": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz",
-			"integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
-			"dev": true,
-			"dependencies": {
-				"eslint-scope": "^5.1.1",
-				"eslint-visitor-keys": "^2.1.0",
-				"semver": "^6.3.0"
-			},
-			"engines": {
-				"node": "^10.13.0 || ^12.13.0 || >=14.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": ">=7.11.0",
-				"eslint": "^7.5.0 || ^8.0.0"
-			}
-		},
-		"node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/@babel/eslint-parser/node_modules/semver": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/@babel/generator": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.0.tgz",
-			"integrity": "sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.17.0",
-				"jsesc": "^2.5.1",
-				"source-map": "^0.5.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-compilation-targets": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz",
-			"integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/compat-data": "^7.16.4",
-				"@babel/helper-validator-option": "^7.16.7",
-				"browserslist": "^4.17.5",
-				"semver": "^6.3.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0"
-			}
-		},
-		"node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/@babel/helper-environment-visitor": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
-			"integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-function-name": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
-			"integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-get-function-arity": "^7.16.7",
-				"@babel/template": "^7.16.7",
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-get-function-arity": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
-			"integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-hoist-variables": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-			"integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-module-imports": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-			"integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-module-transforms": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
-			"integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-environment-visitor": "^7.16.7",
-				"@babel/helper-module-imports": "^7.16.7",
-				"@babel/helper-simple-access": "^7.16.7",
-				"@babel/helper-split-export-declaration": "^7.16.7",
-				"@babel/helper-validator-identifier": "^7.16.7",
-				"@babel/template": "^7.16.7",
-				"@babel/traverse": "^7.16.7",
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-simple-access": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz",
-			"integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-split-export-declaration": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-			"integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
 		"node_modules/@babel/helper-validator-identifier": {
 			"version": "7.16.7",
 			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
@@ -284,29 +30,6 @@
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/helper-validator-option": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-			"integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helpers": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.0.tgz",
-			"integrity": "sha512-Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ==",
-			"dev": true,
-			"dependencies": {
-				"@babel/template": "^7.16.7",
-				"@babel/traverse": "^7.17.0",
-				"@babel/types": "^7.17.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
 		"node_modules/@babel/highlight": {
 			"version": "7.16.10",
 			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
@@ -383,99 +106,6 @@
 				"node": ">=4"
 			}
 		},
-		"node_modules/@babel/parser": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz",
-			"integrity": "sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==",
-			"dev": true,
-			"bin": {
-				"parser": "bin/babel-parser.js"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@babel/template": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-			"integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.16.7",
-				"@babel/parser": "^7.16.7",
-				"@babel/types": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/template/node_modules/@babel/code-frame": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-			"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/highlight": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/traverse": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.0.tgz",
-			"integrity": "sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/code-frame": "^7.16.7",
-				"@babel/generator": "^7.17.0",
-				"@babel/helper-environment-visitor": "^7.16.7",
-				"@babel/helper-function-name": "^7.16.7",
-				"@babel/helper-hoist-variables": "^7.16.7",
-				"@babel/helper-split-export-declaration": "^7.16.7",
-				"@babel/parser": "^7.17.0",
-				"@babel/types": "^7.17.0",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/traverse/node_modules/@babel/code-frame": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-			"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-			"dev": true,
-			"dependencies": {
-				"@babel/highlight": "^7.16.7"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/traverse/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/types": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
-			"integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
-			"dev": true,
-			"dependencies": {
-				"@babel/helper-validator-identifier": "^7.16.7",
-				"to-fast-properties": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
 		"node_modules/@es-joy/jsdoccomment": {
 			"version": "0.18.0",
 			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.18.0.tgz",
@@ -530,35 +160,10 @@
 			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
 			"dev": true
 		},
-		"node_modules/@jridgewell/resolve-uri": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz",
-			"integrity": "sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@jridgewell/sourcemap-codec": {
-			"version": "1.4.10",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz",
-			"integrity": "sha512-Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg==",
-			"dev": true
-		},
-		"node_modules/@jridgewell/trace-mapping": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.2.tgz",
-			"integrity": "sha512-9KzzH4kMjA2XmBRHfqG2/Vtl7s92l6uNDd0wW7frDE+EUvQFGqNXhWp0UGJjSkt3v2AYjzOZn1QO9XaTNJIt1Q==",
-			"dev": true,
-			"dependencies": {
-				"@jridgewell/resolve-uri": "^3.0.3",
-				"@jridgewell/sourcemap-codec": "^1.4.10"
-			}
-		},
 		"node_modules/@mdn/browser-compat-data": {
-			"version": "3.3.14",
-			"resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-3.3.14.tgz",
-			"integrity": "sha512-n2RC9d6XatVbWFdHLimzzUJxJ1KY8LdjqrW6YvGPiRmsHkhOUx74/Ct10x5Yo7bC/Jvqx7cDEW8IMPv/+vwEzA==",
+			"version": "4.1.18",
+			"resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-4.1.18.tgz",
+			"integrity": "sha512-Ap8MOYbyvEilK1+sNY6yh6LmsHSp7f5zzSGlY4AemhbTcoultcozEXPzx42OO6WjoriOsw88aW8TiqgYdXwsxg==",
 			"dev": true
 		},
 		"node_modules/@types/color-name": {
@@ -689,6 +294,12 @@
 				"@mdn/browser-compat-data": "^3.3.14"
 			}
 		},
+		"node_modules/ast-metadata-inferer/node_modules/@mdn/browser-compat-data": {
+			"version": "3.3.14",
+			"resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-3.3.14.tgz",
+			"integrity": "sha512-n2RC9d6XatVbWFdHLimzzUJxJ1KY8LdjqrW6YvGPiRmsHkhOUx74/Ct10x5Yo7bC/Jvqx7cDEW8IMPv/+vwEzA==",
+			"dev": true
+		},
 		"node_modules/astral-regex": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
@@ -699,9 +310,9 @@
 			}
 		},
 		"node_modules/async": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
-			"integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==",
+			"version": "3.2.3",
+			"resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+			"integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
 			"dev": true
 		},
 		"node_modules/balanced-match": {
@@ -733,15 +344,25 @@
 			}
 		},
 		"node_modules/browserslist": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
-			"integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
-			"dev": true,
+			"version": "4.20.3",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
+			"integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/browserslist"
+				}
+			],
 			"dependencies": {
-				"caniuse-lite": "^1.0.30001286",
-				"electron-to-chromium": "^1.4.17",
+				"caniuse-lite": "^1.0.30001332",
+				"electron-to-chromium": "^1.4.118",
 				"escalade": "^3.1.1",
-				"node-releases": "^2.0.1",
+				"node-releases": "^2.0.3",
 				"picocolors": "^1.0.0"
 			},
 			"bin": {
@@ -749,10 +370,6 @@
 			},
 			"engines": {
 				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/browserslist"
 			}
 		},
 		"node_modules/builtin-modules": {
@@ -787,14 +404,20 @@
 			}
 		},
 		"node_modules/caniuse-lite": {
-			"version": "1.0.30001307",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001307.tgz",
-			"integrity": "sha512-+MXEMczJ4FuxJAUp0jvAl6Df0NI/OfW1RWEE61eSmzS7hw6lz4IKutbhbXendwq8BljfFuHtu26VWsg4afQ7Ng==",
-			"dev": true,
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/browserslist"
-			}
+			"version": "1.0.30001332",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz",
+			"integrity": "sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+				}
+			]
 		},
 		"node_modules/chalk": {
 			"version": "4.1.0",
@@ -869,19 +492,10 @@
 			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
 			"dev": true
 		},
-		"node_modules/convert-source-map": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-			"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-			"dev": true,
-			"dependencies": {
-				"safe-buffer": "~5.1.1"
-			}
-		},
 		"node_modules/core-js": {
-			"version": "3.21.0",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.21.0.tgz",
-			"integrity": "sha512-YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ==",
+			"version": "3.22.2",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.2.tgz",
+			"integrity": "sha512-Z5I2vzDnEIqO2YhELVMFcL1An2CIsFe9Q7byZhs8c/QxummxZlAHw33TUHbIte987LkisOgL0LwQ1P9D6VISnA==",
 			"dev": true,
 			"hasInstallScript": true,
 			"funding": {
@@ -972,9 +586,9 @@
 			}
 		},
 		"node_modules/electron-to-chromium": {
-			"version": "1.4.65",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.65.tgz",
-			"integrity": "sha512-0/d8Skk8sW3FxXP0Dd6MnBlrwx7Qo9cqQec3BlIAlvKnrmS3pHsIbaroEi+nd0kZkGpQ6apMEre7xndzjlEnLw==",
+			"version": "1.4.123",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.123.tgz",
+			"integrity": "sha512-0pHGE53WkYoFbsgwYcVKEpWa6jbzlvkohIEA2CUoZ9b5KC+w/zlMiQHvW/4IBcOh7YoEFqRNavgTk02TBoUTUw==",
 			"dev": true
 		},
 		"node_modules/emoji-regex": {
@@ -1080,36 +694,258 @@
 			}
 		},
 		"node_modules/eslint-config-wikimedia": {
-			"version": "0.21.0",
-			"resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.21.0.tgz",
-			"integrity": "sha512-+KoUKaWSKTgIx+Run9gdbGXi6Uox2/JxgROTVmA6yi4mnMuFWwpBXzYFjqZPUT7dzmJSTO3uxwsR44F8GnZhpg==",
+			"version": "0.22.1",
+			"resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.22.1.tgz",
+			"integrity": "sha512-TtN+gWJrcW0i1sEu7vPE1tHpEilrMUuTxP6UK97Amvva/KDV9/tvRUifGhw0q5uBswp+HWgF12p8rq68hZqMbA==",
 			"dev": true,
 			"dependencies": {
-				"eslint": "^7.32.0",
-				"eslint-plugin-compat": "^3.13.0",
+				"eslint": "^8.6.0",
+				"eslint-plugin-compat": "^4.0.2",
 				"eslint-plugin-es": "^4.1.0",
-				"eslint-plugin-jsdoc": "^37.0.3",
+				"eslint-plugin-jsdoc": "^37.7.1",
 				"eslint-plugin-json-es": "^1.5.4",
 				"eslint-plugin-mediawiki": "^0.3.0",
 				"eslint-plugin-mocha": "^9.0.0",
 				"eslint-plugin-no-jquery": "^2.7.0",
 				"eslint-plugin-node": "^11.1.0",
-				"eslint-plugin-qunit": "^7.0.0",
-				"eslint-plugin-unicorn": "^37.0.1",
-				"eslint-plugin-vue": "^8.0.2",
-				"eslint-plugin-wdio": "^7.4.2"
+				"eslint-plugin-qunit": "^7.2.0",
+				"eslint-plugin-unicorn": "^40.1.0",
+				"eslint-plugin-vue": "^8.4.1",
+				"eslint-plugin-wdio": "^7.4.2",
+				"eslint-plugin-yml": "^0.13.0"
+			}
+		},
+		"node_modules/eslint-config-wikimedia/node_modules/@eslint/eslintrc": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.2.tgz",
+			"integrity": "sha512-lTVWHs7O2hjBFZunXTZYnYqtB9GakA1lnxIf+gKq2nY5gxkkNi/lQvveW6t8gFdOHTg6nG50Xs95PrLqVpcaLg==",
+			"dev": true,
+			"dependencies": {
+				"ajv": "^6.12.4",
+				"debug": "^4.3.2",
+				"espree": "^9.3.1",
+				"globals": "^13.9.0",
+				"ignore": "^5.2.0",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^4.1.0",
+				"minimatch": "^3.0.4",
+				"strip-json-comments": "^3.1.1"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/eslint-config-wikimedia/node_modules/@humanwhocodes/config-array": {
+			"version": "0.9.5",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
+			"integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+			"dev": true,
+			"dependencies": {
+				"@humanwhocodes/object-schema": "^1.2.1",
+				"debug": "^4.1.1",
+				"minimatch": "^3.0.4"
+			},
+			"engines": {
+				"node": ">=10.10.0"
+			}
+		},
+		"node_modules/eslint-config-wikimedia/node_modules/acorn": {
+			"version": "8.7.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
+			"integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+			"dev": true,
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/eslint-config-wikimedia/node_modules/argparse": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+			"dev": true
+		},
+		"node_modules/eslint-config-wikimedia/node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint-config-wikimedia/node_modules/eslint": {
+			"version": "8.14.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.14.0.tgz",
+			"integrity": "sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw==",
+			"dev": true,
+			"dependencies": {
+				"@eslint/eslintrc": "^1.2.2",
+				"@humanwhocodes/config-array": "^0.9.2",
+				"ajv": "^6.10.0",
+				"chalk": "^4.0.0",
+				"cross-spawn": "^7.0.2",
+				"debug": "^4.3.2",
+				"doctrine": "^3.0.0",
+				"escape-string-regexp": "^4.0.0",
+				"eslint-scope": "^7.1.1",
+				"eslint-utils": "^3.0.0",
+				"eslint-visitor-keys": "^3.3.0",
+				"espree": "^9.3.1",
+				"esquery": "^1.4.0",
+				"esutils": "^2.0.2",
+				"fast-deep-equal": "^3.1.3",
+				"file-entry-cache": "^6.0.1",
+				"functional-red-black-tree": "^1.0.1",
+				"glob-parent": "^6.0.1",
+				"globals": "^13.6.0",
+				"ignore": "^5.2.0",
+				"import-fresh": "^3.0.0",
+				"imurmurhash": "^0.1.4",
+				"is-glob": "^4.0.0",
+				"js-yaml": "^4.1.0",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"levn": "^0.4.1",
+				"lodash.merge": "^4.6.2",
+				"minimatch": "^3.0.4",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.9.1",
+				"regexpp": "^3.2.0",
+				"strip-ansi": "^6.0.1",
+				"strip-json-comments": "^3.1.0",
+				"text-table": "^0.2.0",
+				"v8-compile-cache": "^2.0.3"
+			},
+			"bin": {
+				"eslint": "bin/eslint.js"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/eslint-config-wikimedia/node_modules/eslint-scope": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+			"integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+			"dev": true,
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/eslint-config-wikimedia/node_modules/eslint-utils": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+			"dev": true,
+			"dependencies": {
+				"eslint-visitor-keys": "^2.0.0"
+			},
+			"engines": {
+				"node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
+			},
+			"peerDependencies": {
+				"eslint": ">=5"
+			}
+		},
+		"node_modules/eslint-config-wikimedia/node_modules/eslint/node_modules/eslint-visitor-keys": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+			"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/eslint-config-wikimedia/node_modules/espree": {
+			"version": "9.3.1",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz",
+			"integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^8.7.0",
+				"acorn-jsx": "^5.3.1",
+				"eslint-visitor-keys": "^3.3.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/eslint-config-wikimedia/node_modules/espree/node_modules/eslint-visitor-keys": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+			"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/eslint-config-wikimedia/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/eslint-config-wikimedia/node_modules/glob-parent": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+			"dev": true,
+			"dependencies": {
+				"is-glob": "^4.0.3"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/eslint-config-wikimedia/node_modules/ignore": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+			"integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/eslint-config-wikimedia/node_modules/js-yaml": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^2.0.1"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
 			}
 		},
 		"node_modules/eslint-plugin-compat": {
-			"version": "3.13.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-3.13.0.tgz",
-			"integrity": "sha512-cv8IYMuTXm7PIjMVDN2y4k/KVnKZmoNGHNq27/9dLstOLydKblieIv+oe2BN2WthuXnFNhaNvv3N1Bvl4dbIGA==",
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-4.0.2.tgz",
+			"integrity": "sha512-xqvoO54CLTVaEYGMzhu35Wzwk/As7rCvz/2dqwnFiWi0OJccEtGIn+5qq3zqIu9nboXlpdBN579fZcItC73Ycg==",
 			"dev": true,
 			"dependencies": {
-				"@mdn/browser-compat-data": "^3.3.14",
+				"@mdn/browser-compat-data": "^4.1.5",
 				"ast-metadata-inferer": "^0.7.0",
 				"browserslist": "^4.16.8",
-				"caniuse-lite": "^1.0.30001251",
+				"caniuse-lite": "^1.0.30001304",
 				"core-js": "^3.16.2",
 				"find-up": "^5.0.0",
 				"lodash.memoize": "4.1.2",
@@ -1119,7 +955,7 @@
 				"node": ">=9.x"
 			},
 			"peerDependencies": {
-				"eslint": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
+				"eslint": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
 			}
 		},
 		"node_modules/eslint-plugin-es": {
@@ -1427,23 +1263,22 @@
 			}
 		},
 		"node_modules/eslint-plugin-unicorn": {
-			"version": "37.0.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-37.0.1.tgz",
-			"integrity": "sha512-E1jq5u9ojnadisJcPi+hMXTGSiIzkIUMDvWsBudsCGXvKUB2aNSU2TcfyW2/jAS5A4ryBXfzxLykMxX1EdluSQ==",
+			"version": "40.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-40.1.0.tgz",
+			"integrity": "sha512-y5doK2DF9Sr5AqKEHbHxjFllJ167nKDRU01HDcWyv4Tnmaoe9iNxMrBnaybZvWZUaE3OC5Unu0lNIevYamloig==",
 			"dev": true,
 			"dependencies": {
-				"@babel/helper-validator-identifier": "^7.14.9",
-				"ci-info": "^3.2.0",
+				"@babel/helper-validator-identifier": "^7.15.7",
+				"ci-info": "^3.3.0",
 				"clean-regexp": "^1.0.0",
-				"eslint-template-visitor": "^2.3.2",
 				"eslint-utils": "^3.0.0",
 				"esquery": "^1.4.0",
-				"indent-string": "4",
+				"indent-string": "^4.0.0",
 				"is-builtin-module": "^3.1.0",
 				"lodash": "^4.17.21",
 				"pluralize": "^8.0.0",
 				"read-pkg-up": "^7.0.1",
-				"regexp-tree": "^0.1.23",
+				"regexp-tree": "^0.1.24",
 				"safe-regex": "^2.1.1",
 				"semver": "^7.3.5",
 				"strip-indent": "^3.0.0"
@@ -1521,6 +1356,27 @@
 				"node": ">=12.0.0"
 			}
 		},
+		"node_modules/eslint-plugin-yml": {
+			"version": "0.13.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-yml/-/eslint-plugin-yml-0.13.0.tgz",
+			"integrity": "sha512-rZvdnhe28jIbgSIZo3qYqkl9hKslyTDfMwqIGDzz873gxghzBw0yeFG+P7sMfOkFfpqwJzZy3IKe2cIiCp4FrA==",
+			"dev": true,
+			"dependencies": {
+				"debug": "^4.3.2",
+				"lodash": "^4.17.21",
+				"natural-compare": "^1.4.0",
+				"yaml-eslint-parser": "^0.5.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ota-meshi"
+			},
+			"peerDependencies": {
+				"eslint": ">=6.0.0"
+			}
+		},
 		"node_modules/eslint-scope": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -1534,22 +1390,6 @@
 				"node": ">=8.0.0"
 			}
 		},
-		"node_modules/eslint-template-visitor": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/eslint-template-visitor/-/eslint-template-visitor-2.3.2.tgz",
-			"integrity": "sha512-3ydhqFpuV7x1M9EK52BPNj6V0Kwu0KKkcIAfpUhwHbR8ocRln/oUHgfxQupY8O1h4Qv/POHDumb/BwwNfxbtnA==",
-			"dev": true,
-			"dependencies": {
-				"@babel/core": "^7.12.16",
-				"@babel/eslint-parser": "^7.12.16",
-				"eslint-visitor-keys": "^2.0.0",
-				"esquery": "^1.3.1",
-				"multimap": "^1.1.0"
-			},
-			"peerDependencies": {
-				"eslint": ">=7.0.0"
-			}
-		},
 		"node_modules/eslint-utils": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
@@ -1592,18 +1432,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/eslint/node_modules/is-glob": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-			"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-			"dev": true,
-			"dependencies": {
-				"is-extglob": "^2.1.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/espree": {
 			"version": "7.3.1",
 			"resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
@@ -1902,15 +1730,6 @@
 			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
 			"dev": true
 		},
-		"node_modules/gensync": {
-			"version": "1.0.0-beta.2",
-			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-			"dev": true,
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
 		"node_modules/get-intrinsic": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
@@ -1960,18 +1779,6 @@
 				"node": ">= 6"
 			}
 		},
-		"node_modules/glob-parent/node_modules/is-glob": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-			"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-			"dev": true,
-			"dependencies": {
-				"is-extglob": "^2.1.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/global-modules": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
@@ -2027,9 +1834,9 @@
 			}
 		},
 		"node_modules/grunt": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.4.1.tgz",
-			"integrity": "sha512-ZXIYXTsAVrA7sM+jZxjQdrBOAg7DyMUplOMhTaspMRExei+fD0BTwdWXnn0W5SXqhb/Q/nlkzXclSi3IH55PIA==",
+			"version": "1.5.2",
+			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.2.tgz",
+			"integrity": "sha512-XCtfaIu72OyDqK24MjWiGC9SwlkuhkS1mrULr1xzuJ2XqAFhP3ZAchZGHJeSCY6mkaOXU4F7SbmmCF7xIVoC9w==",
 			"dev": true,
 			"dependencies": {
 				"dateformat": "~3.0.3",
@@ -2037,7 +1844,7 @@
 				"exit": "~0.1.2",
 				"findup-sync": "~0.3.0",
 				"glob": "~7.1.6",
-				"grunt-cli": "~1.4.2",
+				"grunt-cli": "~1.4.3",
 				"grunt-known-options": "~2.0.0",
 				"grunt-legacy-log": "~3.0.0",
 				"grunt-legacy-util": "~2.0.1",
@@ -2067,6 +1874,38 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/grunt-cli": {
+			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz",
+			"integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==",
+			"dev": true,
+			"dependencies": {
+				"grunt-known-options": "~2.0.0",
+				"interpret": "~1.1.0",
+				"liftup": "~3.0.1",
+				"nopt": "~4.0.1",
+				"v8flags": "~3.2.0"
+			},
+			"bin": {
+				"grunt": "bin/grunt"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/grunt-cli/node_modules/nopt": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+			"integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+			"dev": true,
+			"dependencies": {
+				"abbrev": "1",
+				"osenv": "^0.1.4"
+			},
+			"bin": {
+				"nopt": "bin/nopt.js"
+			}
+		},
 		"node_modules/grunt-eslint": {
 			"version": "23.0.0",
 			"resolved": "https://registry.npmjs.org/grunt-eslint/-/grunt-eslint-23.0.0.tgz",
@@ -2080,6 +1919,15 @@
 				"node": ">=10"
 			}
 		},
+		"node_modules/grunt-known-options": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz",
+			"integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/grunt-legacy-log": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz",
@@ -2147,47 +1995,6 @@
 				"node": ">= 8"
 			}
 		},
-		"node_modules/grunt/node_modules/grunt-cli": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.2.tgz",
-			"integrity": "sha512-wsu6BZh7KCnfeaSkDrKIAvOlqGKxNRTZjc8xfZlvxCByQIqUfZ31kh5uHpPnhQ4NdVgvaWaVxa1LUbVU80nACw==",
-			"dev": true,
-			"dependencies": {
-				"grunt-known-options": "~1.1.1",
-				"interpret": "~1.1.0",
-				"liftup": "~3.0.1",
-				"nopt": "~4.0.1",
-				"v8flags": "~3.2.0"
-			},
-			"bin": {
-				"grunt": "bin/grunt"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/grunt/node_modules/grunt-cli/node_modules/nopt": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
-			"integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
-			"dev": true,
-			"dependencies": {
-				"abbrev": "1",
-				"osenv": "^0.1.4"
-			},
-			"bin": {
-				"nopt": "bin/nopt.js"
-			}
-		},
-		"node_modules/grunt/node_modules/grunt-known-options": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz",
-			"integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/has": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -2372,12 +2179,15 @@
 			}
 		},
 		"node_modules/is-core-module": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.3.0.tgz",
-			"integrity": "sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==",
+			"version": "2.9.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
+			"integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
 			"dev": true,
 			"dependencies": {
 				"has": "^1.0.3"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/is-extglob": {
@@ -2399,9 +2209,9 @@
 			}
 		},
 		"node_modules/is-glob": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-			"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
 			"dev": true,
 			"dependencies": {
 				"is-extglob": "^2.1.1"
@@ -2525,18 +2335,6 @@
 				"node": ">=12.0.0"
 			}
 		},
-		"node_modules/jsesc": {
-			"version": "2.5.2",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-			"dev": true,
-			"bin": {
-				"jsesc": "bin/jsesc"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/json-parse-even-better-errors": {
 			"version": "2.3.1",
 			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -2555,21 +2353,6 @@
 			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
 			"dev": true
 		},
-		"node_modules/json5": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-			"dev": true,
-			"dependencies": {
-				"minimist": "^1.2.5"
-			},
-			"bin": {
-				"json5": "lib/cli.js"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/kind-of": {
 			"version": "6.0.3",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -2626,16 +2409,6 @@
 				"node": ">= 8"
 			}
 		},
-		"node_modules/liftup/node_modules/resolve": {
-			"version": "1.20.0",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-			"integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-			"dev": true,
-			"dependencies": {
-				"is-core-module": "^2.2.0",
-				"path-parse": "^1.0.6"
-			}
-		},
 		"node_modules/lines-and-columns": {
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
@@ -2727,13 +2500,13 @@
 			}
 		},
 		"node_modules/micromatch": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-			"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
 			"dev": true,
 			"dependencies": {
-				"braces": "^3.0.1",
-				"picomatch": "^2.2.3"
+				"braces": "^3.0.2",
+				"picomatch": "^2.3.1"
 			},
 			"engines": {
 				"node": ">=8.6"
@@ -2760,12 +2533,6 @@
 				"node": "*"
 			}
 		},
-		"node_modules/minimist": {
-			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-			"dev": true
-		},
 		"node_modules/mkdirp": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -2784,12 +2551,6 @@
 			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
 			"dev": true
 		},
-		"node_modules/multimap": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/multimap/-/multimap-1.1.0.tgz",
-			"integrity": "sha512-0ZIR9PasPxGXmRsEF8jsDzndzHDj7tIav+JUmvIFB/WHswliFnquxECT/De7GR4yg99ky/NlRKJT82G1y271bw==",
-			"dev": true
-		},
 		"node_modules/natural-compare": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -2797,9 +2558,9 @@
 			"dev": true
 		},
 		"node_modules/node-releases": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
-			"integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz",
+			"integrity": "sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw==",
 			"dev": true
 		},
 		"node_modules/nopt": {
@@ -3082,12 +2843,15 @@
 			"dev": true
 		},
 		"node_modules/picomatch": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
-			"integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
 			"dev": true,
 			"engines": {
 				"node": ">=8.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
 			}
 		},
 		"node_modules/pluralize": {
@@ -3226,9 +2990,9 @@
 			}
 		},
 		"node_modules/rechoir": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
-			"integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==",
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
+			"integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
 			"dev": true,
 			"dependencies": {
 				"resolve": "^1.9.0"
@@ -3247,12 +3011,15 @@
 			}
 		},
 		"node_modules/regexpp": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-			"integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
 			"dev": true,
 			"engines": {
 				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mysticatea"
 			}
 		},
 		"node_modules/regextras": {
@@ -3283,12 +3050,20 @@
 			}
 		},
 		"node_modules/resolve": {
-			"version": "1.17.0",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-			"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+			"version": "1.22.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
+			"integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
 			"dev": true,
 			"dependencies": {
-				"path-parse": "^1.0.6"
+				"is-core-module": "^2.8.1",
+				"path-parse": "^1.0.7",
+				"supports-preserve-symlinks-flag": "^1.0.0"
+			},
+			"bin": {
+				"resolve": "bin/resolve"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/resolve-dir": {
@@ -3325,12 +3100,6 @@
 				"rimraf": "bin.js"
 			}
 		},
-		"node_modules/safe-buffer": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-			"dev": true
-		},
 		"node_modules/safe-regex": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-2.1.1.tgz",
@@ -3396,15 +3165,6 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/source-map": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/spdx-correct": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
@@ -3458,12 +3218,12 @@
 			}
 		},
 		"node_modules/strip-ansi": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-			"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
 			"dev": true,
 			"dependencies": {
-				"ansi-regex": "^5.0.0"
+				"ansi-regex": "^5.0.1"
 			},
 			"engines": {
 				"node": ">=8"
@@ -3505,6 +3265,18 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/supports-preserve-symlinks-flag": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/table": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/table/-/table-6.1.0.tgz",
@@ -3549,15 +3321,6 @@
 			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
 			"dev": true
 		},
-		"node_modules/to-fast-properties": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -3780,219 +3543,59 @@
 			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
 			"dev": true
 		},
-		"node_modules/yocto-queue": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+		"node_modules/yaml": {
+			"version": "1.10.2",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
 			"dev": true,
 			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		}
-	},
-	"dependencies": {
-		"@ampproject/remapping": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.0.4.tgz",
-			"integrity": "sha512-zU3pj3pf//YhaoozRTYKaL20KopXrzuZFc/8Ylc49AuV8grYKH23TTq9JJoR70F8zQbil58KjSchZTWeX+jrIQ==",
-			"dev": true,
-			"requires": {
-				"@jridgewell/trace-mapping": "^0.3.0"
-			}
-		},
-		"@babel/code-frame": {
-			"version": "7.12.11",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-			"integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-			"dev": true,
-			"requires": {
-				"@babel/highlight": "^7.10.4"
+				"node": ">= 6"
 			}
 		},
-		"@babel/compat-data": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.0.tgz",
-			"integrity": "sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==",
-			"dev": true
-		},
-		"@babel/core": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.0.tgz",
-			"integrity": "sha512-x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA==",
+		"node_modules/yaml-eslint-parser": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/yaml-eslint-parser/-/yaml-eslint-parser-0.5.0.tgz",
+			"integrity": "sha512-nJeyLA3YHAzhBTZbRAbu3W6xrSCucyxExmA+ZDtEdUFpGllxAZpto2Zxo2IG0r0eiuEiBM4e+wiAdxTziTq94g==",
 			"dev": true,
-			"requires": {
-				"@ampproject/remapping": "^2.0.0",
-				"@babel/code-frame": "^7.16.7",
-				"@babel/generator": "^7.17.0",
-				"@babel/helper-compilation-targets": "^7.16.7",
-				"@babel/helper-module-transforms": "^7.16.7",
-				"@babel/helpers": "^7.17.0",
-				"@babel/parser": "^7.17.0",
-				"@babel/template": "^7.16.7",
-				"@babel/traverse": "^7.17.0",
-				"@babel/types": "^7.17.0",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.1.2",
-				"semver": "^6.3.0"
-			},
 			"dependencies": {
-				"@babel/code-frame": {
-					"version": "7.16.7",
-					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-					"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-					"dev": true,
-					"requires": {
-						"@babel/highlight": "^7.16.7"
-					}
-				},
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
-			}
-		},
-		"@babel/eslint-parser": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz",
-			"integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
-			"dev": true,
-			"requires": {
-				"eslint-scope": "^5.1.1",
-				"eslint-visitor-keys": "^2.1.0",
-				"semver": "^6.3.0"
+				"eslint-visitor-keys": "^3.0.0",
+				"lodash": "^4.17.21",
+				"yaml": "^1.10.2"
 			},
-			"dependencies": {
-				"eslint-visitor-keys": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-					"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-					"dev": true
-				},
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			}
 		},
-		"@babel/generator": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.0.tgz",
-			"integrity": "sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw==",
+		"node_modules/yaml-eslint-parser/node_modules/eslint-visitor-keys": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+			"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
 			"dev": true,
-			"requires": {
-				"@babel/types": "^7.17.0",
-				"jsesc": "^2.5.1",
-				"source-map": "^0.5.0"
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			}
 		},
-		"@babel/helper-compilation-targets": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz",
-			"integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
+		"node_modules/yocto-queue": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
 			"dev": true,
-			"requires": {
-				"@babel/compat-data": "^7.16.4",
-				"@babel/helper-validator-option": "^7.16.7",
-				"browserslist": "^4.17.5",
-				"semver": "^6.3.0"
+			"engines": {
+				"node": ">=10"
 			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
-			}
-		},
-		"@babel/helper-environment-visitor": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
-			"integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.16.7"
-			}
-		},
-		"@babel/helper-function-name": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
-			"integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-get-function-arity": "^7.16.7",
-				"@babel/template": "^7.16.7",
-				"@babel/types": "^7.16.7"
-			}
-		},
-		"@babel/helper-get-function-arity": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
-			"integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.16.7"
-			}
-		},
-		"@babel/helper-hoist-variables": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-			"integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.16.7"
-			}
-		},
-		"@babel/helper-module-imports": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-			"integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.16.7"
-			}
-		},
-		"@babel/helper-module-transforms": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
-			"integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-environment-visitor": "^7.16.7",
-				"@babel/helper-module-imports": "^7.16.7",
-				"@babel/helper-simple-access": "^7.16.7",
-				"@babel/helper-split-export-declaration": "^7.16.7",
-				"@babel/helper-validator-identifier": "^7.16.7",
-				"@babel/template": "^7.16.7",
-				"@babel/traverse": "^7.16.7",
-				"@babel/types": "^7.16.7"
-			}
-		},
-		"@babel/helper-simple-access": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz",
-			"integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.16.7"
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
-		},
-		"@babel/helper-split-export-declaration": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-			"integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+		}
+	},
+	"dependencies": {
+		"@babel/code-frame": {
+			"version": "7.12.11",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+			"integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.16.7"
+				"@babel/highlight": "^7.10.4"
 			}
 		},
 		"@babel/helper-validator-identifier": {
@@ -4001,23 +3604,6 @@
 			"integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
 			"dev": true
 		},
-		"@babel/helper-validator-option": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-			"integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-			"dev": true
-		},
-		"@babel/helpers": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.0.tgz",
-			"integrity": "sha512-Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ==",
-			"dev": true,
-			"requires": {
-				"@babel/template": "^7.16.7",
-				"@babel/traverse": "^7.17.0",
-				"@babel/types": "^7.17.0"
-			}
-		},
 		"@babel/highlight": {
 			"version": "7.16.10",
 			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
@@ -4081,79 +3667,6 @@
 				}
 			}
 		},
-		"@babel/parser": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz",
-			"integrity": "sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==",
-			"dev": true
-		},
-		"@babel/template": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-			"integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.16.7",
-				"@babel/parser": "^7.16.7",
-				"@babel/types": "^7.16.7"
-			},
-			"dependencies": {
-				"@babel/code-frame": {
-					"version": "7.16.7",
-					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-					"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-					"dev": true,
-					"requires": {
-						"@babel/highlight": "^7.16.7"
-					}
-				}
-			}
-		},
-		"@babel/traverse": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.0.tgz",
-			"integrity": "sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.16.7",
-				"@babel/generator": "^7.17.0",
-				"@babel/helper-environment-visitor": "^7.16.7",
-				"@babel/helper-function-name": "^7.16.7",
-				"@babel/helper-hoist-variables": "^7.16.7",
-				"@babel/helper-split-export-declaration": "^7.16.7",
-				"@babel/parser": "^7.17.0",
-				"@babel/types": "^7.17.0",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0"
-			},
-			"dependencies": {
-				"@babel/code-frame": {
-					"version": "7.16.7",
-					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-					"integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-					"dev": true,
-					"requires": {
-						"@babel/highlight": "^7.16.7"
-					}
-				},
-				"globals": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-					"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-					"dev": true
-				}
-			}
-		},
-		"@babel/types": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
-			"integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-validator-identifier": "^7.16.7",
-				"to-fast-properties": "^2.0.0"
-			}
-		},
 		"@es-joy/jsdoccomment": {
 			"version": "0.18.0",
 			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.18.0.tgz",
@@ -4199,32 +3712,10 @@
 			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
 			"dev": true
 		},
-		"@jridgewell/resolve-uri": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz",
-			"integrity": "sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg==",
-			"dev": true
-		},
-		"@jridgewell/sourcemap-codec": {
-			"version": "1.4.10",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz",
-			"integrity": "sha512-Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg==",
-			"dev": true
-		},
-		"@jridgewell/trace-mapping": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.2.tgz",
-			"integrity": "sha512-9KzzH4kMjA2XmBRHfqG2/Vtl7s92l6uNDd0wW7frDE+EUvQFGqNXhWp0UGJjSkt3v2AYjzOZn1QO9XaTNJIt1Q==",
-			"dev": true,
-			"requires": {
-				"@jridgewell/resolve-uri": "^3.0.3",
-				"@jridgewell/sourcemap-codec": "^1.4.10"
-			}
-		},
 		"@mdn/browser-compat-data": {
-			"version": "3.3.14",
-			"resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-3.3.14.tgz",
-			"integrity": "sha512-n2RC9d6XatVbWFdHLimzzUJxJ1KY8LdjqrW6YvGPiRmsHkhOUx74/Ct10x5Yo7bC/Jvqx7cDEW8IMPv/+vwEzA==",
+			"version": "4.1.18",
+			"resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-4.1.18.tgz",
+			"integrity": "sha512-Ap8MOYbyvEilK1+sNY6yh6LmsHSp7f5zzSGlY4AemhbTcoultcozEXPzx42OO6WjoriOsw88aW8TiqgYdXwsxg==",
 			"dev": true
 		},
 		"@types/color-name": {
@@ -4255,8 +3746,7 @@
 			"version": "5.3.2",
 			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
 			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-			"dev": true,
-			"requires": {}
+			"dev": true
 		},
 		"ajv": {
 			"version": "6.12.6",
@@ -4328,6 +3818,14 @@
 			"dev": true,
 			"requires": {
 				"@mdn/browser-compat-data": "^3.3.14"
+			},
+			"dependencies": {
+				"@mdn/browser-compat-data": {
+					"version": "3.3.14",
+					"resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-3.3.14.tgz",
+					"integrity": "sha512-n2RC9d6XatVbWFdHLimzzUJxJ1KY8LdjqrW6YvGPiRmsHkhOUx74/Ct10x5Yo7bC/Jvqx7cDEW8IMPv/+vwEzA==",
+					"dev": true
+				}
 			}
 		},
 		"astral-regex": {
@@ -4337,9 +3835,9 @@
 			"dev": true
 		},
 		"async": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
-			"integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==",
+			"version": "3.2.3",
+			"resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+			"integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
 			"dev": true
 		},
 		"balanced-match": {
@@ -4368,15 +3866,15 @@
 			}
 		},
 		"browserslist": {
-			"version": "4.19.1",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
-			"integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
+			"version": "4.20.3",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
+			"integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
 			"dev": true,
 			"requires": {
-				"caniuse-lite": "^1.0.30001286",
-				"electron-to-chromium": "^1.4.17",
+				"caniuse-lite": "^1.0.30001332",
+				"electron-to-chromium": "^1.4.118",
 				"escalade": "^3.1.1",
-				"node-releases": "^2.0.1",
+				"node-releases": "^2.0.3",
 				"picocolors": "^1.0.0"
 			}
 		},
@@ -4403,9 +3901,9 @@
 			"dev": true
 		},
 		"caniuse-lite": {
-			"version": "1.0.30001307",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001307.tgz",
-			"integrity": "sha512-+MXEMczJ4FuxJAUp0jvAl6Df0NI/OfW1RWEE61eSmzS7hw6lz4IKutbhbXendwq8BljfFuHtu26VWsg4afQ7Ng==",
+			"version": "1.0.30001332",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz",
+			"integrity": "sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw==",
 			"dev": true
 		},
 		"chalk": {
@@ -4466,19 +3964,10 @@
 			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
 			"dev": true
 		},
-		"convert-source-map": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-			"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-			"dev": true,
-			"requires": {
-				"safe-buffer": "~5.1.1"
-			}
-		},
 		"core-js": {
-			"version": "3.21.0",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.21.0.tgz",
-			"integrity": "sha512-YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ==",
+			"version": "3.22.2",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.2.tgz",
+			"integrity": "sha512-Z5I2vzDnEIqO2YhELVMFcL1An2CIsFe9Q7byZhs8c/QxummxZlAHw33TUHbIte987LkisOgL0LwQ1P9D6VISnA==",
 			"dev": true
 		},
 		"cross-spawn": {
@@ -4540,9 +4029,9 @@
 			}
 		},
 		"electron-to-chromium": {
-			"version": "1.4.65",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.65.tgz",
-			"integrity": "sha512-0/d8Skk8sW3FxXP0Dd6MnBlrwx7Qo9cqQec3BlIAlvKnrmS3pHsIbaroEi+nd0kZkGpQ6apMEre7xndzjlEnLw==",
+			"version": "1.4.123",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.123.tgz",
+			"integrity": "sha512-0pHGE53WkYoFbsgwYcVKEpWa6jbzlvkohIEA2CUoZ9b5KC+w/zlMiQHvW/4IBcOh7YoEFqRNavgTk02TBoUTUw==",
 			"dev": true
 		},
 		"emoji-regex": {
@@ -4634,49 +4123,208 @@
 					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
 					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
 					"dev": true
-				},
-				"is-glob": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-					"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^2.1.1"
-					}
 				}
 			}
 		},
 		"eslint-config-wikimedia": {
-			"version": "0.21.0",
-			"resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.21.0.tgz",
-			"integrity": "sha512-+KoUKaWSKTgIx+Run9gdbGXi6Uox2/JxgROTVmA6yi4mnMuFWwpBXzYFjqZPUT7dzmJSTO3uxwsR44F8GnZhpg==",
+			"version": "0.22.1",
+			"resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.22.1.tgz",
+			"integrity": "sha512-TtN+gWJrcW0i1sEu7vPE1tHpEilrMUuTxP6UK97Amvva/KDV9/tvRUifGhw0q5uBswp+HWgF12p8rq68hZqMbA==",
 			"dev": true,
 			"requires": {
-				"eslint": "^7.32.0",
-				"eslint-plugin-compat": "^3.13.0",
+				"eslint": "^8.6.0",
+				"eslint-plugin-compat": "^4.0.2",
 				"eslint-plugin-es": "^4.1.0",
-				"eslint-plugin-jsdoc": "^37.0.3",
+				"eslint-plugin-jsdoc": "^37.7.1",
 				"eslint-plugin-json-es": "^1.5.4",
 				"eslint-plugin-mediawiki": "^0.3.0",
 				"eslint-plugin-mocha": "^9.0.0",
 				"eslint-plugin-no-jquery": "^2.7.0",
 				"eslint-plugin-node": "^11.1.0",
-				"eslint-plugin-qunit": "^7.0.0",
-				"eslint-plugin-unicorn": "^37.0.1",
-				"eslint-plugin-vue": "^8.0.2",
-				"eslint-plugin-wdio": "^7.4.2"
+				"eslint-plugin-qunit": "^7.2.0",
+				"eslint-plugin-unicorn": "^40.1.0",
+				"eslint-plugin-vue": "^8.4.1",
+				"eslint-plugin-wdio": "^7.4.2",
+				"eslint-plugin-yml": "^0.13.0"
+			},
+			"dependencies": {
+				"@eslint/eslintrc": {
+					"version": "1.2.2",
+					"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.2.tgz",
+					"integrity": "sha512-lTVWHs7O2hjBFZunXTZYnYqtB9GakA1lnxIf+gKq2nY5gxkkNi/lQvveW6t8gFdOHTg6nG50Xs95PrLqVpcaLg==",
+					"dev": true,
+					"requires": {
+						"ajv": "^6.12.4",
+						"debug": "^4.3.2",
+						"espree": "^9.3.1",
+						"globals": "^13.9.0",
+						"ignore": "^5.2.0",
+						"import-fresh": "^3.2.1",
+						"js-yaml": "^4.1.0",
+						"minimatch": "^3.0.4",
+						"strip-json-comments": "^3.1.1"
+					}
+				},
+				"@humanwhocodes/config-array": {
+					"version": "0.9.5",
+					"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
+					"integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+					"dev": true,
+					"requires": {
+						"@humanwhocodes/object-schema": "^1.2.1",
+						"debug": "^4.1.1",
+						"minimatch": "^3.0.4"
+					}
+				},
+				"acorn": {
+					"version": "8.7.1",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
+					"integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+					"dev": true
+				},
+				"argparse": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+					"dev": true
+				},
+				"escape-string-regexp": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+					"dev": true
+				},
+				"eslint": {
+					"version": "8.14.0",
+					"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.14.0.tgz",
+					"integrity": "sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw==",
+					"dev": true,
+					"requires": {
+						"@eslint/eslintrc": "^1.2.2",
+						"@humanwhocodes/config-array": "^0.9.2",
+						"ajv": "^6.10.0",
+						"chalk": "^4.0.0",
+						"cross-spawn": "^7.0.2",
+						"debug": "^4.3.2",
+						"doctrine": "^3.0.0",
+						"escape-string-regexp": "^4.0.0",
+						"eslint-scope": "^7.1.1",
+						"eslint-utils": "^3.0.0",
+						"eslint-visitor-keys": "^3.3.0",
+						"espree": "^9.3.1",
+						"esquery": "^1.4.0",
+						"esutils": "^2.0.2",
+						"fast-deep-equal": "^3.1.3",
+						"file-entry-cache": "^6.0.1",
+						"functional-red-black-tree": "^1.0.1",
+						"glob-parent": "^6.0.1",
+						"globals": "^13.6.0",
+						"ignore": "^5.2.0",
+						"import-fresh": "^3.0.0",
+						"imurmurhash": "^0.1.4",
+						"is-glob": "^4.0.0",
+						"js-yaml": "^4.1.0",
+						"json-stable-stringify-without-jsonify": "^1.0.1",
+						"levn": "^0.4.1",
+						"lodash.merge": "^4.6.2",
+						"minimatch": "^3.0.4",
+						"natural-compare": "^1.4.0",
+						"optionator": "^0.9.1",
+						"regexpp": "^3.2.0",
+						"strip-ansi": "^6.0.1",
+						"strip-json-comments": "^3.1.0",
+						"text-table": "^0.2.0",
+						"v8-compile-cache": "^2.0.3"
+					},
+					"dependencies": {
+						"eslint-visitor-keys": {
+							"version": "3.3.0",
+							"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+							"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+							"dev": true
+						}
+					}
+				},
+				"eslint-scope": {
+					"version": "7.1.1",
+					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+					"integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+					"dev": true,
+					"requires": {
+						"esrecurse": "^4.3.0",
+						"estraverse": "^5.2.0"
+					}
+				},
+				"eslint-utils": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+					"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+					"dev": true,
+					"requires": {
+						"eslint-visitor-keys": "^2.0.0"
+					}
+				},
+				"espree": {
+					"version": "9.3.1",
+					"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz",
+					"integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==",
+					"dev": true,
+					"requires": {
+						"acorn": "^8.7.0",
+						"acorn-jsx": "^5.3.1",
+						"eslint-visitor-keys": "^3.3.0"
+					},
+					"dependencies": {
+						"eslint-visitor-keys": {
+							"version": "3.3.0",
+							"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+							"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+							"dev": true
+						}
+					}
+				},
+				"estraverse": {
+					"version": "5.3.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+					"dev": true
+				},
+				"glob-parent": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+					"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+					"dev": true,
+					"requires": {
+						"is-glob": "^4.0.3"
+					}
+				},
+				"ignore": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+					"integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+					"dev": true
+				},
+				"js-yaml": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+					"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+					"dev": true,
+					"requires": {
+						"argparse": "^2.0.1"
+					}
+				}
 			}
 		},
 		"eslint-plugin-compat": {
-			"version": "3.13.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-3.13.0.tgz",
-			"integrity": "sha512-cv8IYMuTXm7PIjMVDN2y4k/KVnKZmoNGHNq27/9dLstOLydKblieIv+oe2BN2WthuXnFNhaNvv3N1Bvl4dbIGA==",
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-4.0.2.tgz",
+			"integrity": "sha512-xqvoO54CLTVaEYGMzhu35Wzwk/As7rCvz/2dqwnFiWi0OJccEtGIn+5qq3zqIu9nboXlpdBN579fZcItC73Ycg==",
 			"dev": true,
 			"requires": {
-				"@mdn/browser-compat-data": "^3.3.14",
+				"@mdn/browser-compat-data": "^4.1.5",
 				"ast-metadata-inferer": "^0.7.0",
 				"browserslist": "^4.16.8",
-				"caniuse-lite": "^1.0.30001251",
+				"caniuse-lite": "^1.0.30001304",
 				"core-js": "^3.16.2",
 				"find-up": "^5.0.0",
 				"lodash.memoize": "4.1.2",
@@ -4839,8 +4487,7 @@
 			"version": "2.7.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.7.0.tgz",
 			"integrity": "sha512-Aeg7dA6GTH1AcWLlBtWNzOU9efK5KpNi7b0EhBO0o0M+awyzguUUo8gF6hXGjQ9n5h8/uRtYv9zOqQkeC5CG0w==",
-			"dev": true,
-			"requires": {}
+			"dev": true
 		},
 		"eslint-plugin-node": {
 			"version": "11.1.0",
@@ -4902,23 +4549,22 @@
 			}
 		},
 		"eslint-plugin-unicorn": {
-			"version": "37.0.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-37.0.1.tgz",
-			"integrity": "sha512-E1jq5u9ojnadisJcPi+hMXTGSiIzkIUMDvWsBudsCGXvKUB2aNSU2TcfyW2/jAS5A4ryBXfzxLykMxX1EdluSQ==",
+			"version": "40.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-40.1.0.tgz",
+			"integrity": "sha512-y5doK2DF9Sr5AqKEHbHxjFllJ167nKDRU01HDcWyv4Tnmaoe9iNxMrBnaybZvWZUaE3OC5Unu0lNIevYamloig==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-validator-identifier": "^7.14.9",
-				"ci-info": "^3.2.0",
+				"@babel/helper-validator-identifier": "^7.15.7",
+				"ci-info": "^3.3.0",
 				"clean-regexp": "^1.0.0",
-				"eslint-template-visitor": "^2.3.2",
 				"eslint-utils": "^3.0.0",
 				"esquery": "^1.4.0",
-				"indent-string": "4",
+				"indent-string": "^4.0.0",
 				"is-builtin-module": "^3.1.0",
 				"lodash": "^4.17.21",
 				"pluralize": "^8.0.0",
 				"read-pkg-up": "^7.0.1",
-				"regexp-tree": "^0.1.23",
+				"regexp-tree": "^0.1.24",
 				"safe-regex": "^2.1.1",
 				"semver": "^7.3.5",
 				"strip-indent": "^3.0.0"
@@ -4964,6 +4610,18 @@
 			"integrity": "sha512-tkISFycJmRFMKsEjetRcAmWSHKJKnw5rKHDxfE7Ob3tF5lbmYlCLfNKH0UwanOpSdulpe52s3K+CBHSd6qUUNQ==",
 			"dev": true
 		},
+		"eslint-plugin-yml": {
+			"version": "0.13.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-yml/-/eslint-plugin-yml-0.13.0.tgz",
+			"integrity": "sha512-rZvdnhe28jIbgSIZo3qYqkl9hKslyTDfMwqIGDzz873gxghzBw0yeFG+P7sMfOkFfpqwJzZy3IKe2cIiCp4FrA==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.3.2",
+				"lodash": "^4.17.21",
+				"natural-compare": "^1.4.0",
+				"yaml-eslint-parser": "^0.5.0"
+			}
+		},
 		"eslint-scope": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -4974,19 +4632,6 @@
 				"estraverse": "^4.1.1"
 			}
 		},
-		"eslint-template-visitor": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/eslint-template-visitor/-/eslint-template-visitor-2.3.2.tgz",
-			"integrity": "sha512-3ydhqFpuV7x1M9EK52BPNj6V0Kwu0KKkcIAfpUhwHbR8ocRln/oUHgfxQupY8O1h4Qv/POHDumb/BwwNfxbtnA==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.12.16",
-				"@babel/eslint-parser": "^7.12.16",
-				"eslint-visitor-keys": "^2.0.0",
-				"esquery": "^1.3.1",
-				"multimap": "^1.1.0"
-			}
-		},
 		"eslint-utils": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
@@ -5246,12 +4891,6 @@
 			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
 			"dev": true
 		},
-		"gensync": {
-			"version": "1.0.0-beta.2",
-			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-			"dev": true
-		},
 		"get-intrinsic": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
@@ -5290,17 +4929,6 @@
 			"dev": true,
 			"requires": {
 				"is-glob": "^4.0.1"
-			},
-			"dependencies": {
-				"is-glob": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-					"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^2.1.1"
-					}
-				}
 			}
 		},
 		"global-modules": {
@@ -5345,9 +4973,9 @@
 			}
 		},
 		"grunt": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.4.1.tgz",
-			"integrity": "sha512-ZXIYXTsAVrA7sM+jZxjQdrBOAg7DyMUplOMhTaspMRExei+fD0BTwdWXnn0W5SXqhb/Q/nlkzXclSi3IH55PIA==",
+			"version": "1.5.2",
+			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.2.tgz",
+			"integrity": "sha512-XCtfaIu72OyDqK24MjWiGC9SwlkuhkS1mrULr1xzuJ2XqAFhP3ZAchZGHJeSCY6mkaOXU4F7SbmmCF7xIVoC9w==",
 			"dev": true,
 			"requires": {
 				"dateformat": "~3.0.3",
@@ -5355,7 +4983,7 @@
 				"exit": "~0.1.2",
 				"findup-sync": "~0.3.0",
 				"glob": "~7.1.6",
-				"grunt-cli": "~1.4.2",
+				"grunt-cli": "~1.4.3",
 				"grunt-known-options": "~2.0.0",
 				"grunt-legacy-log": "~3.0.0",
 				"grunt-legacy-util": "~2.0.1",
@@ -5365,39 +4993,6 @@
 				"mkdirp": "~1.0.4",
 				"nopt": "~3.0.6",
 				"rimraf": "~3.0.2"
-			},
-			"dependencies": {
-				"grunt-cli": {
-					"version": "1.4.2",
-					"resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.2.tgz",
-					"integrity": "sha512-wsu6BZh7KCnfeaSkDrKIAvOlqGKxNRTZjc8xfZlvxCByQIqUfZ31kh5uHpPnhQ4NdVgvaWaVxa1LUbVU80nACw==",
-					"dev": true,
-					"requires": {
-						"grunt-known-options": "~1.1.1",
-						"interpret": "~1.1.0",
-						"liftup": "~3.0.1",
-						"nopt": "~4.0.1",
-						"v8flags": "~3.2.0"
-					},
-					"dependencies": {
-						"nopt": {
-							"version": "4.0.3",
-							"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
-							"integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
-							"dev": true,
-							"requires": {
-								"abbrev": "1",
-								"osenv": "^0.1.4"
-							}
-						}
-					}
-				},
-				"grunt-known-options": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz",
-					"integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==",
-					"dev": true
-				}
 			}
 		},
 		"grunt-banana-checker": {
@@ -5406,6 +5001,31 @@
 			"integrity": "sha512-SqPiB6OazWqR8USL0NymtuT5Br3mD9WBBsM1rHC/3wIi2SrZNM6/+j9CIeuEM5oCn+AtO2Y0+rzzFyOdC9afAg==",
 			"dev": true
 		},
+		"grunt-cli": {
+			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz",
+			"integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==",
+			"dev": true,
+			"requires": {
+				"grunt-known-options": "~2.0.0",
+				"interpret": "~1.1.0",
+				"liftup": "~3.0.1",
+				"nopt": "~4.0.1",
+				"v8flags": "~3.2.0"
+			},
+			"dependencies": {
+				"nopt": {
+					"version": "4.0.3",
+					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+					"integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+					"dev": true,
+					"requires": {
+						"abbrev": "1",
+						"osenv": "^0.1.4"
+					}
+				}
+			}
+		},
 		"grunt-eslint": {
 			"version": "23.0.0",
 			"resolved": "https://registry.npmjs.org/grunt-eslint/-/grunt-eslint-23.0.0.tgz",
@@ -5416,6 +5036,12 @@
 				"eslint": "^7.0.0"
 			}
 		},
+		"grunt-known-options": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz",
+			"integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==",
+			"dev": true
+		},
 		"grunt-legacy-log": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz",
@@ -5612,9 +5238,9 @@
 			}
 		},
 		"is-core-module": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.3.0.tgz",
-			"integrity": "sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==",
+			"version": "2.9.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
+			"integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
 			"dev": true,
 			"requires": {
 				"has": "^1.0.3"
@@ -5633,9 +5259,9 @@
 			"dev": true
 		},
 		"is-glob": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-			"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
 			"dev": true,
 			"requires": {
 				"is-extglob": "^2.1.1"
@@ -5726,12 +5352,6 @@
 			"integrity": "sha512-zRokSWcPLSWkoNzsWn9pq7YYSwDhKyEe+cJYT2qaPqLOOJb5sFSi46BPj81vP+e8chvCNdQL9RG86Bi9EI6MDw==",
 			"dev": true
 		},
-		"jsesc": {
-			"version": "2.5.2",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-			"dev": true
-		},
 		"json-parse-even-better-errors": {
 			"version": "2.3.1",
 			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -5750,15 +5370,6 @@
 			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
 			"dev": true
 		},
-		"json5": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-			"dev": true,
-			"requires": {
-				"minimist": "^1.2.5"
-			}
-		},
 		"kind-of": {
 			"version": "6.0.3",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -5802,16 +5413,6 @@
 						"micromatch": "^4.0.2",
 						"resolve-dir": "^1.0.1"
 					}
-				},
-				"resolve": {
-					"version": "1.20.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-					"integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-					"dev": true,
-					"requires": {
-						"is-core-module": "^2.2.0",
-						"path-parse": "^1.0.6"
-					}
 				}
 			}
 		},
@@ -5891,13 +5492,13 @@
 			"dev": true
 		},
 		"micromatch": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-			"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
 			"dev": true,
 			"requires": {
-				"braces": "^3.0.1",
-				"picomatch": "^2.2.3"
+				"braces": "^3.0.2",
+				"picomatch": "^2.3.1"
 			}
 		},
 		"min-indent": {
@@ -5915,12 +5516,6 @@
 				"brace-expansion": "^1.1.7"
 			}
 		},
-		"minimist": {
-			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-			"dev": true
-		},
 		"mkdirp": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -5933,12 +5528,6 @@
 			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
 			"dev": true
 		},
-		"multimap": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/multimap/-/multimap-1.1.0.tgz",
-			"integrity": "sha512-0ZIR9PasPxGXmRsEF8jsDzndzHDj7tIav+JUmvIFB/WHswliFnquxECT/De7GR4yg99ky/NlRKJT82G1y271bw==",
-			"dev": true
-		},
 		"natural-compare": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -5946,9 +5535,9 @@
 			"dev": true
 		},
 		"node-releases": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
-			"integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz",
+			"integrity": "sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw==",
 			"dev": true
 		},
 		"nopt": {
@@ -6164,9 +5753,9 @@
 			"dev": true
 		},
 		"picomatch": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
-			"integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
 			"dev": true
 		},
 		"pluralize": {
@@ -6270,9 +5859,9 @@
 			}
 		},
 		"rechoir": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
-			"integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==",
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
+			"integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
 			"dev": true,
 			"requires": {
 				"resolve": "^1.9.0"
@@ -6285,9 +5874,9 @@
 			"dev": true
 		},
 		"regexpp": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-			"integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
 			"dev": true
 		},
 		"regextras": {
@@ -6309,12 +5898,14 @@
 			"dev": true
 		},
 		"resolve": {
-			"version": "1.17.0",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-			"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+			"version": "1.22.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
+			"integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
 			"dev": true,
 			"requires": {
-				"path-parse": "^1.0.6"
+				"is-core-module": "^2.8.1",
+				"path-parse": "^1.0.7",
+				"supports-preserve-symlinks-flag": "^1.0.0"
 			}
 		},
 		"resolve-dir": {
@@ -6342,12 +5933,6 @@
 				"glob": "^7.1.3"
 			}
 		},
-		"safe-buffer": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-			"dev": true
-		},
 		"safe-regex": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-2.1.1.tgz",
@@ -6398,12 +5983,6 @@
 				"is-fullwidth-code-point": "^3.0.0"
 			}
 		},
-		"source-map": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-			"dev": true
-		},
 		"spdx-correct": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
@@ -6454,12 +6033,12 @@
 			}
 		},
 		"strip-ansi": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-			"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
 			"dev": true,
 			"requires": {
-				"ansi-regex": "^5.0.0"
+				"ansi-regex": "^5.0.1"
 			}
 		},
 		"strip-indent": {
@@ -6486,6 +6065,12 @@
 				"has-flag": "^4.0.0"
 			}
 		},
+		"supports-preserve-symlinks-flag": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+			"dev": true
+		},
 		"table": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/table/-/table-6.1.0.tgz",
@@ -6529,12 +6114,6 @@
 			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
 			"dev": true
 		},
-		"to-fast-properties": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-			"dev": true
-		},
 		"to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -6704,6 +6283,31 @@
 			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
 			"dev": true
 		},
+		"yaml": {
+			"version": "1.10.2",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+			"dev": true
+		},
+		"yaml-eslint-parser": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/yaml-eslint-parser/-/yaml-eslint-parser-0.5.0.tgz",
+			"integrity": "sha512-nJeyLA3YHAzhBTZbRAbu3W6xrSCucyxExmA+ZDtEdUFpGllxAZpto2Zxo2IG0r0eiuEiBM4e+wiAdxTziTq94g==",
+			"dev": true,
+			"requires": {
+				"eslint-visitor-keys": "^3.0.0",
+				"lodash": "^4.17.21",
+				"yaml": "^1.10.2"
+			},
+			"dependencies": {
+				"eslint-visitor-keys": {
+					"version": "3.3.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+					"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+					"dev": true
+				}
+			}
+		},
 		"yocto-queue": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
diff --git a/package.json b/package.json
index 012e1e4..7e4244b 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
 		"test": "grunt test"
 	},
 	"devDependencies": {
-		"eslint-config-wikimedia": "0.21.0",
-		"grunt": "1.4.1",
+		"eslint-config-wikimedia": "0.22.1",
+		"grunt": "1.5.2",
 		"grunt-banana-checker": "0.9.0",
 		"grunt-eslint": "23.0.0"
 	}

From 7cee00dbe4abb90250d1e8a5941170806f4e9929 Mon Sep 17 00:00:00 2001
From: Umherirrender <umherirrender_de.wp@web.de>
Date: Wed, 27 Apr 2022 23:32:20 +0200
Subject: [PATCH 057/117] Require MediaWiki 1.35 in extension.json for use of
 HookHandlers

Change-Id: I41ca58fcbf29045d44731a9ad0f523909d2ed099
---
 extension.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension.json b/extension.json
index 30fa1df..d9cc544 100644
--- a/extension.json
+++ b/extension.json
@@ -8,7 +8,7 @@
 	"descriptionmsg": "drawioeditor-desc",
 	"type": "parserhook",
 	"requires": {
-		"MediaWiki": ">= 1.31.0"
+		"MediaWiki": ">= 1.35.0"
 	},
 	"ExtensionMessagesFiles": {
 		"DrawioEditorMagic": "DrawioEditor.magic.php"

From 388fcab476cb6c279c906afe2e2bdaa8689d3988 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Fri, 20 May 2022 23:25:31 +0000
Subject: [PATCH 058/117] build: Updating dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

composer:
* mediawiki/mediawiki-codesniffer: 38.0.0 → 39.0.0
  The following sniffs are failing and were disabled:
  * MediaWiki.NamingConventions.ValidGlobalName.allowedPrefix

* php-parallel-lint/php-console-highlighter: 0.5.0 → 1.0.0
* php-parallel-lint/php-parallel-lint: 1.3.1 → 1.3.2

npm:
* grunt-eslint: 23.0.0 → 24.0.0

Change-Id: I575b04f612d1f6d188737cd96a3aa1e2b64b8267
---
 .phpcs.xml        |    1 +
 composer.json     |    6 +-
 package-lock.json | 1438 +++++++++++++--------------------------------
 package.json      |    2 +-
 4 files changed, 404 insertions(+), 1043 deletions(-)

diff --git a/.phpcs.xml b/.phpcs.xml
index 633949f..3946083 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -4,6 +4,7 @@
 	<arg name="extensions" value="php"/>
 	<arg name="encoding" value="UTF-8"/>
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+		<exclude name="MediaWiki.NamingConventions.ValidGlobalName.allowedPrefix" />
 		<properties>
 			<property name="allowedPrefixes" type="array">
 				<element value="eg" />
diff --git a/composer.json b/composer.json
index 1cb4f5f..8639239 100644
--- a/composer.json
+++ b/composer.json
@@ -6,10 +6,10 @@
 		"composer/installers": "~1.0"
 	},
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "38.0.0",
+		"mediawiki/mediawiki-codesniffer": "39.0.0",
 		"mediawiki/minus-x": "1.1.1",
-		"php-parallel-lint/php-console-highlighter": "0.5.0",
-		"php-parallel-lint/php-parallel-lint": "1.3.1"
+		"php-parallel-lint/php-console-highlighter": "1.0.0",
+		"php-parallel-lint/php-parallel-lint": "1.3.2"
 	},
 	"scripts": {
 		"test": [
diff --git a/package-lock.json b/package-lock.json
index 7ad6163..10c767b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
 				"eslint-config-wikimedia": "0.22.1",
 				"grunt": "1.5.2",
 				"grunt-banana-checker": "0.9.0",
-				"grunt-eslint": "23.0.0"
+				"grunt-eslint": "24.0.0"
 			}
 		},
 		"node_modules/@babel/code-frame": {
@@ -121,32 +121,62 @@
 			}
 		},
 		"node_modules/@eslint/eslintrc": {
-			"version": "0.4.3",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
-			"integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
+			"integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
 			"dev": true,
 			"dependencies": {
 				"ajv": "^6.12.4",
-				"debug": "^4.1.1",
-				"espree": "^7.3.0",
-				"globals": "^13.9.0",
-				"ignore": "^4.0.6",
+				"debug": "^4.3.2",
+				"espree": "^9.3.2",
+				"globals": "^13.15.0",
+				"ignore": "^5.2.0",
 				"import-fresh": "^3.2.1",
-				"js-yaml": "^3.13.1",
-				"minimatch": "^3.0.4",
+				"js-yaml": "^4.1.0",
+				"minimatch": "^3.1.2",
 				"strip-json-comments": "^3.1.1"
 			},
 			"engines": {
-				"node": "^10.12.0 || >=12.0.0"
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/@eslint/eslintrc/node_modules/argparse": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+			"dev": true
+		},
+		"node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^2.0.1"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/@eslint/eslintrc/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"dev": true,
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
 			}
 		},
 		"node_modules/@humanwhocodes/config-array": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
-			"integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+			"version": "0.9.5",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
+			"integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
 			"dev": true,
 			"dependencies": {
-				"@humanwhocodes/object-schema": "^1.2.0",
+				"@humanwhocodes/object-schema": "^1.2.1",
 				"debug": "^4.1.1",
 				"minimatch": "^3.0.4"
 			},
@@ -221,15 +251,6 @@
 				"url": "https://github.com/sponsors/epoberezkin"
 			}
 		},
-		"node_modules/ansi-colors": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-			"dev": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/ansi-regex": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -300,15 +321,6 @@
 			"integrity": "sha512-n2RC9d6XatVbWFdHLimzzUJxJ1KY8LdjqrW6YvGPiRmsHkhOUx74/Ct10x5Yo7bC/Jvqx7cDEW8IMPv/+vwEzA==",
 			"dev": true
 		},
-		"node_modules/astral-regex": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/async": {
 			"version": "3.2.3",
 			"resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
@@ -384,16 +396,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/call-bind": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-			"dev": true,
-			"dependencies": {
-				"function-bind": "^1.1.1",
-				"get-intrinsic": "^1.0.2"
-			}
-		},
 		"node_modules/callsites": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -420,9 +422,9 @@
 			]
 		},
 		"node_modules/chalk": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-			"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
 			"dependencies": {
 				"ansi-styles": "^4.1.0",
@@ -430,6 +432,9 @@
 			},
 			"engines": {
 				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
 		"node_modules/ci-info": {
@@ -591,24 +596,6 @@
 			"integrity": "sha512-0pHGE53WkYoFbsgwYcVKEpWa6jbzlvkohIEA2CUoZ9b5KC+w/zlMiQHvW/4IBcOh7YoEFqRNavgTk02TBoUTUw==",
 			"dev": true
 		},
-		"node_modules/emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
-		},
-		"node_modules/enquirer": {
-			"version": "2.3.6",
-			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-			"dev": true,
-			"dependencies": {
-				"ansi-colors": "^4.1.1"
-			},
-			"engines": {
-				"node": ">=8.6"
-			}
-		},
 		"node_modules/error-ex": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -637,49 +624,44 @@
 			}
 		},
 		"node_modules/eslint": {
-			"version": "7.32.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-			"integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+			"version": "8.16.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
+			"integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
 			"dev": true,
 			"dependencies": {
-				"@babel/code-frame": "7.12.11",
-				"@eslint/eslintrc": "^0.4.3",
-				"@humanwhocodes/config-array": "^0.5.0",
+				"@eslint/eslintrc": "^1.3.0",
+				"@humanwhocodes/config-array": "^0.9.2",
 				"ajv": "^6.10.0",
 				"chalk": "^4.0.0",
 				"cross-spawn": "^7.0.2",
-				"debug": "^4.0.1",
+				"debug": "^4.3.2",
 				"doctrine": "^3.0.0",
-				"enquirer": "^2.3.5",
 				"escape-string-regexp": "^4.0.0",
-				"eslint-scope": "^5.1.1",
-				"eslint-utils": "^2.1.0",
-				"eslint-visitor-keys": "^2.0.0",
-				"espree": "^7.3.1",
+				"eslint-scope": "^7.1.1",
+				"eslint-utils": "^3.0.0",
+				"eslint-visitor-keys": "^3.3.0",
+				"espree": "^9.3.2",
 				"esquery": "^1.4.0",
 				"esutils": "^2.0.2",
 				"fast-deep-equal": "^3.1.3",
 				"file-entry-cache": "^6.0.1",
 				"functional-red-black-tree": "^1.0.1",
-				"glob-parent": "^5.1.2",
-				"globals": "^13.6.0",
-				"ignore": "^4.0.6",
+				"glob-parent": "^6.0.1",
+				"globals": "^13.15.0",
+				"ignore": "^5.2.0",
 				"import-fresh": "^3.0.0",
 				"imurmurhash": "^0.1.4",
 				"is-glob": "^4.0.0",
-				"js-yaml": "^3.13.1",
+				"js-yaml": "^4.1.0",
 				"json-stable-stringify-without-jsonify": "^1.0.1",
 				"levn": "^0.4.1",
 				"lodash.merge": "^4.6.2",
-				"minimatch": "^3.0.4",
+				"minimatch": "^3.1.2",
 				"natural-compare": "^1.4.0",
 				"optionator": "^0.9.1",
-				"progress": "^2.0.0",
-				"regexpp": "^3.1.0",
-				"semver": "^7.2.1",
-				"strip-ansi": "^6.0.0",
+				"regexpp": "^3.2.0",
+				"strip-ansi": "^6.0.1",
 				"strip-json-comments": "^3.1.0",
-				"table": "^6.0.9",
 				"text-table": "^0.2.0",
 				"v8-compile-cache": "^2.0.3"
 			},
@@ -687,7 +669,7 @@
 				"eslint": "bin/eslint.js"
 			},
 			"engines": {
-				"node": "^10.12.0 || >=12.0.0"
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
 			"funding": {
 				"url": "https://opencollective.com/eslint"
@@ -715,227 +697,6 @@
 				"eslint-plugin-yml": "^0.13.0"
 			}
 		},
-		"node_modules/eslint-config-wikimedia/node_modules/@eslint/eslintrc": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.2.tgz",
-			"integrity": "sha512-lTVWHs7O2hjBFZunXTZYnYqtB9GakA1lnxIf+gKq2nY5gxkkNi/lQvveW6t8gFdOHTg6nG50Xs95PrLqVpcaLg==",
-			"dev": true,
-			"dependencies": {
-				"ajv": "^6.12.4",
-				"debug": "^4.3.2",
-				"espree": "^9.3.1",
-				"globals": "^13.9.0",
-				"ignore": "^5.2.0",
-				"import-fresh": "^3.2.1",
-				"js-yaml": "^4.1.0",
-				"minimatch": "^3.0.4",
-				"strip-json-comments": "^3.1.1"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
-		"node_modules/eslint-config-wikimedia/node_modules/@humanwhocodes/config-array": {
-			"version": "0.9.5",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
-			"integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
-			"dev": true,
-			"dependencies": {
-				"@humanwhocodes/object-schema": "^1.2.1",
-				"debug": "^4.1.1",
-				"minimatch": "^3.0.4"
-			},
-			"engines": {
-				"node": ">=10.10.0"
-			}
-		},
-		"node_modules/eslint-config-wikimedia/node_modules/acorn": {
-			"version": "8.7.1",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-			"integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
-			"dev": true,
-			"bin": {
-				"acorn": "bin/acorn"
-			},
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
-		"node_modules/eslint-config-wikimedia/node_modules/argparse": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"dev": true
-		},
-		"node_modules/eslint-config-wikimedia/node_modules/escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/eslint-config-wikimedia/node_modules/eslint": {
-			"version": "8.14.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.14.0.tgz",
-			"integrity": "sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw==",
-			"dev": true,
-			"dependencies": {
-				"@eslint/eslintrc": "^1.2.2",
-				"@humanwhocodes/config-array": "^0.9.2",
-				"ajv": "^6.10.0",
-				"chalk": "^4.0.0",
-				"cross-spawn": "^7.0.2",
-				"debug": "^4.3.2",
-				"doctrine": "^3.0.0",
-				"escape-string-regexp": "^4.0.0",
-				"eslint-scope": "^7.1.1",
-				"eslint-utils": "^3.0.0",
-				"eslint-visitor-keys": "^3.3.0",
-				"espree": "^9.3.1",
-				"esquery": "^1.4.0",
-				"esutils": "^2.0.2",
-				"fast-deep-equal": "^3.1.3",
-				"file-entry-cache": "^6.0.1",
-				"functional-red-black-tree": "^1.0.1",
-				"glob-parent": "^6.0.1",
-				"globals": "^13.6.0",
-				"ignore": "^5.2.0",
-				"import-fresh": "^3.0.0",
-				"imurmurhash": "^0.1.4",
-				"is-glob": "^4.0.0",
-				"js-yaml": "^4.1.0",
-				"json-stable-stringify-without-jsonify": "^1.0.1",
-				"levn": "^0.4.1",
-				"lodash.merge": "^4.6.2",
-				"minimatch": "^3.0.4",
-				"natural-compare": "^1.4.0",
-				"optionator": "^0.9.1",
-				"regexpp": "^3.2.0",
-				"strip-ansi": "^6.0.1",
-				"strip-json-comments": "^3.1.0",
-				"text-table": "^0.2.0",
-				"v8-compile-cache": "^2.0.3"
-			},
-			"bin": {
-				"eslint": "bin/eslint.js"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/eslint-config-wikimedia/node_modules/eslint-scope": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-			"integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-			"dev": true,
-			"dependencies": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^5.2.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
-		"node_modules/eslint-config-wikimedia/node_modules/eslint-utils": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-			"dev": true,
-			"dependencies": {
-				"eslint-visitor-keys": "^2.0.0"
-			},
-			"engines": {
-				"node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/mysticatea"
-			},
-			"peerDependencies": {
-				"eslint": ">=5"
-			}
-		},
-		"node_modules/eslint-config-wikimedia/node_modules/eslint/node_modules/eslint-visitor-keys": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-			"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-			"dev": true,
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
-		"node_modules/eslint-config-wikimedia/node_modules/espree": {
-			"version": "9.3.1",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz",
-			"integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==",
-			"dev": true,
-			"dependencies": {
-				"acorn": "^8.7.0",
-				"acorn-jsx": "^5.3.1",
-				"eslint-visitor-keys": "^3.3.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
-		"node_modules/eslint-config-wikimedia/node_modules/espree/node_modules/eslint-visitor-keys": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-			"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-			"dev": true,
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
-		"node_modules/eslint-config-wikimedia/node_modules/estraverse": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/eslint-config-wikimedia/node_modules/glob-parent": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-			"dev": true,
-			"dependencies": {
-				"is-glob": "^4.0.3"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/eslint-config-wikimedia/node_modules/ignore": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-			"integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-			"dev": true,
-			"engines": {
-				"node": ">= 4"
-			}
-		},
-		"node_modules/eslint-config-wikimedia/node_modules/js-yaml": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-			"dev": true,
-			"dependencies": {
-				"argparse": "^2.0.1"
-			},
-			"bin": {
-				"js-yaml": "bin/js-yaml.js"
-			}
-		},
 		"node_modules/eslint-plugin-compat": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-4.0.2.tgz",
@@ -1018,18 +779,6 @@
 				"eslint": ">= 7"
 			}
 		},
-		"node_modules/eslint-plugin-json-es/node_modules/acorn": {
-			"version": "8.7.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-			"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-			"dev": true,
-			"bin": {
-				"acorn": "bin/acorn"
-			},
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
 		"node_modules/eslint-plugin-json-es/node_modules/eslint-visitor-keys": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
@@ -1039,20 +788,6 @@
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			}
 		},
-		"node_modules/eslint-plugin-json-es/node_modules/espree": {
-			"version": "9.3.0",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz",
-			"integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==",
-			"dev": true,
-			"dependencies": {
-				"acorn": "^8.7.0",
-				"acorn-jsx": "^5.3.1",
-				"eslint-visitor-keys": "^3.1.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
 		"node_modules/eslint-plugin-mediawiki": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-mediawiki/-/eslint-plugin-mediawiki-0.3.0.tgz",
@@ -1213,15 +948,6 @@
 				"node": ">=8.10.0"
 			}
 		},
-		"node_modules/eslint-plugin-node/node_modules/ignore": {
-			"version": "5.1.8",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-			"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-			"dev": true,
-			"engines": {
-				"node": ">= 4"
-			}
-		},
 		"node_modules/eslint-plugin-node/node_modules/semver": {
 			"version": "6.3.0",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -1362,97 +1088,197 @@
 			"integrity": "sha512-rZvdnhe28jIbgSIZo3qYqkl9hKslyTDfMwqIGDzz873gxghzBw0yeFG+P7sMfOkFfpqwJzZy3IKe2cIiCp4FrA==",
 			"dev": true,
 			"dependencies": {
-				"debug": "^4.3.2",
-				"lodash": "^4.17.21",
-				"natural-compare": "^1.4.0",
-				"yaml-eslint-parser": "^0.5.0"
+				"debug": "^4.3.2",
+				"lodash": "^4.17.21",
+				"natural-compare": "^1.4.0",
+				"yaml-eslint-parser": "^0.5.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ota-meshi"
+			},
+			"peerDependencies": {
+				"eslint": ">=6.0.0"
+			}
+		},
+		"node_modules/eslint-scope": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"dev": true,
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/eslint-utils": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+			"integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+			"dev": true,
+			"dependencies": {
+				"eslint-visitor-keys": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+			"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/eslint-visitor-keys": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
+			"integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/eslint/node_modules/argparse": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+			"dev": true
+		},
+		"node_modules/eslint/node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint/node_modules/eslint-scope": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+			"integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+			"dev": true,
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/eslint/node_modules/eslint-utils": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+			"dev": true,
+			"dependencies": {
+				"eslint-visitor-keys": "^2.0.0"
 			},
 			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+				"node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/ota-meshi"
+				"url": "https://github.com/sponsors/mysticatea"
 			},
 			"peerDependencies": {
-				"eslint": ">=6.0.0"
+				"eslint": ">=5"
 			}
 		},
-		"node_modules/eslint-scope": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+		"node_modules/eslint/node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
 			"dev": true,
-			"dependencies": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^4.1.1"
-			},
 			"engines": {
-				"node": ">=8.0.0"
+				"node": ">=10"
 			}
 		},
-		"node_modules/eslint-utils": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-			"integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+		"node_modules/eslint/node_modules/eslint-visitor-keys": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+			"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
 			"dev": true,
-			"dependencies": {
-				"eslint-visitor-keys": "^1.1.0"
-			},
 			"engines": {
-				"node": ">=6"
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			}
 		},
-		"node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-			"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+		"node_modules/eslint/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
 			"dev": true,
 			"engines": {
-				"node": ">=4"
+				"node": ">=4.0"
 			}
 		},
-		"node_modules/eslint-visitor-keys": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
-			"integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
+		"node_modules/eslint/node_modules/js-yaml": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
 			"dev": true,
-			"engines": {
-				"node": ">=10"
+			"dependencies": {
+				"argparse": "^2.0.1"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
 			}
 		},
-		"node_modules/eslint/node_modules/escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+		"node_modules/eslint/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
 			"dev": true,
-			"engines": {
-				"node": ">=10"
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
 			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+			"engines": {
+				"node": "*"
 			}
 		},
 		"node_modules/espree": {
-			"version": "7.3.1",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-			"integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+			"version": "9.3.2",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
+			"integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
 			"dev": true,
 			"dependencies": {
-				"acorn": "^7.4.0",
-				"acorn-jsx": "^5.3.1",
-				"eslint-visitor-keys": "^1.3.0"
+				"acorn": "^8.7.1",
+				"acorn-jsx": "^5.3.2",
+				"eslint-visitor-keys": "^3.3.0"
 			},
 			"engines": {
-				"node": "^10.12.0 || >=12.0.0"
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/espree/node_modules/acorn": {
+			"version": "8.7.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
+			"integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+			"dev": true,
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
 			}
 		},
 		"node_modules/espree/node_modules/eslint-visitor-keys": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-			"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+			"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
 			"dev": true,
 			"engines": {
-				"node": ">=4"
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			}
 		},
 		"node_modules/esprima": {
@@ -1730,17 +1556,6 @@
 			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
 			"dev": true
 		},
-		"node_modules/get-intrinsic": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-			"integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-			"dev": true,
-			"dependencies": {
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-symbols": "^1.0.1"
-			}
-		},
 		"node_modules/getobject": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/getobject/-/getobject-1.0.0.tgz",
@@ -1768,15 +1583,15 @@
 			}
 		},
 		"node_modules/glob-parent": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
 			"dev": true,
 			"dependencies": {
-				"is-glob": "^4.0.1"
+				"is-glob": "^4.0.3"
 			},
 			"engines": {
-				"node": ">= 6"
+				"node": ">=10.13.0"
 			}
 		},
 		"node_modules/global-modules": {
@@ -1810,9 +1625,9 @@
 			}
 		},
 		"node_modules/globals": {
-			"version": "13.12.1",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz",
-			"integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
+			"version": "13.15.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
+			"integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
 			"dev": true,
 			"dependencies": {
 				"type-fest": "^0.20.2"
@@ -1907,16 +1722,22 @@
 			}
 		},
 		"node_modules/grunt-eslint": {
-			"version": "23.0.0",
-			"resolved": "https://registry.npmjs.org/grunt-eslint/-/grunt-eslint-23.0.0.tgz",
-			"integrity": "sha512-QqHSAiGF08EVD7YlD4OSRWuLRaDvpsRdTptwy9WaxUXE+03mCLVA/lEaR6SHWehF7oUwIqCEjaNONeeeWlB4LQ==",
+			"version": "24.0.0",
+			"resolved": "https://registry.npmjs.org/grunt-eslint/-/grunt-eslint-24.0.0.tgz",
+			"integrity": "sha512-WpTeBBFweyhMuPjGwRSQV9JFJ+EczIdlsc7Dd/1g78QVI1aZsk4g/H3e+3S5HEwsS1RKL2YZIrGj8hMLlBfN8w==",
 			"dev": true,
 			"dependencies": {
-				"chalk": "^4.0.0",
-				"eslint": "^7.0.0"
+				"chalk": "^4.1.2",
+				"eslint": "^8.0.1"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			},
+			"peerDependencies": {
+				"grunt": ">=1"
 			}
 		},
 		"node_modules/grunt-known-options": {
@@ -2016,15 +1837,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/has-symbols": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-			"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
 		"node_modules/homedir-polyfill": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
@@ -2065,9 +1877,9 @@
 			}
 		},
 		"node_modules/ignore": {
-			"version": "4.0.6",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+			"integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
 			"dev": true,
 			"engines": {
 				"node": ">= 4"
@@ -2154,18 +1966,6 @@
 			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
 			"dev": true
 		},
-		"node_modules/is-boolean-object": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
-			"integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
-			"dev": true,
-			"dependencies": {
-				"call-bind": "^1.0.0"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
 		"node_modules/is-builtin-module": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.1.0.tgz",
@@ -2199,15 +1999,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/is-fullwidth-code-point": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/is-glob": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -2229,15 +2020,6 @@
 				"node": ">=0.12.0"
 			}
 		},
-		"node_modules/is-number-object": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
-			"integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
 		"node_modules/is-plain-object": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -2262,15 +2044,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/is-string": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-			"integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
 		"node_modules/is-unc-path": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
@@ -2436,18 +2209,6 @@
 			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
 			"dev": true
 		},
-		"node_modules/lodash.clonedeep": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-			"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-			"dev": true
-		},
-		"node_modules/lodash.flatten": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-			"integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
-			"dev": true
-		},
 		"node_modules/lodash.memoize": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -2460,12 +2221,6 @@
 			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
 			"dev": true
 		},
-		"node_modules/lodash.truncate": {
-			"version": "4.4.2",
-			"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-			"integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-			"dev": true
-		},
 		"node_modules/lru-cache": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -2872,15 +2627,6 @@
 				"node": ">= 0.8.0"
 			}
 		},
-		"node_modules/progress": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
 		"node_modules/punycode": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -3031,15 +2777,6 @@
 				"node": ">=0.1.14"
 			}
 		},
-		"node_modules/require-from-string": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/requireindex": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
@@ -3151,20 +2888,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/slice-ansi": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-			"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-			"dev": true,
-			"dependencies": {
-				"ansi-styles": "^4.0.0",
-				"astral-regex": "^2.0.0",
-				"is-fullwidth-code-point": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/spdx-correct": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
@@ -3203,20 +2926,6 @@
 			"integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
 			"dev": true
 		},
-		"node_modules/string-width": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-			"integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-			"dev": true,
-			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/strip-ansi": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -3277,44 +2986,6 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/table": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/table/-/table-6.1.0.tgz",
-			"integrity": "sha512-T4G5KMmqIk6X87gLKWyU5exPpTjLjY5KyrFWaIjv3SvgaIUGXV7UEzGEnZJdTA38/yUS6f9PlKezQ0bYXG3iIQ==",
-			"dev": true,
-			"dependencies": {
-				"ajv": "^8.0.1",
-				"is-boolean-object": "^1.1.0",
-				"is-number-object": "^1.0.4",
-				"is-string": "^1.0.5",
-				"lodash.clonedeep": "^4.5.0",
-				"lodash.flatten": "^4.4.0",
-				"lodash.truncate": "^4.4.2",
-				"slice-ansi": "^4.0.0",
-				"string-width": "^4.2.0"
-			},
-			"engines": {
-				"node": ">=10.0.0"
-			}
-		},
-		"node_modules/table/node_modules/ajv": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.1.0.tgz",
-			"integrity": "sha512-B/Sk2Ix7A36fs/ZkuGLIR86EdjbgR6fsAcbx9lOP/QBSXujDNbVmIS/U4Itz5k8fPFDeVZl/zQ/gJW4Jrq6XjQ==",
-			"dev": true,
-			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
-			}
-		},
-		"node_modules/table/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"dev": true
-		},
 		"node_modules/text-table": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -3453,18 +3124,6 @@
 				"eslint": ">=6.0.0"
 			}
 		},
-		"node_modules/vue-eslint-parser/node_modules/acorn": {
-			"version": "8.7.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-			"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-			"dev": true,
-			"bin": {
-				"acorn": "bin/acorn"
-			},
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
 		"node_modules/vue-eslint-parser/node_modules/eslint-scope": {
 			"version": "7.1.0",
 			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz",
@@ -3487,20 +3146,6 @@
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			}
 		},
-		"node_modules/vue-eslint-parser/node_modules/espree": {
-			"version": "9.3.0",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz",
-			"integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==",
-			"dev": true,
-			"dependencies": {
-				"acorn": "^8.7.0",
-				"acorn-jsx": "^5.3.1",
-				"eslint-visitor-keys": "^3.1.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
 		"node_modules/vue-eslint-parser/node_modules/estraverse": {
 			"version": "5.3.0",
 			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
@@ -3662,46 +3307,72 @@
 					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
 					"dev": true,
 					"requires": {
-						"has-flag": "^3.0.0"
+						"has-flag": "^3.0.0"
+					}
+				}
+			}
+		},
+		"@es-joy/jsdoccomment": {
+			"version": "0.18.0",
+			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.18.0.tgz",
+			"integrity": "sha512-TjT8KJULV4I6ZiwIoKr6eMs+XpRejqwJ/VA+QPDeFGe9j6bZFKmMJ81EeFsGm6JNZhnzm37aoxVROmTh2PZoyA==",
+			"dev": true,
+			"requires": {
+				"comment-parser": "1.3.0",
+				"esquery": "^1.4.0",
+				"jsdoc-type-pratt-parser": "~2.2.2"
+			}
+		},
+		"@eslint/eslintrc": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
+			"integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
+			"dev": true,
+			"requires": {
+				"ajv": "^6.12.4",
+				"debug": "^4.3.2",
+				"espree": "^9.3.2",
+				"globals": "^13.15.0",
+				"ignore": "^5.2.0",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^4.1.0",
+				"minimatch": "^3.1.2",
+				"strip-json-comments": "^3.1.1"
+			},
+			"dependencies": {
+				"argparse": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+					"dev": true
+				},
+				"js-yaml": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+					"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+					"dev": true,
+					"requires": {
+						"argparse": "^2.0.1"
+					}
+				},
+				"minimatch": {
+					"version": "3.1.2",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+					"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+					"dev": true,
+					"requires": {
+						"brace-expansion": "^1.1.7"
 					}
 				}
 			}
 		},
-		"@es-joy/jsdoccomment": {
-			"version": "0.18.0",
-			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.18.0.tgz",
-			"integrity": "sha512-TjT8KJULV4I6ZiwIoKr6eMs+XpRejqwJ/VA+QPDeFGe9j6bZFKmMJ81EeFsGm6JNZhnzm37aoxVROmTh2PZoyA==",
-			"dev": true,
-			"requires": {
-				"comment-parser": "1.3.0",
-				"esquery": "^1.4.0",
-				"jsdoc-type-pratt-parser": "~2.2.2"
-			}
-		},
-		"@eslint/eslintrc": {
-			"version": "0.4.3",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
-			"integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
-			"dev": true,
-			"requires": {
-				"ajv": "^6.12.4",
-				"debug": "^4.1.1",
-				"espree": "^7.3.0",
-				"globals": "^13.9.0",
-				"ignore": "^4.0.6",
-				"import-fresh": "^3.2.1",
-				"js-yaml": "^3.13.1",
-				"minimatch": "^3.0.4",
-				"strip-json-comments": "^3.1.1"
-			}
-		},
 		"@humanwhocodes/config-array": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
-			"integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+			"version": "0.9.5",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
+			"integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
 			"dev": true,
 			"requires": {
-				"@humanwhocodes/object-schema": "^1.2.0",
+				"@humanwhocodes/object-schema": "^1.2.1",
 				"debug": "^4.1.1",
 				"minimatch": "^3.0.4"
 			}
@@ -3746,7 +3417,8 @@
 			"version": "5.3.2",
 			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
 			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-			"dev": true
+			"dev": true,
+			"requires": {}
 		},
 		"ajv": {
 			"version": "6.12.6",
@@ -3760,12 +3432,6 @@
 				"uri-js": "^4.2.2"
 			}
 		},
-		"ansi-colors": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-			"dev": true
-		},
 		"ansi-regex": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -3828,12 +3494,6 @@
 				}
 			}
 		},
-		"astral-regex": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-			"dev": true
-		},
 		"async": {
 			"version": "3.2.3",
 			"resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
@@ -3884,16 +3544,6 @@
 			"integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
 			"dev": true
 		},
-		"call-bind": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-			"dev": true,
-			"requires": {
-				"function-bind": "^1.1.1",
-				"get-intrinsic": "^1.0.2"
-			}
-		},
 		"callsites": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -3907,9 +3557,9 @@
 			"dev": true
 		},
 		"chalk": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-			"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
 			"requires": {
 				"ansi-styles": "^4.1.0",
@@ -4034,21 +3684,6 @@
 			"integrity": "sha512-0pHGE53WkYoFbsgwYcVKEpWa6jbzlvkohIEA2CUoZ9b5KC+w/zlMiQHvW/4IBcOh7YoEFqRNavgTk02TBoUTUw==",
 			"dev": true
 		},
-		"emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
-		},
-		"enquirer": {
-			"version": "2.3.6",
-			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-			"dev": true,
-			"requires": {
-				"ansi-colors": "^4.1.1"
-			}
-		},
 		"error-ex": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -4071,117 +3706,48 @@
 			"dev": true
 		},
 		"eslint": {
-			"version": "7.32.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-			"integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+			"version": "8.16.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
+			"integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "7.12.11",
-				"@eslint/eslintrc": "^0.4.3",
-				"@humanwhocodes/config-array": "^0.5.0",
+				"@eslint/eslintrc": "^1.3.0",
+				"@humanwhocodes/config-array": "^0.9.2",
 				"ajv": "^6.10.0",
 				"chalk": "^4.0.0",
 				"cross-spawn": "^7.0.2",
-				"debug": "^4.0.1",
+				"debug": "^4.3.2",
 				"doctrine": "^3.0.0",
-				"enquirer": "^2.3.5",
 				"escape-string-regexp": "^4.0.0",
-				"eslint-scope": "^5.1.1",
-				"eslint-utils": "^2.1.0",
-				"eslint-visitor-keys": "^2.0.0",
-				"espree": "^7.3.1",
+				"eslint-scope": "^7.1.1",
+				"eslint-utils": "^3.0.0",
+				"eslint-visitor-keys": "^3.3.0",
+				"espree": "^9.3.2",
 				"esquery": "^1.4.0",
 				"esutils": "^2.0.2",
 				"fast-deep-equal": "^3.1.3",
 				"file-entry-cache": "^6.0.1",
 				"functional-red-black-tree": "^1.0.1",
-				"glob-parent": "^5.1.2",
-				"globals": "^13.6.0",
-				"ignore": "^4.0.6",
+				"glob-parent": "^6.0.1",
+				"globals": "^13.15.0",
+				"ignore": "^5.2.0",
 				"import-fresh": "^3.0.0",
 				"imurmurhash": "^0.1.4",
 				"is-glob": "^4.0.0",
-				"js-yaml": "^3.13.1",
+				"js-yaml": "^4.1.0",
 				"json-stable-stringify-without-jsonify": "^1.0.1",
 				"levn": "^0.4.1",
 				"lodash.merge": "^4.6.2",
-				"minimatch": "^3.0.4",
+				"minimatch": "^3.1.2",
 				"natural-compare": "^1.4.0",
 				"optionator": "^0.9.1",
-				"progress": "^2.0.0",
-				"regexpp": "^3.1.0",
-				"semver": "^7.2.1",
-				"strip-ansi": "^6.0.0",
+				"regexpp": "^3.2.0",
+				"strip-ansi": "^6.0.1",
 				"strip-json-comments": "^3.1.0",
-				"table": "^6.0.9",
 				"text-table": "^0.2.0",
 				"v8-compile-cache": "^2.0.3"
 			},
 			"dependencies": {
-				"escape-string-regexp": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-					"dev": true
-				}
-			}
-		},
-		"eslint-config-wikimedia": {
-			"version": "0.22.1",
-			"resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.22.1.tgz",
-			"integrity": "sha512-TtN+gWJrcW0i1sEu7vPE1tHpEilrMUuTxP6UK97Amvva/KDV9/tvRUifGhw0q5uBswp+HWgF12p8rq68hZqMbA==",
-			"dev": true,
-			"requires": {
-				"eslint": "^8.6.0",
-				"eslint-plugin-compat": "^4.0.2",
-				"eslint-plugin-es": "^4.1.0",
-				"eslint-plugin-jsdoc": "^37.7.1",
-				"eslint-plugin-json-es": "^1.5.4",
-				"eslint-plugin-mediawiki": "^0.3.0",
-				"eslint-plugin-mocha": "^9.0.0",
-				"eslint-plugin-no-jquery": "^2.7.0",
-				"eslint-plugin-node": "^11.1.0",
-				"eslint-plugin-qunit": "^7.2.0",
-				"eslint-plugin-unicorn": "^40.1.0",
-				"eslint-plugin-vue": "^8.4.1",
-				"eslint-plugin-wdio": "^7.4.2",
-				"eslint-plugin-yml": "^0.13.0"
-			},
-			"dependencies": {
-				"@eslint/eslintrc": {
-					"version": "1.2.2",
-					"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.2.tgz",
-					"integrity": "sha512-lTVWHs7O2hjBFZunXTZYnYqtB9GakA1lnxIf+gKq2nY5gxkkNi/lQvveW6t8gFdOHTg6nG50Xs95PrLqVpcaLg==",
-					"dev": true,
-					"requires": {
-						"ajv": "^6.12.4",
-						"debug": "^4.3.2",
-						"espree": "^9.3.1",
-						"globals": "^13.9.0",
-						"ignore": "^5.2.0",
-						"import-fresh": "^3.2.1",
-						"js-yaml": "^4.1.0",
-						"minimatch": "^3.0.4",
-						"strip-json-comments": "^3.1.1"
-					}
-				},
-				"@humanwhocodes/config-array": {
-					"version": "0.9.5",
-					"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
-					"integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
-					"dev": true,
-					"requires": {
-						"@humanwhocodes/object-schema": "^1.2.1",
-						"debug": "^4.1.1",
-						"minimatch": "^3.0.4"
-					}
-				},
-				"acorn": {
-					"version": "8.7.1",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-					"integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
-					"dev": true
-				},
 				"argparse": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -4194,57 +3760,6 @@
 					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
 					"dev": true
 				},
-				"eslint": {
-					"version": "8.14.0",
-					"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.14.0.tgz",
-					"integrity": "sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw==",
-					"dev": true,
-					"requires": {
-						"@eslint/eslintrc": "^1.2.2",
-						"@humanwhocodes/config-array": "^0.9.2",
-						"ajv": "^6.10.0",
-						"chalk": "^4.0.0",
-						"cross-spawn": "^7.0.2",
-						"debug": "^4.3.2",
-						"doctrine": "^3.0.0",
-						"escape-string-regexp": "^4.0.0",
-						"eslint-scope": "^7.1.1",
-						"eslint-utils": "^3.0.0",
-						"eslint-visitor-keys": "^3.3.0",
-						"espree": "^9.3.1",
-						"esquery": "^1.4.0",
-						"esutils": "^2.0.2",
-						"fast-deep-equal": "^3.1.3",
-						"file-entry-cache": "^6.0.1",
-						"functional-red-black-tree": "^1.0.1",
-						"glob-parent": "^6.0.1",
-						"globals": "^13.6.0",
-						"ignore": "^5.2.0",
-						"import-fresh": "^3.0.0",
-						"imurmurhash": "^0.1.4",
-						"is-glob": "^4.0.0",
-						"js-yaml": "^4.1.0",
-						"json-stable-stringify-without-jsonify": "^1.0.1",
-						"levn": "^0.4.1",
-						"lodash.merge": "^4.6.2",
-						"minimatch": "^3.0.4",
-						"natural-compare": "^1.4.0",
-						"optionator": "^0.9.1",
-						"regexpp": "^3.2.0",
-						"strip-ansi": "^6.0.1",
-						"strip-json-comments": "^3.1.0",
-						"text-table": "^0.2.0",
-						"v8-compile-cache": "^2.0.3"
-					},
-					"dependencies": {
-						"eslint-visitor-keys": {
-							"version": "3.3.0",
-							"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-							"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-							"dev": true
-						}
-					}
-				},
 				"eslint-scope": {
 					"version": "7.1.1",
 					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
@@ -4262,48 +3777,28 @@
 					"dev": true,
 					"requires": {
 						"eslint-visitor-keys": "^2.0.0"
-					}
-				},
-				"espree": {
-					"version": "9.3.1",
-					"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz",
-					"integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==",
-					"dev": true,
-					"requires": {
-						"acorn": "^8.7.0",
-						"acorn-jsx": "^5.3.1",
-						"eslint-visitor-keys": "^3.3.0"
 					},
 					"dependencies": {
 						"eslint-visitor-keys": {
-							"version": "3.3.0",
-							"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-							"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+							"version": "2.1.0",
+							"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+							"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
 							"dev": true
 						}
 					}
 				},
+				"eslint-visitor-keys": {
+					"version": "3.3.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+					"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+					"dev": true
+				},
 				"estraverse": {
 					"version": "5.3.0",
 					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
 					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
 					"dev": true
 				},
-				"glob-parent": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-					"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^4.0.3"
-					}
-				},
-				"ignore": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-					"integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-					"dev": true
-				},
 				"js-yaml": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -4312,9 +3807,40 @@
 					"requires": {
 						"argparse": "^2.0.1"
 					}
+				},
+				"minimatch": {
+					"version": "3.1.2",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+					"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+					"dev": true,
+					"requires": {
+						"brace-expansion": "^1.1.7"
+					}
 				}
 			}
 		},
+		"eslint-config-wikimedia": {
+			"version": "0.22.1",
+			"resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.22.1.tgz",
+			"integrity": "sha512-TtN+gWJrcW0i1sEu7vPE1tHpEilrMUuTxP6UK97Amvva/KDV9/tvRUifGhw0q5uBswp+HWgF12p8rq68hZqMbA==",
+			"dev": true,
+			"requires": {
+				"eslint": "^8.6.0",
+				"eslint-plugin-compat": "^4.0.2",
+				"eslint-plugin-es": "^4.1.0",
+				"eslint-plugin-jsdoc": "^37.7.1",
+				"eslint-plugin-json-es": "^1.5.4",
+				"eslint-plugin-mediawiki": "^0.3.0",
+				"eslint-plugin-mocha": "^9.0.0",
+				"eslint-plugin-no-jquery": "^2.7.0",
+				"eslint-plugin-node": "^11.1.0",
+				"eslint-plugin-qunit": "^7.2.0",
+				"eslint-plugin-unicorn": "^40.1.0",
+				"eslint-plugin-vue": "^8.4.1",
+				"eslint-plugin-wdio": "^7.4.2",
+				"eslint-plugin-yml": "^0.13.0"
+			}
+		},
 		"eslint-plugin-compat": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-4.0.2.tgz",
@@ -4375,28 +3901,11 @@
 				"espree": "^9.0.0"
 			},
 			"dependencies": {
-				"acorn": {
-					"version": "8.7.0",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-					"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-					"dev": true
-				},
 				"eslint-visitor-keys": {
 					"version": "3.2.0",
 					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
 					"integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
 					"dev": true
-				},
-				"espree": {
-					"version": "9.3.0",
-					"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz",
-					"integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==",
-					"dev": true,
-					"requires": {
-						"acorn": "^8.7.0",
-						"acorn-jsx": "^5.3.1",
-						"eslint-visitor-keys": "^3.1.0"
-					}
 				}
 			}
 		},
@@ -4487,7 +3996,8 @@
 			"version": "2.7.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.7.0.tgz",
 			"integrity": "sha512-Aeg7dA6GTH1AcWLlBtWNzOU9efK5KpNi7b0EhBO0o0M+awyzguUUo8gF6hXGjQ9n5h8/uRtYv9zOqQkeC5CG0w==",
-			"dev": true
+			"dev": true,
+			"requires": {}
 		},
 		"eslint-plugin-node": {
 			"version": "11.1.0",
@@ -4513,12 +4023,6 @@
 						"regexpp": "^3.0.0"
 					}
 				},
-				"ignore": {
-					"version": "5.1.8",
-					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-					"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-					"dev": true
-				},
 				"semver": {
 					"version": "6.3.0",
 					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -4656,20 +4160,26 @@
 			"dev": true
 		},
 		"espree": {
-			"version": "7.3.1",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-			"integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+			"version": "9.3.2",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
+			"integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
 			"dev": true,
 			"requires": {
-				"acorn": "^7.4.0",
-				"acorn-jsx": "^5.3.1",
-				"eslint-visitor-keys": "^1.3.0"
+				"acorn": "^8.7.1",
+				"acorn-jsx": "^5.3.2",
+				"eslint-visitor-keys": "^3.3.0"
 			},
 			"dependencies": {
+				"acorn": {
+					"version": "8.7.1",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
+					"integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+					"dev": true
+				},
 				"eslint-visitor-keys": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-					"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+					"version": "3.3.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+					"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
 					"dev": true
 				}
 			}
@@ -4891,17 +4401,6 @@
 			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
 			"dev": true
 		},
-		"get-intrinsic": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-			"integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-			"dev": true,
-			"requires": {
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-symbols": "^1.0.1"
-			}
-		},
 		"getobject": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/getobject/-/getobject-1.0.0.tgz",
@@ -4923,12 +4422,12 @@
 			}
 		},
 		"glob-parent": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
 			"dev": true,
 			"requires": {
-				"is-glob": "^4.0.1"
+				"is-glob": "^4.0.3"
 			}
 		},
 		"global-modules": {
@@ -4956,9 +4455,9 @@
 			}
 		},
 		"globals": {
-			"version": "13.12.1",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz",
-			"integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
+			"version": "13.15.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
+			"integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
 			"dev": true,
 			"requires": {
 				"type-fest": "^0.20.2"
@@ -5027,13 +4526,13 @@
 			}
 		},
 		"grunt-eslint": {
-			"version": "23.0.0",
-			"resolved": "https://registry.npmjs.org/grunt-eslint/-/grunt-eslint-23.0.0.tgz",
-			"integrity": "sha512-QqHSAiGF08EVD7YlD4OSRWuLRaDvpsRdTptwy9WaxUXE+03mCLVA/lEaR6SHWehF7oUwIqCEjaNONeeeWlB4LQ==",
+			"version": "24.0.0",
+			"resolved": "https://registry.npmjs.org/grunt-eslint/-/grunt-eslint-24.0.0.tgz",
+			"integrity": "sha512-WpTeBBFweyhMuPjGwRSQV9JFJ+EczIdlsc7Dd/1g78QVI1aZsk4g/H3e+3S5HEwsS1RKL2YZIrGj8hMLlBfN8w==",
 			"dev": true,
 			"requires": {
-				"chalk": "^4.0.0",
-				"eslint": "^7.0.0"
+				"chalk": "^4.1.2",
+				"eslint": "^8.0.1"
 			}
 		},
 		"grunt-known-options": {
@@ -5111,12 +4610,6 @@
 			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true
 		},
-		"has-symbols": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-			"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-			"dev": true
-		},
 		"homedir-polyfill": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
@@ -5148,9 +4641,9 @@
 			}
 		},
 		"ignore": {
-			"version": "4.0.6",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-			"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+			"integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
 			"dev": true
 		},
 		"import-fresh": {
@@ -5219,15 +4712,6 @@
 			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
 			"dev": true
 		},
-		"is-boolean-object": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
-			"integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.0"
-			}
-		},
 		"is-builtin-module": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.1.0.tgz",
@@ -5252,12 +4736,6 @@
 			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
 			"dev": true
 		},
-		"is-fullwidth-code-point": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true
-		},
 		"is-glob": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -5273,12 +4751,6 @@
 			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
 			"dev": true
 		},
-		"is-number-object": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
-			"integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==",
-			"dev": true
-		},
 		"is-plain-object": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -5297,12 +4769,6 @@
 				"is-unc-path": "^1.0.0"
 			}
 		},
-		"is-string": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-			"integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
-			"dev": true
-		},
 		"is-unc-path": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
@@ -5437,18 +4903,6 @@
 			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
 			"dev": true
 		},
-		"lodash.clonedeep": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-			"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-			"dev": true
-		},
-		"lodash.flatten": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-			"integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
-			"dev": true
-		},
 		"lodash.memoize": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -5461,12 +4915,6 @@
 			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
 			"dev": true
 		},
-		"lodash.truncate": {
-			"version": "4.4.2",
-			"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-			"integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-			"dev": true
-		},
 		"lru-cache": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -5770,12 +5218,6 @@
 			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
 			"dev": true
 		},
-		"progress": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-			"dev": true
-		},
 		"punycode": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -5885,12 +5327,6 @@
 			"integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==",
 			"dev": true
 		},
-		"require-from-string": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-			"dev": true
-		},
 		"requireindex": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
@@ -5972,17 +5408,6 @@
 			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
 			"dev": true
 		},
-		"slice-ansi": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-			"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-			"dev": true,
-			"requires": {
-				"ansi-styles": "^4.0.0",
-				"astral-regex": "^2.0.0",
-				"is-fullwidth-code-point": "^3.0.0"
-			}
-		},
 		"spdx-correct": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
@@ -6021,17 +5446,6 @@
 			"integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
 			"dev": true
 		},
-		"string-width": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-			"integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-			"dev": true,
-			"requires": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.0"
-			}
-		},
 		"strip-ansi": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -6071,43 +5485,6 @@
 			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
 			"dev": true
 		},
-		"table": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/table/-/table-6.1.0.tgz",
-			"integrity": "sha512-T4G5KMmqIk6X87gLKWyU5exPpTjLjY5KyrFWaIjv3SvgaIUGXV7UEzGEnZJdTA38/yUS6f9PlKezQ0bYXG3iIQ==",
-			"dev": true,
-			"requires": {
-				"ajv": "^8.0.1",
-				"is-boolean-object": "^1.1.0",
-				"is-number-object": "^1.0.4",
-				"is-string": "^1.0.5",
-				"lodash.clonedeep": "^4.5.0",
-				"lodash.flatten": "^4.4.0",
-				"lodash.truncate": "^4.4.2",
-				"slice-ansi": "^4.0.0",
-				"string-width": "^4.2.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "8.1.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.1.0.tgz",
-					"integrity": "sha512-B/Sk2Ix7A36fs/ZkuGLIR86EdjbgR6fsAcbx9lOP/QBSXujDNbVmIS/U4Itz5k8fPFDeVZl/zQ/gJW4Jrq6XjQ==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true
-				}
-			}
-		},
 		"text-table": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -6215,12 +5592,6 @@
 				"semver": "^7.3.5"
 			},
 			"dependencies": {
-				"acorn": {
-					"version": "8.7.0",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-					"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-					"dev": true
-				},
 				"eslint-scope": {
 					"version": "7.1.0",
 					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz",
@@ -6237,17 +5608,6 @@
 					"integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
 					"dev": true
 				},
-				"espree": {
-					"version": "9.3.0",
-					"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz",
-					"integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==",
-					"dev": true,
-					"requires": {
-						"acorn": "^8.7.0",
-						"acorn-jsx": "^5.3.1",
-						"eslint-visitor-keys": "^3.1.0"
-					}
-				},
 				"estraverse": {
 					"version": "5.3.0",
 					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
diff --git a/package.json b/package.json
index 7e4244b..e7bb33a 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,6 @@
 		"eslint-config-wikimedia": "0.22.1",
 		"grunt": "1.5.2",
 		"grunt-banana-checker": "0.9.0",
-		"grunt-eslint": "23.0.0"
+		"grunt-eslint": "24.0.0"
 	}
 }

From 06c80c4178c02fa005f82d6bf165d507dbec7d08 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Thu, 26 May 2022 10:12:25 +0000
Subject: [PATCH 059/117] build: Updating grunt to 1.5.3

Change-Id: I613b062c7613512eee1108f088dc3bef913e8d86
---
 package-lock.json | 20 +++++++++-----------
 package.json      |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 10c767b..2ba17db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,7 +7,7 @@
 			"name": "DrawioEditor",
 			"devDependencies": {
 				"eslint-config-wikimedia": "0.22.1",
-				"grunt": "1.5.2",
+				"grunt": "1.5.3",
 				"grunt-banana-checker": "0.9.0",
 				"grunt-eslint": "24.0.0"
 			}
@@ -1649,9 +1649,9 @@
 			}
 		},
 		"node_modules/grunt": {
-			"version": "1.5.2",
-			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.2.tgz",
-			"integrity": "sha512-XCtfaIu72OyDqK24MjWiGC9SwlkuhkS1mrULr1xzuJ2XqAFhP3ZAchZGHJeSCY6mkaOXU4F7SbmmCF7xIVoC9w==",
+			"version": "1.5.3",
+			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.3.tgz",
+			"integrity": "sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ==",
 			"dev": true,
 			"dependencies": {
 				"dateformat": "~3.0.3",
@@ -3417,8 +3417,7 @@
 			"version": "5.3.2",
 			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
 			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-			"dev": true,
-			"requires": {}
+			"dev": true
 		},
 		"ajv": {
 			"version": "6.12.6",
@@ -3996,8 +3995,7 @@
 			"version": "2.7.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.7.0.tgz",
 			"integrity": "sha512-Aeg7dA6GTH1AcWLlBtWNzOU9efK5KpNi7b0EhBO0o0M+awyzguUUo8gF6hXGjQ9n5h8/uRtYv9zOqQkeC5CG0w==",
-			"dev": true,
-			"requires": {}
+			"dev": true
 		},
 		"eslint-plugin-node": {
 			"version": "11.1.0",
@@ -4472,9 +4470,9 @@
 			}
 		},
 		"grunt": {
-			"version": "1.5.2",
-			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.2.tgz",
-			"integrity": "sha512-XCtfaIu72OyDqK24MjWiGC9SwlkuhkS1mrULr1xzuJ2XqAFhP3ZAchZGHJeSCY6mkaOXU4F7SbmmCF7xIVoC9w==",
+			"version": "1.5.3",
+			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.3.tgz",
+			"integrity": "sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ==",
 			"dev": true,
 			"requires": {
 				"dateformat": "~3.0.3",
diff --git a/package.json b/package.json
index e7bb33a..7aa6e6f 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
 	},
 	"devDependencies": {
 		"eslint-config-wikimedia": "0.22.1",
-		"grunt": "1.5.2",
+		"grunt": "1.5.3",
 		"grunt-banana-checker": "0.9.0",
 		"grunt-eslint": "24.0.0"
 	}

From 5d648928a558c993dabce7e7020cea5ea543057a Mon Sep 17 00:00:00 2001
From: Sanjay Thiyagarajan <sanjayipscoc@gmail.com>
Date: Fri, 3 Jun 2022 11:43:48 -0700
Subject: [PATCH 060/117] Fixes for ApprovedRevs integration

Changes:
1) Add two more parameters to onDrawioGetFile (approvalStatus and approvedImage)
2) Remove unused $img_url_ts from onDrawioGetFile
3) Change the visibility of the placeholder with respect to approval status

Change-Id: I5d98a45b6c5253fc49ea00c4ec89c77a6f0f0a52
---
 src/DrawioEditor.php                   | 14 +++++++-------
 src/Hook/ApprovedRevsSetStableFile.php | 10 +++++++---
 src/Hook/DrawioGetFileHook.php         |  5 ++++-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 0d5fb0c..1f60d49 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -138,11 +138,11 @@ public function parse( &$parser, $name, $opts ) {
 		$latest_is_approved = true;
 		if ( $img ) {
 			$img_url_ts = null;
+			$displayImage = null;
 			$hookRunner = MediaWikiServices::getInstance()->getHookContainer();
-			$hookRunner->run( 'DrawioGetFile', [ &$img, &$latest_is_approved, $parser->getUserIdentity() ] );
-			$noApproved = $img === null;
-
-			$img_url_ts = $img->getUrl();
+			$hookRunner->run( 'DrawioGetFile', [ &$img, &$latest_is_approved, $parser->getUserIdentity(),
+			&$noApproved, &$displayImage ] );
+			$img_url_ts = $displayImage->getUrl();
 			$img_desc_url = $img->getDescriptionUrl();
 			$img_height = $img->getHeight() . 'px';
 			$img_width = $img->getWidth() . 'px';
@@ -167,7 +167,7 @@ public function parse( &$parser, $name, $opts ) {
 
 		/* prepare edit href */
 		$edit_ahref = sprintf( "<a href='javascript:editDrawio(\"%s\", %s, \"%s\", %s, %s, %s, %s,
-		\"%s\", %s, \"%s\")'>",
+		\"%s\", %s, \"%s\")'>" . wfMessage( 'edit' )->text() . "</a>",
 			$id,
 			json_encode( $img_name, JSON_HEX_QUOT | JSON_HEX_APOS ),
 			$opt_type,
@@ -193,6 +193,7 @@ public function parse( &$parser, $name, $opts ) {
 			global $egApprovedRevsBlankFileIfUnapproved;
 			if ( $egApprovedRevsBlankFileIfUnapproved ) {
 				$img = null;
+				$edit_ahref = '';
 			}
 		} else {
 			if ( $img ) {
@@ -215,7 +216,6 @@ public function parse( &$parser, $name, $opts ) {
 			$output .= '<span class="mw-editdrawio">';
 			$output .= '<span class="mw-editsection-bracket">[</span>';
 			$output .= $edit_ahref;
-			$output .= wfMessage( 'edit' )->text() . '</a>';
 			$output .= '<span class="mw-editsection-bracket">]</span>';
 			$output .= '</span>';
 			$output .= '</div>';
@@ -248,7 +248,7 @@ public function parse( &$parser, $name, $opts ) {
 		}
 
 		/* output image and optionally a placeholder if the image does not exist yet */
-		if ( !$img ) {
+		if ( !$img && !$noApproved ) {
 			// show placeholder
 			$output .= sprintf( '<div id="drawio-placeholder-%s" class="DrawioEditorInfoBox">' .
 				'<b>%s</b><br/>empty app.diagrams.net chart</div> ',
diff --git a/src/Hook/ApprovedRevsSetStableFile.php b/src/Hook/ApprovedRevsSetStableFile.php
index 45866a9..188ff20 100644
--- a/src/Hook/ApprovedRevsSetStableFile.php
+++ b/src/Hook/ApprovedRevsSetStableFile.php
@@ -26,13 +26,15 @@ public function __construct( ILoadBalancer $loadBalancer, RepoGroup $repoGroup )
 	/**
 	 * @inheritDoc
 	 */
-	public function onDrawioGetFile( File &$file, &$latestIsStable, User $user ) {
+	public function onDrawioGetFile( File &$file, &$latestIsStable, User $user, bool &$isNotApproved,
+	&$displayFile ) {
 		if ( !class_exists( 'ApprovedRevs' ) ) {
 			return true;
 		}
 		list( $approvedRevTimestamp, $approvedRevSha1 ) = $this->getApprovedFileInfo( $file->getTitle() );
-		$img_url_ts = null;
 		if ( ( !$approvedRevTimestamp ) || ( !$approvedRevSha1 ) ) {
+			$isNotApproved = true;
+			$displayFile = $file;
 			return true;
 		} else {
 			$title = $file->getTitle();
@@ -43,6 +45,8 @@ public function onDrawioGetFile( File &$file, &$latestIsStable, User $user ) {
 			if ( !$displayFile ) {
 				wfDebug( __METHOD__ . ": {$title->getPrefixedDBkey()}: " .
 					"$approvedRevTimestamp not found, using current\n" );
+				$isNotApproved = false;
+				$displayFile = $file;
 				return true;
 			} else {
 				wfDebug( __METHOD__ . ": {$title->getPrefixedDBkey()}: " .
@@ -51,7 +55,7 @@ public function onDrawioGetFile( File &$file, &$latestIsStable, User $user ) {
 			if ( $file->getTimestamp() !== $approvedRevTimestamp ) {
 				$latestIsStable = false;
 			}
-			$file = $displayFile;
+			$isNotApproved = false;
 			return true;
 		}
 	}
diff --git a/src/Hook/DrawioGetFileHook.php b/src/Hook/DrawioGetFileHook.php
index 94f545a..18a36f1 100644
--- a/src/Hook/DrawioGetFileHook.php
+++ b/src/Hook/DrawioGetFileHook.php
@@ -11,7 +11,10 @@ interface DrawioGetFileHook {
 	 * @param File &$file
 	 * @param bool &$latestIsStable
 	 * @param User $user
+	 * @param bool &$isNotApproved
+	 * @param File|null &$displayFile
 	 * @return mixed
 	 */
-	public function onDrawioGetFile( File &$file, &$latestIsStable, User $user );
+	public function onDrawioGetFile( File &$file, &$latestIsStable, User $user, bool &$isNotApproved,
+	File &$displayFile );
 }

From 31a630d5e8813ffc9ea29809d890fa8c04e5f5eb Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Wed, 29 Jun 2022 08:35:01 +0200
Subject: [PATCH 061/117] Localisation updates from https://translatewiki.net.

Change-Id: I46f334275ac1ca0a4cacbeef4d84257f0095863a
---
 i18n/zh-hans.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 i18n/zh-hans.json

diff --git a/i18n/zh-hans.json b/i18n/zh-hans.json
new file mode 100644
index 0000000..6459719
--- /dev/null
+++ b/i18n/zh-hans.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"StarrySky"
+		]
+	},
+	"drawioeditor-desc": "draw.io 流程图建立与内文编辑"
+}

From e5d51cd5441f4b53677ef6b5253a204f9d4aea19 Mon Sep 17 00:00:00 2001
From: rvogel <vogel@hallowelt.biz>
Date: Thu, 21 Jul 2022 13:09:15 +0200
Subject: [PATCH 062/117] Fix PHP8 compatibility

See https://php.watch/versions/8.0/filter_var-flags

Change-Id: Ie10a26f7afacea9f4037efe929cea25fe845fe5e
(cherry picked from commit fcd976499506df88abbb77d69e3121572879f5e8)
---
 src/DrawioEditor.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 1f60d49..50a6716 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -159,8 +159,7 @@ public function parse( &$parser, $name, $opts ) {
 
 		/* get and check base url */
 		$base_url = filter_var( $this->config->get( 'DrawioEditorBackendUrl' ),
-			FILTER_VALIDATE_URL,
-			FILTER_FLAG_SCHEME_REQUIRED & FILTER_FLAG_HOST_REQUIRED );
+			FILTER_VALIDATE_URL );
 		if ( !$base_url ) {
 			return $this->errorMessage( 'Invalid base url' );
 		}

From f8ffd1b0edfc91b6e7963389993b8a826ffd2c5e Mon Sep 17 00:00:00 2001
From: rvogel <vogel@hallowelt.biz>
Date: Thu, 21 Jul 2022 12:50:35 +0200
Subject: [PATCH 063/117] Remove `offline=1` parameter

Using DrawIO with `offline=1` will make it use the browsers
`applicationCache`. Unfortunately this it not enabled in all browsers.
In addition this paramter does not add anything usefull.

ERM28998

Change-Id: I0ff86703a5a9d4146dab7819966c8dd49c97f58c
(cherry picked from commit c84bc95b9a64a071133b9e1668156602ea6b1823)
---
 resources/ext.drawioeditor.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/ext.drawioeditor.js b/resources/ext.drawioeditor.js
index b81877f..034c770 100644
--- a/resources/ext.drawioeditor.js
+++ b/resources/ext.drawioeditor.js
@@ -54,10 +54,10 @@ function DrawioEditor( id, filename, type, interactive, updateHeight, updateWidt
 
 	var localAttr = this.baseUrl !== 'https://embed.diagrams.net' ? "&local=1" : "";
 	this.iframe = $('<iframe>', {
-		src: this.baseUrl + '/?embed=1&proto=json&spin=1&analytics=0&offline=1&picker=0&lang=' + this.language + localAttr,
-	id: 'drawio-iframe-' + id,
-	class: 'DrawioEditorIframe'
-	})
+		src: this.baseUrl + '/?embed=1&proto=json&spin=1&analytics=0&picker=0&lang=' + this.language + localAttr,
+		id: 'drawio-iframe-' + id,
+		class: 'DrawioEditorIframe'
+	});
 	this.iframe.appendTo(this.iframeBox);
 
 	this.iframeWindow = this.iframe.prop('contentWindow');

From 006851008ed5a5e8f95635887941c37279ef2257 Mon Sep 17 00:00:00 2001
From: rvogel <vogel@hallowelt.biz>
Date: Tue, 26 Jul 2022 08:39:01 +0200
Subject: [PATCH 064/117] Fix signature issue in `DrawioGetFile` hook

`MediaWiki\Extension\DrawioEditor\Hook\DrawioGetFileHook` interface
requires `$displayFile` to always be a `File` object.
---
 src/DrawioEditor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 50a6716..483aeae 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -138,7 +138,7 @@ public function parse( &$parser, $name, $opts ) {
 		$latest_is_approved = true;
 		if ( $img ) {
 			$img_url_ts = null;
-			$displayImage = null;
+			$displayImage = $img;
 			$hookRunner = MediaWikiServices::getInstance()->getHookContainer();
 			$hookRunner->run( 'DrawioGetFile', [ &$img, &$latest_is_approved, $parser->getUserIdentity(),
 			&$noApproved, &$displayImage ] );

From 2cf39728975512828ce83ab463d39a581adeaf96 Mon Sep 17 00:00:00 2001
From: rvogel <vogel@hallowelt.biz>
Date: Tue, 26 Jul 2022 08:47:35 +0200
Subject: [PATCH 065/117] Remove `load_composer_autoloader` from manifest

This extension does not have any requirements managed by `composer`.
Therefore the entry is not required.

Change-Id: Ic45f41f6846ab2fe76caa2a87c1fb3c880743fb7
(cherry picked from commit cf0ef33fe2f8905f88cdddb34078a1df22c203c3)
---
 extension.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extension.json b/extension.json
index d9cc544..c961396 100644
--- a/extension.json
+++ b/extension.json
@@ -63,6 +63,5 @@
 			"value": "https://embed.diagrams.net"
 		}
 	},
-	"load_composer_autoloader": true,
 	"manifest_version": 2
 }

From 765f6340de1d23bfb625de9e900135b31cb84e2d Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Fri, 19 Aug 2022 08:29:21 +0200
Subject: [PATCH 066/117] Localisation updates from https://translatewiki.net.

Change-Id: Iaf39bb399fc36b1dc9ffb4cb1da48ecd5dfa7b7e
---
 i18n/zh-hant.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/i18n/zh-hant.json b/i18n/zh-hant.json
index 2e70bc3..5e98c3d 100644
--- a/i18n/zh-hant.json
+++ b/i18n/zh-hant.json
@@ -4,5 +4,10 @@
 			"Kly"
 		]
 	},
-	"drawioeditor-desc": "draw.io 流程圖建立與內文編輯"
+	"drawioeditor-desc": "draw.io 流程圖建立與內文編輯",
+	"drawioeditor-approved-editwarning": "請注意，您現在正編輯此頁面的最新修訂，而非依預設條件所顯示出的批准版本。",
+	"drawioeditor-approved-displaywarning": "這是圖表的批准修訂，而非最新修訂版本。",
+	"drawioeditor-noapproved": "圖表$1沒有批准過的修訂。",
+	"drawioeditor-approve-link": "在此點擊來批准修訂",
+	"drawioeditor-changeapprove-link": "在此點擊來更改此圖表的已批准修訂"
 }

From 716155481ebd67c1590cf10e1f745d96b361a6aa Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Fri, 23 Sep 2022 08:29:00 +0200
Subject: [PATCH 067/117] Localisation updates from https://translatewiki.net.

Change-Id: I1667584f86a919a1f7a25e8c9e6a95983cd12466
---
 i18n/sh.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 i18n/sh.json

diff --git a/i18n/sh.json b/i18n/sh.json
new file mode 100644
index 0000000..3fc2907
--- /dev/null
+++ b/i18n/sh.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Vlad5250"
+		]
+	},
+	"drawioeditor-approved-editwarning": "Imajte u vidu da sada uređujete najnoviju inačicu ovog dijagrama, koja nije odobrena što se prikazuje prema zadanim postavkama."
+}

From 87624ba92cd22daa31d2600e12d6f934a210f2fa Mon Sep 17 00:00:00 2001
From: Meowcat <stravsmi@eawag.ch>
Date: Fri, 2 Sep 2022 12:52:16 +0000
Subject: [PATCH 068/117] Fixing "Deprecated: Use of ParserOutput::addModules
 with non-array argument was deprecated in MediaWiki 1.38" error message

Bug: T316469

Change-Id: Id563c795b59d9fe93d014514bd1b4be859d04666
---
 src/DrawioEditor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 483aeae..577d5dd 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -278,7 +278,7 @@ public function parse( &$parser, $name, $opts ) {
 			$parser->getOutput()->addImage( $img->getTitle()->getDBkey() );
 		}
 
-		$parser->getOutput()->addModules( 'ext.drawioeditor' );
+		$parser->getOutput()->addModules( ['ext.drawioeditor'] );
 
 		return [ $output, 'isHTML' => true, 'noparse' => true ];
 	}

From 53a8d0b33f5c9bad5999a81f6e174c157f2c8443 Mon Sep 17 00:00:00 2001
From: rvogel <vogel@hallowelt.biz>
Date: Wed, 28 Sep 2022 14:18:34 +0200
Subject: [PATCH 069/117] Fix postMessage validity check

... in case `drawioEditorBaseUrl` contains a path

See https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage
on `e.origin`.

ERM29977

[4.2.x]

Change-Id: Iedc85a3afe5d53a1f9be25335b81700f94755321
---
 resources/ext.drawioeditor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/ext.drawioeditor.js b/resources/ext.drawioeditor.js
index 034c770..3de4301 100644
--- a/resources/ext.drawioeditor.js
+++ b/resources/ext.drawioeditor.js
@@ -315,7 +315,7 @@ window.editDrawio = function(id, filename, type, interactive, updateHeight, upda
 
 function drawioHandleMessage(e) {
 	// we only act on event coming from "baseUrl" iframes
-	if (e.origin != window.drawioEditorBaseUrl)
+	if (window.drawioEditorBaseUrl.indexOf( e.origin ) !== 0)
 		return;
 
 	if (!editor)

From aaa39cd961565d147f512e2ea29ded8afa9a135f Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Wed, 5 Oct 2022 07:36:44 +0000
Subject: [PATCH 070/117] build: Updating grunt-banana-checker to 0.10.0

Change-Id: Ib7c0b5aa68c195f75d7bc86686d50c255583e435
---
 package-lock.json | 20 +++++++++++---------
 package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2ba17db..9f28e18 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
 			"devDependencies": {
 				"eslint-config-wikimedia": "0.22.1",
 				"grunt": "1.5.3",
-				"grunt-banana-checker": "0.9.0",
+				"grunt-banana-checker": "0.10.0",
 				"grunt-eslint": "24.0.0"
 			}
 		},
@@ -1678,9 +1678,9 @@
 			}
 		},
 		"node_modules/grunt-banana-checker": {
-			"version": "0.9.0",
-			"resolved": "https://registry.npmjs.org/grunt-banana-checker/-/grunt-banana-checker-0.9.0.tgz",
-			"integrity": "sha512-SqPiB6OazWqR8USL0NymtuT5Br3mD9WBBsM1rHC/3wIi2SrZNM6/+j9CIeuEM5oCn+AtO2Y0+rzzFyOdC9afAg==",
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/grunt-banana-checker/-/grunt-banana-checker-0.10.0.tgz",
+			"integrity": "sha512-Sx+P3zWjn4YmBCqzidnCEkYrACe1SLTIT8kKC6C3f21Hu6sm17U/V+re343cuK3U+iGZv15ux6bY+69buIbYrA==",
 			"dev": true,
 			"bin": {
 				"banana-checker": "src/cli.js"
@@ -3417,7 +3417,8 @@
 			"version": "5.3.2",
 			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
 			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-			"dev": true
+			"dev": true,
+			"requires": {}
 		},
 		"ajv": {
 			"version": "6.12.6",
@@ -3995,7 +3996,8 @@
 			"version": "2.7.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.7.0.tgz",
 			"integrity": "sha512-Aeg7dA6GTH1AcWLlBtWNzOU9efK5KpNi7b0EhBO0o0M+awyzguUUo8gF6hXGjQ9n5h8/uRtYv9zOqQkeC5CG0w==",
-			"dev": true
+			"dev": true,
+			"requires": {}
 		},
 		"eslint-plugin-node": {
 			"version": "11.1.0",
@@ -4493,9 +4495,9 @@
 			}
 		},
 		"grunt-banana-checker": {
-			"version": "0.9.0",
-			"resolved": "https://registry.npmjs.org/grunt-banana-checker/-/grunt-banana-checker-0.9.0.tgz",
-			"integrity": "sha512-SqPiB6OazWqR8USL0NymtuT5Br3mD9WBBsM1rHC/3wIi2SrZNM6/+j9CIeuEM5oCn+AtO2Y0+rzzFyOdC9afAg==",
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/grunt-banana-checker/-/grunt-banana-checker-0.10.0.tgz",
+			"integrity": "sha512-Sx+P3zWjn4YmBCqzidnCEkYrACe1SLTIT8kKC6C3f21Hu6sm17U/V+re343cuK3U+iGZv15ux6bY+69buIbYrA==",
 			"dev": true
 		},
 		"grunt-cli": {
diff --git a/package.json b/package.json
index 7aa6e6f..f9d5de1 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
 	"devDependencies": {
 		"eslint-config-wikimedia": "0.22.1",
 		"grunt": "1.5.3",
-		"grunt-banana-checker": "0.9.0",
+		"grunt-banana-checker": "0.10.0",
 		"grunt-eslint": "24.0.0"
 	}
 }

From 94d85806427e10e95cfc450ff8dc2cee3c5f269a Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Mon, 17 Oct 2022 08:21:07 +0200
Subject: [PATCH 071/117] Localisation updates from https://translatewiki.net.

Change-Id: Iceaaf32090f2501ac337028bd9ac4240f0bb5b0d
---
 i18n/pt.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/i18n/pt.json b/i18n/pt.json
index 7f9f8cf..0bb1dbf 100644
--- a/i18n/pt.json
+++ b/i18n/pt.json
@@ -4,5 +4,10 @@
 			"Hamilton Abreu"
 		]
 	},
-	"drawioeditor-desc": "Criação e edição em linha de fluxogramas para draw.io"
+	"drawioeditor-desc": "Criação e edição em linha de fluxogramas para draw.io",
+	"drawioeditor-approved-editwarning": "Note, por favor, que está agora a editar a revisão mais recente deste diagrama, a qual não é a revisão aprovada que é mostrada por padrão.",
+	"drawioeditor-approved-displaywarning": "Esta é a revisão aprovada do diagrama e não a revisão mais recente.",
+	"drawioeditor-noapproved": "O diagrama $1 não tem nenhuma revisão aprovada.",
+	"drawioeditor-approve-link": "Clique aqui para aprovar uma revisão",
+	"drawioeditor-changeapprove-link": "Clique aqui para alterar a revisão aprovada para este diagrama"
 }

From 7e0c5ddd7edd7e1d668b17d0251a614836116e77 Mon Sep 17 00:00:00 2001
From: Sanjay Thiyagarajan <sanjayipscoc@gmail.com>
Date: Fri, 21 Oct 2022 23:00:49 +0530
Subject: [PATCH 072/117] Fix spacing problem

Change-Id: Iecba485b4ebfa9ca7c156de8e3e0ec85ff753252
---
 src/DrawioEditor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 577d5dd..543c898 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -278,7 +278,7 @@ public function parse( &$parser, $name, $opts ) {
 			$parser->getOutput()->addImage( $img->getTitle()->getDBkey() );
 		}
 
-		$parser->getOutput()->addModules( ['ext.drawioeditor'] );
+		$parser->getOutput()->addModules( [ 'ext.drawioeditor' ] );
 
 		return [ $output, 'isHTML' => true, 'noparse' => true ];
 	}

From 96c3eb66f4a132e0c73da8776a294a97c8d89e8a Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Fri, 21 Oct 2022 02:46:48 +0000
Subject: [PATCH 073/117] build: Updating minimatch to 3.0.8

* https://github.com/advisories/GHSA-f8q6-p94x-37v3

Change-Id: Ic41f2985a80dbeaaeb82d81f70842f386f5850bb
---
 package-lock.json | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9f28e18..db8df7d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1795,12 +1795,6 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/grunt-legacy-util/node_modules/lodash": {
-			"version": "4.17.21",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-			"dev": true
-		},
 		"node_modules/grunt-legacy-util/node_modules/which": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -2277,9 +2271,9 @@
 			}
 		},
 		"node_modules/minimatch": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"version": "3.0.8",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
+			"integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
 			"dev": true,
 			"dependencies": {
 				"brace-expansion": "^1.1.7"
@@ -3417,8 +3411,7 @@
 			"version": "5.3.2",
 			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
 			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-			"dev": true,
-			"requires": {}
+			"dev": true
 		},
 		"ajv": {
 			"version": "6.12.6",
@@ -3996,8 +3989,7 @@
 			"version": "2.7.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.7.0.tgz",
 			"integrity": "sha512-Aeg7dA6GTH1AcWLlBtWNzOU9efK5KpNi7b0EhBO0o0M+awyzguUUo8gF6hXGjQ9n5h8/uRtYv9zOqQkeC5CG0w==",
-			"dev": true,
-			"requires": {}
+			"dev": true
 		},
 		"eslint-plugin-node": {
 			"version": "11.1.0",
@@ -4578,12 +4570,6 @@
 				"which": "~2.0.2"
 			},
 			"dependencies": {
-				"lodash": {
-					"version": "4.17.21",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-					"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-					"dev": true
-				},
 				"which": {
 					"version": "2.0.2",
 					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -4956,9 +4942,9 @@
 			"dev": true
 		},
 		"minimatch": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"version": "3.0.8",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
+			"integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
 			"dev": true,
 			"requires": {
 				"brace-expansion": "^1.1.7"

From 877a466333641e8750e2aeac60fa124f2fa3b6d4 Mon Sep 17 00:00:00 2001
From: Sanjay Thiyagarajan <sanjayipscoc@gmail.com>
Date: Tue, 20 Sep 2022 21:47:17 +0530
Subject: [PATCH 074/117] Change object type to display images

Change-Id: I012421d42afa77b569526f9193a1e9cf57185e4f
---
 src/DrawioEditor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 543c898..d2c5bb6 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -232,7 +232,7 @@ public function parse( &$parser, $name, $opts ) {
 				$img = $repo->findFile( $img_name );
 			}
 			if ( $img ) {
-				$img_fmt = '<object id="drawio-img-%s" data="%s" data-editurl="%s" type="text/svg+xml"
+				$img_fmt = '<object id="drawio-img-%s" data="%s" data-editurl="%s" type="image/svg+xml"
 				style="%s"></object>';
 				$img_html = sprintf( $img_fmt, $id, $img_url_ts, $img->getUrl(),  $img_style );
 			}

From 2183e4da2b2ae49a33fdb94a57368eb3cd54e7c1 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Tue, 1 Nov 2022 08:52:01 +0100
Subject: [PATCH 075/117] Localisation updates from https://translatewiki.net.

Change-Id: I5781987024ca0bf82dd908131a685c4f3cdad8a8
---
 i18n/ar.json | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 i18n/ar.json

diff --git a/i18n/ar.json b/i18n/ar.json
new file mode 100644
index 0000000..6236d06
--- /dev/null
+++ b/i18n/ar.json
@@ -0,0 +1,13 @@
+{
+	"@metadata": {
+		"authors": [
+			"Meno25"
+		]
+	},
+	"drawioeditor-desc": "رسم مخطط تدفق الرسم والتحرير المضمن",
+	"drawioeditor-approved-editwarning": "يرجى ملاحظة أنك تقوم الآن بتحرير أحدث مراجعة لهذا الرسم التخطيطي ، وهي ليست النسخة المعتمدة المعروضة بشكل افتراضي.",
+	"drawioeditor-approved-displaywarning": "هذه هي المراجعة المعتمدة للرسم التخطيطي وليست المراجعة الأخيرة.",
+	"drawioeditor-noapproved": "الرسم التخطيطي $1 ليس له مراجعة معتمدة.",
+	"drawioeditor-approve-link": "انقر هنا للموافقة على المراجعة",
+	"drawioeditor-changeapprove-link": "انقر هنا لتغيير المراجعة المعتمدة لهذا الرسم التخطيطي"
+}

From cd1d60f5415ae00fa9cb1a763a804362c07d1788 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Wed, 16 Nov 2022 01:50:11 +0000
Subject: [PATCH 076/117] build: Updating mediawiki/mediawiki-codesniffer to
 40.0.1

Change-Id: I1bfeed28e598df456c6f14800e7047038ef1137a
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8639239..bd0ab39 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
 		"composer/installers": "~1.0"
 	},
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "39.0.0",
+		"mediawiki/mediawiki-codesniffer": "40.0.1",
 		"mediawiki/minus-x": "1.1.1",
 		"php-parallel-lint/php-console-highlighter": "1.0.0",
 		"php-parallel-lint/php-parallel-lint": "1.3.2"

From 02290a927ac537f7b789125d685e5e041395e8ff Mon Sep 17 00:00:00 2001
From: rvogel <vogel@hallowelt.biz>
Date: Fri, 4 Nov 2022 08:29:30 +0100
Subject: [PATCH 077/117] Add placeholder image

Make the initial visual output of the parserfunction more appealing

ERM30343

[4.2.x]

Change-Id: I85e719dae40c8d6f96f5b597d28c606dbfa60955
---
 extension.json                 |   4 +-
 resources/ext.drawioeditor.css |  10 +-
 resources/placeholder.svg      | 181 +++++++++++++++++++++++++++++++++
 src/DrawioEditor.php           |   3 +-
 4 files changed, 193 insertions(+), 5 deletions(-)
 create mode 100644 resources/placeholder.svg

diff --git a/extension.json b/extension.json
index c961396..714c460 100644
--- a/extension.json
+++ b/extension.json
@@ -22,9 +22,11 @@
 		"MediaWiki\\Extension\\DrawioEditor\\": "src/"
 	},
 	"ResourceModules": {
+		"ext.drawioeditor.styles": {
+			"styles": "ext.drawioeditor.css"
+		},
 		"ext.drawioeditor": {
 			"scripts": "ext.drawioeditor.js",
-			"styles": "ext.drawioeditor.css",
 			"dependencies": [
 				"jquery.ui",
 				"mediawiki.api"
diff --git a/resources/ext.drawioeditor.css b/resources/ext.drawioeditor.css
index e02da86..1a0383d 100644
--- a/resources/ext.drawioeditor.css
+++ b/resources/ext.drawioeditor.css
@@ -18,9 +18,13 @@
 }
 
 .DrawioEditorInfoBox {
-  border: 2px dotted black;
+  padding-top: 20px;
   text-align:center;
-  margin: 5px 0px 20px 0px;
-  padding:5px;
+  /* @embed */
+  background-image: url('./placeholder.svg');
+  background-repeat: no-repeat;
+  background-position: center;
+  min-width: 600px;
+  min-height: 400px;
 }
 
diff --git a/resources/placeholder.svg b/resources/placeholder.svg
new file mode 100644
index 0000000..7bdd452
--- /dev/null
+++ b/resources/placeholder.svg
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 158.75 105.83334"
+   height="400"
+   width="600"
+   sodipodi:docname="placeholder.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     id="namedview838"
+     showgrid="false"
+     inkscape:zoom="1.8833333"
+     inkscape:cx="300"
+     inkscape:cy="200"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <marker
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker1204"
+       style="overflow:visible">
+      <path
+         id="path1202"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#575757;stroke-width:1pt;stroke-opacity:1;fill:#575757;fill-opacity:1"
+         transform="scale(0.4)" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="TriangleOutM"
+       refX="0.0"
+       refY="0.0"
+       orient="auto">
+      <path
+         transform="scale(0.4)"
+         style="fill-rule:evenodd;stroke:#575757;stroke-width:1pt;stroke-opacity:1;fill:#575757;fill-opacity:1"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         id="path1005" />
+    </marker>
+    <marker
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker1144"
+       style="overflow:visible">
+      <path
+         id="path1142"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(0.8)" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(0.99499373,0,0,0.99250949,0.02128724,-189.33836)"
+     id="layer1"
+     style="stroke-width:1.00628817;paint-order:markers stroke fill">
+    <rect
+       ry="0"
+       rx="0"
+       y="191.16666"
+       x="0.37797621"
+       height="105.83334"
+       width="158.75"
+       id="rect815"
+       style="opacity:1;fill:#efefef;fill-opacity:1;stroke:#4e4e4e;stroke-width:0.7987411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99215686;paint-order:markers stroke fill" />
+    <rect
+       y="207.43849"
+       x="53.313545"
+       height="25.664583"
+       width="52.122917"
+       id="rect836"
+       style="opacity:1;fill:#d3d3d3;fill-opacity:1;stroke:#4e4e4e;stroke-width:0.7987411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99386926;paint-order:markers stroke fill" />
+    <rect
+       y="255.06354"
+       x="16.191967"
+       height="25.664583"
+       width="52.122917"
+       id="rect842"
+       style="opacity:1;fill:#d3d3d3;fill-opacity:1;stroke:#4e4e4e;stroke-width:0.7987411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99386926;paint-order:markers stroke fill" />
+    <rect
+       style="opacity:1;fill:#d3d3d3;fill-opacity:1;stroke:#4e4e4e;stroke-width:0.7987411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99386926;paint-order:markers stroke fill"
+       id="rect844"
+       width="52.122917"
+       height="25.664583"
+       x="90.355202"
+       y="255.06354" />
+    <rect
+       y="212.27554"
+       x="57.086884"
+       height="4.8108511"
+       width="37.952274"
+       id="rect846"
+       style="opacity:1;fill:#a9a9a9;fill-opacity:1;stroke:none;stroke-width:0.7987411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99386926;paint-order:markers stroke fill" />
+    <rect
+       style="opacity:1;fill:#a9a9a9;fill-opacity:1;stroke:none;stroke-width:0.7987411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99386926;paint-order:markers stroke fill"
+       id="rect848"
+       width="31.270536"
+       height="4.8108511"
+       x="57.086884"
+       y="219.20311" />
+    <circle
+       r="7.8844509"
+       cy="267.73398"
+       cx="102.49786"
+       id="path850"
+       style="opacity:1;fill:#a9a9a9;fill-opacity:1;stroke:none;stroke-width:0.7987411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99386926;paint-order:markers stroke fill" />
+    <rect
+       y="261.97159"
+       x="113.48613"
+       height="4.8108511"
+       width="21.648834"
+       id="rect852"
+       style="opacity:1;fill:#a9a9a9;fill-opacity:1;stroke:none;stroke-width:0.7987411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99386926;paint-order:markers stroke fill" />
+    <rect
+       style="opacity:1;fill:#a9a9a9;fill-opacity:1;stroke:none;stroke-width:0.7987411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99386926;paint-order:markers stroke fill"
+       id="rect854"
+       width="14.967096"
+       height="4.8108511"
+       x="113.48613"
+       y="268.89914" />
+    <path
+       id="path856"
+       d="m 78.309972,234.51805 v 8.62035 H 41.426775 v 8.87387"
+       style="fill:none;fill-rule:evenodd;stroke:#575757;stroke-width:0.53249433;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1204);paint-order:markers stroke fill"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path858"
+       d="m 70.024616,268.66941 h 17.0678"
+       style="fill:none;fill-rule:evenodd;stroke:#575757;stroke-width:0.53249433;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#TriangleOutM);paint-order:markers stroke fill"
+       inkscape:connector-curvature="0" />
+    <rect
+       y="261.97696"
+       x="26.618156"
+       height="4.8108511"
+       width="31.270536"
+       id="rect1458"
+       style="opacity:1;fill:#a9a9a9;fill-opacity:1;stroke:none;stroke-width:0.7987411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99386926;paint-order:markers stroke fill" />
+    <rect
+       style="opacity:1;fill:#a9a9a9;fill-opacity:1;stroke:none;stroke-width:0.7987411;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99386926;paint-order:markers stroke fill"
+       id="rect1462"
+       width="13.898017"
+       height="4.8108511"
+       x="26.618156"
+       y="268.85614" />
+  </g>
+</svg>
diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index d2c5bb6..1cc6d66 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -250,7 +250,7 @@ public function parse( &$parser, $name, $opts ) {
 		if ( !$img && !$noApproved ) {
 			// show placeholder
 			$output .= sprintf( '<div id="drawio-placeholder-%s" class="DrawioEditorInfoBox">' .
-				'<b>%s</b><br/>empty app.diagrams.net chart</div> ',
+				'<b>%s</b></div> ',
 				$id, $dispname );
 		} else {
 			// the image or object element must be there in any case
@@ -279,6 +279,7 @@ public function parse( &$parser, $name, $opts ) {
 		}
 
 		$parser->getOutput()->addModules( [ 'ext.drawioeditor' ] );
+		$parser->getOutput()->addModuleStyles( [ 'ext.drawioeditor.styles' ] );
 
 		return [ $output, 'isHTML' => true, 'noparse' => true ];
 	}

From 0995f54687017a15a56cd054fce38a3a63630ec0 Mon Sep 17 00:00:00 2001
From: rvogel <vogel@hallowelt.biz>
Date: Mon, 12 Dec 2022 12:05:39 +0100
Subject: [PATCH 078/117] Add generic author information

ERM30784
[4.2.x]

Change-Id: I7a283df03289fd78a64919c07695034dcbc71aa8
---
 extension.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extension.json b/extension.json
index 714c460..adac5e6 100644
--- a/extension.json
+++ b/extension.json
@@ -3,7 +3,8 @@
 	"license-name": "GPL-3.0-only",
 	"version": "1.1",
 	"author": [
-		"Markus Gebert"
+		"Markus Gebert",
+		"[https://www.hallowelt.com Hallo Welt! GmbH]"
 	],
 	"descriptionmsg": "drawioeditor-desc",
 	"type": "parserhook",

From 4b2ae7babf6c962a62399f120d72c1107fc05a6f Mon Sep 17 00:00:00 2001
From: rvogel <vogel@hallowelt.biz>
Date: Fri, 16 Dec 2022 17:02:01 +0100
Subject: [PATCH 079/117] Add ImageMap for clickable diagrams

ERM30848

[4.2.x]

Change-Id: I89901cacc33363ff05327c395e01e78eb2ca649c
---
 src/DrawioEditor.php                          |  37 ++++-
 src/IMXDocumentExtractor.php                  |  15 ++
 src/ImageMapGenerator.php                     | 139 ++++++++++++++++++
 src/MXDocumentExtractor/Base.php              | 103 +++++++++++++
 src/MXDocumentExtractor/NullExtractor.php     |  16 ++
 src/MXDocumentExtractor/PNG.php               |  22 +++
 src/MXDocumentExtractor/SVG.php               |  17 +++
 tests/phpunit/ImageMapGeneratorTest.php       |  57 +++++++
 tests/phpunit/MXDocumentExtractor/PNGTest.php |  34 +++++
 tests/phpunit/MXDocumentExtractor/SVGTest.php |  34 +++++
 tests/phpunit/data/test-1-dxdocument.xml      |  22 +++
 tests/phpunit/data/test-1.html                |   6 +
 tests/phpunit/data/test-1.png                 | Bin 0 -> 6126 bytes
 tests/phpunit/data/test-1.svg                 |  16 ++
 tests/phpunit/data/test-2-dxdocument.xml      |  22 +++
 tests/phpunit/data/test-2.html                |   6 +
 16 files changed, 544 insertions(+), 2 deletions(-)
 create mode 100644 src/IMXDocumentExtractor.php
 create mode 100644 src/ImageMapGenerator.php
 create mode 100644 src/MXDocumentExtractor/Base.php
 create mode 100644 src/MXDocumentExtractor/NullExtractor.php
 create mode 100644 src/MXDocumentExtractor/PNG.php
 create mode 100644 src/MXDocumentExtractor/SVG.php
 create mode 100644 tests/phpunit/ImageMapGeneratorTest.php
 create mode 100644 tests/phpunit/MXDocumentExtractor/PNGTest.php
 create mode 100644 tests/phpunit/MXDocumentExtractor/SVGTest.php
 create mode 100644 tests/phpunit/data/test-1-dxdocument.xml
 create mode 100644 tests/phpunit/data/test-1.html
 create mode 100644 tests/phpunit/data/test-1.png
 create mode 100644 tests/phpunit/data/test-1.svg
 create mode 100644 tests/phpunit/data/test-2-dxdocument.xml
 create mode 100644 tests/phpunit/data/test-2.html

diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 1cc6d66..831072c 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -4,6 +4,10 @@
 
 use Config;
 use File;
+use FileRepo;
+use MediaWiki\Extension\DrawioEditor\MXDocumentExtractor\NullExtractor;
+use MediaWiki\Extension\DrawioEditor\MXDocumentExtractor\PNG;
+use MediaWiki\Extension\DrawioEditor\MXDocumentExtractor\SVG;
 use MediaWiki\MediaWikiServices;
 use Parser;
 use PPFrame;
@@ -237,11 +241,18 @@ public function parse( &$parser, $name, $opts ) {
 				$img_html = sprintf( $img_fmt, $id, $img_url_ts, $img->getUrl(),  $img_style );
 			}
 		} else {
-			$img_fmt = '<img id="drawio-img-%s" src="%s" title="%s" alt="%s" style="%s"></img>';
+			$mxDocumentExtractor = $this->getMXDocumentExtractor( $opt_type, $img->getRepo() );
+			$mxDocument = $mxDocumentExtractor->extractMXDocument( $img );
+			$imageMapGenerator = new ImageMapGenerator();
+			$imageMapName = 'drawio-map-' . $id;
+			$imageMap = $imageMapGenerator->generateImageMap( $mxDocument, $imageMapName );
+			$img_fmt = '<img id="drawio-img-%s" src="%s" title="%s" alt="%s" style="%s" usemap="#%s"></img>';
+			$img_fmt .= $imageMap;
 			$img_html = '<a id="drawio-img-href-' . $id . '" href="' . $img_desc_url . '">';
 			$img_html .= sprintf(
 				$img_fmt, $id, $img_url_ts,
-				'drawio: ' . $dispname, 'drawio: ' . $dispname, $img_style
+				'drawio: ' . $dispname, 'drawio: ' . $dispname, $img_style,
+				$imageMapName
 			);
 			$img_html .= '</a>';
 		}
@@ -284,6 +295,28 @@ public function parse( &$parser, $name, $opts ) {
 		return [ $output, 'isHTML' => true, 'noparse' => true ];
 	}
 
+	/**
+	 * @param string $opt_type
+	 * @param FileRepo $repo
+	 * @return IMXDocumentExtractor
+	 */
+	private function getMXDocumentExtractor( $opt_type, $repo ) {
+		$extractor = null;
+		$backend = $repo->getBackend();
+		switch ( $opt_type ) {
+			case 'png':
+				$extractor = new PNG( $backend );
+				break;
+			case 'svg':
+				$extractor = new SVG( $backend );
+				break;
+			default:
+				$extractor = new NullExtractor( $backend );
+				break;
+		}
+		return $extractor;
+	}
+
 	/**
 	 * @param string $msg
 	 * @return array
diff --git a/src/IMXDocumentExtractor.php b/src/IMXDocumentExtractor.php
new file mode 100644
index 0000000..b8e4486
--- /dev/null
+++ b/src/IMXDocumentExtractor.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace MediaWiki\Extension\DrawioEditor;
+
+use DOMDocument;
+use File;
+
+interface IMXDocumentExtractor {
+
+	/**
+	 * @param File $image The image to extract the MX document from.
+	 * @return DOMDocument The embedded MX document.
+	 */
+	public function extractMXDocument( $image ): DOMDocument;
+}
diff --git a/src/ImageMapGenerator.php b/src/ImageMapGenerator.php
new file mode 100644
index 0000000..f7ff978
--- /dev/null
+++ b/src/ImageMapGenerator.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace MediaWiki\Extension\DrawioEditor;
+
+use DOMDocument;
+use DOMElement;
+use DOMXPath;
+
+class ImageMapGenerator {
+
+	/** @var DOMDocument */
+	private $imageMap = null;
+
+	/** @var int */
+	private $offsetX = 0;
+
+	/** @var int */
+	private $offsetY = 0;
+
+	/**
+	 * @param string $shape
+	 * @param string $coords
+	 * @param string $href
+	 * @param string $targetVal
+	 */
+	private function addArea( $shape, $coords, $href, $targetVal ) {
+		$area = $this->imageMap->createElement( 'area' );
+		$area->setAttribute( 'shape', $shape );
+		$area->setAttribute( 'coords', $coords );
+		$area->setAttribute( 'href', $href );
+		if ( $targetVal !== '' ) {
+			$area->setAttribute( 'target', $targetVal );
+		}
+		$this->imageMap->documentElement->appendChild( $area );
+	}
+
+	/**
+	 * @param DOMDocument $diagramDOM
+	 * @param string $name
+	 * @return string
+	 */
+	public function generateImageMap( $diagramDOM, $name ): string {
+		$this->imageMap = new DOMDocument();
+		$this->imageMap->loadXML( '<map name="' . $name . '"></map>' );
+
+		$xpath = new DOMXPath( $diagramDOM );
+		$this->calculateOffsets( $xpath );
+		$linkEls = $xpath->query( '//*[@link]' );
+		foreach ( $linkEls as $linkEl ) {
+			$this->processLinkElement( $linkEl );
+		}
+		if ( $this->imageMap->documentElement->childNodes->length === 0 ) {
+			return '';
+		}
+
+		$html = $this->imageMap->saveXML( $this->imageMap->documentElement );
+		return $html;
+	}
+
+	/**
+	 * DrawIO will create an image file without any <padding>
+	 * But internaly it stores absolute coordinates in the mxFile.
+	 * @param DOMXPath $xpath
+	 * @return void
+	 */
+	private function calculateOffsets( $xpath ) {
+		$allGeometries = $xpath->query( '//mxGeometry' );
+		$xCoords = [];
+		$yCoords = [];
+
+		foreach ( $allGeometries as $geometry ) {
+			$xCoords[] = $geometry->getAttribute( 'x' );
+			$yCoords[] = $geometry->getAttribute( 'y' );
+		}
+		if ( !empty( $xCoords ) ) {
+			$this->offsetX = min( $xCoords );
+		}
+		if ( !empty( $yCoords ) ) {
+			$this->offsetY = min( $yCoords );
+		}
+	}
+
+	/**
+	 * Examples of `$linkEl`:
+	 *
+	 * <UserObject label="" link="#Main_Page" id="2">
+	 *		<mxCell style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+	 *			<mxGeometry x="70" y="300" width="180" height="60" as="geometry"/>
+	 *		</mxCell>
+	 *	</UserObject>
+	 *	<UserObject label="" link="#Special:Version" id="3">
+	 *		<mxCell style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;" vertex="1" parent="1">
+	 *			<mxGeometry x="170" y="380" width="80" height="80" as="geometry"/>
+	 *		</mxCell>
+	 *	</UserObject>
+	 *	<UserObject label="" link="https://wiki.company.local" id="4">
+	 *		<mxCell style="shape=dataStorage;whiteSpace=wrap;html=1;fixedSize=1;" vertex="1" parent="1">
+	 *			<mxGeometry x="70" y="380" width="100" height="80" as="geometry"/>
+	 *		</mxCell>
+	 *	</UserObject>
+	 *
+	 * @param DOMElement $linkEl
+	 * @return void
+	 */
+	private function processLinkElement( $linkEl ) {
+		// TODO: Proper handling of internal and external links
+		$linkTarget = $linkEl->getAttribute( 'link' );
+
+		// TODO: This must be more flexible!
+		$cellEl = $linkEl->getElementsByTagName( 'mxCell' )->item( 0 );
+		if ( $cellEl === null ) {
+			return;
+		}
+		$geometryEl = $cellEl->getElementsByTagName( 'mxGeometry' )->item( 0 );
+		if ( $geometryEl === null ) {
+			return;
+		}
+
+		$x = $geometryEl->getAttribute( 'x' ) - $this->offsetX;
+		$y = $geometryEl->getAttribute( 'y' ) - $this->offsetY;
+
+		$width = $geometryEl->getAttribute( 'width' ) + $x;
+		$height = $geometryEl->getAttribute( 'height' ) + $y;
+
+		$href = $linkTarget;
+		$shape = 'rect';
+		$coords = "$x,$y,$width,$height";
+
+		// We only support `target="_blank"` for now as we don't know about
+		// the actual values that can be inside of the `UserObject` element.
+		$target = $linkEl->getAttribute( 'linkTarget' );
+		$targetVal = '';
+		if ( $target === '_blank' ) {
+			$targetVal = '_blank';
+		}
+
+		$this->addArea( $shape, $coords, $href, $targetVal );
+	}
+}
diff --git a/src/MXDocumentExtractor/Base.php b/src/MXDocumentExtractor/Base.php
new file mode 100644
index 0000000..57b31a5
--- /dev/null
+++ b/src/MXDocumentExtractor/Base.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace MediaWiki\Extension\DrawioEditor\MXDocumentExtractor;
+
+use DOMDocument;
+use MediaWiki\Extension\DrawioEditor\IMXDocumentExtractor;
+
+abstract class Base implements IMXDocumentExtractor {
+
+	/** @var string */
+	protected $imageContent = '';
+
+	/** @var FileBackend */
+	private $fileBackend = null;
+
+	/**
+	 * @param FileBackend $fileBackend
+	 */
+	public function __construct( $fileBackend ) {
+		$this->fileBackend = $fileBackend;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function extractMXDocument( $image ): DOMDocument {
+		$this->imageContent = $this->fileBackend->getFileContents( [
+			'src' => $image->getPath()
+		] );
+
+		$mxFileString = $this->getPlainMXFileString();
+		$mxFileDOM = $this->getMXFileDOM( $mxFileString );
+		$diagramDOM = $this->getDiagramDOM( $mxFileDOM );
+		if ( $diagramDOM === null ) {
+			return new DOMDocument();
+		}
+		return $diagramDOM;
+	}
+
+	/**
+	 * @return string
+	 */
+	abstract protected function getPlainMXFileString(): string;
+
+	/**
+	 * @param string $mxfileXML
+	 * @return DOMDocument
+	 */
+	protected function getMXFileDOM( $mxfileXML ) {
+		$mxfileXMLDOM = new DOMDocument();
+		$mxfileXMLDOM->loadXML( $mxfileXML );
+
+		return $mxfileXMLDOM;
+	}
+
+	/**
+	 * Example of `$diagramXmlString`:
+	 *
+	 * <mxGraphModel dx="422" dy="661" grid="1" gridSize="10" guides="1" tooltips="1" connect="1"
+	 * arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
+	 *		<root>
+	 *			<mxCell id="0"/>
+	 *			<mxCell id="1" parent="0"/>
+	 *			<UserObject label="" link="#Main_Page" id="2">
+	 *				<mxCell style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+	 *					<mxGeometry x="70" y="300" width="180" height="60" as="geometry"/>
+	 *				</mxCell>
+	 *			</UserObject>
+	 *			<UserObject label="" link="#Special:Version" id="3">
+	 *				<mxCell style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;" vertex="1" parent="1">
+	 *					<mxGeometry x="170" y="380" width="80" height="80" as="geometry"/>
+	 *				</mxCell>
+	 *			</UserObject>
+	 *			<UserObject label="" link="https://wiki.company.local" id="4">
+	 *				<mxCell style="shape=dataStorage;whiteSpace=wrap;html=1;fixedSize=1;" vertex="1" parent="1">
+	 *					<mxGeometry x="70" y="380" width="100" height="80" as="geometry"/>
+	 *				</mxCell>
+	 *			</UserObject>
+	 *		</root>
+	 *	</mxGraphModel>
+	 *
+	 * See also https://drawio-app.com/extracting-the-xml-from-mxfiles/
+	 *
+	 * @param DOMDocument $mxfileXMLDOM
+	 * @return DOMDocument|null
+	 */
+	protected function getDiagramDOM( $mxfileXMLDOM ) {
+		$diagramEl = $mxfileXMLDOM->getElementsByTagName( 'diagram' )->item( 0 );
+		if ( $diagramEl === null ) {
+			// TODO: Proper handling of invalid XML
+			return null;
+		}
+		// This is a Base64-encoded, gzipped, URL-encoded XML string.
+		$b64DiagramXML = $diagramEl->nodeValue;
+		$inflatedDiagramXML = base64_decode( $b64DiagramXML );
+		$urlencodedDiagramXML = gzinflate( $inflatedDiagramXML );
+		$diagramXmlString = urldecode( $urlencodedDiagramXML );
+		$documentXML = new DOMDocument();
+		$documentXML->loadXML( $diagramXmlString );
+
+		return $documentXML;
+	}
+}
diff --git a/src/MXDocumentExtractor/NullExtractor.php b/src/MXDocumentExtractor/NullExtractor.php
new file mode 100644
index 0000000..0d60970
--- /dev/null
+++ b/src/MXDocumentExtractor/NullExtractor.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace MediaWiki\Extension\DrawioEditor\MXDocumentExtractor;
+
+use DOMDocument;
+use MediaWiki\Extension\DrawioEditor\IMXDocumentExtractor;
+
+class NullExtractor implements IMXDocumentExtractor {
+
+	/**
+	 * @inheritDoc
+	 */
+	public function extractMXDocument( $image ): DOMDocument {
+		return new DOMDocument();
+	}
+}
diff --git a/src/MXDocumentExtractor/PNG.php b/src/MXDocumentExtractor/PNG.php
new file mode 100644
index 0000000..0f19547
--- /dev/null
+++ b/src/MXDocumentExtractor/PNG.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace MediaWiki\Extension\DrawioEditor\MXDocumentExtractor;
+
+class PNG extends Base {
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function getPlainMXFileString(): string {
+		$encodedXML = preg_replace(
+			'#^.*?tEXt(.*?)IDAT.*?$#s',
+			'$1',
+			$this->imageContent
+		);
+		$partiallyDecodedXML = urldecode( $encodedXML );
+		$matches = [];
+		preg_match( '#<mxfile.*?>(.*?)</mxfile>#s', $partiallyDecodedXML, $matches );
+		$strippedXML = $matches[0];
+		return trim( $strippedXML );
+	}
+}
diff --git a/src/MXDocumentExtractor/SVG.php b/src/MXDocumentExtractor/SVG.php
new file mode 100644
index 0000000..09c5624
--- /dev/null
+++ b/src/MXDocumentExtractor/SVG.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace MediaWiki\Extension\DrawioEditor\MXDocumentExtractor;
+
+use DOMDocument;
+
+class SVG extends Base {
+	/**
+	 * @inheritDoc
+	 */
+	protected function getPlainMXFileString(): string {
+		$svgDOM = new DOMDocument();
+		$svgDOM->loadXML( $this->imageContent );
+		$mxfileXML = $svgDOM->documentElement->getAttribute( 'content' );
+		return $mxfileXML;
+	}
+}
diff --git a/tests/phpunit/ImageMapGeneratorTest.php b/tests/phpunit/ImageMapGeneratorTest.php
new file mode 100644
index 0000000..d98cbb0
--- /dev/null
+++ b/tests/phpunit/ImageMapGeneratorTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace MediaWiki\Extension\DrawioEditor\Tests;
+
+use DOMDocument;
+use MediaWiki\Extension\DrawioEditor\ImageMapGenerator;
+use PHPUnit\Framework\TestCase;
+
+class ImageMapGeneratorTest extends TestCase {
+
+	/**
+	 * @param string $inputXMLFile
+	 * @param string $expectedOutputXMLFile
+	 * @return void
+	 * @covers \MediaWiki\Extension\DrawioEditor\ImageMapGenerator\ImageMapGenerator::generateImageMap
+	 * @dataProvider provideTestGenerateImageMapData
+	 */
+	public function testGenerateImageMap( $inputXMLFile, $expectedOutputXMLFile ) {
+		$imageMapGenerator = new ImageMapGenerator();
+		$inputDOM = new DOMDocument();
+		$inputDOM->load( $inputXMLFile );
+		$actualImageMap = $imageMapGenerator->generateImageMap( $inputDOM, 'test' );
+		$expectedImageMap = file_get_contents( $expectedOutputXMLFile );
+		$this->assertXmlStringEqualsXmlString(
+			$expectedImageMap,
+			$actualImageMap
+		);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideTestGenerateImageMapData() {
+		return [
+			[
+				__DIR__ . '/data/test-1-dxdocument.xml',
+				__DIR__ . '/data/test-1.html',
+			],
+			[
+				__DIR__ . '/data/test-2-dxdocument.xml',
+				__DIR__ . '/data/test-2.html',
+			],
+		];
+	}
+
+	/**
+	 * @return void
+	 * @covers \MediaWiki\Extension\DrawioEditor\ImageMapGenerator\ImageMapGenerator::generateImageMap
+	 * @dataProvider provideTestGenerateImageMapData
+	 */
+	public function testGenerateImageMapWithEmptyMXDocument() {
+		$imageMapGenerator = new ImageMapGenerator();
+		$inputDOM = new DOMDocument();
+		$actualImageMap = $imageMapGenerator->generateImageMap( $inputDOM, 'test' );
+		$this->assertSame( '', $actualImageMap );
+	}
+}
diff --git a/tests/phpunit/MXDocumentExtractor/PNGTest.php b/tests/phpunit/MXDocumentExtractor/PNGTest.php
new file mode 100644
index 0000000..28544cb
--- /dev/null
+++ b/tests/phpunit/MXDocumentExtractor/PNGTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace MediaWiki\Extension\DrawioEditor\Tests\MXDocumentExtractor;
+
+use File;
+use FileBackend;
+use MediaWiki\Extension\DrawioEditor\MXDocumentExtractor\PNG;
+use PHPUnit\Framework\TestCase;
+
+class PNGTest extends TestCase {
+
+	/**
+	 * @covers \MediaWiki\Extension\DrawioEditor\MXDocumentExtractor\PNG::extractMXDocument
+	 */
+	public function testExtractMXDocument() {
+		$imageContent = file_get_contents( __DIR__ . '/../data/test-1.png' );
+		$fileBackend = $this->createMock( FileBackend::class );
+		$fileBackend
+			->method( 'getFileContentsMulti' )
+			->willReturn( [ '/dummy/file.png' => $imageContent ] );
+		$image = $this->createMock( File::class );
+		$image
+			->method( 'getPath' )
+			->willReturn( '/dummy/file.png' );
+
+		$generator = new PNG( $fileBackend );
+		$actualImageMap = $generator->extractMXDocument( $image );
+		$expectedImageMap = file_get_contents( __DIR__ . '/../data/test-1-dxdocument.xml' );
+		$this->assertXmlStringEqualsXmlString(
+			$expectedImageMap,
+			$actualImageMap->saveXML()
+		);
+	}
+}
diff --git a/tests/phpunit/MXDocumentExtractor/SVGTest.php b/tests/phpunit/MXDocumentExtractor/SVGTest.php
new file mode 100644
index 0000000..1bcde25
--- /dev/null
+++ b/tests/phpunit/MXDocumentExtractor/SVGTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace MediaWiki\Extension\DrawioEditor\Tests\MXDocumentExtractor;
+
+use File;
+use FileBackend;
+use MediaWiki\Extension\DrawioEditor\MXDocumentExtractor\SVG;
+use PHPUnit\Framework\TestCase;
+
+class SVGTest extends TestCase {
+
+	/**
+	 * @covers \MediaWiki\Extension\DrawioEditor\MXDocumentExtractor\SVG::extractMXDocument
+	 */
+	public function testExtractMXDocument() {
+		$imageContent = file_get_contents( __DIR__ . '/../data/test-1.svg' );
+		$fileBackend = $this->createMock( FileBackend::class );
+		$fileBackend
+			->method( 'getFileContentsMulti' )
+			->willReturn( [ '/dummy/file.svg' => $imageContent ] );
+		$image = $this->createMock( File::class );
+		$image
+			->method( 'getPath' )
+			->willReturn( '/dummy/file.svg' );
+
+		$generator = new SVG( $fileBackend );
+		$actualImageMap = $generator->extractMXDocument( $image );
+		$expectedImageMap = file_get_contents( __DIR__ . '/../data/test-1-dxdocument.xml' );
+		$this->assertXmlStringEqualsXmlString(
+			$expectedImageMap,
+			$actualImageMap->saveXML()
+		);
+	}
+}
diff --git a/tests/phpunit/data/test-1-dxdocument.xml b/tests/phpunit/data/test-1-dxdocument.xml
new file mode 100644
index 0000000..8de7a50
--- /dev/null
+++ b/tests/phpunit/data/test-1-dxdocument.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mxGraphModel dx="422" dy="661" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
+	<root>
+		<mxCell id="0"/>
+		<mxCell id="1" parent="0"/>
+		<UserObject label="" link="#Main_Page" id="2">
+			<mxCell style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+				<mxGeometry x="70" y="300" width="180" height="60" as="geometry"/>
+			</mxCell>
+		</UserObject>
+		<UserObject label="" link="#Special:Version" id="3">
+			<mxCell style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;" vertex="1" parent="1">
+				<mxGeometry x="170" y="380" width="80" height="80" as="geometry"/>
+			</mxCell>
+		</UserObject>
+		<UserObject label="" link="https://wiki.company.local" id="4">
+			<mxCell style="shape=dataStorage;whiteSpace=wrap;html=1;fixedSize=1;" vertex="1" parent="1">
+				<mxGeometry x="70" y="380" width="100" height="80" as="geometry"/>
+			</mxCell>
+		</UserObject>
+	</root>
+</mxGraphModel>
\ No newline at end of file
diff --git a/tests/phpunit/data/test-1.html b/tests/phpunit/data/test-1.html
new file mode 100644
index 0000000..35268be
--- /dev/null
+++ b/tests/phpunit/data/test-1.html
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map name="test">
+	<area shape="rect" coords="0,0,180,60" href="#Main_Page" />
+	<area shape="rect" coords="100,80,180,160" href="#Special:Version" />
+	<area shape="rect" coords="0,80,100,160" href="https://wiki.company.local" />
+</map>
\ No newline at end of file
diff --git a/tests/phpunit/data/test-1.png b/tests/phpunit/data/test-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..1782464fcfd27fbc520de127159cacde869c79b8
GIT binary patch
literal 6126
zcmeHLc_5VC_a7=GS)xrL*~)Haj2UlP#y-Z(U>GFpU}h|1#ta6bD3vI?tgp(RB|>FO
zDm!HjA^VH$k+SrAyuIJw@BQcZ$M65&eV+N;`<&;VbMKsc?mg!`cW@Ykquj#WAQ0%N
zk)f^`P*(uIEG`ZJuM6!-0u`H&nE?`1+<A5m1Uj(D(6eHA`n!@nTtHF~o!>1furi72
z!;pgLN`b*Ho=z@AMIzbJjqd2_qv++r0Ej>jPb!h@N_HXs?gdr`gB4VO8-`bbNI|rr
z@V`M34u;$O?(gX4;`NV6RYhe$zy&K66)6Z3XrakoOn;#Ehr{e)(2GDz+uPg2h2Y|3
zOa?~NSB0o4LSXwW#)fzkv=mqeXnT;|U4Y8K#o3*@&!R)3Q#}ESzKXJ%qVoO)5X~K3
z9qHtMiP)dHuM6FWO!fND#1+*Pp}(i-!f<r^O(p8nyiDwAo_>CCYlw<@fID2(>31In
z%iHB&irFVZ^Z?EMqaZ*$`5%>7Ti~H4U~PRpvWck*1nJ_<AQ67c@Nxtu`nPg%fL0V#
zehcxnF>?Yq{Pc|go#^X2!qFBeFg$?nh4E0fz*8wOM~b&9(#p}mov01y0O{hvaCBlq
z3GQG|775@$t1ygR)m*%&&KN!5HQmD*sp`YD*7L+-)w~VSrfvWcr-o5e^M#=hXh%1!
zrv)4!X%qC3WMyp~J%qN84^am~wD3dg8|x!k0c1SJKR}mEFm*ID)YbDr0$SHMw6^rc
z`g?c;7@C+Mb#!nhx=eQ`6yC@mgC?o$YaeQa(Nl8_K&jGgRM5^y4~8iUMe%c{>YDnw
z>j(HbxhqrE%pJ86I3|IN@PxRc^_&cy{j_b|;XX_q4{e+Quxv;o66=a`B~hGc1eA}P
zk97dvi9tkADFiQI{q$-6`WQnD14)Og*`QqD?uHh0GhZaa%w5Nj=>~(L{Y_{_&i?-1
z21K-_si!dtkG90(l~pjveOq$#Mw)uzS->C|I2oet4b#y_TNwM8`ZDQyHcn<Rii#D^
z5dw815Kz`8PM(%D11EDsJ%}?5VH`m4b5%1$7-A@DbZ2Eh5|l*7;1Oy_OMO!>Dwsi~
zV+i_|I+nUNE*L1;2%_o)^YCzj={vG0U{?wit4mULweSys(}1y2dgi_munokU?yBNt
zZfK*Thci*}w{(YFTlyg&beyjz-9SwR<z<3E=~KuShG;X45e5w-`BE4jIE00jo~s@a
zuHwODI#~ilQ)LL0igKa&<DK`-3bMaY|FOrvjT3nOXJ<q7JQwmIAdp~*k*+r0-)=EI
z1SdqOZ0b_hWN^H>ugt|!^d`?*D&OEy*`wn-548)d&d1z4=52mGFWY5`oG28FQ*w>8
zxZu7U^ECU6Z$q--ZLJ&Px`*;-g-;$6U_N@pftS6}S$g@jzJt{%SAXW!M)St|b4!14
zcx4s~M`|u1u62D6DyY4-J?i5E`oQU*#m;l_oCNOshWG%_G`>5lnF!X(lZpZbHc0e-
zoyM;Ti1)@CgkEOjr)<(?f86G$v`D<p0CA}XA`*ghxhkdv9I&A9l-e|u#`$oYHLg+_
z5VFG#BPAw)RA3$aBnZlKRmzRM&y|&UiT&&0P+WPEd5b|f&RCRf^PpDVU|ar_1Ts(R
zJ}8j=-2V^vzbeyIvp1H&e#imEcG~=-gK{1SbguU{n-BN7-u7&v1IWA>wizL<yobgY
zIl^%g2ih-&;vh+8JX~4&9LeUu3Mgiu;zvgDDCYueV~bKb7cP9-0mBxa@-p5@i%S*!
zI*px6)#u{7P<{$A6mf{3GGlg^O}w`m^q&D99cA9LE5XXi%G!i>bDMvePO{f9wY9Cm
zC957U^agSDkf2lF?=_AmJ5&veEzixZeqCI&P*2D30VNliRa%HIz+{{Kh_h9sRt|cc
z^n|6dftpJaQP_j(S%;bNXz4#}EG?xY@7xjiBr=y`fyZkx7z}%$$b;fFky5T8t>>17
zS6!c3WgI<xc#eyYFR3e8rO~}L{-QE%LYIq&=OEDc0||OAsjXq$JG8?!tg;fO{1ENE
zK4U`i@CYw=>+<dG?^jPrNvYY{+3EB-`yBx~dnmO0zOpDKP)K5${$n*Z_E=wcwy~JY
zuZJ%N)W(7isHb;+92pVe14W2w<ILF{vP(*q7lfnU|DmB_S3zuvRau|u2x}4zM1NZx
z9v&W_YKimy`svwHY;3G(YKL!bQPJWuXyq^ndb_ScnU{1azY#Cnr@6MiepygZ@c7b_
zvisgqjsx<xFG>fTp4D)JGG8Gy)^st;^YeENjf`TXq@<!AUJk5Gr5;`x@f&Ms2;;0?
zUt9axOWCM8+cf<-@J99Ys8d#kvhUYV<_H8rBR@aC&TCG*5tEvl>bSS_W3#iflM&bQ
zyeBH_J*i?y^T*a!_><h+?WcCNLs3=2LrgC(#i^+&t0GHx!6w@B3+Fs34$4cLqGBTx
zll0{Dbdhg``A`%U{XRP;CZ^W1kZFJI+AfFMO@W*~iXV%`x}21dFdY{kKb14Q;upB`
zMZ3AZ{kboLkv0kUnyfvE-izia<>#qDW?krB*bq2$=#XIEH(e*pv17-+0BW8-sbsg4
zo{9{?=Hp$7Zf<g8LF*=JBgmRzkw1K2&vc|N`c_{%1FDf5eZ1lX8$N&jyj@X#KI?|Q
z%##@j35f%DBO|-iU@(o@Tc6yvwzosTeoLRfTn^myj~k4P362?z+gKPF%P%hWQc3NQ
zd)JxB#WJgh1@CN$Y;0@<6H_>qg1Ntr)r)m^ciVKhu2VsOMrCf477^IAmPTs>9T$fx
z8eyX3qnnGvoD2O$5+mos_UaEWirMG6wGzvQ=I1Hay1L;X0#W_N#l^gD8XH?|zuAJe
z5_9+|6#;HI9IiD>C!)r!BSo)gLt=wD(|+2jF6f8I<B!P$eSH;1%^fW5#l^*IF58=n
z*dpulTS@5;qMwljg@uP`8}oh8+@2qVl+_>G+ex=>-c-1tps<mp(uFRkB7<UBOD|r)
z3mY8Zj<D3pt)E{G%x1W>CB93DkN*NsDQN`}+qn`F671EWP~7h4f<DSGLT*oo?1c*}
z$37GZc*Z6te=@bUX5E^E+qH4n-c)z|{DM|}#m46SMWL;0H<b?Gym_;f+#}sdf<|+O
z+SP4_Rmf;Hy??(4Q&Pg}w9Oi>$Hm4v$;rw6(ZT6K__JR&p;c~rdU_Pt>WJ<eqI0|B
zaNZn~R98RsbYq1RZ2~sCQaaIjd3o>THL}F|Z(n)_oFE0ZB6nY~GlS{$wHlzvkfn4{
z!Lf01<8N*rdB<cj18it<NpBE7Gm-=giyt4>5Z$}-b~T@D%+2GLTiYhRaY{$IxVB0w
zDwv-Q`2r+2msiFciIffxsBneQb`_=jiBSmb6wj!9jnJ!tBP<rrkt5YUlkcN6dDKSK
zBzuLUa#mkoKhUtcy6Swj7E!q!awrFrKGZiln&AX~$bE4RnRutaufP8dDWg)b;LyXR
zBYZM#wT?45G19FY0qc+SB4Kz7i*b*LP<g;=b-cWmG)wI3_i8}vY$iLqy9?!IWjXiX
z^T|Djo)aU1ArPh1j+qY)LA)FlmRUGxre;WRdk<FAq);<<RmYB32A%w2cw}T(9%TDS
zXe;p9vu9`Och-!ls6G9n)RXo>s~BtR!QzJgyF45ln+b9R>7bp}rWaO5TJvK83knyM
zlz#23O}7z0YDUSS^YQ(5)xIVO;ePrDF8>Q+#G+>4NNPEM0enJyxJmQ{#|`yUpp+Jy
zu`dp5GIl{iBr;hXOLju;k;k3?u(|>kOOJ_p<{(*8`B*?kOpM4JtMnYk@IXT@^Y<d;
zET7(%la~*=+htO^7$Rhd#YPCqV1lmw{6@C1=XFLRk-VcXXgc5?zv40|xm(iR++5IF
za_@CUXGGTKx0RJGf{squ&lVY)&5#8x#A{%1@Gu)2TW4{xVj1U(y8ZU`A@_=*^=jWm
z?lVS5cF1q_8aW3^rL;-?15LE4k?daqr{;e}-@9k)w>D)|CVxyRgZt}f?HP@qe?5lG
zcBWVVv8+3OH{%kE?&$0+p^?og-~)Jue)oZ5sn7MZt894|vVGZWYioCuYF2J+DZCQ`
zs}I>;T5pGJ*45P|Ei5e5Kl$hfP8@y3T)1KHgB6d0f1V5b$_m<EtP(qQWsHwWbZ~Hp
z`AFhnxXD;;n6#dKYV~ZwzKS}Qv$4S}$jzPoE+QhbHST_j1laT5$l%})d(9;Kzanh%
z@k>U=#y!-LSE`{FE1ypfoT1i?1KVNCSV!l;pe|}MfZBNL=-hJsuf0>komQJMDJes{
z4V+>R%8vMbhi~c>eI&I5JK{bz6&5wUHF6@=vTzZc+A#&$JT9!Zy0PJ@5%7()@;I+e
z`*D4J4xbr8QeFL3HsE-cZ0EahnwqqUw-aI^I|31+>}5Xly%#?$Y*gLTmngckdm4Lb
z_3fR+#1lbPG!?OihK9u|uaWbrXS?=zHUbMRi+)}MEL-yAHHY$TA^-0qep%0-KmW45
zT%T)UHMw~73~Yyw_p)u%*HQkd`=HVd#a{5kuc;CS(d{;6#KU#*FN&Q*+M1gU-E?$x
z(preJf)0B}1dA*KU4QNELY{rdS)e2)B{jO2)LJ&tKFhOL*h<H3FnoOj^7<$PwGM67
z+z(L3vIzxUbBq9Xt&>Nsr|5|MBAKM_0P?d}F&q8C!NI%{jalb#UA)}fvahafZ#I_%
zoQKiXKE)*o)!I>OSnJY*A%>IOnSe=11$&PxP1o|NsIza(CnqQ0E2;a*-PE(glyuK=
z1dOLi$-eHXpo7MPmV)r`@bt{!pBH_q8!yg5@=^(QtnA07rQU+q0}L!J`xlmL)}yBe
z=C}pYpQdepE$`a%U+7nmWqyGQcW_>*^k9X_+rNv<WFM}gMkrjV+|iqvoHUQg%q$6<
z%TC&2z3%rremgpP=@Q_um)X7?5srO;ofHe+8fS0k3{kD$nmA%r?%HvfeWP!(>At4a
zyUWxam+kC#-{yLTOKe}3ae+ENtjx~N4&Y2pRSvB;*qf9^r~s#_DGZR;56BS*`QcYi
z##kNX;P9=gtc=ahQM<|V|Ipgj)@EyO{|i17R-ZyNK$A#+VZkqLN6F8upzv#N?RA~T
z=jP^02R(v89~9dg!z^VJ=Eu%9MKuJi5aQ4a<ccA$hiGY^Pm8{M^!a0UJI5ciO%tP2
z@Wu3%s=e%+5fKrOb8|V@#kJZ4$9U3+n_=;Z$G@<f+-3(4hG?{!;Sa2fBhj&ZL1vNs
z50WS1Y@UP)b!=z$!gEgK%0}nEn=|Nn6@rc`7n>ly8|0(?{P=t+bN4liLMxlNQ~}>5
z*?jLZpFF7tJOZ%)_Sd7^?wW5~?gH>P?;>Y$x1fw10J&l&3)_Ub@c@cI>jVH3rm)(O
z%c@I30^*AMAgb3B;aB%XR4-;?0swY1<q-e-=V^DUTlBah0l00@^6g}G3ma%5_%{E^
zeYhVxr^VC+$wBX!p9G)>dvC+xcnZjU?oQ0{ecUJfS@8`7D$KZxI{^Sc_Q~9z7T7!X
zPq7M^tNWlS-rv}lE3L6A$tK=9THX+MQ1`aX2gawkgUyM5Tw2%r^A#x6t&VE|b341x
zt&V@pUp<Nc=JMc|IotDZC&}~kbGC04G9EXZf8I`=MBD{vj;-I%>P-k^Yo^6l8ckN;
zUJ;mh=^#7x_R7SGE@?mQ&kZSG2B*%y^=ZKWH8}NlV@5CXglAqsLBN}v+YWINLd~6>
z(#K7Iv37rM%#!a+E-%|>CM2j{0|K7sw$bXEKtK}K-rnBkT8?0pcJf)5ARm8(io(6m
z!8J5Qv8VVS?B$#1`c_m`<tC$ZkZdyt9zF<*ou|0FYu~NdY!-dHvQj-;+$rf+&2>W<
zl*n=LV9=+bA=HA07V4#lh!?Mz1`lv5tDcF{S9m8{k^;Dj%%dD(Rq?2}n2l~nM@K)e
z&o5RvL0iMPfLCVL7c>zFmYtoQsHml4X#3O@@rCy|l6LiKx?SjxP-!62noUFa#1<A5
zNcz;QPrQpPQdL#`arNre)LT6tkLOjOve!^7*2^kPu7v93%0w23MNWfxri{!n6f3Oc
z4g8aN2YbiH>Y=i-6q>d++qw*|q_ngz9w-kxX5fTxK8Gk1GXDyYxCuK>soO#q<mJOn
zQeiax$1!O~dW?<Fn*Dhh2HUIxLSkVX4TF@-_;{f!fZHZVPo8)+q(;b+-rJPFQYl~j
z<jFxd9b1d<b-oJ&B@wNyttDrKg`Ey2^HGqm`{x+tRzXg2G7J}&>C+lof>~QyM@L6T
z36<2bz1|d6cmKhU=m`>V?*BVPq&>(ow6gkiqr2No?1Y_Yi?O4vZCam$a+)`@nO2_>
zG@f=bu7y%qSm+`kAOKxIf7l-ICPdWT`1$lBps{YAl$uK%hYn?*RcAB@Lb2at$ko$r
zNn<L)QLN$`A>JqA_IY>i54^uGR{yxJZnSG)Aj#EEa@-v_#2+Lk_ETV~AqPO7@nLp{
zKraKoFG-o-iN9JsCi0`S%xgrQ{<yEvWcX;`8F8Fo$bZ83hSiEtTQ?$6i$+`h@&5h$
zS>VsRfg8uhe#O1?ndMj>EN=>gritkE)1Lw{6$Y4W<e-NgqBkO8{Ko9%oVu~Be`OQ4
zF9j-Dxa;BJ2VXGe%znI!JQ*@8?Kx^Ln{aw?a1dp-OnqWUtQh(4R04;HH2W(qg(OKR
z>{A7jCBgFY@-Y1Zl0=35lQMH6kyz4486nu)*Eg8#^7K$DssU%7(bn3!W`sh~dpx(Q
zrH<@CAdn)!*U!SEhq*u;dv+X^{0CH5;f_GwmrJM9gUrm$X`vkuxsHww<&eFgKsPtH
zS1rV$mYy{1`l%wzZ6L79eDLiXBeSot<-x|l%jS$XX=!H*`zW3h@Ffw@h1?OrXSle%
z@O*qh$kgm?ptQ8~MAGSu)8JD)rQYLj>>}T-$%2Afd(x=uq$11I(Z0UpF|o1djZr9J
zNZ_VNorZsv3=_dCdg)VoQqn-KWnuj^T#*wLz2-ahi0x=zOVRm%Wx7{uRAJlJY-V=a
zxjl$i)zy=1Usfb=x6Zo0>K+*Q&WzHZ6cH0E0X%w3GHZQ?EsEs@?g|0|Fu3nmD?cM6
zqx&7M)jj?Fn|`3JgCOD0B4P@8Mw*X_;K7e&WngPGPv3plrG5w9t&+UFbF*o22!LxR
z>5}dPB0`RJL#f<KzUx+aI3qkFqRp*6d0f?{Rp?x~%=PQnwQ{Jc!bcHNJk8txlgVqj
zDhZ!CGyZk3T%@9+B048WT1iv0e*J9IwczDDm;M5q`rXC~Qo8F;)!JoR;_=U4i=-#q
zz}DJ@Jj%;!o@VlTeF&Gg;{88=r#QnJl&H5+`_|@?^o#RYJE88}^pYCz0Uu<fhtVxY
HI^6g#H%&1x

literal 0
HcmV?d00001

diff --git a/tests/phpunit/data/test-1.svg b/tests/phpunit/data/test-1.svg
new file mode 100644
index 0000000..fd560f5
--- /dev/null
+++ b/tests/phpunit/data/test-1.svg
@@ -0,0 +1,16 @@
+<svg
+	xmlns="http://www.w3.org/2000/svg"
+	xmlns:xlink="http://www.w3.org/2000/svg" version="1.1" width="181px" height="161px" viewBox="-0.5 -0.5 181 161" content="&lt;mxfile host=&quot;embed.diagrams.net&quot; modified=&quot;2022-12-16T13:44:29.475Z&quot; agent=&quot;5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36&quot; version=&quot;20.7.4&quot; etag=&quot;EUbG6Xw6fl8FZ74HJXdt&quot; type=&quot;embed&quot;&gt;&lt;diagram id=&quot;aCI9MKqzX_XA8krSlI-C&quot; name=&quot;Page-1&quot;&gt;vZRbT4MwFIB/Da8LUJ28zrnNl0UToj6ajp5BXaGkdAL+eltabu4Wk2myh/L1tKf7enocNE+rlcB5suYEmOO7pHLQg+P7N77v6J9LagOmU8+AWFBi0ACE9AssdC3dUwLFKFByziTNxzDiWQaRHDEsBC/HYVvOxllzHMMBCCPMDukbJTIxNLh1e/4INE7azJ5rZ1LcBltQJJjwcoDQwkFzwbk0o7SaA9PuWi9m3fLEbHcwAZk8suClAPG0+dBOfJfhjbqWJsgsYzTbtd9ojWn2/qxFNHNtBr87ZJe8kHUrRvB9RkCHug66LxMqIcxxpGdLVQmKJTLVOT01NBt/gpBQnTy+N8i3Ap6CFLUKsQvurEZbR6j1XPa34gWWJYMbmVqGbSHE3c69KzWwf7H9HNj7rc0wh4hiNT97BVFQno2torNWFVCVDZeN4iI35b6llb6Fayj2fjoODh0fUxz8q+JESv32Z3prf1nSHZ1EPM1xVk8YVw93rPvmrG71JnM9JFjiUHLRNINL6hvjtlP9UXEfEd81luubV6hvQ034oJejxTc=&lt;/diagram&gt;&lt;/mxfile&gt;">
+	<defs/>
+	<g>
+		<a xlink:href="#Main_Page">
+			<rect x="0" y="0" width="180" height="60" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+		</a>
+		<a xlink:href="#Special:Version">
+			<ellipse cx="140" cy="120" rx="40" ry="40" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+		</a>
+		<a xlink:href="https://wiki.company.local">
+			<path d="M 20 80 L 100 80 Q 60 120 100 160 L 20 160 Q -20 120 20 80 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+		</a>
+	</g>
+</svg>
\ No newline at end of file
diff --git a/tests/phpunit/data/test-2-dxdocument.xml b/tests/phpunit/data/test-2-dxdocument.xml
new file mode 100644
index 0000000..8b4a6f9
--- /dev/null
+++ b/tests/phpunit/data/test-2-dxdocument.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mxGraphModel dx="422" dy="661" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
+	<root>
+		<mxCell id="0"/>
+		<mxCell id="1" parent="0"/>
+		<UserObject label="" link="#Main_Page" id="2">
+			<mxCell style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+				<mxGeometry x="70" y="300" width="180" height="60" as="geometry"/>
+			</mxCell>
+		</UserObject>
+		<UserObject label="" link="#Special:Version" id="3">
+			<mxCell style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;" vertex="1" parent="1">
+				<mxGeometry x="170" y="380" width="80" height="80" as="geometry"/>
+			</mxCell>
+		</UserObject>
+		<UserObject label="" link="https://wiki.company.local" id="4" linkTarget="_blank">
+			<mxCell style="shape=dataStorage;whiteSpace=wrap;html=1;fixedSize=1;" vertex="1" parent="1">
+				<mxGeometry x="70" y="380" width="100" height="80" as="geometry"/>
+			</mxCell>
+		</UserObject>
+	</root>
+</mxGraphModel>
\ No newline at end of file
diff --git a/tests/phpunit/data/test-2.html b/tests/phpunit/data/test-2.html
new file mode 100644
index 0000000..fc61620
--- /dev/null
+++ b/tests/phpunit/data/test-2.html
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map name="test">
+	<area shape="rect" coords="0,0,180,60" href="#Main_Page" />
+	<area shape="rect" coords="100,80,180,160" href="#Special:Version" />
+	<area shape="rect" coords="0,80,100,160" href="https://wiki.company.local" target="_blank" />
+</map>
\ No newline at end of file

From 02ea58e3c24d794d6de1469068ff34dc5c9e71d0 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Thu, 29 Dec 2022 10:01:24 +0100
Subject: [PATCH 080/117] Localisation updates from https://translatewiki.net.

Change-Id: Ifeed98bc1054dd482caccc4f36473e4f15d9ecba
---
 i18n/he.json | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 i18n/he.json

diff --git a/i18n/he.json b/i18n/he.json
new file mode 100644
index 0000000..8f763ea
--- /dev/null
+++ b/i18n/he.json
@@ -0,0 +1,13 @@
+{
+	"@metadata": {
+		"authors": [
+			"Amire80"
+		]
+	},
+	"drawioeditor-desc": "יצירה ועריכה מובנית של תרשימי זרימה של draw.io",
+	"drawioeditor-approved-editwarning": "יש לשים לב לכך שעכשיו נערכת הגרסה העדכנית ביותר של התרשים הזה, ולא הגרסה מאושרת שמוצגת כברירת מחדל.",
+	"drawioeditor-approved-displaywarning": "זוהי הגרסה המאושרת של התרשים ולא הגרסה האחרונה.",
+	"drawioeditor-noapproved": "לתרשים $1 אין גרסה מאושרת.",
+	"drawioeditor-approve-link": "יש ללחוץ כאן כדי לאשר גרסה",
+	"drawioeditor-changeapprove-link": "יש ללחוץ כאן כדי לשנות את הגרסה המאושרת עבור התרשים הזה"
+}

From bcd6812d94aabaf656d23e0f26815c16e097d095 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Thu, 5 Jan 2023 09:07:59 +0100
Subject: [PATCH 081/117] Localisation updates from https://translatewiki.net.

Change-Id: I1ccc35835fcec7d8b2ba23b0a636cc026c480801
---
 i18n/sl.json | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 i18n/sl.json

diff --git a/i18n/sl.json b/i18n/sl.json
new file mode 100644
index 0000000..98f8dce
--- /dev/null
+++ b/i18n/sl.json
@@ -0,0 +1,13 @@
+{
+	"@metadata": {
+		"authors": [
+			"Eleassar"
+		]
+	},
+	"drawioeditor-desc": "Ustvarjanje diagramov poteka in znotrajvrstično urejanje Draw.io",
+	"drawioeditor-approved-editwarning": "Upoštevajte, da zdaj urejate zadnjo redakcijo tega diagrama, ki ni privzeto prikazana odobrena.",
+	"drawioeditor-approved-displaywarning": "To je odobrena in ne zadnja redakcija diagrama.",
+	"drawioeditor-noapproved": "Diagram $1 nima odobrene redakcije.",
+	"drawioeditor-approve-link": "Kliknite, da odobrite redakcijo",
+	"drawioeditor-changeapprove-link": "Kliknite tu, da spremenite odobreno redakcijo tega diagrama"
+}

From 687411ea7288f9826e4ee8d5cf41930fa2f4fa3e Mon Sep 17 00:00:00 2001
From: Hamish Slater <hamishslater@hotmail.com>
Date: Thu, 12 Jan 2023 14:06:46 +0100
Subject: [PATCH 082/117] Allow required composer plugins

composer/installers

ERM30996

[REL1_35, REL1_39, master]

Change-Id: Ic4f1b85d0f29271793f871a83a0562a773fcbe05
---
 composer.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/composer.json b/composer.json
index bd0ab39..88f86ab 100644
--- a/composer.json
+++ b/composer.json
@@ -22,5 +22,10 @@
 			"phpcbf"
 		],
 		"phpcs": "phpcs -sp --cache"
+	},
+	"config": {
+		"allow-plugins": {
+			"composer/installers": true
+		}
 	}
 }

From e8f85dbb07b765c4355fadd3065210e1b77a826a Mon Sep 17 00:00:00 2001
From: Pavlo Yashchenko <pyashchenko@hallowelt.com>
Date: Mon, 20 Jun 2022 14:29:31 +0200
Subject: [PATCH 083/117] Merge DrawioEditor and BlueSpiceDrawioConnector

ERM21590

[4.1.x]

Change-Id: I883b664b9063f9635afd0c1eb9a2c2f895111214
---
 extension.json                                |  39 ++++++-
 i18n/en.json                                  |  12 +-
 i18n/qqq.json                                 |  12 +-
 includes/DrawioConnector.php                  | 101 +++++++++++++++++
 resources/ve/ve.ce.DrawioNode.js              |  17 +++
 resources/ve/ve.dm.DrawioNode.js              |  21 ++++
 resources/ve/ve.ui.DrawioInspector.js         | 105 ++++++++++++++++++
 resources/ve/ve.ui.DrawioNodeTool.js          |  24 ++++
 .../BSInsertMagicAjaxGetData/AddDrawioTag.php |  28 +++++
 src/Hook/Tag.php                              |  45 ++++++++
 10 files changed, 400 insertions(+), 4 deletions(-)
 create mode 100644 includes/DrawioConnector.php
 create mode 100644 resources/ve/ve.ce.DrawioNode.js
 create mode 100644 resources/ve/ve.dm.DrawioNode.js
 create mode 100644 resources/ve/ve.ui.DrawioInspector.js
 create mode 100644 resources/ve/ve.ui.DrawioNodeTool.js
 create mode 100644 src/Hook/BSInsertMagicAjaxGetData/AddDrawioTag.php
 create mode 100644 src/Hook/Tag.php

diff --git a/extension.json b/extension.json
index adac5e6..546cd3f 100644
--- a/extension.json
+++ b/extension.json
@@ -6,6 +6,13 @@
 		"Markus Gebert",
 		"[https://www.hallowelt.com Hallo Welt! GmbH]"
 	],
+	"attributes": {
+		"VisualEditor": {
+			"PluginModules": [
+				"ext.drawioconnector.visualEditor"
+			]
+		}
+	},
 	"descriptionmsg": "drawioeditor-desc",
 	"type": "parserhook",
 	"requires": {
@@ -39,6 +46,23 @@
 				"drawioeditor-approve-link",
 				"drawioeditor-changeapprove-link"
 			]
+		},
+		"ext.drawioconnector.visualEditor": {
+			"scripts": [
+				"ve/ve.dm.DrawioNode.js",
+				"ve/ve.ce.DrawioNode.js",
+				"ve/ve.ui.DrawioInspector.js",
+				"ve/ve.ui.DrawioNodeTool.js"
+			],
+			"dependencies": [
+				"ext.visualEditor.mwcore",
+				"oojs-ui"
+			],
+			"messages": [
+				"drawioconnector-tag-drawio-desc",
+				"drawioconnector-ve-drawio-title",
+				"drawio-usage"
+			]
 		}
 	},
 	"ResourceFileModulePaths": {
@@ -46,10 +70,21 @@
 		"remoteExtPath": "DrawioEditor/resources"
 	},
 	"Hooks": {
-		"ParserFirstCallInit": "MediaWiki\\Extension\\DrawioEditor\\Hook\\ParserFirstCallInit\\SetFunctionHook::callback",
-		"DrawioGetFile": "approveRevsSetStableFile"
+		"ParserFirstCallInit": [
+			"tag",
+			"MediaWiki\\Extension\\DrawioEditor\\Hook\\ParserFirstCallInit\\SetFunctionHook::callback"
+		],
+		"DrawioGetFile": "approveRevsSetStableFile",
+		"BSInsertMagicAjaxGetData": [
+			"\\MediaWiki\\Extension\\DrawioEditor\\Hook\\BSInsertMagicAjaxGetData\\AddDrawioTag::callback"
+		],
+		"BSUEModulePDFFindFiles": "BlueSpiceDrawioConnector::onBSUEModulePDFFindFiles",
+		"ImagePageAfterImageLinks": "BlueSpiceDrawioConnector::onImagePageAfterImageLinks"
 	},
 	"HookHandlers": {
+		"tag": {
+			"class": "\\MediaWiki\\Extension\\DrawioEditor\\Hook\\Tag"
+		},
 		"approveRevsSetStableFile": {
 			"class": "MediaWiki\\Extension\\DrawioEditor\\Hook\\ApprovedRevsSetStableFile",
 			"services": [ "DBLoadBalancer", "RepoGroup" ]
diff --git a/i18n/en.json b/i18n/en.json
index fe4c9b1..a9eb373 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,5 +5,15 @@
 	"drawioeditor-approved-displaywarning": "This is the approved revision of the diagram and not the latest revision.",
 	"drawioeditor-noapproved": "The diagram $1 has no approved revision.",
 	"drawioeditor-approve-link": "Click here to approve a revision",
-	"drawioeditor-changeapprove-link": "Click here to change the approved revision for this diagram"
+	"drawioeditor-changeapprove-link": "Click here to change the approved revision for this diagram",
+
+	"drawio-usage": "Used with Drawio tag",
+	"drawio-not-used": "There are no pages with this Drawio image",
+	"drawioconnector-extension-description": "Connects BlueSpice to Drawio",
+	"drawioconnector-tag-drawio-title": "drawio",
+	"drawioconnector-ve-drawio-title": "Draw.io diagram",
+	"drawioconnector-tag-drawio-desc": "Insert a draw.io diagram that can be edited.",
+	"drawioconnector-ve-drawio-tag-name": "Name",
+	"drawioconnector-ve-drawio-tag-name-help": "Name of the diagram as stored in the wiki",
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagram-1"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 370d77c..7e585ca 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -7,5 +7,15 @@
 	"drawioeditor-approved-displaywarning": "Used as warning shown in '''bold'''.",
 	"drawioeditor-noapproved": "Displayed when $1 has no approved revision",
 	"drawioeditor-approve-link": "Link to approve a revision of the diagram",
-	"drawioeditor-changeapprove-link": "Link to change the approved revision of the diagram"
+	"drawioeditor-changeapprove-link": "Link to change the approved revision of the diagram",
+
+	"drawio-usage": "Headline for list of pages which use a particular drawio image. Displayed on the image page",
+	"drawio-not-used": "Text shown when no page uses a particular drawio image. Displayed on the image page",
+	"drawioconnector-extension-description": "Describes the purpose of the extension",
+	"drawioconnector-tag-drawio-title": "Used in InsertMagic extension, tag description for drawio",
+	"drawioconnector-ve-drawio-title": "Used in VisualEditor tag inspector, tag title for drawio",
+	"drawioconnector-tag-drawio-desc": "Used in VisualEditor tag inspector, tag description for drawio.",
+	"drawioconnector-ve-drawio-tag-name": "Label for the input field for name of the diagram",
+	"drawioconnector-ve-drawio-tag-name-help": "Help text for the input field for name of the diagram",
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Placeholder text for the input field for name of the diagram"
 }
diff --git a/includes/DrawioConnector.php b/includes/DrawioConnector.php
new file mode 100644
index 0000000..681aa32
--- /dev/null
+++ b/includes/DrawioConnector.php
@@ -0,0 +1,101 @@
+<?php
+
+use MediaWiki\MediaWikiServices;
+
+class DrawioConnector {
+	/**
+	 *
+	 * @param mixed $oPDFServlet
+	 * @param mixed $oImageElement
+	 * @param string &$sAbsoluteFileSystemPath
+	 * @param string &$sFileName
+	 * @param string $sDirectory
+	 * @return void
+	 */
+	public static function onBSUEModulePDFFindFiles(
+		$oPDFServlet,
+		$oImageElement,
+		&$sAbsoluteFileSystemPath,
+		&$sFileName,
+		$sDirectory
+	) {
+		if ( $sDirectory !== 'images' ) {
+			return true;
+		}
+		if ( strpos( $oImageElement->getAttribute( 'id' ), "drawio-img-" ) !== false ) {
+			$oImageElement->removeAttribute( 'style' );
+		}
+		return true;
+	}
+
+	/**
+	 *
+	 * @param mixed $oImagePage
+	 * @param string &$sHtml
+	 * @return void
+	 */
+	public static function onImagePageAfterImageLinks( $oImagePage, &$sHtml ) {
+		$oTitle = $oImagePage->getTitle();
+		$sFileName = $oTitle->getText();
+		if ( strpos( $sFileName, '.drawio.' ) === false ) {
+			return true;
+		}
+		// $sFileName = str_replace( '.drawio.' . $wgDrawioEditorImageType, '', $sFileName );
+		$sFileName = str_replace( ' ', '_', $sFileName );
+		$aConds = [
+			"old_text LIKE '%{{#drawio:" . $sFileName . "}}%'",
+			"old_text LIKE '%{{#drawio: " . $sFileName . "}}%'",
+			"old_text LIKE '%{{#drawio:" . $sFileName . "|%'",
+			"old_text LIKE '%{{#drawio: " . $sFileName . "|%'",
+		];
+
+		$oDBR = wfGetDB( DB_REPLICA );
+		$oRes = $oDBR->select(
+				[ 'page', 'revision', 'slots', 'text' ],
+				[ 'page_namespace', 'rev_id', 'page_title' ],
+				'(' . implode( ' OR ', $aConds ) .
+				') AND page_id = rev_page AND rev_id = slot_revision_id AND old_id = slot_content_id',
+				__METHOD__
+		);
+
+		$aLinks = [];
+		$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+		foreach ( $oRes as $oRow ) {
+			$oRevision = Revision::newFromId( $oRow->rev_id );
+			if ( $oRevision->isCurrent() ) {
+				$title = Title::makeTitle( $oRow->page_namespace, $oRow->page_title );
+				$sLink = $linkRenderer->makeLink( $title );
+				$oLi = Html::rawElement( 'li', [], $sLink ) . "\n";
+				$aLinks[$title->getPrefixedDBkey()] = $oLi;
+			}
+		}
+
+		$pagePropsRes = $oDBR->select(
+			'page_props',
+			'pp_page',
+			[
+				'pp_propname' => 'drawio-image',
+				'pp_value' => $sFileName
+			],
+			__METHOD__
+		);
+		foreach ( $pagePropsRes as $row ) {
+			$title = Title::newFromID( $row->pp_page );
+			$link = $linkRenderer->makeLink( $title );
+			$liEl = Html::rawElement( 'li', [], $link );
+			$aLinks[$title->getPrefixedDBkey()] = $liEl;
+		}
+		ksort( $aLinks );
+
+		$sHtml .= Html::rawElement( 'h2', [], wfMessage( 'drawio-usage' )->plain() );
+		$sHtml .= Html::openElement( 'ul' ) . "\n";
+		if ( empty( $aLinks ) ) {
+			$sHtml .= Html::rawElement( 'p', [], wfMessage( 'drawio-not-used' )->plain() );
+		} else {
+			$sHtml .= implode( "\n", $aLinks );
+		}
+		$sHtml .= Html::closeElement( 'ul' );
+
+		return true;
+	}
+}
diff --git a/resources/ve/ve.ce.DrawioNode.js b/resources/ve/ve.ce.DrawioNode.js
new file mode 100644
index 0000000..b07a571
--- /dev/null
+++ b/resources/ve/ve.ce.DrawioNode.js
@@ -0,0 +1,17 @@
+ve.ce.DrawioNode = function VeCeAttachmentNode() {
+	// Parent constructor
+	ve.ce.DrawioNode.super.apply( this, arguments );
+};
+
+/* Inheritance */
+OO.inheritClass( ve.ce.DrawioNode, ve.ce.MWInlineExtensionNode );
+
+/* Static properties */
+ve.ce.DrawioNode.static.name = 'drawio';
+ve.ce.DrawioNode.static.primaryCommandName = 'drawio';
+
+// If body is empty, tag does not render anything
+ve.ce.DrawioNode.static.rendersEmpty = false;
+
+/* Registration */
+ve.ce.nodeFactory.register( ve.ce.DrawioNode );
diff --git a/resources/ve/ve.dm.DrawioNode.js b/resources/ve/ve.dm.DrawioNode.js
new file mode 100644
index 0000000..faa39d0
--- /dev/null
+++ b/resources/ve/ve.dm.DrawioNode.js
@@ -0,0 +1,21 @@
+ve.dm.DrawioNode = function DrawioNode() {
+	// Parent constructor
+	ve.dm.DrawioNode.super.apply( this, arguments );
+};
+
+/* Inheritance */
+OO.inheritClass( ve.dm.DrawioNode, ve.dm.MWInlineExtensionNode );
+
+/* Static members */
+ve.dm.DrawioNode.static.name = 'drawio';
+ve.dm.DrawioNode.static.tagName = 'drawio';
+
+// Name of the parser tag
+ve.dm.DrawioNode.static.extensionName = 'drawio';
+
+// This tag renders without content
+ve.dm.DrawioNode.static.childNodeTypes = [];
+ve.dm.DrawioNode.static.isContent = false;
+
+/* Registration */
+ve.dm.modelRegistry.register( ve.dm.DrawioNode );
diff --git a/resources/ve/ve.ui.DrawioInspector.js b/resources/ve/ve.ui.DrawioInspector.js
new file mode 100644
index 0000000..6386117
--- /dev/null
+++ b/resources/ve/ve.ui.DrawioInspector.js
@@ -0,0 +1,105 @@
+ve.ui.DrawioInspector = function VeUiAttachmentInspector( config ) {
+	// Parent constructor
+	ve.ui.DrawioInspector.super.call( this, ve.extendObject( { padded: true }, config ) );
+};
+
+/* Inheritance */
+OO.inheritClass( ve.ui.DrawioInspector, ve.ui.MWLiveExtensionInspector );
+
+/* Static properties */
+ve.ui.DrawioInspector.static.name = 'drawioInspector';
+ve.ui.DrawioInspector.static.title = mw.message( 'drawioconnector-ve-drawio-title' ).text();
+ve.ui.DrawioInspector.static.modelClasses = [ ve.dm.DrawioNode ];
+ve.ui.DrawioInspector.static.dir = 'ltr';
+
+// This tag does not have any content
+ve.ui.DrawioInspector.static.allowedEmpty = true;
+ve.ui.DrawioInspector.static.selfCloseEmptyBody = false;
+
+/**
+ * @inheritdoc
+ */
+ve.ui.DrawioInspector.prototype.initialize = function () {
+	ve.ui.DrawioInspector.super.prototype.initialize.call( this );
+	this.filename = mw.config.get( 'wgTitle' ) + "-" + ( Math.floor( Math.random() * 100000000) + 1 );
+
+	// remove input field with links in it
+	this.input.$element.remove();
+
+	this.createLayout();
+
+	this.form.$element.append(
+		this.indexLayout.$element
+	);
+};
+
+ve.ui.DrawioInspector.prototype.createLayout = function ( ) {
+	this.indexLayout = new OO.ui.PanelLayout( {
+		expanded: false,
+		padded: true
+	} );
+
+	// 'Used with Drawio tag' Label
+	this.insertLabel = new OO.ui.LabelWidget( {
+		label: OO.ui.deferMsg( 'drawioconnector-tag-drawio-desc' )
+	} );
+	
+	// InputWidget for file Name
+	this.fileNameInputWidget = new OO.ui.TextInputWidget();
+	this.fileNameInputLayout = new OO.ui.FieldLayout( this.fileNameInputWidget, {
+		align: 'left',
+		label: 'File Name'
+	} )
+
+	// InputWidget for file extension
+	this.savingFormatWidget = new OO.ui.ButtonSelectWidget( {
+		items: [
+			new OO.ui.ButtonOptionWidget( {
+				data: 'png',
+				label: 'png'
+			} ),
+			new OO.ui.ButtonOptionWidget( {
+				data: 'svg',
+				label: 'svg'
+			} )
+		]
+	} );
+	this.savingFormatLayout = new OO.ui.FieldLayout( this.savingFormatWidget, {
+		align: 'left',
+		label: 'File Format'
+	} )
+
+	// set default values
+	this.fileNameInputWidget.setValue( this.filename );
+	this.fileNameInputWidget.setDisabled( true );
+	this.savingFormatWidget.selectItem( this.savingFormatWidget.items[0] );
+
+	this.indexLayout.$element.append( 
+		this.insertLabel.$element,
+		this.fileNameInputLayout.$element,
+		this.savingFormatLayout.$element 
+	);
+}
+
+ve.ui.DrawioInspector.prototype.getSetupProcess = function ( data ) {
+	return ve.ui.DrawioInspector.super.prototype.getSetupProcess.call( this, data )
+		.next( function () {
+			this.selectedNode.getAttribute( 'mw' ).attrs;
+			this.actions.setAbilities( { done: true } );
+		}, this );
+}	
+
+ve.ui.DrawioInspector.prototype.updateMwData = function ( mwData ) {
+	ve.ui.DrawioInspector.super.prototype.updateMwData.call( this, mwData );
+	
+	var filename = this.fileNameInputWidget.getValue();
+	if ( filename.match( /[a-zA-Z0-9\s_\\.\-\(\):]/ ) ) {
+		mwData.attrs.filename = filename;
+	}
+	mwData.attrs.type = this.savingFormatWidget.findSelectedItem().getData();
+}
+
+/* Registration */
+ve.ui.windowFactory.register( ve.ui.DrawioInspector );
+
+
diff --git a/resources/ve/ve.ui.DrawioNodeTool.js b/resources/ve/ve.ui.DrawioNodeTool.js
new file mode 100644
index 0000000..b17477c
--- /dev/null
+++ b/resources/ve/ve.ui.DrawioNodeTool.js
@@ -0,0 +1,24 @@
+ve.ui.DrawioNodeTool = function DrawioNodeTool( toolGroup, config ) {
+	ve.ui.DrawioNodeTool.super.call( this, toolGroup, config );
+};
+
+OO.inheritClass( ve.ui.DrawioNodeTool, ve.ui.FragmentInspectorTool );
+
+ve.ui.DrawioNodeTool.static.name = 'drawioTool';
+ve.ui.DrawioNodeTool.static.group = 'none';
+ve.ui.DrawioNodeTool.static.autoAddToCatchall = false;
+ve.ui.DrawioNodeTool.static.icon = 'attachment';
+ve.ui.DrawioNodeTool.static.title = mw.message(
+	'drawio-usage'
+).text();
+ve.ui.DrawioNodeTool.static.modelClasses = [ ve.dm.DrawioNode ];
+ve.ui.DrawioNodeTool.static.commandName = 'drawioCommand';
+
+ve.ui.toolFactory.register( ve.ui.DrawioNodeTool );
+
+ve.ui.commandRegistry.register(
+	new ve.ui.Command(
+		'drawioCommand', 'window', 'open',
+		{ args: [ 'drawioInspector' ], supportedSelections: [ 'linear' ] }
+	)
+);
diff --git a/src/Hook/BSInsertMagicAjaxGetData/AddDrawioTag.php b/src/Hook/BSInsertMagicAjaxGetData/AddDrawioTag.php
new file mode 100644
index 0000000..1c7b3aa
--- /dev/null
+++ b/src/Hook/BSInsertMagicAjaxGetData/AddDrawioTag.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace MediaWiki\Extension\DrawioEditor\Hook\BSInsertMagicAjaxGetData;
+
+use BlueSpice\InsertMagic\Hook\BSInsertMagicAjaxGetData;
+
+class AddDrawioTag extends BSInsertMagicAjaxGetData {
+
+	protected function skipProcessing() {
+		return $this->type !== 'tags';
+	}
+
+	protected function doProcess() {
+		$this->response->result[] = (object)[
+			'id' => 'drawio',
+			'type' => 'tag',
+			'name' => 'drawio',
+			'desc' => wfMessage( 'drawioconnector-tag-drawio-desc' )->escaped(),
+			'code' => '{{#drawio:filename="Diagram.png" }}',
+			'mwvecommand' => 'drawioCommand',
+			'previewable' => false,
+			'examples' => [ [ 'code' => '{{#drawio:filename="Diagram.png" }}' ] ],
+			'helplink' => "https://en.wiki.bluespice.com/wiki/Reference:BlueSpiceDrawioConnector"
+		];
+		return true;
+	}
+
+}
diff --git a/src/Hook/Tag.php b/src/Hook/Tag.php
new file mode 100644
index 0000000..aca5791
--- /dev/null
+++ b/src/Hook/Tag.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace MediaWiki\Extension\DrawioEditor\Hook;
+
+use Html;
+use MediaWiki\Extension\DrawioEditor\DrawioEditor;
+use MediaWiki\Hook\ParserFirstCallInitHook;
+use Parser;
+use PPFrame;
+
+class Tag implements ParserFirstCallInitHook {
+	public const NAME = 'drawio';
+	public const BS_NAME = 'bs:drawio';
+
+	/**
+	 * @param Parser $parser
+	 */
+	public function onParserFirstCallInit( $parser ) {
+		$parser->setHook( static::NAME, [ $this, 'onDrawIo' ] );
+		$parser->setHook( static::BS_NAME, [ $this, 'onDrawIo' ] );
+	}
+
+	/**
+	 * @param string|null $input
+	 * @param array $args
+	 * @param Parser $parser
+	 * @param PPFrame $frame
+	 * @return void
+	 */
+	public function onDrawIo( ?string $input, array $args, Parser $parser,
+		PPFrame $frame ) {
+		$drawioEditor = new DrawioEditor();
+		$magicWordData = $drawioEditor->parse( $parser, $args[ 'filename' ], $args );
+		$parser->getOutput()->setProperty( 'drawio-image', $args[ 'filename' ] );
+		$parser->getOutput()->addModules( [ 'ext.drawioconnector.init' ] );
+
+		$out = Html::element( 'div', [
+			'class' => 'drawio'
+		] );
+		$out .= $magicWordData[0];
+		$out .= Html::closeElement( 'div' );
+		return $out;
+	}
+
+}

From 9beef56ecdd7577fa1c528881632463ab8fa84ae Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Mon, 16 Jan 2023 08:28:13 +0100
Subject: [PATCH 084/117] Localisation updates from https://translatewiki.net.

Change-Id: I254a2de91119fb8964e3df5d0f687ca7456e3816
---
 i18n/es.json  |  9 +++++++--
 i18n/fi.json  | 11 +++++++++++
 i18n/fr.json  | 11 ++++++++++-
 i18n/hu.json  |  8 ++++++++
 i18n/ia.json  | 11 ++++++++++-
 i18n/ja.json  |  8 ++++++++
 i18n/kaa.json |  8 ++++++++
 i18n/kn.json  | 11 +++++++++++
 i18n/mk.json  | 11 ++++++++++-
 i18n/nl.json  | 16 ++++++++++++++++
 i18n/pt.json  | 11 ++++++++++-
 i18n/qqq.json |  1 -
 i18n/sh.json  |  3 ++-
 i18n/sl.json  | 11 ++++++++++-
 14 files changed, 121 insertions(+), 9 deletions(-)
 create mode 100644 i18n/fi.json
 create mode 100644 i18n/hu.json
 create mode 100644 i18n/ja.json
 create mode 100644 i18n/kaa.json
 create mode 100644 i18n/kn.json
 create mode 100644 i18n/nl.json

diff --git a/i18n/es.json b/i18n/es.json
index 14b9b2d..83465ee 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -1,7 +1,8 @@
 {
 	"@metadata": {
 		"authors": [
-			"DiegoAmbrocio"
+			"DiegoAmbrocio",
+			"Fitoschido"
 		]
 	},
 	"drawioeditor-desc": "Creación de diagramas de flujo en draw.io y edición en línea",
@@ -9,5 +10,9 @@
 	"drawioeditor-approved-displaywarning": "Esta es la revisión aprobada del diagrama y no la última revisión.",
 	"drawioeditor-noapproved": "El diagrama $1 no tiene ninguna revisión aprobada.",
 	"drawioeditor-approve-link": "Haga clic aquí para aprobar una revisión",
-	"drawioeditor-changeapprove-link": "Haga clic aquí para cambiar la revisión aprobada para este diagrama"
+	"drawioeditor-changeapprove-link": "Haga clic aquí para cambiar la revisión aprobada para este diagrama",
+	"drawio-not-used": "No existe ninguna página en esta imagen de Drawio",
+	"drawioconnector-extension-description": "Conecta BlueSpice con Drawio",
+	"drawioconnector-ve-drawio-title": "Diagrama de Draw.io",
+	"drawioconnector-ve-drawio-tag-name": "Nombre"
 }
diff --git a/i18n/fi.json b/i18n/fi.json
new file mode 100644
index 0000000..a533606
--- /dev/null
+++ b/i18n/fi.json
@@ -0,0 +1,11 @@
+{
+	"@metadata": {
+		"authors": [
+			"Nike"
+		]
+	},
+	"drawio-usage": "Käytetty Drawio-elementin kanssa",
+	"drawioconnector-extension-description": "Yhdistää BlueSpicen Drawioon",
+	"drawioconnector-ve-drawio-title": "Draw.io-kaavio",
+	"drawioconnector-ve-drawio-tag-name": "Nimi"
+}
diff --git a/i18n/fr.json b/i18n/fr.json
index 9ff6be2..14535c0 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -12,5 +12,14 @@
 	"drawioeditor-approved-displaywarning": "Ceci est la version approuvée du diagramme mais pas la dernière version.",
 	"drawioeditor-noapproved": "Le diagramme $1 n’a pas de version approuvée.",
 	"drawioeditor-approve-link": "Cliquez ici pour approuver une version",
-	"drawioeditor-changeapprove-link": "Cliquer ici pour modifier la version approuvée de ce diagramme"
+	"drawioeditor-changeapprove-link": "Cliquer ici pour modifier la version approuvée de ce diagramme",
+	"drawio-usage": "Utilisé avec la balise Drawio",
+	"drawio-not-used": "Il n’y a aucune page avec cette image Drawio.",
+	"drawioconnector-extension-description": "Connecte BlueSpice à Drawio.",
+	"drawioconnector-tag-drawio-title": "Draw.io",
+	"drawioconnector-ve-drawio-title": "Diagramme Draw.io",
+	"drawioconnector-tag-drawio-desc": "Insérer un diagramme Draw.io qui peut être modifié.",
+	"drawioconnector-ve-drawio-tag-name": "Nom",
+	"drawioconnector-ve-drawio-tag-name-help": "Nom du diagramme tel qu’il est stocké dans le wiki",
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagramme-1"
 }
diff --git a/i18n/hu.json b/i18n/hu.json
new file mode 100644
index 0000000..1fdc67d
--- /dev/null
+++ b/i18n/hu.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Eukarióta"
+		]
+	},
+	"drawioconnector-ve-drawio-tag-name": "Név"
+}
diff --git a/i18n/ia.json b/i18n/ia.json
index 3ca907e..310fd0b 100644
--- a/i18n/ia.json
+++ b/i18n/ia.json
@@ -9,5 +9,14 @@
 	"drawioeditor-approved-displaywarning": "Iste es le version approbate del diagramma e non le ultime version.",
 	"drawioeditor-noapproved": "Le diagramma $1 non ha un version approbate.",
 	"drawioeditor-approve-link": "Clicca hic pro approbar un version",
-	"drawioeditor-changeapprove-link": "Clicca hic pro cambiar le version approbate de iste diagramma"
+	"drawioeditor-changeapprove-link": "Clicca hic pro cambiar le version approbate de iste diagramma",
+	"drawio-usage": "Usate con etiquetta Drawio",
+	"drawio-not-used": "Il non ha paginas con iste imagine Drawio",
+	"drawioconnector-extension-description": "Connecte BlueSpice a Drawio",
+	"drawioconnector-tag-drawio-title": "drawio",
+	"drawioconnector-ve-drawio-title": "Diagramma Draw.io",
+	"drawioconnector-tag-drawio-desc": "Inserer un diagramma draw.io modificabile.",
+	"drawioconnector-ve-drawio-tag-name": "Nomine",
+	"drawioconnector-ve-drawio-tag-name-help": "Nomine del diagramma como immagazinate in le wiki",
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagramma-1"
 }
diff --git a/i18n/ja.json b/i18n/ja.json
new file mode 100644
index 0000000..91b6545
--- /dev/null
+++ b/i18n/ja.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"MathXplore"
+		]
+	},
+	"drawioconnector-ve-drawio-tag-name": "名前"
+}
diff --git a/i18n/kaa.json b/i18n/kaa.json
new file mode 100644
index 0000000..080ff9b
--- /dev/null
+++ b/i18n/kaa.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Ajiniyaz Nurniyazov"
+		]
+	},
+	"drawioconnector-ve-drawio-tag-name": "At"
+}
diff --git a/i18n/kn.json b/i18n/kn.json
new file mode 100644
index 0000000..0c6192b
--- /dev/null
+++ b/i18n/kn.json
@@ -0,0 +1,11 @@
+{
+	"@metadata": {
+		"authors": [
+			"Ashay vb"
+		]
+	},
+	"drawio-usage": "ಡ್ರಾವಿಯೋ ಟ್ಯಾಗ್‌ನೊಂದಿಗೆ ಬಳಸಲಾಗಿದೆ",
+	"drawioconnector-extension-description": "ಬ್ಲೂಸ್ಪೈಸ್ ಅನ್ನು ಡ್ರಾವಿಯೊಗೆ ಸಂಪರ್ಕಿಸುತ್ತದೆ",
+	"drawioconnector-ve-drawio-title": "Draw.io ರೇಖಾಚಿತ್ರ",
+	"drawioconnector-ve-drawio-tag-name": "ಹೆಸರು"
+}
diff --git a/i18n/mk.json b/i18n/mk.json
index 57f4891..3171a11 100644
--- a/i18n/mk.json
+++ b/i18n/mk.json
@@ -9,5 +9,14 @@
 	"drawioeditor-approved-displaywarning": "Ова е одобрената преработка на дијаграмот, а не последната преработка.",
 	"drawioeditor-noapproved": "Дијаграмот $1 нема одобрена преработка.",
 	"drawioeditor-approve-link": "Стиснете тука за да одобрите преработка",
-	"drawioeditor-changeapprove-link": "Стискете тука за да ја смените одобрената преработка за дијаграмов"
+	"drawioeditor-changeapprove-link": "Стискете тука за да ја смените одобрената преработка за дијаграмов",
+	"drawio-usage": "Се користи со ознаката Drawio",
+	"drawio-not-used": "Нема страници со оваа слика од Drawio",
+	"drawioconnector-extension-description": "Го поврзува BlueSpice со Drawio",
+	"drawioconnector-tag-drawio-title": "drawio",
+	"drawioconnector-ve-drawio-title": "Дијаграм од Draw.io",
+	"drawioconnector-tag-drawio-desc": "Внесете дијаграм од draw.io што може да се уредува.",
+	"drawioconnector-ve-drawio-tag-name": "Име",
+	"drawioconnector-ve-drawio-tag-name-help": "Име на дијаграмот како што е складиран на викито",
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Дијаграм-1"
 }
diff --git a/i18n/nl.json b/i18n/nl.json
new file mode 100644
index 0000000..3e4b59a
--- /dev/null
+++ b/i18n/nl.json
@@ -0,0 +1,16 @@
+{
+	"@metadata": {
+		"authors": [
+			"McDutchie"
+		]
+	},
+	"drawio-usage": "Gebruikt met Drawio-tag",
+	"drawio-not-used": "Er zijn geen pagina's met deze Drawio-afbeelding",
+	"drawioconnector-extension-description": "Verbindt BlueSpice met Drawio",
+	"drawioconnector-tag-drawio-title": "drawio",
+	"drawioconnector-ve-drawio-title": "Draw.io-diagram",
+	"drawioconnector-tag-drawio-desc": "Een draw.io-diagram invoegen dat kan worden bewerkt.",
+	"drawioconnector-ve-drawio-tag-name": "Naam",
+	"drawioconnector-ve-drawio-tag-name-help": "Naam van het diagram zoals in de wiki opgeslagen",
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagram-1"
+}
diff --git a/i18n/pt.json b/i18n/pt.json
index 0bb1dbf..83e36b9 100644
--- a/i18n/pt.json
+++ b/i18n/pt.json
@@ -9,5 +9,14 @@
 	"drawioeditor-approved-displaywarning": "Esta é a revisão aprovada do diagrama e não a revisão mais recente.",
 	"drawioeditor-noapproved": "O diagrama $1 não tem nenhuma revisão aprovada.",
 	"drawioeditor-approve-link": "Clique aqui para aprovar uma revisão",
-	"drawioeditor-changeapprove-link": "Clique aqui para alterar a revisão aprovada para este diagrama"
+	"drawioeditor-changeapprove-link": "Clique aqui para alterar a revisão aprovada para este diagrama",
+	"drawio-usage": "Usada com etiqueta Drawio",
+	"drawio-not-used": "Não há nenhuma página com esta imagem Drawio",
+	"drawioconnector-extension-description": "Liga o BlueSpice ao Drawio",
+	"drawioconnector-tag-drawio-title": "drawio",
+	"drawioconnector-ve-drawio-title": "Diagrama Draw.io",
+	"drawioconnector-tag-drawio-desc": "Inserir um diagrama draw.io que pode ser editado.",
+	"drawioconnector-ve-drawio-tag-name": "Nome",
+	"drawioconnector-ve-drawio-tag-name-help": "Nome do diagrama tal como armazenado na wiki",
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagrama-1"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 7e585ca..36b33e9 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -8,7 +8,6 @@
 	"drawioeditor-noapproved": "Displayed when $1 has no approved revision",
 	"drawioeditor-approve-link": "Link to approve a revision of the diagram",
 	"drawioeditor-changeapprove-link": "Link to change the approved revision of the diagram",
-
 	"drawio-usage": "Headline for list of pages which use a particular drawio image. Displayed on the image page",
 	"drawio-not-used": "Text shown when no page uses a particular drawio image. Displayed on the image page",
 	"drawioconnector-extension-description": "Describes the purpose of the extension",
diff --git a/i18n/sh.json b/i18n/sh.json
index 3fc2907..5acd6d4 100644
--- a/i18n/sh.json
+++ b/i18n/sh.json
@@ -4,5 +4,6 @@
 			"Vlad5250"
 		]
 	},
-	"drawioeditor-approved-editwarning": "Imajte u vidu da sada uređujete najnoviju inačicu ovog dijagrama, koja nije odobrena što se prikazuje prema zadanim postavkama."
+	"drawioeditor-approved-editwarning": "Imajte u vidu da sada uređujete najnoviju inačicu ovog dijagrama, koja nije odobrena što se prikazuje prema zadanim postavkama.",
+	"drawioconnector-tag-drawio-title": "drawio"
 }
diff --git a/i18n/sl.json b/i18n/sl.json
index 98f8dce..aada7a2 100644
--- a/i18n/sl.json
+++ b/i18n/sl.json
@@ -9,5 +9,14 @@
 	"drawioeditor-approved-displaywarning": "To je odobrena in ne zadnja redakcija diagrama.",
 	"drawioeditor-noapproved": "Diagram $1 nima odobrene redakcije.",
 	"drawioeditor-approve-link": "Kliknite, da odobrite redakcijo",
-	"drawioeditor-changeapprove-link": "Kliknite tu, da spremenite odobreno redakcijo tega diagrama"
+	"drawioeditor-changeapprove-link": "Kliknite tu, da spremenite odobreno redakcijo tega diagrama",
+	"drawio-usage": "Uporablja se z značko Drawio",
+	"drawio-not-used": "Ni strani s to sliko Drawio",
+	"drawioconnector-extension-description": "Povezuje BlueSpice z Drawio",
+	"drawioconnector-tag-drawio-title": "drawio",
+	"drawioconnector-ve-drawio-title": "Diagram Draw.io",
+	"drawioconnector-tag-drawio-desc": "Vstavite diagram draw.io, ki ga je mogoče urejati.",
+	"drawioconnector-ve-drawio-tag-name": "Ime",
+	"drawioconnector-ve-drawio-tag-name-help": "Ime diagrama, kot je shranjeno v vikiju",
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagram-1"
 }

From 9b93f9fe113f8ffbccfa58ffd2ad7b4151ab036d Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Tue, 17 Jan 2023 08:07:20 +0100
Subject: [PATCH 085/117] Localisation updates from https://translatewiki.net.

Change-Id: Ie36dff329d3a795e009afa5b1e9ddb6241c153a3
---
 i18n/ckb.json      |  8 ++++++++
 i18n/it.json       |  8 ++++++++
 i18n/skr-arab.json |  8 ++++++++
 i18n/tt-cyrl.json  | 15 +++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 100644 i18n/ckb.json
 create mode 100644 i18n/it.json
 create mode 100644 i18n/skr-arab.json
 create mode 100644 i18n/tt-cyrl.json

diff --git a/i18n/ckb.json b/i18n/ckb.json
new file mode 100644
index 0000000..19bb088
--- /dev/null
+++ b/i18n/ckb.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Aram"
+		]
+	},
+	"drawioconnector-ve-drawio-tag-name": "ناو"
+}
diff --git a/i18n/it.json b/i18n/it.json
new file mode 100644
index 0000000..5fc6688
--- /dev/null
+++ b/i18n/it.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Beta16"
+		]
+	},
+	"drawioconnector-ve-drawio-tag-name": "Nome"
+}
diff --git a/i18n/skr-arab.json b/i18n/skr-arab.json
new file mode 100644
index 0000000..5e25cb3
--- /dev/null
+++ b/i18n/skr-arab.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Saraiki"
+		]
+	},
+	"drawioconnector-ve-drawio-tag-name": "ناں"
+}
diff --git a/i18n/tt-cyrl.json b/i18n/tt-cyrl.json
new file mode 100644
index 0000000..7ec7218
--- /dev/null
+++ b/i18n/tt-cyrl.json
@@ -0,0 +1,15 @@
+{
+	"@metadata": {
+		"authors": [
+			"Ильгиз"
+		]
+	},
+	"drawio-usage": "Drawio тегы белән кулланыла",
+	"drawio-not-used": "Шушы Drawio сурәте белән анда битләр юк",
+	"drawioconnector-extension-description": "BlueSpiceны Drawioга тоташтыра",
+	"drawioconnector-tag-drawio-title": "drawio",
+	"drawioconnector-ve-drawio-title": "Draw.io диаграммасы",
+	"drawioconnector-tag-drawio-desc": "Үзгәртелә торган draw.io диаграммасы кертегез.",
+	"drawioconnector-ve-drawio-tag-name": "Исем",
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Диаграмма-1"
+}

From fbaf60590e0763353d2df2900f6fd9b478c4be73 Mon Sep 17 00:00:00 2001
From: rvogel <vogel@hallowelt.biz>
Date: Tue, 17 Jan 2023 11:54:49 +0100
Subject: [PATCH 086/117] Fix bad class name

ERM21590

[4.1.x]

Change-Id: I810a5eea745fec424b38fedeacdab2b446ee519b
(cherry picked from commit 951534968b2760adebf639ce13329ff7158ec383)
---
 extension.json                                | 4 ++--
 includes/DrawioConnector.php => src/Hooks.php | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)
 rename includes/DrawioConnector.php => src/Hooks.php (96%)

diff --git a/extension.json b/extension.json
index 546cd3f..bbfc432 100644
--- a/extension.json
+++ b/extension.json
@@ -78,8 +78,8 @@
 		"BSInsertMagicAjaxGetData": [
 			"\\MediaWiki\\Extension\\DrawioEditor\\Hook\\BSInsertMagicAjaxGetData\\AddDrawioTag::callback"
 		],
-		"BSUEModulePDFFindFiles": "BlueSpiceDrawioConnector::onBSUEModulePDFFindFiles",
-		"ImagePageAfterImageLinks": "BlueSpiceDrawioConnector::onImagePageAfterImageLinks"
+		"BSUEModulePDFFindFiles": "\\MediaWiki\\Extension\\DrawioEditor\\Hooks::onBSUEModulePDFFindFiles",
+		"ImagePageAfterImageLinks": "\\MediaWiki\\Extension\\DrawioEditor\\Hooks::onImagePageAfterImageLinks"
 	},
 	"HookHandlers": {
 		"tag": {
diff --git a/includes/DrawioConnector.php b/src/Hooks.php
similarity index 96%
rename from includes/DrawioConnector.php
rename to src/Hooks.php
index 681aa32..b7c71c0 100644
--- a/includes/DrawioConnector.php
+++ b/src/Hooks.php
@@ -1,8 +1,13 @@
 <?php
 
+namespace MediaWiki\Extension\DrawioEditor;
+
+use Html;
 use MediaWiki\MediaWikiServices;
+use Revision;
+use Title;
 
-class DrawioConnector {
+class Hooks {
 	/**
 	 *
 	 * @param mixed $oPDFServlet

From 74e1a7395bd2118c70a532179d808fc4ae4d0af9 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Thu, 19 Jan 2023 11:31:16 +0100
Subject: [PATCH 087/117] Localisation updates from https://translatewiki.net.

Change-Id: I757b9a83a62fb4b43c621ca852b0510548c9d7c6
---
 i18n/hi.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 i18n/hi.json

diff --git a/i18n/hi.json b/i18n/hi.json
new file mode 100644
index 0000000..a64b133
--- /dev/null
+++ b/i18n/hi.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Abijeet Patro"
+		]
+	},
+	"drawioconnector-ve-drawio-tag-name": "नाम"
+}

From 1909aebb0fc7941be01a689ccaea5c7834d169ce Mon Sep 17 00:00:00 2001
From: dvogel <daniel.vogel@hallowelt.com>
Date: Tue, 17 Jan 2023 14:56:05 +0100
Subject: [PATCH 088/117] Add a fallback filename for drawio image

[4.2.x]

ERM27235

Change-Id: I40f5e80c2a8e818728acb9e4b9fae6a506fa11ca
---
 src/DrawioEditor.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 831072c..abfc2d6 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -138,6 +138,13 @@ public function parse( &$parser, $name, $opts ) {
 		$img_name = $name . ".drawio." . $opt_type;
 		$repo = $this->services->getRepoGroup();
 		$img = $repo->findFile( $img_name );
+
+		if ( !$img ) {
+			// fallback
+			$img_name = $name . $opt_type;
+			$img = $repo->findFile( $img_name );
+		}
+
 		$noApproved = false;
 		$latest_is_approved = true;
 		if ( $img ) {

From 68e52f87217b2c49150b5cc21b6ede9d6e9dd26b Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Mon, 23 Jan 2023 08:22:50 +0100
Subject: [PATCH 089/117] Localisation updates from https://translatewiki.net.

Change-Id: I554b4e5bc859221469ef45c7350fff21922b13a9
---
 i18n/ko.json  | 3 ++-
 i18n/kus.json | 8 ++++++++
 i18n/ms.json  | 8 ++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 i18n/kus.json
 create mode 100644 i18n/ms.json

diff --git a/i18n/ko.json b/i18n/ko.json
index 8fbee31..2f71cde 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -8,5 +8,6 @@
 	"drawioeditor-approved-displaywarning": "이것은 다이어그램의 승인된 판이며 최신판은 아닙니다.",
 	"drawioeditor-noapproved": "$1 다이어그램에 승인된 판이 없습니다.",
 	"drawioeditor-approve-link": "판을 승인하려면 여기를 클릭하십시오",
-	"drawioeditor-changeapprove-link": "이 다이어그램의 승인된 판을 변경하려면 여기를 클릭하십시오"
+	"drawioeditor-changeapprove-link": "이 다이어그램의 승인된 판을 변경하려면 여기를 클릭하십시오",
+	"drawioconnector-ve-drawio-tag-name": "이름"
 }
diff --git a/i18n/kus.json b/i18n/kus.json
new file mode 100644
index 0000000..06274fe
--- /dev/null
+++ b/i18n/kus.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"WINDOL"
+		]
+	},
+	"drawioconnector-ve-drawio-tag-name": "Yʋ'ʋr"
+}
diff --git a/i18n/ms.json b/i18n/ms.json
new file mode 100644
index 0000000..d7b4478
--- /dev/null
+++ b/i18n/ms.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Tofeiku"
+		]
+	},
+	"drawioconnector-ve-drawio-tag-name": "Nama"
+}

From a670f990f106847d792cb4d64790180a33049f88 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Thu, 26 Jan 2023 08:51:23 +0100
Subject: [PATCH 090/117] Localisation updates from https://translatewiki.net.

Change-Id: I760560af035e155bcbc6c83c2deb7f85e47d5f08
---
 i18n/lb.json  | 4 +++-
 i18n/qqq.json | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/i18n/lb.json b/i18n/lb.json
index f3e7df8..4281896 100644
--- a/i18n/lb.json
+++ b/i18n/lb.json
@@ -5,5 +5,7 @@
 		]
 	},
 	"drawioeditor-noapproved": "Den Diagramm $1 huet keng akzeptéiert Versioun.",
-	"drawioeditor-approve-link": "Klickt hei fir eng Versioun z'akzeptéieren"
+	"drawioeditor-approve-link": "Klickt hei fir eng Versioun z'akzeptéieren",
+	"drawioconnector-ve-drawio-tag-name": "Numm",
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagramm-1"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 36b33e9..649d701 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,6 +1,8 @@
 {
 	"@metadata": {
-		"authors": []
+		"authors": [
+			"Robby"
+		]
 	},
 	"drawioeditor-desc": "{{desc|name=DrawioEditor|url=https://www.mediawiki.org/wiki/Extension:DrawioEditor}}",
 	"drawioeditor-approved-editwarning": "Used as warning shown in '''bold'''.",
@@ -14,7 +16,7 @@
 	"drawioconnector-tag-drawio-title": "Used in InsertMagic extension, tag description for drawio",
 	"drawioconnector-ve-drawio-title": "Used in VisualEditor tag inspector, tag title for drawio",
 	"drawioconnector-tag-drawio-desc": "Used in VisualEditor tag inspector, tag description for drawio.",
-	"drawioconnector-ve-drawio-tag-name": "Label for the input field for name of the diagram",
+	"drawioconnector-ve-drawio-tag-name": "Label for the input field for name of the diagram\n{{identical|Name}}",
 	"drawioconnector-ve-drawio-tag-name-help": "Help text for the input field for name of the diagram",
 	"drawioconnector-ve-drawio-tag-name-placeholder": "Placeholder text for the input field for name of the diagram"
 }

From 111d1976ccbed84f906eea4582c62feae4e17462 Mon Sep 17 00:00:00 2001
From: Hamish Slater <hamishslater@hotmail.com>
Date: Mon, 23 Jan 2023 12:24:44 +0100
Subject: [PATCH 091/117] Bump composer/installers version to 2

ERM29065

[REL1_35, REL1_39, master]

Change-Id: I7f6ae896f6f0e0313f5af5a18b6cea945ffd6433
(cherry picked from commit 08e1820a9baa5c4a9534d5f946dd67698b6210a1)
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 88f86ab..78e096d 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
 	"type": "mediawiki-extension",
 	"description": "This is a MediaWiki extension that integrates the draw.io flow chart editor and allows inline editing of charts.",
 	"require": {
-		"composer/installers": "~1.0"
+		"composer/installers": "~1.0|~2"
 	},
 	"require-dev": {
 		"mediawiki/mediawiki-codesniffer": "40.0.1",

From 9fae44cecf4fcd2292ce9aab9ec91c3b8153f4ee Mon Sep 17 00:00:00 2001
From: miriam schlindwein <schlindwein@hallowelt.com>
Date: Fri, 20 Jan 2023 09:03:54 +0100
Subject: [PATCH 092/117] Add drawio droplet

ERM29375

[4.x]

Change-Id: Iaea9dc2a6fac0396dbd91bd8fbc5557afa8c6cfc
---
 extension.json                            | 15 ++++-
 resources/contentdroplets-drawio-icon.svg | 28 +++++++++
 resources/ext.drawio.droplet.css          |  3 +
 src/ContentDroplets/DrawioDroplet.php     | 74 +++++++++++++++++++++++
 src/DrawioEditor.php                      | 12 ++++
 5 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 resources/contentdroplets-drawio-icon.svg
 create mode 100644 resources/ext.drawio.droplet.css
 create mode 100644 src/ContentDroplets/DrawioDroplet.php

diff --git a/extension.json b/extension.json
index bbfc432..063baf6 100644
--- a/extension.json
+++ b/extension.json
@@ -11,6 +11,13 @@
 			"PluginModules": [
 				"ext.drawioconnector.visualEditor"
 			]
+		},
+		"ContentDroplets": {
+			"Droplets": {
+				"drawio": {
+					"class": "\\MediaWiki\\Extension\\DrawioEditor\\ContentDroplets\\DrawioDroplet"
+				}
+			}
 		}
 	},
 	"descriptionmsg": "drawioeditor-desc",
@@ -54,6 +61,9 @@
 				"ve/ve.ui.DrawioInspector.js",
 				"ve/ve.ui.DrawioNodeTool.js"
 			],
+			"styles": [
+				"ext.drawio.droplet.css"
+			],
 			"dependencies": [
 				"ext.visualEditor.mwcore",
 				"oojs-ui"
@@ -61,7 +71,9 @@
 			"messages": [
 				"drawioconnector-tag-drawio-desc",
 				"drawioconnector-ve-drawio-title",
-				"drawio-usage"
+				"drawio-usage",
+				"drawio-droplet-name",
+				"drawio-droplet-description"
 			]
 		}
 	},
@@ -70,6 +82,7 @@
 		"remoteExtPath": "DrawioEditor/resources"
 	},
 	"Hooks": {
+		"MessageCache::get": "\\MediaWiki\\Extension\\DrawioEditor\\DrawioEditor::mockMessages",
 		"ParserFirstCallInit": [
 			"tag",
 			"MediaWiki\\Extension\\DrawioEditor\\Hook\\ParserFirstCallInit\\SetFunctionHook::callback"
diff --git a/resources/contentdroplets-drawio-icon.svg b/resources/contentdroplets-drawio-icon.svg
new file mode 100644
index 0000000..9e62d16
--- /dev/null
+++ b/resources/contentdroplets-drawio-icon.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="39mm" height="39mm" viewBox="0 0 39 39" version="1.1" id="svg8" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" sodipodi:docname="Droplet.svg">
+  <defs id="defs2" />
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4283557" inkscape:cx="-5.0424383" inkscape:cy="37.05737" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" showguides="true" inkscape:guide-bbox="true" inkscape:window-width="1920" inkscape:window-height="1009" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1">
+    <sodipodi:guide position="34.710188,9.2997108" orientation="0,1" id="guide1374" inkscape:locked="false" />
+    <sodipodi:guide position="19.627586,22.04861" orientation="1,0" id="guide1376" inkscape:locked="false" />
+    <inkscape:grid type="xygrid" id="grid1378" />
+  </sodipodi:namedview>
+  <metadata id="metadata5">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Ebene 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-258)">
+    <rect style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect5110" width="12.325351" height="1.9647278" x="7.3022375" y="267.30032" rx="1.3229165" ry="1.3229166" />
+    <rect style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect5110-3" width="13.687603" height="1.9647278" x="7.3022375" y="271.81921" rx="1.3229164" ry="1.3229166" />
+    <rect style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect5110-6" width="16.634693" height="1.9647278" x="7.3022375" y="276.27258" rx="1.3229165" ry="1.3229166" />
+    <rect style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:1.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect5110-7" width="19.712769" height="1.9647278" x="7.3022375" y="280.79147" rx="1.3229167" ry="1.3229166" />
+    <rect style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect5110-5" width="22.856335" height="1.9647278" x="7.3022375" y="285.73557" rx="1.3229165" ry="1.3229166" />
+    <circle style="opacity:1;fill:#241c1c;fill-opacity:1;stroke:none;stroke-width:2.46499991;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:74.26771545;stroke-opacity:1;paint-order:fill markers stroke" id="path836" cx="29.420271" cy="272.31262" r="4.2207561" />
+  </g>
+</svg>
diff --git a/resources/ext.drawio.droplet.css b/resources/ext.drawio.droplet.css
new file mode 100644
index 0000000..1724736
--- /dev/null
+++ b/resources/ext.drawio.droplet.css
@@ -0,0 +1,3 @@
+.droplet .icon-droplet.droplet-drawio {
+	background-image: url('contentdroplets-drawio-icon.svg');
+}
diff --git a/src/ContentDroplets/DrawioDroplet.php b/src/ContentDroplets/DrawioDroplet.php
new file mode 100644
index 0000000..aa5832e
--- /dev/null
+++ b/src/ContentDroplets/DrawioDroplet.php
@@ -0,0 +1,74 @@
+<?php
+
+declare( strict_types = 1 );
+
+namespace MediaWiki\Extension\DrawioEditor\ContentDroplets;
+
+use MediaWiki\Extension\ContentDroplets\Droplet\TagDroplet;
+use Message;
+
+class DrawioDroplet extends TagDroplet {
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getName(): Message {
+		return Message::newFromKey( 'drawio-droplet-name' );
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getDescription(): Message {
+		return Message::newFromKey( 'drawio-droplet-description' );
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getIcon(): string {
+		return 'droplet-drawio';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getRLModule(): string {
+		return 'ext.drawioconnector.visualEditor';
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getCategories(): array {
+		return [ 'visualization', 'featured' ];
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getTagName(): string {
+		return 'drawio';
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getAttributes(): array {
+		return [ 'filename' ];
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function hasContent(): bool {
+		return false;
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getVeCommand(): ?string {
+		return 'drawioCommand';
+	}
+}
diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index abfc2d6..2cde089 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -360,4 +360,16 @@ private function isReadOnly( $img ) {
 			( !$img && !$this->services->getPermissionManager()->userHasRight( $user, 'reupload' ) ) ||
 			( $isProtected );
 	}
+
+	/**
+	 * TODO:Remove me
+	 *
+	 * @param string &$lckey
+	 * @return void
+	 */
+	public static function mockMessages( &$lckey ) {
+		if ( $lckey === 'drawio-droplet-name' || $lckey === 'drawio-droplet-description' ) {
+			$lckey = 'drawioconnector-tag-drawio-title';
+		}
+	}
 }

From 1182367f78753701b4355e388a13877edb08473c Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Mon, 30 Jan 2023 08:29:46 +0100
Subject: [PATCH 093/117] Localisation updates from https://translatewiki.net.

Change-Id: I8d1fc191c07e073e25929077ff50e8492d4ead54
---
 i18n/bn.json | 8 ++++++++
 i18n/ko.json | 2 ++
 i18n/sh.json | 1 +
 3 files changed, 11 insertions(+)
 create mode 100644 i18n/bn.json

diff --git a/i18n/bn.json b/i18n/bn.json
new file mode 100644
index 0000000..7cbdaa1
--- /dev/null
+++ b/i18n/bn.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"আফতাবুজ্জামান"
+		]
+	},
+	"drawioconnector-ve-drawio-tag-name": "নাম"
+}
diff --git a/i18n/ko.json b/i18n/ko.json
index 2f71cde..c95e46c 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -9,5 +9,7 @@
 	"drawioeditor-noapproved": "$1 다이어그램에 승인된 판이 없습니다.",
 	"drawioeditor-approve-link": "판을 승인하려면 여기를 클릭하십시오",
 	"drawioeditor-changeapprove-link": "이 다이어그램의 승인된 판을 변경하려면 여기를 클릭하십시오",
+	"drawioconnector-tag-drawio-title": "drawio",
+	"drawioconnector-ve-drawio-title": "Draw.io 다이어그램",
 	"drawioconnector-ve-drawio-tag-name": "이름"
 }
diff --git a/i18n/sh.json b/i18n/sh.json
index 5acd6d4..9e47d9d 100644
--- a/i18n/sh.json
+++ b/i18n/sh.json
@@ -5,5 +5,6 @@
 		]
 	},
 	"drawioeditor-approved-editwarning": "Imajte u vidu da sada uređujete najnoviju inačicu ovog dijagrama, koja nije odobrena što se prikazuje prema zadanim postavkama.",
+	"drawio-not-used": "Nema stranica s ovom Drawio slikom",
 	"drawioconnector-tag-drawio-title": "drawio"
 }

From d39e14d1a4891e17a1a9553cb20774d26abdcb55 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Wed, 1 Feb 2023 09:17:45 +0100
Subject: [PATCH 094/117] Localisation updates from https://translatewiki.net.

Change-Id: I785a76567d2088b8ea4f030f1b05b76387f41086
---
 i18n/ms.json    | 1 +
 i18n/pt-br.json | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/i18n/ms.json b/i18n/ms.json
index d7b4478..8992a66 100644
--- a/i18n/ms.json
+++ b/i18n/ms.json
@@ -4,5 +4,6 @@
 			"Tofeiku"
 		]
 	},
+	"drawioconnector-ve-drawio-title": "Gambar rajah Draw.io",
 	"drawioconnector-ve-drawio-tag-name": "Nama"
 }
diff --git a/i18n/pt-br.json b/i18n/pt-br.json
index 620e740..72d7763 100644
--- a/i18n/pt-br.json
+++ b/i18n/pt-br.json
@@ -11,5 +11,6 @@
 	"drawioeditor-approved-displaywarning": "Esta é a versão aprovada do diagrama, e não a versão mais recente.",
 	"drawioeditor-noapproved": "O diagrama $1 não possui revisão aprovada.",
 	"drawioeditor-approve-link": "Clique aqui para aprovar uma revisão",
-	"drawioeditor-changeapprove-link": "Clique aqui para alterar a revisão aprovada para este diagrama"
+	"drawioeditor-changeapprove-link": "Clique aqui para alterar a revisão aprovada para este diagrama",
+	"drawioconnector-ve-drawio-tag-name": "Nome"
 }

From 4c17ffc81ec88e1de096370741273c04c44d87c1 Mon Sep 17 00:00:00 2001
From: pavloyashchenko <pyashchenko@hallowelt.com>
Date: Wed, 1 Feb 2023 14:41:15 +0100
Subject: [PATCH 095/117] Fix Diagramm saving process

ERM31047

[4.2.x]

Change-Id: Ice83eb61e7d4f8d4e9d07f89cfe958d8cdb7e855
(cherry picked from commit bba3fa2894ac901373a398b89fadfd0ff667e3bc)
---
 src/DrawioEditor.php | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 2cde089..b9eb5d3 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -141,7 +141,7 @@ public function parse( &$parser, $name, $opts ) {
 
 		if ( !$img ) {
 			// fallback
-			$img_name = $name . $opt_type;
+			$img_name = $name . '.' . $opt_type;
 			$img = $repo->findFile( $img_name );
 		}
 
@@ -248,20 +248,30 @@ public function parse( &$parser, $name, $opts ) {
 				$img_html = sprintf( $img_fmt, $id, $img_url_ts, $img->getUrl(),  $img_style );
 			}
 		} else {
-			$mxDocumentExtractor = $this->getMXDocumentExtractor( $opt_type, $img->getRepo() );
-			$mxDocument = $mxDocumentExtractor->extractMXDocument( $img );
-			$imageMapGenerator = new ImageMapGenerator();
-			$imageMapName = 'drawio-map-' . $id;
-			$imageMap = $imageMapGenerator->generateImageMap( $mxDocument, $imageMapName );
-			$img_fmt = '<img id="drawio-img-%s" src="%s" title="%s" alt="%s" style="%s" usemap="#%s"></img>';
-			$img_fmt .= $imageMap;
-			$img_html = '<a id="drawio-img-href-' . $id . '" href="' . $img_desc_url . '">';
-			$img_html .= sprintf(
-				$img_fmt, $id, $img_url_ts,
-				'drawio: ' . $dispname, 'drawio: ' . $dispname, $img_style,
-				$imageMapName
-			);
-			$img_html .= '</a>';
+			if ( !$img ) {
+				$img_fmt = '<img id="drawio-img-%s" src="%s" title="%s" alt="%s" style="%s"></img>';
+				$img_html = '<a id="drawio-img-href-' . $id . '" href="' . $img_desc_url . '">';
+				$img_html .= sprintf(
+					$img_fmt, $id, $img_url_ts,
+					'drawio: ' . $dispname, 'drawio: ' . $dispname, $img_style
+				);
+				$img_html .= '</a>';
+			} else {
+				$mxDocumentExtractor = $this->getMXDocumentExtractor( $opt_type, $img->getRepo() );
+				$mxDocument = $mxDocumentExtractor->extractMXDocument( $img );
+				$imageMapGenerator = new ImageMapGenerator();
+				$imageMapName = 'drawio-map-' . $id;
+				$imageMap = $imageMapGenerator->generateImageMap( $mxDocument, $imageMapName );
+				$img_fmt = '<img id="drawio-img-%s" src="%s" title="%s" alt="%s" style="%s" usemap="#%s"></img>';
+				$img_fmt .= $imageMap;
+				$img_html = '<a id="drawio-img-href-' . $id . '" href="' . $img_desc_url . '">';
+				$img_html .= sprintf(
+					$img_fmt, $id, $img_url_ts,
+					'drawio: ' . $dispname, 'drawio: ' . $dispname, $img_style,
+					$imageMapName
+				);
+				$img_html .= '</a>';
+			}
 		}
 
 		/* output image and optionally a placeholder if the image does not exist yet */

From 0f241aecd14c150abd6409f6a55b3a22dc56db9b Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Mon, 6 Feb 2023 08:44:48 +0100
Subject: [PATCH 096/117] Localisation updates from https://translatewiki.net.

Change-Id: I692393095c97e568bcd264ce2943eec0598b597d
---
 i18n/he.json  | 10 +++++++++-
 i18n/mey.json |  8 ++++++++
 i18n/qqq.json |  3 ++-
 i18n/tk.json  |  8 ++++++++
 i18n/tr.json  |  5 +++--
 5 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 i18n/mey.json
 create mode 100644 i18n/tk.json

diff --git a/i18n/he.json b/i18n/he.json
index 8f763ea..0818270 100644
--- a/i18n/he.json
+++ b/i18n/he.json
@@ -9,5 +9,13 @@
 	"drawioeditor-approved-displaywarning": "זוהי הגרסה המאושרת של התרשים ולא הגרסה האחרונה.",
 	"drawioeditor-noapproved": "לתרשים $1 אין גרסה מאושרת.",
 	"drawioeditor-approve-link": "יש ללחוץ כאן כדי לאשר גרסה",
-	"drawioeditor-changeapprove-link": "יש ללחוץ כאן כדי לשנות את הגרסה המאושרת עבור התרשים הזה"
+	"drawioeditor-changeapprove-link": "יש ללחוץ כאן כדי לשנות את הגרסה המאושרת עבור התרשים הזה",
+	"drawio-usage": "בשימוש עם תג Drawio",
+	"drawio-not-used": "אין דפים עם תמונת ה־Drawio הזאת",
+	"drawioconnector-extension-description": "חיבור BlueSpice ל־Drawio",
+	"drawioconnector-ve-drawio-title": "תרשים Draw.io",
+	"drawioconnector-tag-drawio-desc": "הוספת תרשים draw.io שניתן לערוך.",
+	"drawioconnector-ve-drawio-tag-name": "שם",
+	"drawioconnector-ve-drawio-tag-name-help": "שם התרשים כפי שמאוחסן בוויקי",
+	"drawioconnector-ve-drawio-tag-name-placeholder": "תרשים-1"
 }
diff --git a/i18n/mey.json b/i18n/mey.json
new file mode 100644
index 0000000..f4923d9
--- /dev/null
+++ b/i18n/mey.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Tidsaleh"
+		]
+	},
+	"drawioconnector-ve-drawio-tag-name": "اسم"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 649d701..02c065c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,6 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
+			"Amire80",
 			"Robby"
 		]
 	},
@@ -13,7 +14,7 @@
 	"drawio-usage": "Headline for list of pages which use a particular drawio image. Displayed on the image page",
 	"drawio-not-used": "Text shown when no page uses a particular drawio image. Displayed on the image page",
 	"drawioconnector-extension-description": "Describes the purpose of the extension",
-	"drawioconnector-tag-drawio-title": "Used in InsertMagic extension, tag description for drawio",
+	"drawioconnector-tag-drawio-title": "{{optional}}\nUsed in InsertMagic extension, tag description for drawio",
 	"drawioconnector-ve-drawio-title": "Used in VisualEditor tag inspector, tag title for drawio",
 	"drawioconnector-tag-drawio-desc": "Used in VisualEditor tag inspector, tag description for drawio.",
 	"drawioconnector-ve-drawio-tag-name": "Label for the input field for name of the diagram\n{{identical|Name}}",
diff --git a/i18n/tk.json b/i18n/tk.json
new file mode 100644
index 0000000..efb2c94
--- /dev/null
+++ b/i18n/tk.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"TayfunEt."
+		]
+	},
+	"drawioconnector-ve-drawio-tag-name": "At"
+}
diff --git a/i18n/tr.json b/i18n/tr.json
index bc8fb32..1cfa37b 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -1,8 +1,9 @@
 {
 	"@metadata": {
 		"authors": [
-			"MuratTheTurkish"
+			"MuratTheTurkish",
+			"Rapsar"
 		]
 	},
-	"drawioeditor-desc": "draw.io akış şeması oluşturma ve satır içi düzenleme"
+	"drawioeditor-desc": "draw.io akış şeması oluşturma ve satır içi değişiklik yapma"
 }

From 53ae85feaeb3ce382c94353e43137df9260c8ae8 Mon Sep 17 00:00:00 2001
From: pavloyashchenko <pyashchenko@hallowelt.com>
Date: Fri, 3 Feb 2023 15:30:59 +0100
Subject: [PATCH 097/117] FIX Text in svg diagrams not displayed

Fix taken from https://phabricator.wikimedia.org/T271347

ERM24392

[4.2.x]

Change-Id: I41a42e27dcbd4c0adbefa4aae8634bafd1f834de
(cherry picked from commit 53abb6f6bdbf60cb278718a1c64701811f1526f8)
(cherry picked from commit 4cf63758cfe50a481de226f07401f814a58bfe78)
---
 resources/ext.drawioeditor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/ext.drawioeditor.js b/resources/ext.drawioeditor.js
index 3de4301..545de14 100644
--- a/resources/ext.drawioeditor.js
+++ b/resources/ext.drawioeditor.js
@@ -255,7 +255,7 @@ DrawioEditor.prototype.save = function(datauri) {
 	// convert base64 to uint8 array
 	datastr = atob(parts[4]);
 	var expr = /"http:\/\/[^"]*?1999[^"]*?"/gmi;
-	datastr = datastr.replace( expr, '"http://www.w3.org/2000/svg"' );
+	datastr = datastr.replace( expr, '"http://www.w3.org/1999/xhtml"' );
 	data = new Uint8Array(datastr.length)
 	for (i = 0; i < datastr.length; i++) {
 		data[i] = datastr.charCodeAt(i);

From 2937265be832387ec30cea1a81c30ce61d622169 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Wed, 15 Feb 2023 08:25:33 +0100
Subject: [PATCH 098/117] Localisation updates from https://translatewiki.net.

Change-Id: Ia416c2527c881d940e4bb3d421842d61560b0061
---
 i18n/ia.json      | 1 -
 i18n/ko.json      | 1 -
 i18n/mk.json      | 1 -
 i18n/nl.json      | 1 -
 i18n/pt.json      | 1 -
 i18n/sh.json      | 3 +--
 i18n/sl.json      | 1 -
 i18n/tt-cyrl.json | 1 -
 8 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/i18n/ia.json b/i18n/ia.json
index 310fd0b..08805ba 100644
--- a/i18n/ia.json
+++ b/i18n/ia.json
@@ -13,7 +13,6 @@
 	"drawio-usage": "Usate con etiquetta Drawio",
 	"drawio-not-used": "Il non ha paginas con iste imagine Drawio",
 	"drawioconnector-extension-description": "Connecte BlueSpice a Drawio",
-	"drawioconnector-tag-drawio-title": "drawio",
 	"drawioconnector-ve-drawio-title": "Diagramma Draw.io",
 	"drawioconnector-tag-drawio-desc": "Inserer un diagramma draw.io modificabile.",
 	"drawioconnector-ve-drawio-tag-name": "Nomine",
diff --git a/i18n/ko.json b/i18n/ko.json
index c95e46c..2113b24 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -9,7 +9,6 @@
 	"drawioeditor-noapproved": "$1 다이어그램에 승인된 판이 없습니다.",
 	"drawioeditor-approve-link": "판을 승인하려면 여기를 클릭하십시오",
 	"drawioeditor-changeapprove-link": "이 다이어그램의 승인된 판을 변경하려면 여기를 클릭하십시오",
-	"drawioconnector-tag-drawio-title": "drawio",
 	"drawioconnector-ve-drawio-title": "Draw.io 다이어그램",
 	"drawioconnector-ve-drawio-tag-name": "이름"
 }
diff --git a/i18n/mk.json b/i18n/mk.json
index 3171a11..78596db 100644
--- a/i18n/mk.json
+++ b/i18n/mk.json
@@ -13,7 +13,6 @@
 	"drawio-usage": "Се користи со ознаката Drawio",
 	"drawio-not-used": "Нема страници со оваа слика од Drawio",
 	"drawioconnector-extension-description": "Го поврзува BlueSpice со Drawio",
-	"drawioconnector-tag-drawio-title": "drawio",
 	"drawioconnector-ve-drawio-title": "Дијаграм од Draw.io",
 	"drawioconnector-tag-drawio-desc": "Внесете дијаграм од draw.io што може да се уредува.",
 	"drawioconnector-ve-drawio-tag-name": "Име",
diff --git a/i18n/nl.json b/i18n/nl.json
index 3e4b59a..1870e20 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -7,7 +7,6 @@
 	"drawio-usage": "Gebruikt met Drawio-tag",
 	"drawio-not-used": "Er zijn geen pagina's met deze Drawio-afbeelding",
 	"drawioconnector-extension-description": "Verbindt BlueSpice met Drawio",
-	"drawioconnector-tag-drawio-title": "drawio",
 	"drawioconnector-ve-drawio-title": "Draw.io-diagram",
 	"drawioconnector-tag-drawio-desc": "Een draw.io-diagram invoegen dat kan worden bewerkt.",
 	"drawioconnector-ve-drawio-tag-name": "Naam",
diff --git a/i18n/pt.json b/i18n/pt.json
index 83e36b9..8ba8e7d 100644
--- a/i18n/pt.json
+++ b/i18n/pt.json
@@ -13,7 +13,6 @@
 	"drawio-usage": "Usada com etiqueta Drawio",
 	"drawio-not-used": "Não há nenhuma página com esta imagem Drawio",
 	"drawioconnector-extension-description": "Liga o BlueSpice ao Drawio",
-	"drawioconnector-tag-drawio-title": "drawio",
 	"drawioconnector-ve-drawio-title": "Diagrama Draw.io",
 	"drawioconnector-tag-drawio-desc": "Inserir um diagrama draw.io que pode ser editado.",
 	"drawioconnector-ve-drawio-tag-name": "Nome",
diff --git a/i18n/sh.json b/i18n/sh.json
index 9e47d9d..34a81c7 100644
--- a/i18n/sh.json
+++ b/i18n/sh.json
@@ -5,6 +5,5 @@
 		]
 	},
 	"drawioeditor-approved-editwarning": "Imajte u vidu da sada uređujete najnoviju inačicu ovog dijagrama, koja nije odobrena što se prikazuje prema zadanim postavkama.",
-	"drawio-not-used": "Nema stranica s ovom Drawio slikom",
-	"drawioconnector-tag-drawio-title": "drawio"
+	"drawio-not-used": "Nema stranica s ovom Drawio slikom"
 }
diff --git a/i18n/sl.json b/i18n/sl.json
index aada7a2..c4910a3 100644
--- a/i18n/sl.json
+++ b/i18n/sl.json
@@ -13,7 +13,6 @@
 	"drawio-usage": "Uporablja se z značko Drawio",
 	"drawio-not-used": "Ni strani s to sliko Drawio",
 	"drawioconnector-extension-description": "Povezuje BlueSpice z Drawio",
-	"drawioconnector-tag-drawio-title": "drawio",
 	"drawioconnector-ve-drawio-title": "Diagram Draw.io",
 	"drawioconnector-tag-drawio-desc": "Vstavite diagram draw.io, ki ga je mogoče urejati.",
 	"drawioconnector-ve-drawio-tag-name": "Ime",
diff --git a/i18n/tt-cyrl.json b/i18n/tt-cyrl.json
index 7ec7218..3d06a5c 100644
--- a/i18n/tt-cyrl.json
+++ b/i18n/tt-cyrl.json
@@ -7,7 +7,6 @@
 	"drawio-usage": "Drawio тегы белән кулланыла",
 	"drawio-not-used": "Шушы Drawio сурәте белән анда битләр юк",
 	"drawioconnector-extension-description": "BlueSpiceны Drawioга тоташтыра",
-	"drawioconnector-tag-drawio-title": "drawio",
 	"drawioconnector-ve-drawio-title": "Draw.io диаграммасы",
 	"drawioconnector-tag-drawio-desc": "Үзгәртелә торган draw.io диаграммасы кертегез.",
 	"drawioconnector-ve-drawio-tag-name": "Исем",

From 21237b81c232c66d7fdb26bbaef7aef2aa4b289e Mon Sep 17 00:00:00 2001
From: Hamish Slater <hamishslater@hotmail.com>
Date: Mon, 20 Feb 2023 14:12:01 +0100
Subject: [PATCH 099/117] Remove redundant 1.35 code

ERM29303

[REL1_39, master]

Change-Id: Ib426fda973656a54e22d542ca5c1185a72ecb110
---
 src/DrawioEditor.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index b9eb5d3..00244a9 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -354,14 +354,8 @@ private function errorMessage( $msg ) {
 	private function isReadOnly( $img ) {
 		$user = RequestContext::getMain()->getUser();
 		$parser = $this->services->getParser();
-
-		if ( method_exists( $this->services, 'getRestrictionStore' ) ) {
-			// MW 1.37+
-			$isProtected = $parser->getTitle() ?
-				$this->services->getRestrictionStore()->isProtected( $parser->getTitle(), 'edit' ) : false;
-		} else {
-			$isProtected = $parser->getTitle() ? $parser->getTitle()->isProtected( 'edit' ) : false;
-		}
+		$isProtected = $parser->getTitle() ?
+			$this->services->getRestrictionStore()->isProtected( $parser->getTitle(), 'edit' ) : false;
 
 		return !$this->config->get( 'EnableUploads' ) ||
 				!$this->services->getPermissionManager()->userHasRight( $user, 'upload' ) ||

From 9564b6dec3be914d3f0631a302fcbd2efbc8f5fe Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Thu, 23 Feb 2023 08:38:52 +0100
Subject: [PATCH 100/117] Localisation updates from https://translatewiki.net.

Change-Id: Icd95ae137a00ae17bd57970b74163c2c7a6125c0
---
 i18n/zh-hant.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/i18n/zh-hant.json b/i18n/zh-hant.json
index 5e98c3d..1013c5e 100644
--- a/i18n/zh-hant.json
+++ b/i18n/zh-hant.json
@@ -9,5 +9,13 @@
 	"drawioeditor-approved-displaywarning": "這是圖表的批准修訂，而非最新修訂版本。",
 	"drawioeditor-noapproved": "圖表$1沒有批准過的修訂。",
 	"drawioeditor-approve-link": "在此點擊來批准修訂",
-	"drawioeditor-changeapprove-link": "在此點擊來更改此圖表的已批准修訂"
+	"drawioeditor-changeapprove-link": "在此點擊來更改此圖表的已批准修訂",
+	"drawio-usage": "與 Drawio 標籤一起使用",
+	"drawio-not-used": "沒有包含此 Drawio 圖片的頁面",
+	"drawioconnector-extension-description": "連接 BlueSpice 到 Drawio",
+	"drawioconnector-ve-drawio-title": "Draw.io 流程圖",
+	"drawioconnector-tag-drawio-desc": "插入一個可被編輯的 draw.io 流程圖。",
+	"drawioconnector-ve-drawio-tag-name": "名稱",
+	"drawioconnector-ve-drawio-tag-name-help": "儲存在 wiki 中的流程圖名稱",
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagram-1"
 }

From 294aed80aca1053185d275f008c7c326409e5926 Mon Sep 17 00:00:00 2001
From: miriam schlindwein <schlindwein@hallowelt.com>
Date: Fri, 10 Feb 2023 10:51:18 +0100
Subject: [PATCH 101/117] Fix rlmodules to array

ERM31420

[4.x]

Change-Id: I90d4ce782b3a5443cfbb77a6550c42f87c8245fc
(cherry picked from commit 4a24cd7866b6feb622fcb3c05d11f6e40a3c34a0)
(cherry picked from commit 4cb7b852a4ae9b7b2ff0a08de85390e5124d4bdc)
---
 src/ContentDroplets/DrawioDroplet.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ContentDroplets/DrawioDroplet.php b/src/ContentDroplets/DrawioDroplet.php
index aa5832e..309b5b7 100644
--- a/src/ContentDroplets/DrawioDroplet.php
+++ b/src/ContentDroplets/DrawioDroplet.php
@@ -33,8 +33,8 @@ public function getIcon(): string {
 	/**
 	 * @inheritDoc
 	 */
-	public function getRLModule(): string {
-		return 'ext.drawioconnector.visualEditor';
+	public function getRLModules(): array {
+		return [ 'ext.drawioconnector.visualEditor' ];
 	}
 
 	/**

From 27a0b5412870de8b4b07d6d27af4d500b6e14722 Mon Sep 17 00:00:00 2001
From: rvogel <vogel@hallowelt.biz>
Date: Mon, 27 Feb 2023 11:03:23 +0100
Subject: [PATCH 102/117] Remove SVG option and fix filename validation

ERM31619
ERM24392

[4.2.x]

Change-Id: I166bec5683d3a01a797299187d2b7f42cf64f371
---
 extension.json                        |  2 +-
 resources/ve/ve.ui.DrawioInspector.js | 71 ++++++++++++---------------
 2 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/extension.json b/extension.json
index 063baf6..0c43031 100644
--- a/extension.json
+++ b/extension.json
@@ -69,8 +69,8 @@
 				"oojs-ui"
 			],
 			"messages": [
-				"drawioconnector-tag-drawio-desc",
 				"drawioconnector-ve-drawio-title",
+				"drawioconnector-ve-drawio-tag-name",
 				"drawio-usage",
 				"drawio-droplet-name",
 				"drawio-droplet-description"
diff --git a/resources/ve/ve.ui.DrawioInspector.js b/resources/ve/ve.ui.DrawioInspector.js
index 6386117..2638edf 100644
--- a/resources/ve/ve.ui.DrawioInspector.js
+++ b/resources/ve/ve.ui.DrawioInspector.js
@@ -22,6 +22,8 @@ ve.ui.DrawioInspector.static.selfCloseEmptyBody = false;
 ve.ui.DrawioInspector.prototype.initialize = function () {
 	ve.ui.DrawioInspector.super.prototype.initialize.call( this );
 	this.filename = mw.config.get( 'wgTitle' ) + "-" + ( Math.floor( Math.random() * 100000000) + 1 );
+	// filename must only contain alphanumeric characters, dashes and underscores
+	this.filename = this.filename.replace( /[^a-zA-Z0-9_-]/g, '_' );
 
 	// remove input field with links in it
 	this.input.$element.remove();
@@ -39,47 +41,39 @@ ve.ui.DrawioInspector.prototype.createLayout = function ( ) {
 		padded: true
 	} );
 
-	// 'Used with Drawio tag' Label
-	this.insertLabel = new OO.ui.LabelWidget( {
-		label: OO.ui.deferMsg( 'drawioconnector-tag-drawio-desc' )
-	} );
-	
 	// InputWidget for file Name
-	this.fileNameInputWidget = new OO.ui.TextInputWidget();
+	this.fileNameInputWidget = new OO.ui.TextInputWidget( {
+		validate: function ( value ) {
+			if ( value === '' ) {
+				return false;
+			}
+			if ( !value.match( /^[a-zA-Z0-9_-]+$/ ) ) {
+				return false;
+			}
+			return true;
+		}
+	} );
+	this.fileNameInputWidget.on( 'change', this.onFileNameChange, [], this );
 	this.fileNameInputLayout = new OO.ui.FieldLayout( this.fileNameInputWidget, {
 		align: 'left',
-		label: 'File Name'
-	} )
-
-	// InputWidget for file extension
-	this.savingFormatWidget = new OO.ui.ButtonSelectWidget( {
-		items: [
-			new OO.ui.ButtonOptionWidget( {
-				data: 'png',
-				label: 'png'
-			} ),
-			new OO.ui.ButtonOptionWidget( {
-				data: 'svg',
-				label: 'svg'
-			} )
-		]
+		label: OO.ui.deferMsg( 'drawioconnector-ve-drawio-tag-name' )
 	} );
-	this.savingFormatLayout = new OO.ui.FieldLayout( this.savingFormatWidget, {
-		align: 'left',
-		label: 'File Format'
-	} )
 
 	// set default values
 	this.fileNameInputWidget.setValue( this.filename );
-	this.fileNameInputWidget.setDisabled( true );
-	this.savingFormatWidget.selectItem( this.savingFormatWidget.items[0] );
 
-	this.indexLayout.$element.append( 
-		this.insertLabel.$element,
-		this.fileNameInputLayout.$element,
-		this.savingFormatLayout.$element 
+	this.indexLayout.$element.append(
+		this.fileNameInputLayout.$element
 	);
-}
+};
+
+ve.ui.DrawioInspector.prototype.onFileNameChange = function () {
+	var actions = this.actions;
+	actions.setAbilities( { done: false } );
+	this.fileNameInputWidget.getValidity().done( function() {
+		actions.setAbilities( { done: true } );
+	} );
+};
 
 ve.ui.DrawioInspector.prototype.getSetupProcess = function ( data ) {
 	return ve.ui.DrawioInspector.super.prototype.getSetupProcess.call( this, data )
@@ -87,17 +81,16 @@ ve.ui.DrawioInspector.prototype.getSetupProcess = function ( data ) {
 			this.selectedNode.getAttribute( 'mw' ).attrs;
 			this.actions.setAbilities( { done: true } );
 		}, this );
-}	
+};
 
 ve.ui.DrawioInspector.prototype.updateMwData = function ( mwData ) {
 	ve.ui.DrawioInspector.super.prototype.updateMwData.call( this, mwData );
-	
+
 	var filename = this.fileNameInputWidget.getValue();
-	if ( filename.match( /[a-zA-Z0-9\s_\\.\-\(\):]/ ) ) {
-		mwData.attrs.filename = filename;
-	}
-	mwData.attrs.type = this.savingFormatWidget.findSelectedItem().getData();
-}
+	mwData.attrs.filename = filename;
+	// filename must only contain alphanumeric characters, and underscores
+	mwData.attrs.filename = mwData.attrs.filename.replace( /[^a-zA-Z0-9_]/g, '_' );
+};
 
 /* Registration */
 ve.ui.windowFactory.register( ve.ui.DrawioInspector );

From 5ae6e0b2d3e1fdf1534da34243ca45ff1d14acb9 Mon Sep 17 00:00:00 2001
From: "d.savuljesku" <d.savuljesku@gmail.com>
Date: Mon, 6 Mar 2023 11:48:17 +0100
Subject: [PATCH 103/117] Prevent fatal on empty $mxfileXML

[4.2.x]

ERM 31712

Change-Id: I84dfdf8337f553e163030c7bb9331c66e7dcf3c8
---
 src/MXDocumentExtractor/Base.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/MXDocumentExtractor/Base.php b/src/MXDocumentExtractor/Base.php
index 57b31a5..18b71a3 100644
--- a/src/MXDocumentExtractor/Base.php
+++ b/src/MXDocumentExtractor/Base.php
@@ -30,6 +30,9 @@ public function extractMXDocument( $image ): DOMDocument {
 
 		$mxFileString = $this->getPlainMXFileString();
 		$mxFileDOM = $this->getMXFileDOM( $mxFileString );
+		if ( !$mxFileDOM ) {
+			return new DOMDocument();
+		}
 		$diagramDOM = $this->getDiagramDOM( $mxFileDOM );
 		if ( $diagramDOM === null ) {
 			return new DOMDocument();
@@ -44,10 +47,13 @@ abstract protected function getPlainMXFileString(): string;
 
 	/**
 	 * @param string $mxfileXML
-	 * @return DOMDocument
+	 * @return DOMDocument|null
 	 */
 	protected function getMXFileDOM( $mxfileXML ) {
 		$mxfileXMLDOM = new DOMDocument();
+		if ( empty( $mxfileXML ) ) {
+			return null;
+		}
 		$mxfileXMLDOM->loadXML( $mxfileXML );
 
 		return $mxfileXMLDOM;

From 7192e38ffddbaa168c35a061890506e94d2a75d8 Mon Sep 17 00:00:00 2001
From: rvogel <vogel@hallowelt.biz>
Date: Thu, 9 Mar 2023 14:56:55 +0100
Subject: [PATCH 104/117] Set proper version

---
 extension.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension.json b/extension.json
index 0c43031..7ccdf26 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
 {
 	"name": "DrawioEditor",
 	"license-name": "GPL-3.0-only",
-	"version": "1.1",
+	"version": "2.0.0-alpha",
 	"author": [
 		"Markus Gebert",
 		"[https://www.hallowelt.com Hallo Welt! GmbH]"

From 099c1cfde80f3f15a9fea06ca773504d34cb7e94 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Sat, 11 Mar 2023 20:09:11 +0000
Subject: [PATCH 105/117] build: Updating mediawiki/mediawiki-codesniffer to
 41.0.0

Change-Id: Icffbd4846ac3aec8336cedb323ea7e6aac15ac9c
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 78e096d..c1b595b 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
 		"composer/installers": "~1.0|~2"
 	},
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "40.0.1",
+		"mediawiki/mediawiki-codesniffer": "41.0.0",
 		"mediawiki/minus-x": "1.1.1",
 		"php-parallel-lint/php-console-highlighter": "1.0.0",
 		"php-parallel-lint/php-parallel-lint": "1.3.2"

From e0d5da1495e46953f2c93528c88f2a3873b142ae Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Tue, 14 Mar 2023 21:37:37 +0000
Subject: [PATCH 106/117] build: Updating npm dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* eslint-config-wikimedia: 0.22.1 → 0.24.0
* grunt: 1.5.3 → 1.6.1

Change-Id: Ibba8550e36515fcce1cb8c464e67f8290023113f
---
 package-lock.json | 1633 +++++++++++++++++++++++----------------------
 package.json      |    4 +-
 2 files changed, 846 insertions(+), 791 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index db8df7d..3601475 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,37 +6,40 @@
 		"": {
 			"name": "DrawioEditor",
 			"devDependencies": {
-				"eslint-config-wikimedia": "0.22.1",
-				"grunt": "1.5.3",
+				"eslint-config-wikimedia": "0.24.0",
+				"grunt": "1.6.1",
 				"grunt-banana-checker": "0.10.0",
 				"grunt-eslint": "24.0.0"
 			}
 		},
 		"node_modules/@babel/code-frame": {
-			"version": "7.12.11",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-			"integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+			"version": "7.18.6",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+			"integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
 			"dev": true,
 			"dependencies": {
-				"@babel/highlight": "^7.10.4"
+				"@babel/highlight": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-validator-identifier": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-			"integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+			"version": "7.19.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+			"integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
 			"dev": true,
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/highlight": {
-			"version": "7.16.10",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
-			"integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
+			"version": "7.18.6",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+			"integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
 			"dev": true,
 			"dependencies": {
-				"@babel/helper-validator-identifier": "^7.16.7",
+				"@babel/helper-validator-identifier": "^7.18.6",
 				"chalk": "^2.0.0",
 				"js-tokens": "^4.0.0"
 			},
@@ -82,13 +85,22 @@
 		"node_modules/@babel/highlight/node_modules/color-name": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
 			"dev": true
 		},
+		"node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
 		"node_modules/@babel/highlight/node_modules/has-flag": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
 			"dev": true,
 			"engines": {
 				"node": ">=4"
@@ -107,29 +119,62 @@
 			}
 		},
 		"node_modules/@es-joy/jsdoccomment": {
-			"version": "0.18.0",
-			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.18.0.tgz",
-			"integrity": "sha512-TjT8KJULV4I6ZiwIoKr6eMs+XpRejqwJ/VA+QPDeFGe9j6bZFKmMJ81EeFsGm6JNZhnzm37aoxVROmTh2PZoyA==",
+			"version": "0.23.6",
+			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.23.6.tgz",
+			"integrity": "sha512-cCtumxG+qrYORGeOkDQ58GtSt/bb2XiP9GC0x2YduoUEX2EmBQ48FtoZMUs+8wiIdTDN1izUiRUD2FDu+p+Lvg==",
 			"dev": true,
 			"dependencies": {
-				"comment-parser": "1.3.0",
+				"comment-parser": "1.3.1",
 				"esquery": "^1.4.0",
-				"jsdoc-type-pratt-parser": "~2.2.2"
+				"jsdoc-type-pratt-parser": "~2.2.5"
 			},
 			"engines": {
 				"node": "^12 || ^14 || ^16 || ^17"
 			}
 		},
+		"node_modules/@eslint-community/eslint-utils": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz",
+			"integrity": "sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==",
+			"dev": true,
+			"dependencies": {
+				"eslint-visitor-keys": "^3.3.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"peerDependencies": {
+				"eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+			}
+		},
+		"node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+			"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/@eslint-community/regexpp": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz",
+			"integrity": "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==",
+			"dev": true,
+			"engines": {
+				"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+			}
+		},
 		"node_modules/@eslint/eslintrc": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
-			"integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz",
+			"integrity": "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==",
 			"dev": true,
 			"dependencies": {
 				"ajv": "^6.12.4",
 				"debug": "^4.3.2",
-				"espree": "^9.3.2",
-				"globals": "^13.15.0",
+				"espree": "^9.5.0",
+				"globals": "^13.19.0",
 				"ignore": "^5.2.0",
 				"import-fresh": "^3.2.1",
 				"js-yaml": "^4.1.0",
@@ -138,6 +183,9 @@
 			},
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
 			}
 		},
 		"node_modules/@eslint/eslintrc/node_modules/argparse": {
@@ -170,20 +218,42 @@
 				"node": "*"
 			}
 		},
+		"node_modules/@eslint/js": {
+			"version": "8.36.0",
+			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz",
+			"integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
 		"node_modules/@humanwhocodes/config-array": {
-			"version": "0.9.5",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
-			"integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+			"version": "0.11.8",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
+			"integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
 			"dev": true,
 			"dependencies": {
 				"@humanwhocodes/object-schema": "^1.2.1",
 				"debug": "^4.1.1",
-				"minimatch": "^3.0.4"
+				"minimatch": "^3.0.5"
 			},
 			"engines": {
 				"node": ">=10.10.0"
 			}
 		},
+		"node_modules/@humanwhocodes/module-importer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+			"integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+			"dev": true,
+			"engines": {
+				"node": ">=12.22"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/nzakas"
+			}
+		},
 		"node_modules/@humanwhocodes/object-schema": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
@@ -196,6 +266,41 @@
 			"integrity": "sha512-Ap8MOYbyvEilK1+sNY6yh6LmsHSp7f5zzSGlY4AemhbTcoultcozEXPzx42OO6WjoriOsw88aW8TiqgYdXwsxg==",
 			"dev": true
 		},
+		"node_modules/@nodelib/fs.scandir": {
+			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+			"dev": true,
+			"dependencies": {
+				"@nodelib/fs.stat": "2.0.5",
+				"run-parallel": "^1.1.9"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@nodelib/fs.stat": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@nodelib/fs.walk": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+			"dev": true,
+			"dependencies": {
+				"@nodelib/fs.scandir": "2.1.5",
+				"fastq": "^1.6.0"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
 		"node_modules/@types/color-name": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
@@ -215,9 +320,9 @@
 			"dev": true
 		},
 		"node_modules/acorn": {
-			"version": "7.4.1",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+			"version": "8.8.2",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+			"integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
 			"dev": true,
 			"bin": {
 				"acorn": "bin/acorn"
@@ -333,6 +438,12 @@
 			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
 			"dev": true
 		},
+		"node_modules/boolbase": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+			"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+			"dev": true
+		},
 		"node_modules/brace-expansion": {
 			"version": "1.1.11",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -384,10 +495,16 @@
 				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
 			}
 		},
+		"node_modules/browserslist-config-wikimedia": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/browserslist-config-wikimedia/-/browserslist-config-wikimedia-0.4.0.tgz",
+			"integrity": "sha512-U/fmsaGlCKOqRIjKqXwQ44qFqiStngRTphj1Cf6IHV6J8OK8T0gu9dKc7Ljq4v7bwhnhN+YCCa4fA3nZlPNivQ==",
+			"dev": true
+		},
 		"node_modules/builtin-modules": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
-			"integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+			"integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
 			"dev": true,
 			"engines": {
 				"node": ">=6"
@@ -438,15 +555,24 @@
 			}
 		},
 		"node_modules/ci-info": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
-			"integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
-			"dev": true
+			"version": "3.8.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+			"integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"engines": {
+				"node": ">=8"
+			}
 		},
 		"node_modules/clean-regexp": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz",
-			"integrity": "sha1-jffHquUf02h06PjQW5GAvBGj/tc=",
+			"integrity": "sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==",
 			"dev": true,
 			"dependencies": {
 				"escape-string-regexp": "^1.0.5"
@@ -455,6 +581,15 @@
 				"node": ">=4"
 			}
 		},
+		"node_modules/clean-regexp/node_modules/escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
 		"node_modules/color-convert": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -483,9 +618,9 @@
 			}
 		},
 		"node_modules/comment-parser": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.0.tgz",
-			"integrity": "sha512-hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA==",
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.1.tgz",
+			"integrity": "sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==",
 			"dev": true,
 			"engines": {
 				"node": ">= 12.0.0"
@@ -537,19 +672,31 @@
 				"node": ">= 8"
 			}
 		},
+		"node_modules/cssesc": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+			"dev": true,
+			"bin": {
+				"cssesc": "bin/cssesc"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/dateformat": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-			"integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
+			"version": "4.6.3",
+			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
+			"integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==",
 			"dev": true,
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/debug": {
-			"version": "4.3.3",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-			"integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+			"version": "4.3.4",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
 			"dev": true,
 			"dependencies": {
 				"ms": "2.1.2"
@@ -615,22 +762,30 @@
 			}
 		},
 		"node_modules/escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
 			"dev": true,
 			"engines": {
-				"node": ">=0.8.0"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/eslint": {
-			"version": "8.16.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
-			"integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
-			"dev": true,
-			"dependencies": {
-				"@eslint/eslintrc": "^1.3.0",
-				"@humanwhocodes/config-array": "^0.9.2",
+			"version": "8.36.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz",
+			"integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==",
+			"dev": true,
+			"dependencies": {
+				"@eslint-community/eslint-utils": "^4.2.0",
+				"@eslint-community/regexpp": "^4.4.0",
+				"@eslint/eslintrc": "^2.0.1",
+				"@eslint/js": "8.36.0",
+				"@humanwhocodes/config-array": "^0.11.8",
+				"@humanwhocodes/module-importer": "^1.0.1",
+				"@nodelib/fs.walk": "^1.2.8",
 				"ajv": "^6.10.0",
 				"chalk": "^4.0.0",
 				"cross-spawn": "^7.0.2",
@@ -638,20 +793,22 @@
 				"doctrine": "^3.0.0",
 				"escape-string-regexp": "^4.0.0",
 				"eslint-scope": "^7.1.1",
-				"eslint-utils": "^3.0.0",
 				"eslint-visitor-keys": "^3.3.0",
-				"espree": "^9.3.2",
-				"esquery": "^1.4.0",
+				"espree": "^9.5.0",
+				"esquery": "^1.4.2",
 				"esutils": "^2.0.2",
 				"fast-deep-equal": "^3.1.3",
 				"file-entry-cache": "^6.0.1",
-				"functional-red-black-tree": "^1.0.1",
-				"glob-parent": "^6.0.1",
-				"globals": "^13.15.0",
+				"find-up": "^5.0.0",
+				"glob-parent": "^6.0.2",
+				"globals": "^13.19.0",
+				"grapheme-splitter": "^1.0.4",
 				"ignore": "^5.2.0",
 				"import-fresh": "^3.0.0",
 				"imurmurhash": "^0.1.4",
 				"is-glob": "^4.0.0",
+				"is-path-inside": "^3.0.3",
+				"js-sdsl": "^4.1.4",
 				"js-yaml": "^4.1.0",
 				"json-stable-stringify-without-jsonify": "^1.0.1",
 				"levn": "^0.4.1",
@@ -659,11 +816,9 @@
 				"minimatch": "^3.1.2",
 				"natural-compare": "^1.4.0",
 				"optionator": "^0.9.1",
-				"regexpp": "^3.2.0",
 				"strip-ansi": "^6.0.1",
 				"strip-json-comments": "^3.1.0",
-				"text-table": "^0.2.0",
-				"v8-compile-cache": "^2.0.3"
+				"text-table": "^0.2.0"
 			},
 			"bin": {
 				"eslint": "bin/eslint.js"
@@ -676,25 +831,26 @@
 			}
 		},
 		"node_modules/eslint-config-wikimedia": {
-			"version": "0.22.1",
-			"resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.22.1.tgz",
-			"integrity": "sha512-TtN+gWJrcW0i1sEu7vPE1tHpEilrMUuTxP6UK97Amvva/KDV9/tvRUifGhw0q5uBswp+HWgF12p8rq68hZqMbA==",
+			"version": "0.24.0",
+			"resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.24.0.tgz",
+			"integrity": "sha512-8oH/YhJ87ONSmuRfATgx8U7Jcwz3tBemrh6YOezIfj9f2QfE71ZhaKZrNPdfS7vIklLor/cB9vX7sxN10nz8xw==",
 			"dev": true,
 			"dependencies": {
-				"eslint": "^8.6.0",
+				"browserslist-config-wikimedia": "^0.4.0",
+				"eslint": "^8.31.0",
 				"eslint-plugin-compat": "^4.0.2",
-				"eslint-plugin-es": "^4.1.0",
-				"eslint-plugin-jsdoc": "^37.7.1",
-				"eslint-plugin-json-es": "^1.5.4",
-				"eslint-plugin-mediawiki": "^0.3.0",
+				"eslint-plugin-es-x": "^5.2.1",
+				"eslint-plugin-jsdoc": "39.2.2",
+				"eslint-plugin-json-es": "^1.5.7",
+				"eslint-plugin-mediawiki": "^0.4.0",
 				"eslint-plugin-mocha": "^9.0.0",
 				"eslint-plugin-no-jquery": "^2.7.0",
 				"eslint-plugin-node": "^11.1.0",
 				"eslint-plugin-qunit": "^7.2.0",
-				"eslint-plugin-unicorn": "^40.1.0",
-				"eslint-plugin-vue": "^8.4.1",
-				"eslint-plugin-wdio": "^7.4.2",
-				"eslint-plugin-yml": "^0.13.0"
+				"eslint-plugin-unicorn": "^42.0.0",
+				"eslint-plugin-vue": "^8.7.1",
+				"eslint-plugin-wdio": "^7.19.4",
+				"eslint-plugin-yml": "^0.14.0"
 			}
 		},
 		"node_modules/eslint-plugin-compat": {
@@ -719,162 +875,96 @@
 				"eslint": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
 			}
 		},
-		"node_modules/eslint-plugin-es": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
-			"integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
+		"node_modules/eslint-plugin-es-x": {
+			"version": "5.4.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-5.4.0.tgz",
+			"integrity": "sha512-6Mniw760Nhd6brnDy+rz857LD+icZe5wXmsvXSuJ84svM0Q53ulJxpMhTJmpqHaLzYh7fuGAJ8V62ohbmqF+jA==",
 			"dev": true,
 			"dependencies": {
-				"eslint-utils": "^2.0.0",
+				"eslint-utils": "^2.0.0 || ^3.0.0",
 				"regexpp": "^3.0.0"
 			},
 			"engines": {
 				"node": ">=8.10.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ota-meshi"
+			},
+			"peerDependencies": {
+				"eslint": ">=4.19.1"
 			}
 		},
 		"node_modules/eslint-plugin-jsdoc": {
-			"version": "37.7.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-37.7.1.tgz",
-			"integrity": "sha512-ySxDTedl6qKXT/VeTwcZlhsRtvNQZGPklyVnaL5+ge20vowzFA9CKvrY0NXRqvdIz6JBVMFpxX9DSmS3OyAUOQ==",
+			"version": "39.2.2",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.2.2.tgz",
+			"integrity": "sha512-ybkvja0p9JRzHEd2ST9h+Z47DLOuPyXpeb6r18/zKHdMmggPU1J0/zl+F0phea8ze9rMxi42MJVmGXi2NZ7PpA==",
 			"dev": true,
 			"dependencies": {
-				"@es-joy/jsdoccomment": "~0.18.0",
-				"comment-parser": "1.3.0",
-				"debug": "^4.3.3",
+				"@es-joy/jsdoccomment": "~0.23.1",
+				"comment-parser": "1.3.1",
+				"debug": "^4.3.4",
 				"escape-string-regexp": "^4.0.0",
 				"esquery": "^1.4.0",
-				"regextras": "^0.8.0",
-				"semver": "^7.3.5",
+				"semver": "^7.3.7",
 				"spdx-expression-parse": "^3.0.1"
 			},
 			"engines": {
-				"node": "^12 || ^14 || ^16 || ^17"
+				"node": "^14 || ^16 || ^17"
 			},
 			"peerDependencies": {
 				"eslint": "^7.0.0 || ^8.0.0"
 			}
 		},
-		"node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+		"node_modules/eslint-plugin-jsdoc/node_modules/semver": {
+			"version": "7.3.8",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+			"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
 			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"bin": {
+				"semver": "bin/semver.js"
+			},
 			"engines": {
 				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/eslint-plugin-json-es": {
-			"version": "1.5.4",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-json-es/-/eslint-plugin-json-es-1.5.4.tgz",
-			"integrity": "sha512-DdjnNMUZ1iMrUXfxUQrTU7IyoEOsa4Kg0Zd6nOyOq1mUb75deK7NrcbI1FlWGdGVgqX99bUOD27i81EYiG794Q==",
+			"version": "1.5.7",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-json-es/-/eslint-plugin-json-es-1.5.7.tgz",
+			"integrity": "sha512-ehBHcCcJo4iViYx6vp3T+SmwzLIlVDzZNoVxN/txZIiPwDQ26mnYaN5iJ3imqN4l1b8z6rbxEH2kB9XDGxeU/w==",
 			"dev": true,
 			"dependencies": {
-				"eslint-visitor-keys": "^3.0.0",
-				"espree": "^9.0.0"
+				"eslint-visitor-keys": "^3.3.0",
+				"espree": "^9.3.1"
 			},
 			"peerDependencies": {
 				"eslint": ">= 7"
 			}
 		},
 		"node_modules/eslint-plugin-json-es/node_modules/eslint-visitor-keys": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
-			"integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+			"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
 			"dev": true,
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			}
 		},
 		"node_modules/eslint-plugin-mediawiki": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-mediawiki/-/eslint-plugin-mediawiki-0.3.0.tgz",
-			"integrity": "sha512-Lhyj2PSkhDzYSc1PNbURysY/WoqvY0brw558ZInT3erzf5KUlro18MTKFdV+nlht475ZgnsfHsgfg6Ut2w1SVg==",
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-mediawiki/-/eslint-plugin-mediawiki-0.4.0.tgz",
+			"integrity": "sha512-Eufptb8lrElYwIONvgxlMBnPD6PYT4xAFprWlBxV5brCmUh8MZ41+lMxt2TPwEC6C85ngflkVez8BV8tWS9RyQ==",
 			"dev": true,
 			"dependencies": {
-				"eslint-plugin-vue": "^7.20.0",
+				"eslint-plugin-vue": "^8.7.1",
 				"upath": "^2.0.1"
 			},
 			"peerDependencies": {
 				"eslint": ">=5.0.0"
 			}
 		},
-		"node_modules/eslint-plugin-mediawiki/node_modules/eslint-plugin-vue": {
-			"version": "7.20.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.20.0.tgz",
-			"integrity": "sha512-oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw==",
-			"dev": true,
-			"dependencies": {
-				"eslint-utils": "^2.1.0",
-				"natural-compare": "^1.4.0",
-				"semver": "^6.3.0",
-				"vue-eslint-parser": "^7.10.0"
-			},
-			"engines": {
-				"node": ">=8.10"
-			},
-			"peerDependencies": {
-				"eslint": "^6.2.0 || ^7.0.0 || ^8.0.0"
-			}
-		},
-		"node_modules/eslint-plugin-mediawiki/node_modules/eslint-visitor-keys": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-			"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/eslint-plugin-mediawiki/node_modules/espree": {
-			"version": "6.2.1",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
-			"integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
-			"dev": true,
-			"dependencies": {
-				"acorn": "^7.1.1",
-				"acorn-jsx": "^5.2.0",
-				"eslint-visitor-keys": "^1.1.0"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/eslint-plugin-mediawiki/node_modules/semver": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-			"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-			"dev": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/eslint-plugin-mediawiki/node_modules/vue-eslint-parser": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",
-			"integrity": "sha512-qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg==",
-			"dev": true,
-			"dependencies": {
-				"debug": "^4.1.1",
-				"eslint-scope": "^5.1.1",
-				"eslint-visitor-keys": "^1.1.0",
-				"espree": "^6.2.1",
-				"esquery": "^1.4.0",
-				"lodash": "^4.17.21",
-				"semver": "^6.3.0"
-			},
-			"engines": {
-				"node": ">=8.10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/mysticatea"
-			},
-			"peerDependencies": {
-				"eslint": ">=5.0.0"
-			}
-		},
 		"node_modules/eslint-plugin-mocha": {
 			"version": "9.0.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-9.0.0.tgz",
@@ -989,9 +1079,9 @@
 			}
 		},
 		"node_modules/eslint-plugin-unicorn": {
-			"version": "40.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-40.1.0.tgz",
-			"integrity": "sha512-y5doK2DF9Sr5AqKEHbHxjFllJ167nKDRU01HDcWyv4Tnmaoe9iNxMrBnaybZvWZUaE3OC5Unu0lNIevYamloig==",
+			"version": "42.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-42.0.0.tgz",
+			"integrity": "sha512-ixBsbhgWuxVaNlPTT8AyfJMlhyC5flCJFjyK3oKE8TRrwBnaHvUbuIkCM1lqg8ryYrFStL/T557zfKzX4GKSlg==",
 			"dev": true,
 			"dependencies": {
 				"@babel/helper-validator-identifier": "^7.15.7",
@@ -1016,7 +1106,7 @@
 				"url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1"
 			},
 			"peerDependencies": {
-				"eslint": ">=7.32.0"
+				"eslint": ">=8.8.0"
 			}
 		},
 		"node_modules/eslint-plugin-unicorn/node_modules/eslint-utils": {
@@ -1038,13 +1128,15 @@
 			}
 		},
 		"node_modules/eslint-plugin-vue": {
-			"version": "8.4.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.4.1.tgz",
-			"integrity": "sha512-nmWOhNmDx9TZ+yP9ZhezTkZUupSHsYA2TocRm+efPSXMOyFrVczVlaIuQcLBjCtI8CbkBiUQ3VcyQsjlIhDrhA==",
+			"version": "8.7.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.7.1.tgz",
+			"integrity": "sha512-28sbtm4l4cOzoO1LtzQPxfxhQABararUb1JtqusQqObJpWX2e/gmVyeYVfepizPFne0Q5cILkYGiBoV36L12Wg==",
 			"dev": true,
 			"dependencies": {
 				"eslint-utils": "^3.0.0",
 				"natural-compare": "^1.4.0",
+				"nth-check": "^2.0.1",
+				"postcss-selector-parser": "^6.0.9",
 				"semver": "^7.3.5",
 				"vue-eslint-parser": "^8.0.1"
 			},
@@ -1074,18 +1166,18 @@
 			}
 		},
 		"node_modules/eslint-plugin-wdio": {
-			"version": "7.4.2",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-wdio/-/eslint-plugin-wdio-7.4.2.tgz",
-			"integrity": "sha512-tkISFycJmRFMKsEjetRcAmWSHKJKnw5rKHDxfE7Ob3tF5lbmYlCLfNKH0UwanOpSdulpe52s3K+CBHSd6qUUNQ==",
+			"version": "7.25.3",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-wdio/-/eslint-plugin-wdio-7.25.3.tgz",
+			"integrity": "sha512-2zbYwV14Md9FNlyhaIILVGPB6w4bu2eJdOTywDUs2Qy4ebcQNwrxB0qCaf7Rm4O+T0Ir+tdYHYBBfbDocSLKng==",
 			"dev": true,
 			"engines": {
 				"node": ">=12.0.0"
 			}
 		},
 		"node_modules/eslint-plugin-yml": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-yml/-/eslint-plugin-yml-0.13.0.tgz",
-			"integrity": "sha512-rZvdnhe28jIbgSIZo3qYqkl9hKslyTDfMwqIGDzz873gxghzBw0yeFG+P7sMfOkFfpqwJzZy3IKe2cIiCp4FrA==",
+			"version": "0.14.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-yml/-/eslint-plugin-yml-0.14.0.tgz",
+			"integrity": "sha512-+0+bBV/07txENbxfrHF9olGoLCHez64vmnOmjWOoLwmXOwfdaSRleBSPIi4nWQs7WwX8lm/fSLadOjbVEcsXQQ==",
 			"dev": true,
 			"dependencies": {
 				"debug": "^4.3.2",
@@ -1104,16 +1196,16 @@
 			}
 		},
 		"node_modules/eslint-scope": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+			"integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
 			"dev": true,
 			"dependencies": {
 				"esrecurse": "^4.3.0",
-				"estraverse": "^4.1.1"
+				"estraverse": "^5.2.0"
 			},
 			"engines": {
-				"node": ">=8.0.0"
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			}
 		},
 		"node_modules/eslint-utils": {
@@ -1152,58 +1244,6 @@
 			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
 			"dev": true
 		},
-		"node_modules/eslint/node_modules/escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/eslint/node_modules/eslint-scope": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-			"integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-			"dev": true,
-			"dependencies": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^5.2.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
-		"node_modules/eslint/node_modules/eslint-utils": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-			"dev": true,
-			"dependencies": {
-				"eslint-visitor-keys": "^2.0.0"
-			},
-			"engines": {
-				"node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/mysticatea"
-			},
-			"peerDependencies": {
-				"eslint": ">=5"
-			}
-		},
-		"node_modules/eslint/node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/eslint/node_modules/eslint-visitor-keys": {
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
@@ -1213,15 +1253,6 @@
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			}
 		},
-		"node_modules/eslint/node_modules/estraverse": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
 		"node_modules/eslint/node_modules/js-yaml": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -1247,29 +1278,20 @@
 			}
 		},
 		"node_modules/espree": {
-			"version": "9.3.2",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
-			"integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
+			"version": "9.5.0",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz",
+			"integrity": "sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==",
 			"dev": true,
 			"dependencies": {
-				"acorn": "^8.7.1",
+				"acorn": "^8.8.0",
 				"acorn-jsx": "^5.3.2",
 				"eslint-visitor-keys": "^3.3.0"
 			},
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
-		"node_modules/espree/node_modules/acorn": {
-			"version": "8.7.1",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-			"integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
-			"dev": true,
-			"bin": {
-				"acorn": "bin/acorn"
 			},
-			"engines": {
-				"node": ">=0.4.0"
+			"funding": {
+				"url": "https://opencollective.com/eslint"
 			}
 		},
 		"node_modules/espree/node_modules/eslint-visitor-keys": {
@@ -1295,9 +1317,9 @@
 			}
 		},
 		"node_modules/esquery": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+			"integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
 			"dev": true,
 			"dependencies": {
 				"estraverse": "^5.1.0"
@@ -1306,15 +1328,6 @@
 				"node": ">=0.10"
 			}
 		},
-		"node_modules/esquery/node_modules/estraverse": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-			"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
 		"node_modules/esrecurse": {
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
@@ -1327,19 +1340,10 @@
 				"node": ">=4.0"
 			}
 		},
-		"node_modules/esrecurse/node_modules/estraverse": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-			"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
 		"node_modules/estraverse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
 			"dev": true,
 			"engines": {
 				"node": ">=4.0"
@@ -1405,6 +1409,15 @@
 			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
 			"dev": true
 		},
+		"node_modules/fastq": {
+			"version": "1.15.0",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+			"integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+			"dev": true,
+			"dependencies": {
+				"reusify": "^1.0.4"
+			}
+		},
 		"node_modules/file-entry-cache": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -1446,31 +1459,18 @@
 			}
 		},
 		"node_modules/findup-sync": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
-			"integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
-			"dev": true,
-			"dependencies": {
-				"glob": "~5.0.0"
-			},
-			"engines": {
-				"node": ">= 0.6.0"
-			}
-		},
-		"node_modules/findup-sync/node_modules/glob": {
-			"version": "5.0.15",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-			"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz",
+			"integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==",
 			"dev": true,
 			"dependencies": {
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "2 || 3",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
+				"detect-file": "^1.0.0",
+				"is-glob": "^4.0.3",
+				"micromatch": "^4.0.4",
+				"resolve-dir": "^1.0.1"
 			},
 			"engines": {
-				"node": "*"
+				"node": ">= 10.13.0"
 			}
 		},
 		"node_modules/fined": {
@@ -1550,12 +1550,6 @@
 			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
 			"dev": true
 		},
-		"node_modules/functional-red-black-tree": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-			"dev": true
-		},
 		"node_modules/getobject": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/getobject/-/getobject-1.0.0.tgz",
@@ -1625,9 +1619,9 @@
 			}
 		},
 		"node_modules/globals": {
-			"version": "13.15.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
-			"integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
+			"version": "13.20.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+			"integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
 			"dev": true,
 			"dependencies": {
 				"type-fest": "^0.20.2"
@@ -1639,42 +1633,37 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/globals/node_modules/type-fest": {
-			"version": "0.20.2",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			}
+		"node_modules/grapheme-splitter": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+			"integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+			"dev": true
 		},
 		"node_modules/grunt": {
-			"version": "1.5.3",
-			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.3.tgz",
-			"integrity": "sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ==",
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.6.1.tgz",
+			"integrity": "sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA==",
 			"dev": true,
 			"dependencies": {
-				"dateformat": "~3.0.3",
+				"dateformat": "~4.6.2",
 				"eventemitter2": "~0.4.13",
 				"exit": "~0.1.2",
-				"findup-sync": "~0.3.0",
+				"findup-sync": "~5.0.0",
 				"glob": "~7.1.6",
 				"grunt-cli": "~1.4.3",
 				"grunt-known-options": "~2.0.0",
 				"grunt-legacy-log": "~3.0.0",
 				"grunt-legacy-util": "~2.0.1",
-				"iconv-lite": "~0.4.13",
+				"iconv-lite": "~0.6.3",
 				"js-yaml": "~3.14.0",
 				"minimatch": "~3.0.4",
-				"mkdirp": "~1.0.4",
-				"nopt": "~3.0.6",
-				"rimraf": "~3.0.2"
+				"nopt": "~3.0.6"
 			},
 			"bin": {
 				"grunt": "bin/grunt"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=16"
 			}
 		},
 		"node_modules/grunt-banana-checker": {
@@ -1859,12 +1848,12 @@
 			"dev": true
 		},
 		"node_modules/iconv-lite": {
-			"version": "0.4.24",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
 			"dev": true,
 			"dependencies": {
-				"safer-buffer": ">= 2.1.2 < 3"
+				"safer-buffer": ">= 2.1.2 < 3.0.0"
 			},
 			"engines": {
 				"node": ">=0.10.0"
@@ -1957,19 +1946,22 @@
 		"node_modules/is-arrayish": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
 			"dev": true
 		},
 		"node_modules/is-builtin-module": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.1.0.tgz",
-			"integrity": "sha512-OV7JjAgOTfAFJmHZLvpSTb4qi0nIILDV1gWPYDnDJUTNFM5aGlRAhk4QcT8i7TuAleeEV5Fdkqn3t4mS+Q11fg==",
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+			"integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
 			"dev": true,
 			"dependencies": {
-				"builtin-modules": "^3.0.0"
+				"builtin-modules": "^3.3.0"
 			},
 			"engines": {
 				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/is-core-module": {
@@ -2014,6 +2006,15 @@
 				"node": ">=0.12.0"
 			}
 		},
+		"node_modules/is-path-inside": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+			"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/is-plain-object": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -2074,6 +2075,16 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/js-sdsl": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
+			"integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==",
+			"dev": true,
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/js-sdsl"
+			}
+		},
 		"node_modules/js-tokens": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -2094,9 +2105,9 @@
 			}
 		},
 		"node_modules/jsdoc-type-pratt-parser": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.2.tgz",
-			"integrity": "sha512-zRokSWcPLSWkoNzsWn9pq7YYSwDhKyEe+cJYT2qaPqLOOJb5sFSi46BPj81vP+e8chvCNdQL9RG86Bi9EI6MDw==",
+			"version": "2.2.5",
+			"resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.5.tgz",
+			"integrity": "sha512-2a6eRxSxp1BW040hFvaJxhsCMI9lT8QB8t14t+NY5tC5rckIR0U9cr2tjOeaFirmEOy6MHvmJnY7zTBHq431Lw==",
 			"dev": true,
 			"engines": {
 				"node": ">=12.0.0"
@@ -2282,18 +2293,6 @@
 				"node": "*"
 			}
 		},
-		"node_modules/mkdirp": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-			"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-			"dev": true,
-			"bin": {
-				"mkdirp": "bin/cmd.js"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/ms": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -2345,6 +2344,18 @@
 				"semver": "bin/semver"
 			}
 		},
+		"node_modules/nth-check": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+			"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+			"dev": true,
+			"dependencies": {
+				"boolbase": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/nth-check?sponsor=1"
+			}
+		},
 		"node_modules/object.defaults": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
@@ -2612,6 +2623,19 @@
 				"node": ">=4"
 			}
 		},
+		"node_modules/postcss-selector-parser": {
+			"version": "6.0.11",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
+			"integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
+			"dev": true,
+			"dependencies": {
+				"cssesc": "^3.0.0",
+				"util-deprecate": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/prelude-ls": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -2622,14 +2646,34 @@
 			}
 		},
 		"node_modules/punycode": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+			"integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
 			"dev": true,
 			"engines": {
 				"node": ">=6"
 			}
 		},
+		"node_modules/queue-microtask": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
 		"node_modules/ramda": {
 			"version": "0.27.2",
 			"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.2.tgz",
@@ -2720,6 +2764,15 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/read-pkg-up/node_modules/type-fest": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/read-pkg/node_modules/type-fest": {
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
@@ -2762,15 +2815,6 @@
 				"url": "https://github.com/sponsors/mysticatea"
 			}
 		},
-		"node_modules/regextras": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz",
-			"integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.1.14"
-			}
-		},
 		"node_modules/requireindex": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
@@ -2819,6 +2863,16 @@
 				"node": ">=4"
 			}
 		},
+		"node_modules/reusify": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+			"dev": true,
+			"engines": {
+				"iojs": ">=1.0.0",
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/rimraf": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -2831,6 +2885,29 @@
 				"rimraf": "bin.js"
 			}
 		},
+		"node_modules/run-parallel": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"dependencies": {
+				"queue-microtask": "^1.2.2"
+			}
+		},
 		"node_modules/safe-regex": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-2.1.1.tgz",
@@ -2883,9 +2960,9 @@
 			}
 		},
 		"node_modules/spdx-correct": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+			"integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
 			"dev": true,
 			"dependencies": {
 				"spdx-expression-parse": "^3.0.0",
@@ -2909,9 +2986,9 @@
 			}
 		},
 		"node_modules/spdx-license-ids": {
-			"version": "3.0.11",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
-			"integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
+			"version": "3.0.13",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
+			"integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==",
 			"dev": true
 		},
 		"node_modules/sprintf-js": {
@@ -3011,12 +3088,15 @@
 			}
 		},
 		"node_modules/type-fest": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
 			"dev": true,
 			"engines": {
-				"node": ">=8"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/unc-path-regex": {
@@ -3066,12 +3146,6 @@
 			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
 			"dev": true
 		},
-		"node_modules/v8-compile-cache": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-			"dev": true
-		},
 		"node_modules/v8flags": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
@@ -3095,9 +3169,9 @@
 			}
 		},
 		"node_modules/vue-eslint-parser": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.2.0.tgz",
-			"integrity": "sha512-hvl8OVT8imlKk/lQyhkshqwQQChzHETcBd5abiO4ePw7ib7QUZLfW+2TUrJHKUvFOCFRJrDin5KJO9OHzB5bRQ==",
+			"version": "8.3.0",
+			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz",
+			"integrity": "sha512-dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g==",
 			"dev": true,
 			"dependencies": {
 				"debug": "^4.3.2",
@@ -3118,37 +3192,15 @@
 				"eslint": ">=6.0.0"
 			}
 		},
-		"node_modules/vue-eslint-parser/node_modules/eslint-scope": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz",
-			"integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==",
-			"dev": true,
-			"dependencies": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^5.2.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			}
-		},
 		"node_modules/vue-eslint-parser/node_modules/eslint-visitor-keys": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
-			"integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+			"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
 			"dev": true,
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			}
 		},
-		"node_modules/vue-eslint-parser/node_modules/estraverse": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
 		"node_modules/which": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -3229,27 +3281,27 @@
 	},
 	"dependencies": {
 		"@babel/code-frame": {
-			"version": "7.12.11",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-			"integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+			"version": "7.18.6",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+			"integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
 			"dev": true,
 			"requires": {
-				"@babel/highlight": "^7.10.4"
+				"@babel/highlight": "^7.18.6"
 			}
 		},
 		"@babel/helper-validator-identifier": {
-			"version": "7.16.7",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-			"integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+			"version": "7.19.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+			"integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
 			"dev": true
 		},
 		"@babel/highlight": {
-			"version": "7.16.10",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
-			"integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
+			"version": "7.18.6",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+			"integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-validator-identifier": "^7.16.7",
+				"@babel/helper-validator-identifier": "^7.18.6",
 				"chalk": "^2.0.0",
 				"js-tokens": "^4.0.0"
 			},
@@ -3286,13 +3338,19 @@
 				"color-name": {
 					"version": "1.1.3",
 					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-					"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+					"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+					"dev": true
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
 					"dev": true
 				},
 				"has-flag": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-					"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+					"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
 					"dev": true
 				},
 				"supports-color": {
@@ -3307,26 +3365,49 @@
 			}
 		},
 		"@es-joy/jsdoccomment": {
-			"version": "0.18.0",
-			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.18.0.tgz",
-			"integrity": "sha512-TjT8KJULV4I6ZiwIoKr6eMs+XpRejqwJ/VA+QPDeFGe9j6bZFKmMJ81EeFsGm6JNZhnzm37aoxVROmTh2PZoyA==",
+			"version": "0.23.6",
+			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.23.6.tgz",
+			"integrity": "sha512-cCtumxG+qrYORGeOkDQ58GtSt/bb2XiP9GC0x2YduoUEX2EmBQ48FtoZMUs+8wiIdTDN1izUiRUD2FDu+p+Lvg==",
 			"dev": true,
 			"requires": {
-				"comment-parser": "1.3.0",
+				"comment-parser": "1.3.1",
 				"esquery": "^1.4.0",
-				"jsdoc-type-pratt-parser": "~2.2.2"
+				"jsdoc-type-pratt-parser": "~2.2.5"
+			}
+		},
+		"@eslint-community/eslint-utils": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz",
+			"integrity": "sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==",
+			"dev": true,
+			"requires": {
+				"eslint-visitor-keys": "^3.3.0"
+			},
+			"dependencies": {
+				"eslint-visitor-keys": {
+					"version": "3.3.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+					"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+					"dev": true
+				}
 			}
 		},
+		"@eslint-community/regexpp": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz",
+			"integrity": "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==",
+			"dev": true
+		},
 		"@eslint/eslintrc": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
-			"integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz",
+			"integrity": "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==",
 			"dev": true,
 			"requires": {
 				"ajv": "^6.12.4",
 				"debug": "^4.3.2",
-				"espree": "^9.3.2",
-				"globals": "^13.15.0",
+				"espree": "^9.5.0",
+				"globals": "^13.19.0",
 				"ignore": "^5.2.0",
 				"import-fresh": "^3.2.1",
 				"js-yaml": "^4.1.0",
@@ -3360,17 +3441,29 @@
 				}
 			}
 		},
+		"@eslint/js": {
+			"version": "8.36.0",
+			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz",
+			"integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==",
+			"dev": true
+		},
 		"@humanwhocodes/config-array": {
-			"version": "0.9.5",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
-			"integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+			"version": "0.11.8",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
+			"integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
 			"dev": true,
 			"requires": {
 				"@humanwhocodes/object-schema": "^1.2.1",
 				"debug": "^4.1.1",
-				"minimatch": "^3.0.4"
+				"minimatch": "^3.0.5"
 			}
 		},
+		"@humanwhocodes/module-importer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+			"integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+			"dev": true
+		},
 		"@humanwhocodes/object-schema": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
@@ -3383,6 +3476,32 @@
 			"integrity": "sha512-Ap8MOYbyvEilK1+sNY6yh6LmsHSp7f5zzSGlY4AemhbTcoultcozEXPzx42OO6WjoriOsw88aW8TiqgYdXwsxg==",
 			"dev": true
 		},
+		"@nodelib/fs.scandir": {
+			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+			"dev": true,
+			"requires": {
+				"@nodelib/fs.stat": "2.0.5",
+				"run-parallel": "^1.1.9"
+			}
+		},
+		"@nodelib/fs.stat": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+			"dev": true
+		},
+		"@nodelib/fs.walk": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+			"dev": true,
+			"requires": {
+				"@nodelib/fs.scandir": "2.1.5",
+				"fastq": "^1.6.0"
+			}
+		},
 		"@types/color-name": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
@@ -3402,16 +3521,17 @@
 			"dev": true
 		},
 		"acorn": {
-			"version": "7.4.1",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+			"version": "8.8.2",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+			"integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
 			"dev": true
 		},
 		"acorn-jsx": {
 			"version": "5.3.2",
 			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
 			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-			"dev": true
+			"dev": true,
+			"requires": {}
 		},
 		"ajv": {
 			"version": "6.12.6",
@@ -3499,6 +3619,12 @@
 			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
 			"dev": true
 		},
+		"boolbase": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+			"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+			"dev": true
+		},
 		"brace-expansion": {
 			"version": "1.1.11",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -3531,10 +3657,16 @@
 				"picocolors": "^1.0.0"
 			}
 		},
+		"browserslist-config-wikimedia": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/browserslist-config-wikimedia/-/browserslist-config-wikimedia-0.4.0.tgz",
+			"integrity": "sha512-U/fmsaGlCKOqRIjKqXwQ44qFqiStngRTphj1Cf6IHV6J8OK8T0gu9dKc7Ljq4v7bwhnhN+YCCa4fA3nZlPNivQ==",
+			"dev": true
+		},
 		"builtin-modules": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
-			"integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+			"integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
 			"dev": true
 		},
 		"callsites": {
@@ -3560,18 +3692,26 @@
 			}
 		},
 		"ci-info": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
-			"integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==",
+			"version": "3.8.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+			"integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
 			"dev": true
 		},
 		"clean-regexp": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz",
-			"integrity": "sha1-jffHquUf02h06PjQW5GAvBGj/tc=",
+			"integrity": "sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==",
 			"dev": true,
 			"requires": {
 				"escape-string-regexp": "^1.0.5"
+			},
+			"dependencies": {
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+					"dev": true
+				}
 			}
 		},
 		"color-convert": {
@@ -3596,9 +3736,9 @@
 			"dev": true
 		},
 		"comment-parser": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.0.tgz",
-			"integrity": "sha512-hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA==",
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.1.tgz",
+			"integrity": "sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==",
 			"dev": true
 		},
 		"concat-map": {
@@ -3635,16 +3775,22 @@
 				}
 			}
 		},
+		"cssesc": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+			"dev": true
+		},
 		"dateformat": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-			"integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
+			"version": "4.6.3",
+			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
+			"integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==",
 			"dev": true
 		},
 		"debug": {
-			"version": "4.3.3",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-			"integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+			"version": "4.3.4",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
 			"dev": true,
 			"requires": {
 				"ms": "2.1.2"
@@ -3693,19 +3839,24 @@
 			"dev": true
 		},
 		"escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
 			"dev": true
 		},
 		"eslint": {
-			"version": "8.16.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
-			"integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
+			"version": "8.36.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz",
+			"integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==",
 			"dev": true,
 			"requires": {
-				"@eslint/eslintrc": "^1.3.0",
-				"@humanwhocodes/config-array": "^0.9.2",
+				"@eslint-community/eslint-utils": "^4.2.0",
+				"@eslint-community/regexpp": "^4.4.0",
+				"@eslint/eslintrc": "^2.0.1",
+				"@eslint/js": "8.36.0",
+				"@humanwhocodes/config-array": "^0.11.8",
+				"@humanwhocodes/module-importer": "^1.0.1",
+				"@nodelib/fs.walk": "^1.2.8",
 				"ajv": "^6.10.0",
 				"chalk": "^4.0.0",
 				"cross-spawn": "^7.0.2",
@@ -3713,20 +3864,22 @@
 				"doctrine": "^3.0.0",
 				"escape-string-regexp": "^4.0.0",
 				"eslint-scope": "^7.1.1",
-				"eslint-utils": "^3.0.0",
 				"eslint-visitor-keys": "^3.3.0",
-				"espree": "^9.3.2",
-				"esquery": "^1.4.0",
+				"espree": "^9.5.0",
+				"esquery": "^1.4.2",
 				"esutils": "^2.0.2",
 				"fast-deep-equal": "^3.1.3",
 				"file-entry-cache": "^6.0.1",
-				"functional-red-black-tree": "^1.0.1",
-				"glob-parent": "^6.0.1",
-				"globals": "^13.15.0",
+				"find-up": "^5.0.0",
+				"glob-parent": "^6.0.2",
+				"globals": "^13.19.0",
+				"grapheme-splitter": "^1.0.4",
 				"ignore": "^5.2.0",
 				"import-fresh": "^3.0.0",
 				"imurmurhash": "^0.1.4",
 				"is-glob": "^4.0.0",
+				"is-path-inside": "^3.0.3",
+				"js-sdsl": "^4.1.4",
 				"js-yaml": "^4.1.0",
 				"json-stable-stringify-without-jsonify": "^1.0.1",
 				"levn": "^0.4.1",
@@ -3734,11 +3887,9 @@
 				"minimatch": "^3.1.2",
 				"natural-compare": "^1.4.0",
 				"optionator": "^0.9.1",
-				"regexpp": "^3.2.0",
 				"strip-ansi": "^6.0.1",
 				"strip-json-comments": "^3.1.0",
-				"text-table": "^0.2.0",
-				"v8-compile-cache": "^2.0.3"
+				"text-table": "^0.2.0"
 			},
 			"dependencies": {
 				"argparse": {
@@ -3747,51 +3898,12 @@
 					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
 					"dev": true
 				},
-				"escape-string-regexp": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-					"dev": true
-				},
-				"eslint-scope": {
-					"version": "7.1.1",
-					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-					"integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-					"dev": true,
-					"requires": {
-						"esrecurse": "^4.3.0",
-						"estraverse": "^5.2.0"
-					}
-				},
-				"eslint-utils": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-					"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-					"dev": true,
-					"requires": {
-						"eslint-visitor-keys": "^2.0.0"
-					},
-					"dependencies": {
-						"eslint-visitor-keys": {
-							"version": "2.1.0",
-							"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-							"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-							"dev": true
-						}
-					}
-				},
 				"eslint-visitor-keys": {
 					"version": "3.3.0",
 					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
 					"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
 					"dev": true
 				},
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
-				},
 				"js-yaml": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -3813,25 +3925,26 @@
 			}
 		},
 		"eslint-config-wikimedia": {
-			"version": "0.22.1",
-			"resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.22.1.tgz",
-			"integrity": "sha512-TtN+gWJrcW0i1sEu7vPE1tHpEilrMUuTxP6UK97Amvva/KDV9/tvRUifGhw0q5uBswp+HWgF12p8rq68hZqMbA==",
+			"version": "0.24.0",
+			"resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.24.0.tgz",
+			"integrity": "sha512-8oH/YhJ87ONSmuRfATgx8U7Jcwz3tBemrh6YOezIfj9f2QfE71ZhaKZrNPdfS7vIklLor/cB9vX7sxN10nz8xw==",
 			"dev": true,
 			"requires": {
-				"eslint": "^8.6.0",
+				"browserslist-config-wikimedia": "^0.4.0",
+				"eslint": "^8.31.0",
 				"eslint-plugin-compat": "^4.0.2",
-				"eslint-plugin-es": "^4.1.0",
-				"eslint-plugin-jsdoc": "^37.7.1",
-				"eslint-plugin-json-es": "^1.5.4",
-				"eslint-plugin-mediawiki": "^0.3.0",
+				"eslint-plugin-es-x": "^5.2.1",
+				"eslint-plugin-jsdoc": "39.2.2",
+				"eslint-plugin-json-es": "^1.5.7",
+				"eslint-plugin-mediawiki": "^0.4.0",
 				"eslint-plugin-mocha": "^9.0.0",
 				"eslint-plugin-no-jquery": "^2.7.0",
 				"eslint-plugin-node": "^11.1.0",
 				"eslint-plugin-qunit": "^7.2.0",
-				"eslint-plugin-unicorn": "^40.1.0",
-				"eslint-plugin-vue": "^8.4.1",
-				"eslint-plugin-wdio": "^7.4.2",
-				"eslint-plugin-yml": "^0.13.0"
+				"eslint-plugin-unicorn": "^42.0.0",
+				"eslint-plugin-vue": "^8.7.1",
+				"eslint-plugin-wdio": "^7.19.4",
+				"eslint-plugin-yml": "^0.14.0"
 			}
 		},
 		"eslint-plugin-compat": {
@@ -3850,118 +3963,68 @@
 				"semver": "7.3.5"
 			}
 		},
-		"eslint-plugin-es": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
-			"integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
+		"eslint-plugin-es-x": {
+			"version": "5.4.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-5.4.0.tgz",
+			"integrity": "sha512-6Mniw760Nhd6brnDy+rz857LD+icZe5wXmsvXSuJ84svM0Q53ulJxpMhTJmpqHaLzYh7fuGAJ8V62ohbmqF+jA==",
 			"dev": true,
 			"requires": {
-				"eslint-utils": "^2.0.0",
+				"eslint-utils": "^2.0.0 || ^3.0.0",
 				"regexpp": "^3.0.0"
 			}
 		},
 		"eslint-plugin-jsdoc": {
-			"version": "37.7.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-37.7.1.tgz",
-			"integrity": "sha512-ySxDTedl6qKXT/VeTwcZlhsRtvNQZGPklyVnaL5+ge20vowzFA9CKvrY0NXRqvdIz6JBVMFpxX9DSmS3OyAUOQ==",
+			"version": "39.2.2",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.2.2.tgz",
+			"integrity": "sha512-ybkvja0p9JRzHEd2ST9h+Z47DLOuPyXpeb6r18/zKHdMmggPU1J0/zl+F0phea8ze9rMxi42MJVmGXi2NZ7PpA==",
 			"dev": true,
 			"requires": {
-				"@es-joy/jsdoccomment": "~0.18.0",
-				"comment-parser": "1.3.0",
-				"debug": "^4.3.3",
+				"@es-joy/jsdoccomment": "~0.23.1",
+				"comment-parser": "1.3.1",
+				"debug": "^4.3.4",
 				"escape-string-regexp": "^4.0.0",
 				"esquery": "^1.4.0",
-				"regextras": "^0.8.0",
-				"semver": "^7.3.5",
+				"semver": "^7.3.7",
 				"spdx-expression-parse": "^3.0.1"
 			},
 			"dependencies": {
-				"escape-string-regexp": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-					"dev": true
+				"semver": {
+					"version": "7.3.8",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
 				}
 			}
 		},
 		"eslint-plugin-json-es": {
-			"version": "1.5.4",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-json-es/-/eslint-plugin-json-es-1.5.4.tgz",
-			"integrity": "sha512-DdjnNMUZ1iMrUXfxUQrTU7IyoEOsa4Kg0Zd6nOyOq1mUb75deK7NrcbI1FlWGdGVgqX99bUOD27i81EYiG794Q==",
+			"version": "1.5.7",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-json-es/-/eslint-plugin-json-es-1.5.7.tgz",
+			"integrity": "sha512-ehBHcCcJo4iViYx6vp3T+SmwzLIlVDzZNoVxN/txZIiPwDQ26mnYaN5iJ3imqN4l1b8z6rbxEH2kB9XDGxeU/w==",
 			"dev": true,
 			"requires": {
-				"eslint-visitor-keys": "^3.0.0",
-				"espree": "^9.0.0"
+				"eslint-visitor-keys": "^3.3.0",
+				"espree": "^9.3.1"
 			},
 			"dependencies": {
 				"eslint-visitor-keys": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
-					"integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
+					"version": "3.3.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+					"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
 					"dev": true
 				}
 			}
 		},
 		"eslint-plugin-mediawiki": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-mediawiki/-/eslint-plugin-mediawiki-0.3.0.tgz",
-			"integrity": "sha512-Lhyj2PSkhDzYSc1PNbURysY/WoqvY0brw558ZInT3erzf5KUlro18MTKFdV+nlht475ZgnsfHsgfg6Ut2w1SVg==",
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-mediawiki/-/eslint-plugin-mediawiki-0.4.0.tgz",
+			"integrity": "sha512-Eufptb8lrElYwIONvgxlMBnPD6PYT4xAFprWlBxV5brCmUh8MZ41+lMxt2TPwEC6C85ngflkVez8BV8tWS9RyQ==",
 			"dev": true,
 			"requires": {
-				"eslint-plugin-vue": "^7.20.0",
+				"eslint-plugin-vue": "^8.7.1",
 				"upath": "^2.0.1"
-			},
-			"dependencies": {
-				"eslint-plugin-vue": {
-					"version": "7.20.0",
-					"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.20.0.tgz",
-					"integrity": "sha512-oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw==",
-					"dev": true,
-					"requires": {
-						"eslint-utils": "^2.1.0",
-						"natural-compare": "^1.4.0",
-						"semver": "^6.3.0",
-						"vue-eslint-parser": "^7.10.0"
-					}
-				},
-				"eslint-visitor-keys": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-					"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-					"dev": true
-				},
-				"espree": {
-					"version": "6.2.1",
-					"resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
-					"integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
-					"dev": true,
-					"requires": {
-						"acorn": "^7.1.1",
-						"acorn-jsx": "^5.2.0",
-						"eslint-visitor-keys": "^1.1.0"
-					}
-				},
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				},
-				"vue-eslint-parser": {
-					"version": "7.11.0",
-					"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",
-					"integrity": "sha512-qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.1.1",
-						"eslint-scope": "^5.1.1",
-						"eslint-visitor-keys": "^1.1.0",
-						"espree": "^6.2.1",
-						"esquery": "^1.4.0",
-						"lodash": "^4.17.21",
-						"semver": "^6.3.0"
-					}
-				}
 			}
 		},
 		"eslint-plugin-mocha": {
@@ -3989,7 +4052,8 @@
 			"version": "2.7.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.7.0.tgz",
 			"integrity": "sha512-Aeg7dA6GTH1AcWLlBtWNzOU9efK5KpNi7b0EhBO0o0M+awyzguUUo8gF6hXGjQ9n5h8/uRtYv9zOqQkeC5CG0w==",
-			"dev": true
+			"dev": true,
+			"requires": {}
 		},
 		"eslint-plugin-node": {
 			"version": "11.1.0",
@@ -4045,9 +4109,9 @@
 			}
 		},
 		"eslint-plugin-unicorn": {
-			"version": "40.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-40.1.0.tgz",
-			"integrity": "sha512-y5doK2DF9Sr5AqKEHbHxjFllJ167nKDRU01HDcWyv4Tnmaoe9iNxMrBnaybZvWZUaE3OC5Unu0lNIevYamloig==",
+			"version": "42.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-42.0.0.tgz",
+			"integrity": "sha512-ixBsbhgWuxVaNlPTT8AyfJMlhyC5flCJFjyK3oKE8TRrwBnaHvUbuIkCM1lqg8ryYrFStL/T557zfKzX4GKSlg==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-validator-identifier": "^7.15.7",
@@ -4078,13 +4142,15 @@
 			}
 		},
 		"eslint-plugin-vue": {
-			"version": "8.4.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.4.1.tgz",
-			"integrity": "sha512-nmWOhNmDx9TZ+yP9ZhezTkZUupSHsYA2TocRm+efPSXMOyFrVczVlaIuQcLBjCtI8CbkBiUQ3VcyQsjlIhDrhA==",
+			"version": "8.7.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.7.1.tgz",
+			"integrity": "sha512-28sbtm4l4cOzoO1LtzQPxfxhQABararUb1JtqusQqObJpWX2e/gmVyeYVfepizPFne0Q5cILkYGiBoV36L12Wg==",
 			"dev": true,
 			"requires": {
 				"eslint-utils": "^3.0.0",
 				"natural-compare": "^1.4.0",
+				"nth-check": "^2.0.1",
+				"postcss-selector-parser": "^6.0.9",
 				"semver": "^7.3.5",
 				"vue-eslint-parser": "^8.0.1"
 			},
@@ -4101,15 +4167,15 @@
 			}
 		},
 		"eslint-plugin-wdio": {
-			"version": "7.4.2",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-wdio/-/eslint-plugin-wdio-7.4.2.tgz",
-			"integrity": "sha512-tkISFycJmRFMKsEjetRcAmWSHKJKnw5rKHDxfE7Ob3tF5lbmYlCLfNKH0UwanOpSdulpe52s3K+CBHSd6qUUNQ==",
+			"version": "7.25.3",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-wdio/-/eslint-plugin-wdio-7.25.3.tgz",
+			"integrity": "sha512-2zbYwV14Md9FNlyhaIILVGPB6w4bu2eJdOTywDUs2Qy4ebcQNwrxB0qCaf7Rm4O+T0Ir+tdYHYBBfbDocSLKng==",
 			"dev": true
 		},
 		"eslint-plugin-yml": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-yml/-/eslint-plugin-yml-0.13.0.tgz",
-			"integrity": "sha512-rZvdnhe28jIbgSIZo3qYqkl9hKslyTDfMwqIGDzz873gxghzBw0yeFG+P7sMfOkFfpqwJzZy3IKe2cIiCp4FrA==",
+			"version": "0.14.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-yml/-/eslint-plugin-yml-0.14.0.tgz",
+			"integrity": "sha512-+0+bBV/07txENbxfrHF9olGoLCHez64vmnOmjWOoLwmXOwfdaSRleBSPIi4nWQs7WwX8lm/fSLadOjbVEcsXQQ==",
 			"dev": true,
 			"requires": {
 				"debug": "^4.3.2",
@@ -4119,13 +4185,13 @@
 			}
 		},
 		"eslint-scope": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+			"integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
 			"dev": true,
 			"requires": {
 				"esrecurse": "^4.3.0",
-				"estraverse": "^4.1.1"
+				"estraverse": "^5.2.0"
 			}
 		},
 		"eslint-utils": {
@@ -4152,22 +4218,16 @@
 			"dev": true
 		},
 		"espree": {
-			"version": "9.3.2",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
-			"integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
+			"version": "9.5.0",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz",
+			"integrity": "sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==",
 			"dev": true,
 			"requires": {
-				"acorn": "^8.7.1",
+				"acorn": "^8.8.0",
 				"acorn-jsx": "^5.3.2",
 				"eslint-visitor-keys": "^3.3.0"
 			},
 			"dependencies": {
-				"acorn": {
-					"version": "8.7.1",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-					"integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
-					"dev": true
-				},
 				"eslint-visitor-keys": {
 					"version": "3.3.0",
 					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
@@ -4183,20 +4243,12 @@
 			"dev": true
 		},
 		"esquery": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+			"integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
 			"dev": true,
 			"requires": {
 				"estraverse": "^5.1.0"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-					"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-					"dev": true
-				}
 			}
 		},
 		"esrecurse": {
@@ -4206,20 +4258,12 @@
 			"dev": true,
 			"requires": {
 				"estraverse": "^5.2.0"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-					"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-					"dev": true
-				}
 			}
 		},
 		"estraverse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
 			"dev": true
 		},
 		"esutils": {
@@ -4273,6 +4317,15 @@
 			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
 			"dev": true
 		},
+		"fastq": {
+			"version": "1.15.0",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+			"integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+			"dev": true,
+			"requires": {
+				"reusify": "^1.0.4"
+			}
+		},
 		"file-entry-cache": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -4302,27 +4355,15 @@
 			}
 		},
 		"findup-sync": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
-			"integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz",
+			"integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==",
 			"dev": true,
 			"requires": {
-				"glob": "~5.0.0"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "5.0.15",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-					"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-					"dev": true,
-					"requires": {
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "2 || 3",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				}
+				"detect-file": "^1.0.0",
+				"is-glob": "^4.0.3",
+				"micromatch": "^4.0.4",
+				"resolve-dir": "^1.0.1"
 			}
 		},
 		"fined": {
@@ -4387,12 +4428,6 @@
 			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
 			"dev": true
 		},
-		"functional-red-black-tree": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-			"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-			"dev": true
-		},
 		"getobject": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/getobject/-/getobject-1.0.0.tgz",
@@ -4447,43 +4482,39 @@
 			}
 		},
 		"globals": {
-			"version": "13.15.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
-			"integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
+			"version": "13.20.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+			"integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
 			"dev": true,
 			"requires": {
 				"type-fest": "^0.20.2"
-			},
-			"dependencies": {
-				"type-fest": {
-					"version": "0.20.2",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-					"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-					"dev": true
-				}
 			}
 		},
+		"grapheme-splitter": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+			"integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+			"dev": true
+		},
 		"grunt": {
-			"version": "1.5.3",
-			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.3.tgz",
-			"integrity": "sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ==",
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.6.1.tgz",
+			"integrity": "sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA==",
 			"dev": true,
 			"requires": {
-				"dateformat": "~3.0.3",
+				"dateformat": "~4.6.2",
 				"eventemitter2": "~0.4.13",
 				"exit": "~0.1.2",
-				"findup-sync": "~0.3.0",
+				"findup-sync": "~5.0.0",
 				"glob": "~7.1.6",
 				"grunt-cli": "~1.4.3",
 				"grunt-known-options": "~2.0.0",
 				"grunt-legacy-log": "~3.0.0",
 				"grunt-legacy-util": "~2.0.1",
-				"iconv-lite": "~0.4.13",
+				"iconv-lite": "~0.6.3",
 				"js-yaml": "~3.14.0",
 				"minimatch": "~3.0.4",
-				"mkdirp": "~1.0.4",
-				"nopt": "~3.0.6",
-				"rimraf": "~3.0.2"
+				"nopt": "~3.0.6"
 			}
 		},
 		"grunt-banana-checker": {
@@ -4618,12 +4649,12 @@
 			"dev": true
 		},
 		"iconv-lite": {
-			"version": "0.4.24",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
 			"dev": true,
 			"requires": {
-				"safer-buffer": ">= 2.1.2 < 3"
+				"safer-buffer": ">= 2.1.2 < 3.0.0"
 			}
 		},
 		"ignore": {
@@ -4695,16 +4726,16 @@
 		"is-arrayish": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
 			"dev": true
 		},
 		"is-builtin-module": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.1.0.tgz",
-			"integrity": "sha512-OV7JjAgOTfAFJmHZLvpSTb4qi0nIILDV1gWPYDnDJUTNFM5aGlRAhk4QcT8i7TuAleeEV5Fdkqn3t4mS+Q11fg==",
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+			"integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
 			"dev": true,
 			"requires": {
-				"builtin-modules": "^3.0.0"
+				"builtin-modules": "^3.3.0"
 			}
 		},
 		"is-core-module": {
@@ -4737,6 +4768,12 @@
 			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
 			"dev": true
 		},
+		"is-path-inside": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+			"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+			"dev": true
+		},
 		"is-plain-object": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -4782,6 +4819,12 @@
 			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
 			"dev": true
 		},
+		"js-sdsl": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
+			"integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==",
+			"dev": true
+		},
 		"js-tokens": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -4799,9 +4842,9 @@
 			}
 		},
 		"jsdoc-type-pratt-parser": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.2.tgz",
-			"integrity": "sha512-zRokSWcPLSWkoNzsWn9pq7YYSwDhKyEe+cJYT2qaPqLOOJb5sFSi46BPj81vP+e8chvCNdQL9RG86Bi9EI6MDw==",
+			"version": "2.2.5",
+			"resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.5.tgz",
+			"integrity": "sha512-2a6eRxSxp1BW040hFvaJxhsCMI9lT8QB8t14t+NY5tC5rckIR0U9cr2tjOeaFirmEOy6MHvmJnY7zTBHq431Lw==",
 			"dev": true
 		},
 		"json-parse-even-better-errors": {
@@ -4950,12 +4993,6 @@
 				"brace-expansion": "^1.1.7"
 			}
 		},
-		"mkdirp": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-			"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-			"dev": true
-		},
 		"ms": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -5003,6 +5040,15 @@
 				}
 			}
 		},
+		"nth-check": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+			"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+			"dev": true,
+			"requires": {
+				"boolbase": "^1.0.0"
+			}
+		},
 		"object.defaults": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
@@ -5198,6 +5244,16 @@
 			"integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
 			"dev": true
 		},
+		"postcss-selector-parser": {
+			"version": "6.0.11",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
+			"integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
+			"dev": true,
+			"requires": {
+				"cssesc": "^3.0.0",
+				"util-deprecate": "^1.0.2"
+			}
+		},
 		"prelude-ls": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -5205,9 +5261,15 @@
 			"dev": true
 		},
 		"punycode": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+			"integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+			"dev": true
+		},
+		"queue-microtask": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
 			"dev": true
 		},
 		"ramda": {
@@ -5283,6 +5345,12 @@
 					"requires": {
 						"p-limit": "^2.2.0"
 					}
+				},
+				"type-fest": {
+					"version": "0.8.1",
+					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+					"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+					"dev": true
 				}
 			}
 		},
@@ -5307,12 +5375,6 @@
 			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
 			"dev": true
 		},
-		"regextras": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz",
-			"integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==",
-			"dev": true
-		},
 		"requireindex": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
@@ -5346,6 +5408,12 @@
 			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
 			"dev": true
 		},
+		"reusify": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+			"dev": true
+		},
 		"rimraf": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -5355,6 +5423,15 @@
 				"glob": "^7.1.3"
 			}
 		},
+		"run-parallel": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+			"dev": true,
+			"requires": {
+				"queue-microtask": "^1.2.2"
+			}
+		},
 		"safe-regex": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-2.1.1.tgz",
@@ -5395,9 +5472,9 @@
 			"dev": true
 		},
 		"spdx-correct": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+			"integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
 			"dev": true,
 			"requires": {
 				"spdx-expression-parse": "^3.0.0",
@@ -5421,9 +5498,9 @@
 			}
 		},
 		"spdx-license-ids": {
-			"version": "3.0.11",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
-			"integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
+			"version": "3.0.13",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
+			"integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==",
 			"dev": true
 		},
 		"sprintf-js": {
@@ -5496,9 +5573,9 @@
 			}
 		},
 		"type-fest": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
 			"dev": true
 		},
 		"unc-path-regex": {
@@ -5538,12 +5615,6 @@
 			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
 			"dev": true
 		},
-		"v8-compile-cache": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-			"dev": true
-		},
 		"v8flags": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
@@ -5564,9 +5635,9 @@
 			}
 		},
 		"vue-eslint-parser": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.2.0.tgz",
-			"integrity": "sha512-hvl8OVT8imlKk/lQyhkshqwQQChzHETcBd5abiO4ePw7ib7QUZLfW+2TUrJHKUvFOCFRJrDin5KJO9OHzB5bRQ==",
+			"version": "8.3.0",
+			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz",
+			"integrity": "sha512-dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g==",
 			"dev": true,
 			"requires": {
 				"debug": "^4.3.2",
@@ -5578,26 +5649,10 @@
 				"semver": "^7.3.5"
 			},
 			"dependencies": {
-				"eslint-scope": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz",
-					"integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==",
-					"dev": true,
-					"requires": {
-						"esrecurse": "^4.3.0",
-						"estraverse": "^5.2.0"
-					}
-				},
 				"eslint-visitor-keys": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
-					"integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
-					"dev": true
-				},
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+					"version": "3.3.0",
+					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+					"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
 					"dev": true
 				}
 			}
diff --git a/package.json b/package.json
index f9d5de1..d2c9f1d 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
 		"test": "grunt test"
 	},
 	"devDependencies": {
-		"eslint-config-wikimedia": "0.22.1",
-		"grunt": "1.5.3",
+		"eslint-config-wikimedia": "0.24.0",
+		"grunt": "1.6.1",
 		"grunt-banana-checker": "0.10.0",
 		"grunt-eslint": "24.0.0"
 	}

From a45681ac021d97ab7f4be5b32b29ae40a8bdda86 Mon Sep 17 00:00:00 2001
From: pavloyashchenko <pyashchenko@hallowelt.com>
Date: Tue, 14 Mar 2023 12:05:27 +0100
Subject: [PATCH 107/117] Fix filename validation regex

Enable underscores, dots, commas and whitespaces

ERM31619

[4.2.x]

Change-Id: Ib4a5245d8008772583f2864060ba1b7f96214610
---
 resources/ve/ve.ui.DrawioInspector.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/ve/ve.ui.DrawioInspector.js b/resources/ve/ve.ui.DrawioInspector.js
index 2638edf..6b62525 100644
--- a/resources/ve/ve.ui.DrawioInspector.js
+++ b/resources/ve/ve.ui.DrawioInspector.js
@@ -47,7 +47,7 @@ ve.ui.DrawioInspector.prototype.createLayout = function ( ) {
 			if ( value === '' ) {
 				return false;
 			}
-			if ( !value.match( /^[a-zA-Z0-9_-]+$/ ) ) {
+			if ( !value.match( /^[\w,-.\s]+$/ ) ) {
 				return false;
 			}
 			return true;

From d0f6fad790ed6ed7a08d3f4124bead371b003970 Mon Sep 17 00:00:00 2001
From: Hamish Slater <hamishslater@hotmail.com>
Date: Thu, 23 Mar 2023 14:51:07 +0100
Subject: [PATCH 108/117] Replace deprecated calls to 'Parser::getTitle'

ERM30083

[REL1_39, master]

Change-Id: I747a72a02657aae1f5026d27ef177a980ee2d4f4
---
 src/DrawioEditor.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index 00244a9..d1c4e79 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -12,6 +12,7 @@
 use Parser;
 use PPFrame;
 use RequestContext;
+use Title;
 
 class DrawioEditor {
 
@@ -354,8 +355,10 @@ private function errorMessage( $msg ) {
 	private function isReadOnly( $img ) {
 		$user = RequestContext::getMain()->getUser();
 		$parser = $this->services->getParser();
-		$isProtected = $parser->getTitle() ?
-			$this->services->getRestrictionStore()->isProtected( $parser->getTitle(), 'edit' ) : false;
+		$pageRef = $parser->getPage();
+		$title = Title::castFromPageReference( $pageRef );
+		$isProtected = $title ?
+			$this->services->getRestrictionStore()->isProtected( $title, 'edit' ) : false;
 
 		return !$this->config->get( 'EnableUploads' ) ||
 				!$this->services->getPermissionManager()->userHasRight( $user, 'upload' ) ||

From 5b986ffa63bba47918af6e1bc4fd943a72cef8b8 Mon Sep 17 00:00:00 2001
From: Hamish Slater <hamishslater@hotmail.com>
Date: Mon, 20 Mar 2023 12:47:44 +0100
Subject: [PATCH 109/117] Fix deprecated calls to 'User::isAllowed'

ERM29872

[REL1_39, master]

Change-Id: I464d4fa63f3eef87387fa628e9e61037aa7c2b6d
---
 src/DrawioEditor.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index d1c4e79..f9d5a98 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -151,7 +151,7 @@ public function parse( &$parser, $name, $opts ) {
 		if ( $img ) {
 			$img_url_ts = null;
 			$displayImage = $img;
-			$hookRunner = MediaWikiServices::getInstance()->getHookContainer();
+			$hookRunner = $this->services->getHookContainer();
 			$hookRunner->run( 'DrawioGetFile', [ &$img, &$latest_is_approved, $parser->getUserIdentity(),
 			&$noApproved, &$displayImage ] );
 			$img_url_ts = $displayImage->getUrl();
@@ -194,10 +194,12 @@ public function parse( &$parser, $name, $opts ) {
 		/* output begin */
 		$output = '<div>';
 		$user = RequestContext::getMain()->getUser();
+		$permisionManager = $this->services->getPermissionManager();
+		$userHasRight = $permisionManager->userHasRight( $user, 'approverevisions' );
 		if ( $noApproved ) {
 			$output .= '<p class="successbox">' .
 			wfMessage( "drawioeditor-noapproved", $name )->text();
-			if ( $user->isAllowed( 'approverevisions' ) ) {
+			if ( $userHasRight ) {
 				$output .= ' <a href="' . $img_desc_url . '">'
 				. wfMessage( "drawioeditor-approve-link" ) . '</a>';
 			}
@@ -212,7 +214,7 @@ public function parse( &$parser, $name, $opts ) {
 					$output .= '<p class="successbox" id="approved-displaywarning">' .
 				wfMessage( "drawioeditor-approved-displaywarning" )->text();
 				}
-				if ( $user->isAllowed( 'approverevisions' ) ) {
+				if ( $userHasRight ) {
 					$output .= ' <a href="' . $img_desc_url . '">'
 					. wfMessage( "drawioeditor-changeapprove-link" ) . '</a>';
 				}

From a5b7851ac6aa74b6b3e160723c7d436574c80ed9 Mon Sep 17 00:00:00 2001
From: "d.savuljesku" <d.savuljesku@gmail.com>
Date: Mon, 27 Mar 2023 08:50:03 +0200
Subject: [PATCH 110/117] Prevent fatal on empty $mxfileXML #2

[4.2.x]

ERM32059

Change-Id: I00b795a8fe0367878d9117794a46aeaf741732e0
---
 src/MXDocumentExtractor/Base.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/MXDocumentExtractor/Base.php b/src/MXDocumentExtractor/Base.php
index 18b71a3..b51dc2b 100644
--- a/src/MXDocumentExtractor/Base.php
+++ b/src/MXDocumentExtractor/Base.php
@@ -101,6 +101,9 @@ protected function getDiagramDOM( $mxfileXMLDOM ) {
 		$inflatedDiagramXML = base64_decode( $b64DiagramXML );
 		$urlencodedDiagramXML = gzinflate( $inflatedDiagramXML );
 		$diagramXmlString = urldecode( $urlencodedDiagramXML );
+		if ( empty( $diagramXmlString ) ) {
+			return null;
+		}
 		$documentXML = new DOMDocument();
 		$documentXML->loadXML( $diagramXmlString );
 

From d345d9af6aaffdc75f9a8669216635566c706906 Mon Sep 17 00:00:00 2001
From: miriam schlindwein <schlindwein@hallowelt.com>
Date: Thu, 9 Feb 2023 16:21:35 +0100
Subject: [PATCH 111/117] Add messages for droplet

ERM31408

[4.x]

Change-Id: I4a0937e87edc3d2ee7a9a8c6648be758d596ae57
(cherry picked from commit 1de4500a19e351659c69361c2d7717eeffaf4d7d)
(cherry picked from commit a610a893ec38fbae271f58c72679e541f8615154)
---
 extension.json       |  1 -
 i18n/de.json         |  4 +++-
 i18n/en.json         |  4 +++-
 i18n/qqq.json        |  4 +++-
 src/DrawioEditor.php | 11 -----------
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/extension.json b/extension.json
index 7ccdf26..f651da5 100644
--- a/extension.json
+++ b/extension.json
@@ -82,7 +82,6 @@
 		"remoteExtPath": "DrawioEditor/resources"
 	},
 	"Hooks": {
-		"MessageCache::get": "\\MediaWiki\\Extension\\DrawioEditor\\DrawioEditor::mockMessages",
 		"ParserFirstCallInit": [
 			"tag",
 			"MediaWiki\\Extension\\DrawioEditor\\Hook\\ParserFirstCallInit\\SetFunctionHook::callback"
diff --git a/i18n/de.json b/i18n/de.json
index 0b4f078..f900c4b 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -7,5 +7,7 @@
 	"drawioeditor-approved-displaywarning": "Dies ist die genehmigte Version des Diagramms und nicht die letzte Version.",
 	"drawioeditor-noapproved": "Das Diagramm $1 hat keine genehmigte Version.",
 	"drawioeditor-approve-link": "Klicke hier, um eine Version zu genehmigen",
-	"drawioeditor-changeapprove-link": "Klicke hier, um die genehmigte Version für dieses Diagramm zu ändern"
+	"drawioeditor-changeapprove-link": "Klicke hier, um die genehmigte Version für dieses Diagramm zu ändern",
+	"drawio-droplet-name": "Diagramm",
+	"drawio-droplet-description": "Bearbeitbares draw.io-Diagramm"
 }
diff --git a/i18n/en.json b/i18n/en.json
index a9eb373..1ff57a8 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -15,5 +15,7 @@
 	"drawioconnector-tag-drawio-desc": "Insert a draw.io diagram that can be edited.",
 	"drawioconnector-ve-drawio-tag-name": "Name",
 	"drawioconnector-ve-drawio-tag-name-help": "Name of the diagram as stored in the wiki",
-	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagram-1"
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagram-1",
+	"drawio-droplet-name": "Diagram",
+	"drawio-droplet-description": "Editable draw.io diagram"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 02c065c..ba77d45 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -19,5 +19,7 @@
 	"drawioconnector-tag-drawio-desc": "Used in VisualEditor tag inspector, tag description for drawio.",
 	"drawioconnector-ve-drawio-tag-name": "Label for the input field for name of the diagram\n{{identical|Name}}",
 	"drawioconnector-ve-drawio-tag-name-help": "Help text for the input field for name of the diagram",
-	"drawioconnector-ve-drawio-tag-name-placeholder": "Placeholder text for the input field for name of the diagram"
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Placeholder text for the input field for name of the diagram",
+	"drawio-droplet-name": "Title of droplet for tag drawio",
+	"drawio-droplet-description": "Description of droplet for tag drawio"
 }
diff --git a/src/DrawioEditor.php b/src/DrawioEditor.php
index f9d5a98..12c7894 100644
--- a/src/DrawioEditor.php
+++ b/src/DrawioEditor.php
@@ -370,15 +370,4 @@ private function isReadOnly( $img ) {
 			( $isProtected );
 	}
 
-	/**
-	 * TODO:Remove me
-	 *
-	 * @param string &$lckey
-	 * @return void
-	 */
-	public static function mockMessages( &$lckey ) {
-		if ( $lckey === 'drawio-droplet-name' || $lckey === 'drawio-droplet-description' ) {
-			$lckey = 'drawioconnector-tag-drawio-title';
-		}
-	}
 }

From 9ebf5c572aa85b34597895bab777a819f39a60af Mon Sep 17 00:00:00 2001
From: Hamish Slater <hamishslater@hotmail.com>
Date: Thu, 23 Mar 2023 11:36:15 +0100
Subject: [PATCH 112/117] Fix deprecated calls to 'ParserOutput::setProperty'

ERM29497

[REL1_39, master]

Change-Id: Ie83cb6e3028dfa679e0318a09c27c81990e9b41b
---
 src/Hook/Tag.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Hook/Tag.php b/src/Hook/Tag.php
index aca5791..ff9b338 100644
--- a/src/Hook/Tag.php
+++ b/src/Hook/Tag.php
@@ -31,7 +31,7 @@ public function onDrawIo( ?string $input, array $args, Parser $parser,
 		PPFrame $frame ) {
 		$drawioEditor = new DrawioEditor();
 		$magicWordData = $drawioEditor->parse( $parser, $args[ 'filename' ], $args );
-		$parser->getOutput()->setProperty( 'drawio-image', $args[ 'filename' ] );
+		$parser->getOutput()->setPageProperty( 'drawio-image', $args[ 'filename' ] );
 		$parser->getOutput()->addModules( [ 'ext.drawioconnector.init' ] );
 
 		$out = Html::element( 'div', [

From 05b5a73580e3bd61648e4add66987edc352cfe27 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Thu, 30 Mar 2023 09:01:39 +0200
Subject: [PATCH 113/117] Localisation updates from https://translatewiki.net.

Change-Id: I64833ff25d3c74fe99d507910eef33e919da70d9
---
 i18n/mk.json    | 4 +++-
 i18n/ru.json    | 8 ++++++++
 i18n/sl.json    | 4 +++-
 i18n/sr-ec.json | 8 ++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 i18n/ru.json
 create mode 100644 i18n/sr-ec.json

diff --git a/i18n/mk.json b/i18n/mk.json
index 78596db..5aed920 100644
--- a/i18n/mk.json
+++ b/i18n/mk.json
@@ -17,5 +17,7 @@
 	"drawioconnector-tag-drawio-desc": "Внесете дијаграм од draw.io што може да се уредува.",
 	"drawioconnector-ve-drawio-tag-name": "Име",
 	"drawioconnector-ve-drawio-tag-name-help": "Име на дијаграмот како што е складиран на викито",
-	"drawioconnector-ve-drawio-tag-name-placeholder": "Дијаграм-1"
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Дијаграм-1",
+	"drawio-droplet-name": "Дијаграм",
+	"drawio-droplet-description": "Уредлив draw.io-дијаграм"
 }
diff --git a/i18n/ru.json b/i18n/ru.json
new file mode 100644
index 0000000..b5d99e1
--- /dev/null
+++ b/i18n/ru.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Kareyac"
+		]
+	},
+	"drawio-droplet-name": "Диаграмма"
+}
diff --git a/i18n/sl.json b/i18n/sl.json
index c4910a3..d72f14c 100644
--- a/i18n/sl.json
+++ b/i18n/sl.json
@@ -17,5 +17,7 @@
 	"drawioconnector-tag-drawio-desc": "Vstavite diagram draw.io, ki ga je mogoče urejati.",
 	"drawioconnector-ve-drawio-tag-name": "Ime",
 	"drawioconnector-ve-drawio-tag-name-help": "Ime diagrama, kot je shranjeno v vikiju",
-	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagram-1"
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagram-1",
+	"drawio-droplet-name": "Diagram",
+	"drawio-droplet-description": "Diagram draw.io, ki ga je mogoče urejati"
 }
diff --git a/i18n/sr-ec.json b/i18n/sr-ec.json
new file mode 100644
index 0000000..c521186
--- /dev/null
+++ b/i18n/sr-ec.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Milicevic01"
+		]
+	},
+	"drawio-droplet-name": "Дијаграм"
+}

From 438bf15a409bd8cf88f01a53382b0b95d1c562af Mon Sep 17 00:00:00 2001
From: Wout Gevaert <wout@wikibase.nl>
Date: Thu, 30 Mar 2023 10:51:42 +0200
Subject: [PATCH 114/117] Fix notices in case MXDocument is not set on PNG file

Remove Notice: Undefined offset: 0 in extensions/DrawioEditor/src/MXDocumentExtractor/PNG.php on line 19

Change-Id: I2fa68693cab41298c3dba369a84f4f112a876d89
---
 src/MXDocumentExtractor/PNG.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MXDocumentExtractor/PNG.php b/src/MXDocumentExtractor/PNG.php
index 0f19547..8c4a917 100644
--- a/src/MXDocumentExtractor/PNG.php
+++ b/src/MXDocumentExtractor/PNG.php
@@ -16,7 +16,7 @@ protected function getPlainMXFileString(): string {
 		$partiallyDecodedXML = urldecode( $encodedXML );
 		$matches = [];
 		preg_match( '#<mxfile.*?>(.*?)</mxfile>#s', $partiallyDecodedXML, $matches );
-		$strippedXML = $matches[0];
+		$strippedXML = $matches[0] ?? '';
 		return trim( $strippedXML );
 	}
 }

From bac6758e98d01b6ed8b02453d93f892239d06a43 Mon Sep 17 00:00:00 2001
From: Translation updater bot <l10n-bot@translatewiki.net>
Date: Fri, 31 Mar 2023 09:57:41 +0200
Subject: [PATCH 115/117] Localisation updates from https://translatewiki.net.

Change-Id: Ib65d0c9d1bed9b53df2138a17a207ba851f9328f
---
 i18n/fr.json    | 4 +++-
 i18n/ia.json    | 4 +++-
 i18n/it.json    | 3 ++-
 i18n/pt-br.json | 5 ++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/i18n/fr.json b/i18n/fr.json
index 14535c0..ed1e845 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -21,5 +21,7 @@
 	"drawioconnector-tag-drawio-desc": "Insérer un diagramme Draw.io qui peut être modifié.",
 	"drawioconnector-ve-drawio-tag-name": "Nom",
 	"drawioconnector-ve-drawio-tag-name-help": "Nom du diagramme tel qu’il est stocké dans le wiki",
-	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagramme-1"
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagramme-1",
+	"drawio-droplet-name": "Diagramme",
+	"drawio-droplet-description": "Diagramme draw.io modifiable"
 }
diff --git a/i18n/ia.json b/i18n/ia.json
index 08805ba..95daff2 100644
--- a/i18n/ia.json
+++ b/i18n/ia.json
@@ -17,5 +17,7 @@
 	"drawioconnector-tag-drawio-desc": "Inserer un diagramma draw.io modificabile.",
 	"drawioconnector-ve-drawio-tag-name": "Nomine",
 	"drawioconnector-ve-drawio-tag-name-help": "Nomine del diagramma como immagazinate in le wiki",
-	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagramma-1"
+	"drawioconnector-ve-drawio-tag-name-placeholder": "Diagramma-1",
+	"drawio-droplet-name": "Diagramma",
+	"drawio-droplet-description": "Diagramma draw.io modificabile"
 }
diff --git a/i18n/it.json b/i18n/it.json
index 5fc6688..d744a6c 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -4,5 +4,6 @@
 			"Beta16"
 		]
 	},
-	"drawioconnector-ve-drawio-tag-name": "Nome"
+	"drawioconnector-ve-drawio-tag-name": "Nome",
+	"drawio-droplet-name": "Diagramma"
 }
diff --git a/i18n/pt-br.json b/i18n/pt-br.json
index 72d7763..e5bb179 100644
--- a/i18n/pt-br.json
+++ b/i18n/pt-br.json
@@ -3,6 +3,7 @@
 		"authors": [
 			"Eduardo Addad de Oliveira",
 			"Eduardoaddad",
+			"Re demz",
 			"YuriNikolai"
 		]
 	},
@@ -12,5 +13,7 @@
 	"drawioeditor-noapproved": "O diagrama $1 não possui revisão aprovada.",
 	"drawioeditor-approve-link": "Clique aqui para aprovar uma revisão",
 	"drawioeditor-changeapprove-link": "Clique aqui para alterar a revisão aprovada para este diagrama",
-	"drawioconnector-ve-drawio-tag-name": "Nome"
+	"drawioconnector-ve-drawio-tag-name": "Nome",
+	"drawio-droplet-name": "Diagrama",
+	"drawio-droplet-description": "Diagrama draw.io editável"
 }

From 2f084694978633eaf65b5070a8400a62ea301943 Mon Sep 17 00:00:00 2001
From: Wout Gevaert <wout@wikibase.nl>
Date: Thu, 30 Mar 2023 12:42:09 +0200
Subject: [PATCH 116/117] Improve PNG graphmodel handling

This patch allows for extracting mxfile data from png
when it is stored in zTXt instead of in tEXt.

Complies with https://w3c.github.io/PNG-spec/

Change-Id: Iaa20f978f44f15bcf6798ba12f51a6f906c48504
---
 src/MXDocumentExtractor/PNG.php | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/MXDocumentExtractor/PNG.php b/src/MXDocumentExtractor/PNG.php
index 8c4a917..22e4686 100644
--- a/src/MXDocumentExtractor/PNG.php
+++ b/src/MXDocumentExtractor/PNG.php
@@ -2,6 +2,8 @@
 
 namespace MediaWiki\Extension\DrawioEditor\MXDocumentExtractor;
 
+use Wikimedia\AtEase\AtEase;
+
 class PNG extends Base {
 
 	/**
@@ -16,7 +18,36 @@ protected function getPlainMXFileString(): string {
 		$partiallyDecodedXML = urldecode( $encodedXML );
 		$matches = [];
 		preg_match( '#<mxfile.*?>(.*?)</mxfile>#s', $partiallyDecodedXML, $matches );
-		$strippedXML = $matches[0] ?? '';
+		if ( empty( $matches ) ) {
+			// Extract from zTXt instead of tEXt.
+			$type = 'zTXt';
+			// The 2 zero bytes are for null-termination of comment (one byte) and encoding type (another byte).
+			// See https://w3c.github.io/PNG-spec/#11zTXt
+			$comment = 'mxGraphModel' . "\x0\x0";
+			$position = strpos( $this->imageContent, $type . $comment );
+			if ( $position !== false ) {
+				// 4 bytes before chunk type give chunck length.
+				// See https://w3c.github.io/PNG-spec/#5Chunk-layout
+				$unpacked = unpack( "N", substr( $this->imageContent, $position - 4, 4 ) );
+				$chunckLength = $unpacked["1"];
+				$data = substr(
+					$this->imageContent,
+					$position + strlen( $type . $comment ),
+					$chunckLength - strlen( $comment )
+				);
+				AtEase::suppressWarnings();
+				$data = gzinflate( $data );
+				AtEase::restoreWarnings();
+				if ( !is_string( $data ) ) {
+					$data = '';
+				}
+				$strippedXML = urldecode( $data );
+			} else {
+				$strippedXML = '';
+			}
+		} else {
+			$strippedXML = $matches[0];
+		}
 		return trim( $strippedXML );
 	}
 }

From 632fa80e7ef7a91cdcd9e6531c39632a2af8903b Mon Sep 17 00:00:00 2001
From: bluespice-bot <support@hallowelt.com>
Date: Fri, 31 Mar 2023 15:16:46 +0200
Subject: [PATCH 117/117] Set droplet icon

ERM32177

[4.x]
---
 resources/contentdroplets-drawio-icon.svg | 41 +++++++++++++----------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/resources/contentdroplets-drawio-icon.svg b/resources/contentdroplets-drawio-icon.svg
index 9e62d16..ac4fd73 100644
--- a/resources/contentdroplets-drawio-icon.svg
+++ b/resources/contentdroplets-drawio-icon.svg
@@ -1,28 +1,35 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="39mm" height="39mm" viewBox="0 0 39 39" version="1.1" id="svg8" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" sodipodi:docname="Droplet.svg">
-  <defs id="defs2" />
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4283557" inkscape:cx="-5.0424383" inkscape:cy="37.05737" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" showguides="true" inkscape:guide-bbox="true" inkscape:window-width="1920" inkscape:window-height="1009" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1">
-    <sodipodi:guide position="34.710188,9.2997108" orientation="0,1" id="guide1374" inkscape:locked="false" />
-    <sodipodi:guide position="19.627586,22.04861" orientation="1,0" id="guide1376" inkscape:locked="false" />
-    <inkscape:grid type="xygrid" id="grid1378" />
-  </sodipodi:namedview>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg8" version="1.1" viewBox="0 0 16.933333 16.933333" height="64" width="64" sodipodi:docname="contentdroplets-bpmn-icon.svg" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="1009" id="namedview21" showgrid="false" inkscape:zoom="14.75" inkscape:cx="32.567393" inkscape:cy="24.531741" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="layer1" />
+  <defs id="defs2">
+    <marker style="overflow:visible" id="marker1178" refX="0.0" refY="0.0" orient="auto">
+      <path transform="scale(0.8) translate(12.5,0)" style="fill-rule:evenodd;stroke:black;stroke-width:1pt;stroke-opacity:1" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path1176" />
+    </marker>
+    <marker style="overflow:visible" id="Arrow1Lstart" refX="0.0" refY="0.0" orient="auto">
+      <path transform="scale(0.8) translate(12.5,0)" style="fill-rule:evenodd;stroke:black;stroke-width:1pt;stroke-opacity:1" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path900" />
+    </marker>
+  </defs>
   <metadata id="metadata5">
     <rdf:RDF>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g inkscape:label="Ebene 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-258)">
-    <rect style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect5110" width="12.325351" height="1.9647278" x="7.3022375" y="267.30032" rx="1.3229165" ry="1.3229166" />
-    <rect style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect5110-3" width="13.687603" height="1.9647278" x="7.3022375" y="271.81921" rx="1.3229164" ry="1.3229166" />
-    <rect style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect5110-6" width="16.634693" height="1.9647278" x="7.3022375" y="276.27258" rx="1.3229165" ry="1.3229166" />
-    <rect style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:1.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect5110-7" width="19.712769" height="1.9647278" x="7.3022375" y="280.79147" rx="1.3229167" ry="1.3229166" />
-    <rect style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect5110-5" width="22.856335" height="1.9647278" x="7.3022375" y="285.73557" rx="1.3229165" ry="1.3229166" />
-    <circle style="opacity:1;fill:#241c1c;fill-opacity:1;stroke:none;stroke-width:2.46499991;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:74.26771545;stroke-opacity:1;paint-order:fill markers stroke" id="path836" cx="29.420271" cy="272.31262" r="4.2207561" />
+  <g transform="translate(0,-280.06666)" id="layer1" style="fill:none;fill-opacity:1;stroke:#00897b;stroke-opacity:1">
+    <path style="color:black;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:black;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:black;solid-opacity:1;vector-effect:none;fill:#3e5389;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.01999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:74.26771545;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="M 29.150391 14.917969 C 27.785969 14.917969 26.640625 16.063325 26.640625 17.427734 L 26.640625 23.429688 C 26.640625 24.794135 27.785969 25.939453 29.150391 25.939453 L 30.945312 25.939453 L 30.945312 30.736328 L 13.65625 30.736328 A 1.2101211 1.2101211 0 0 0 13.464844 30.722656 A 1.2101211 1.2101211 0 0 0 13.179688 30.761719 A 1.21206 1.21206 0 0 0 12.269531 32.326172 L 12.269531 34.945312 A 1.2106299 1.2106299 0 0 0 14.689453 34.945312 L 14.689453 33.158203 L 30.841797 33.158203 L 30.841797 34.945312 A 1.2106299 1.2106299 0 1 0 33.263672 34.945312 L 33.263672 33.158203 L 49.546875 33.158203 L 49.546875 34.945312 A 1.2106299 1.2106299 0 0 0 51.96875 34.945312 L 51.96875 31.947266 A 1.2101211 1.2101211 0 0 0 51.96875 31.929688 A 1.2106205 1.2106205 0 0 0 51.966797 31.888672 A 1.2101211 1.2101211 0 0 0 50.742188 30.722656 A 1.2101211 1.2101211 0 0 0 50.587891 30.736328 L 33.365234 30.736328 L 33.365234 25.939453 L 35.152344 25.939453 C 36.516765 25.939453 37.662109 24.794135 37.662109 23.429688 L 37.662109 17.427734 C 37.662109 16.063325 36.516765 14.917969 35.152344 14.917969 L 29.150391 14.917969 z M 29.660156 17.9375 L 34.642578 17.9375 L 34.642578 22.919922 L 29.660156 22.919922 L 29.660156 17.9375 z M 10.578125 38.878906 C 9.2137038 38.878906 8.0683594 40.024262 8.0683594 41.388672 L 8.0683594 47.390625 C 8.0683594 48.755034 9.2137038 49.900391 10.578125 49.900391 L 16.580078 49.900391 C 17.944499 49.900391 19.089844 48.755034 19.089844 47.390625 L 19.089844 41.388672 C 19.089844 40.024262 17.944499 38.878906 16.580078 38.878906 L 10.578125 38.878906 z M 29.349609 38.878906 C 27.985188 38.878906 26.839844 40.024262 26.839844 41.388672 L 26.839844 47.390625 C 26.839844 48.755034 27.985188 49.900391 29.349609 49.900391 L 35.351562 49.900391 C 36.715984 49.900391 37.861328 48.755034 37.861328 47.390625 L 37.861328 41.388672 C 37.861328 40.024262 36.715984 38.878906 35.351562 38.878906 L 29.349609 38.878906 z M 47.828125 38.878906 C 46.463704 38.878906 45.318359 40.024262 45.318359 41.388672 L 45.318359 47.390625 C 45.318359 48.755034 46.463704 49.900391 47.828125 49.900391 L 53.828125 49.900391 C 55.192546 49.900391 56.337891 48.755034 56.337891 47.390625 L 56.337891 41.388672 C 56.337891 40.024262 55.192546 38.878906 53.828125 38.878906 L 47.828125 38.878906 z M 11.087891 41.898438 L 16.070312 41.898438 L 16.070312 46.875 L 11.087891 46.875 L 11.087891 41.898438 z M 29.867188 41.898438 L 34.841797 41.898438 L 34.841797 46.875 L 29.867188 46.875 L 29.867188 41.898438 z M 48.335938 41.898438 L 53.320312 41.898438 L 53.320312 46.875 L 48.335938 46.875 L 48.335938 41.898438 z " transform="matrix(0.26458333,0,0,0.26458333,0,280.06666)" id="rect815" />
+    <path id="path886" d="M 2.4722431,287.8126 Z" style="fill:none;stroke:#00897b;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" />
+    <path inkscape:connector-curvature="0" style="color:black;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:black;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:black;solid-opacity:1;vector-effect:none;fill:#747474;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.79904163;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:74.26771545;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 8.1876123,286.93024 v 1.26917 h -4.574397 c -0.01675,-0.003 -0.03368,-0.004 -0.05064,-0.004 -0.02547,4.2e-4 -0.0508,0.004 -0.07545,0.0103 -0.187864,0.0383 -0.30041,0.23171 -0.240813,0.41393 v 0.69298 c 0.01373,0.41289 0.62654,0.41289 0.640271,0 v -0.47284 h 4.273641 v 0.47284 c 0,0.42719 0.6407882,0.42719 0.6407882,0 v -0.47284 h 4.3082645 v 0.47284 c 0,0.42719 0.640788,0.42719 0.640788,0 v -0.79323 c 1.3e-5,-0.002 1.3e-5,-0.003 0,-0.005 -1.15e-4,-0.004 -2.92e-4,-0.007 -5.3e-4,-0.0109 -0.0063,-0.17375 -0.150156,-0.31071 -0.324011,-0.30851 -0.01368,4.6e-4 -0.02731,0.002 -0.04082,0.004 H 8.8278847 v -1.26917 z" id="rect815-5" sodipodi:nodetypes="ccccccccccssccsscccccccc" />
+    <rect style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:0.44979167;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:74.26771545;stroke-opacity:1;paint-order:fill markers stroke" id="rect859" width="1.3182657" height="1.31672" x="2.9336708" y="291.15228" />
+    <rect style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:0.44979167;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:74.26771545;stroke-opacity:1;paint-order:fill markers stroke" id="rect859-6" width="1.3182657" height="1.31672" x="7.9002929" y="291.15228" />
+    <rect style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:0.44979167;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:74.26771545;stroke-opacity:1;paint-order:fill markers stroke" id="rect859-6-7" width="1.3182657" height="1.31672" x="12.788883" y="291.15228" />
+    <rect style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:0.44979167;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:74.26771545;stroke-opacity:1;paint-order:fill markers stroke" id="rect859-6-7-5" width="1.3182657" height="1.31672" x="7.8475828" y="284.81262" />
   </g>
+  <style type="text/css" id="style817">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:none;}
+	.st2{fill:#3E5389;}
+</style>
 </svg>