Merge branch 'master' of https://github.com/SVG-Edit/svgedit

badges/tests-badge.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="83" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="#696969" d="M0 0h41v20H0z"/><path fill="#4c1" d="M41 0h42v20H41z"/><path fill="url(#smooth)" d="M0 0h83v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">Tests</text><text class="high" x="5" y="14">Tests</text><text class="shadow" x="46.5" y="15">21/21</text><text class="high" x="46" y="14">21/21</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="97" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="#696969" d="M0 0h41v20H0z"/><path fill="#4c1" d="M41 0h56v20H41z"/><path fill="url(#smooth)" d="M0 0h97v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">Tests</text><text class="high" x="5" y="14">Tests</text><text class="shadow" x="46.5" y="15">139/139</text><text class="high" x="46" y="14">139/139</text></g></svg>

cypress/integration/unit/contextmenu.js

@@ -1,4 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
+window.$ = $;
 import * as contextmenu from '../../../instrumented/editor/contextmenu.js';
 
 describe('contextmenu', function () {

cypress/integration/unit/coords.js

@@ -1,5 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
-
+window.$ = $;
 import { NS } from '../../../instrumented/common/namespaces.js';
 import * as utilities from '../../../instrumented/svgcanvas/utilities.js';
 import * as coords from '../../../instrumented/svgcanvas/coords.js';

cypress/integration/unit/draw.js

@@ -1,5 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
-
+window.$ = $;
 import { NS } from '../../../instrumented/common/namespaces.js';
 import * as draw from '../../../instrumented/svgcanvas/draw.js';
 import * as units from '../../../instrumented/common/units.js';

cypress/integration/unit/history.js

@@ -1,5 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
-
+window.$ = $;
 import { NS } from '../../../instrumented/common/namespaces.js';
 import * as transformlist from '../../../instrumented/svgcanvas/svgtransformlist.js';
 import * as utilities from '../../../instrumented/svgcanvas/utilities.js';

cypress/integration/unit/math.js

@@ -1,5 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
-
+window.$ = $;
 import { NS } from '../../../instrumented/common/namespaces.js';
 import * as math from '../../../instrumented/svgcanvas/math.js';
 

cypress/integration/unit/path.js

@@ -1,7 +1,7 @@
 /* globals SVGPathSeg */
 import 'pathseg';
-
+import $ from 'jquery';
-import '../../../instrumented/editor/jquery.min.js';
+window.$ = $;
 
 import { NS } from '../../../instrumented/common/namespaces.js';
 import * as utilities from '../../../instrumented/svgcanvas/utilities.js';

cypress/integration/unit/recalculate.js

@@ -1,10 +1,11 @@
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
-
+window.$ = $;
 import { NS } from '../../../instrumented/common/namespaces.js';
 import * as utilities from '../../../instrumented/svgcanvas/utilities.js';
 import * as coords from '../../../instrumented/svgcanvas/coords.js';
 import * as recalculate from '../../../instrumented/svgcanvas/recalculate.js';
 
+
 describe('recalculate', function () {
   // eslint-disable-next-line no-shadow
   const root = document.createElement('div');

cypress/integration/unit/sanitize.js

@@ -1,5 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
-
+window.$ = $;
 import { NS } from '../../../instrumented/common/namespaces.js';
 import * as sanitize from '../../../instrumented/svgcanvas/sanitize.js';
 

cypress/integration/unit/select.js

@@ -1,5 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
-
+window.$ = $;
 import * as select from '../../../instrumented/svgcanvas/select.js';
 import { NS } from '../../../instrumented/common/namespaces.js';
 

cypress/integration/unit/svgtransformlist.js

@@ -1,5 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
-
+window.$ = $;
 import { NS } from '../../../instrumented/common/namespaces.js';
 import * as transformlist from '../../../instrumented/svgcanvas/svgtransformlist.js';
 import { disableSupportsNativeTransformLists } from '../../../instrumented/common/browser.js';

cypress/integration/unit/test1.js

@@ -1,5 +1,6 @@
 /* eslint-disable max-len, no-console */
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
+window.$ = $;
 
 import SvgCanvas from '../../../instrumented/svgcanvas/svgcanvas.js';
 

cypress/integration/unit/units.js

@@ -1,5 +1,5 @@
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
-
+window.$ = $;
 import * as units from '../../../instrumented/common/units.js';
 
 describe('units', function () {

cypress/integration/unit/utilities-bbox.js

@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 import 'pathseg';
-
+import $ from 'jquery';
-import '../../../instrumented/editor/jquery.min.js';
+window.$ = $;
 
 import { NS } from '../../../instrumented/common/namespaces.js';
 import * as utilities from '../../../instrumented/svgcanvas/utilities.js';

cypress/integration/unit/utilities-performance.js

@@ -1,6 +1,7 @@
 /* eslint-disable max-len, no-console */
 import 'pathseg';
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
+window.$ = $;
 
 import { NS } from '../../../instrumented/common/namespaces.js';
 import * as utilities from '../../../instrumented/svgcanvas/utilities.js';

cypress/integration/unit/utilities.js

@@ -1,6 +1,6 @@
 /* eslint-disable max-len */
-import '../../../instrumented/editor/jquery.min.js';
+import $ from 'jquery';
-
+window.$ = $;
 import * as browser from '../../../instrumented/common/browser.js';
 import * as utilities from '../../../instrumented/svgcanvas/utilities.js';
 import { NS } from '../../../instrumented/common/namespaces.js';

package-lock.json

@@ -14,7 +14,8 @@
         "core-js": "3.12.1",
         "deparam": "1.0.5",
         "elix": "15.0.0",
-        "i18next": "20.2.4",
+        "i18next": "20.3.0",
+        "jquery": "3.6.0",
         "jspdf": "2.3.1",
         "pathseg": "1.2.0",
         "regenerator-runtime": "0.13.7",
@@ -49,7 +50,7 @@
         "cypress-axe": "0.12.2",
         "cypress-multi-reporters": "1.5.0",
         "cypress-plugin-snapshots": "1.4.4",
-        "eslint": "^7.26.0",
+        "eslint": "7.27.0",
         "eslint-config-standard": "16.0.2",
         "eslint-plugin-array-func": "3.1.7",
         "eslint-plugin-chai-expect": "2.2.0",
@@ -59,7 +60,7 @@
         "eslint-plugin-cypress": "2.11.3",
         "eslint-plugin-eslint-comments": "3.2.0",
         "eslint-plugin-html": "^6.1.2",
-        "eslint-plugin-import": "2.23.2",
+        "eslint-plugin-import": "2.23.3",
         "eslint-plugin-jsdoc": "34.8.2",
         "eslint-plugin-markdown": "^2.1.0",
         "eslint-plugin-mocha": "8.1.0",
@@ -1096,20 +1097,6 @@
         "@babel/helper-plugin-utils": "^7.13.0",
         "@babel/helper-validator-identifier": "^7.12.11",
         "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz",
-          "integrity": "sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA==",
-          "dev": true
-        },
-        "@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
-        }
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
@@ -1291,14 +1278,6 @@
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz",
-          "integrity": "sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA==",
-          "dev": true
-        }
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
@@ -7902,31 +7881,6 @@
       "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
       "dev": true
     },
-    "node_modules/contains-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-1.0.0.tgz",
-      "integrity": "sha1-NFizMhhWA+ju0Y9RjUoQiIo6vJE=",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^2.1.1",
-        "path-starts-with": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/contains-path/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/content-disposition": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
@@ -9988,9 +9942,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "7.26.0",
+      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.27.0.tgz",
-      "integrity": "sha512-4R1ieRf52/izcZE7AlLy56uIHHDLT74Yzz2Iv2l6kDaYvEu9x+wMB5dZArVL8SYGXSYV2YAg70FcW5Y5nGGNIg==",
+      "integrity": "sha512-JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "7.12.11",
@@ -10001,12 +9955,14 @@
         "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",
@@ -10018,7 +9974,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",
@@ -10027,7 +9983,7 @@
         "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"
       },
@@ -10343,14 +10299,13 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.23.2",
+      "version": "2.23.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.2.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.3.tgz",
-      "integrity": "sha512-LmNoRptHBxOP+nb0PIKz1y6OSzCJlB+0g0IGS3XV4KaKk2q4szqQ6s6F1utVf5ZRkxk/QOTjdxe7v4VjS99Bsg==",
+      "integrity": "sha512-wDxdYbSB55F7T5CC7ucDjY641VvKmlRwT0Vxh7PkY1mI4rclVRFWYfsrjDgZvwYYDZ5ee0ZtfFKXowWjqvEoRQ==",
       "dev": true,
       "dependencies": {
         "array-includes": "^3.1.3",
         "array.prototype.flat": "^1.2.4",
-        "contains-path": "^1.0.0",
         "debug": "^2.6.9",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.4",
@@ -11097,6 +11052,18 @@
         "node": ">=6.0"
       }
     },
+    "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": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -13141,9 +13108,9 @@
       }
     },
     "node_modules/i18next": {
-      "version": "20.2.4",
+      "version": "20.3.0",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-20.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-20.3.0.tgz",
-      "integrity": "sha512-goE1LCA/IZOGG26PkkqoOl2KWR7YP606SvokVQZ29J6QwE02KycrzNetoMUJeqYrTxs4rmiiZgZp+q8qofQL6Q==",
+      "integrity": "sha512-eFv4aQvaGykp48mI4JEaCcoD/j4zoYjFnDYhChe3ukwvbHx3q4mKZlB8YnmhYrHQR5FopLlCrzcSuY0ZWfiakA==",
       "dependencies": {
         "@babel/runtime": "^7.12.0"
       }
@@ -14433,6 +14400,11 @@
       "integrity": "sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ==",
       "dev": true
     },
+    "node_modules/jquery": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
+      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+    },
     "node_modules/js-base64": {
       "version": "2.6.4",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
@@ -15392,6 +15364,12 @@
       "integrity": "sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=",
       "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.once": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
@@ -15403,6 +15381,12 @@
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
       "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
     },
+    "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/lodash.unescape": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz",
@@ -18782,30 +18766,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/path-starts-with": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/path-starts-with/-/path-starts-with-1.0.0.tgz",
-      "integrity": "sha1-soJDAV6LE43lcmgqxS2kLmRq2E4=",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-starts-with/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -21913,15 +21873,17 @@
       "dev": true
     },
     "node_modules/table": {
-      "version": "6.0.7",
+      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.0.7.tgz",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-      "integrity": "sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==",
+      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
       "dev": true,
       "dependencies": {
-        "ajv": "^7.0.2",
+        "ajv": "^8.0.1",
-        "lodash": "^4.17.20",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.truncate": "^4.4.2",
         "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
         "node": ">=10.0.0"
@@ -21961,15 +21923,19 @@
       }
     },
     "node_modules/table/node_modules/ajv": {
-      "version": "7.2.1",
+      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.5.0.tgz",
-      "integrity": "sha512-+nu0HDv7kNSOua9apAVc979qd932rrZeb3WOvoiD31A/p1mIE5/9bN2027pE2rOPYEdS3UHzsvof4hY+lM9/WQ==",
+      "integrity": "sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ==",
       "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"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
     "node_modules/table/node_modules/ansi-styles": {
@@ -21982,6 +21948,9 @@
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/table/node_modules/color-convert": {
@@ -22020,6 +21989,9 @@
       },
       "engines": {
         "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
     "node_modules/taffydb": {
@@ -26574,12 +26546,6 @@
             "resolve-from": "^4.0.0"
           }
         },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -27172,15 +27138,6 @@
         "extend": "3.0.2"
       }
     },
-    "@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"
-      }
-    },
     "@mysticatea/eslint-plugin": {
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/@mysticatea/eslint-plugin/-/eslint-plugin-13.0.0.tgz",
@@ -28440,12 +28397,6 @@
             "ms": "2.1.2"
           }
         },
-        "depd": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-          "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-          "dev": true
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -28683,74 +28634,6 @@
         "es-abstract": "^1.18.0-next.2",
         "get-intrinsic": "^1.1.1",
         "is-string": "^1.0.5"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.18.0-next.2",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz",
-          "integrity": "sha512-Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "get-intrinsic": "^1.0.2",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-negative-zero": "^2.0.1",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.9.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "string.prototype.trimend": "^1.0.3",
-            "string.prototype.trimstart": "^1.0.3"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-          "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
-          "dev": true
-        },
-        "object-inspect": {
-          "version": "1.9.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
-          "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==",
-          "dev": true
-        },
-        "object.assign": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.0",
-            "define-properties": "^1.1.3",
-            "has-symbols": "^1.0.1",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz",
-          "integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.0",
-            "define-properties": "^1.1.3"
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz",
-          "integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.0",
-            "define-properties": "^1.1.3"
-          }
-        }
       }
     },
     "array-union": {
@@ -28913,9 +28796,9 @@
       "dev": true
     },
     "aws4": {
-      "version": "1.11.0",
+      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+      "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==",
       "dev": true
     },
     "axe-core": {
@@ -31281,27 +31164,6 @@
       "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
       "dev": true
     },
-    "contains-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-1.0.0.tgz",
-      "integrity": "sha1-NFizMhhWA+ju0Y9RjUoQiIo6vJE=",
-      "dev": true,
-      "requires": {
-        "normalize-path": "^2.1.1",
-        "path-starts-with": "^1.0.0"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        }
-      }
-    },
     "content-disposition": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
@@ -31680,12 +31542,6 @@
             "camelcase": "^5.0.0",
             "decamelize": "^1.2.0"
           }
-        },
-        "universalify": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-          "dev": true
         }
       }
     },
@@ -32838,27 +32694,6 @@
           "requires": {
             "async-limiter": "~1.0.0"
           }
-        },
-        "tr46": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-          "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
-          "dev": true,
-          "requires": {
-            "punycode": "^2.1.0"
-          }
-        },
-        "webidl-conversions": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-          "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
-          "dev": true
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-          "dev": true
         }
       }
     },
@@ -33053,9 +32888,9 @@
       }
     },
     "eslint": {
-      "version": "7.26.0",
+      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.27.0.tgz",
-      "integrity": "sha512-4R1ieRf52/izcZE7AlLy56uIHHDLT74Yzz2Iv2l6kDaYvEu9x+wMB5dZArVL8SYGXSYV2YAg70FcW5Y5nGGNIg==",
+      "integrity": "sha512-JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "7.12.11",
@@ -33066,12 +32901,14 @@
         "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",
@@ -33083,7 +32920,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",
@@ -33092,7 +32929,7 @@
         "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"
       },
@@ -33149,6 +32986,12 @@
             "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
+        },
         "eslint-scope": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -33201,23 +33044,6 @@
             }
           }
         },
-        "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",
@@ -33616,14 +33442,13 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.23.2",
+      "version": "2.23.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.2.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.3.tgz",
-      "integrity": "sha512-LmNoRptHBxOP+nb0PIKz1y6OSzCJlB+0g0IGS3XV4KaKk2q4szqQ6s6F1utVf5ZRkxk/QOTjdxe7v4VjS99Bsg==",
+      "integrity": "sha512-wDxdYbSB55F7T5CC7ucDjY641VvKmlRwT0Vxh7PkY1mI4rclVRFWYfsrjDgZvwYYDZ5ee0ZtfFKXowWjqvEoRQ==",
       "dev": true,
       "requires": {
         "array-includes": "^3.1.3",
         "array.prototype.flat": "^1.2.4",
-        "contains-path": "^1.0.0",
         "debug": "^2.6.9",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.4",
@@ -33728,15 +33553,6 @@
             "yallist": "^4.0.0"
           }
         },
-        "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"
-          }
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -33992,15 +33808,6 @@
             "yallist": "^4.0.0"
           }
         },
-        "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"
-          }
-        },
         "p-locate": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
@@ -35478,17 +35285,6 @@
             "domelementtype": "^2.0.1",
             "domhandler": "^4.0.0",
             "entities": "^2.0.0"
-          },
-          "dependencies": {
-            "domhandler": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz",
-              "integrity": "sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==",
-              "dev": true,
-              "requires": {
-                "domelementtype": "^2.1.0"
-              }
-            }
           }
         },
         "domelementtype": {
@@ -35519,12 +35315,6 @@
         "http-errors": "~1.7.2"
       },
       "dependencies": {
-        "depd": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-          "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-          "dev": true
-        },
         "http-errors": {
           "version": "1.7.3",
           "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
@@ -35650,9 +35440,9 @@
       }
     },
     "i18next": {
-      "version": "20.2.4",
+      "version": "20.3.0",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-20.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-20.3.0.tgz",
-      "integrity": "sha512-goE1LCA/IZOGG26PkkqoOl2KWR7YP606SvokVQZ29J6QwE02KycrzNetoMUJeqYrTxs4rmiiZgZp+q8qofQL6Q==",
+      "integrity": "sha512-eFv4aQvaGykp48mI4JEaCcoD/j4zoYjFnDYhChe3ukwvbHx3q4mKZlB8YnmhYrHQR5FopLlCrzcSuY0ZWfiakA==",
       "requires": {
         "@babel/runtime": "^7.12.0"
       }
@@ -36672,6 +36462,11 @@
       "integrity": "sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ==",
       "dev": true
     },
+    "jquery": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
+      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+    },
     "js-base64": {
       "version": "2.6.4",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
@@ -37471,6 +37266,12 @@
       "integrity": "sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=",
       "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.once": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
@@ -37482,6 +37283,12 @@
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
       "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
     },
+    "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
+    },
     "lodash.unescape": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz",
@@ -40208,26 +40015,6 @@
       "integrity": "sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=",
       "dev": true
     },
-    "path-starts-with": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/path-starts-with/-/path-starts-with-1.0.0.tgz",
-      "integrity": "sha1-soJDAV6LE43lcmgqxS2kLmRq2E4=",
-      "dev": true,
-      "requires": {
-        "normalize-path": "^2.1.1"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        }
-      }
-    },
     "path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -40905,9 +40692,9 @@
       "dev": true
     },
     "regexpu-core": {
-      "version": "4.7.1",
+      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
-      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
+      "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
       "dev": true,
       "requires": {
         "regenerate": "^1.4.0",
@@ -40949,9 +40736,9 @@
       "dev": true
     },
     "regjsparser": {
-      "version": "0.6.7",
+      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.7.tgz",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
-      "integrity": "sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ==",
+      "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
       "dev": true,
       "requires": {
         "jsesc": "~0.5.0"
@@ -41344,12 +41131,6 @@
         "path-is-absolute": "1.0.1"
       },
       "dependencies": {
-        "depd": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-          "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-          "dev": true
-        },
         "http-errors": {
           "version": "1.6.3",
           "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
@@ -42834,21 +42615,23 @@
       "dev": true
     },
     "table": {
-      "version": "6.0.7",
+      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.0.7.tgz",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-      "integrity": "sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==",
+      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
       "dev": true,
       "requires": {
-        "ajv": "^7.0.2",
+        "ajv": "^8.0.1",
-        "lodash": "^4.17.20",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.truncate": "^4.4.2",
         "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0"
       },
       "dependencies": {
         "ajv": {
-          "version": "7.2.1",
+          "version": "8.5.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.2.1.tgz",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.5.0.tgz",
-          "integrity": "sha512-+nu0HDv7kNSOua9apAVc979qd932rrZeb3WOvoiD31A/p1mIE5/9bN2027pE2rOPYEdS3UHzsvof4hY+lM9/WQ==",
+          "integrity": "sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -44070,9 +43853,9 @@
       }
     },
     "uri-js": {
-      "version": "4.4.1",
+      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
       "dev": true,
       "requires": {
         "punycode": "^2.1.0"
@@ -44836,12 +44619,6 @@
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "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
-    },
     "zwitch": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",

package.json

@@ -98,7 +98,8 @@
     "core-js": "3.12.1",
     "deparam": "1.0.5",
     "elix": "15.0.0",
-    "i18next": "20.2.4",
+    "i18next": "20.3.0",
+    "jquery": "3.6.0",
     "jspdf": "2.3.1",
     "pathseg": "1.2.0",
     "regenerator-runtime": "0.13.7",
@@ -133,7 +134,7 @@
     "cypress-axe": "0.12.2",
     "cypress-multi-reporters": "1.5.0",
     "cypress-plugin-snapshots": "1.4.4",
-    "eslint": "^7.26.0",
+    "eslint": "7.27.0",
     "eslint-config-standard": "16.0.2",
     "eslint-plugin-array-func": "3.1.7",
     "eslint-plugin-chai-expect": "2.2.0",
@@ -143,7 +144,7 @@
     "eslint-plugin-cypress": "2.11.3",
     "eslint-plugin-eslint-comments": "3.2.0",
     "eslint-plugin-html": "^6.1.2",
-    "eslint-plugin-import": "2.23.2",
+    "eslint-plugin-import": "2.23.3",
     "eslint-plugin-jsdoc": "34.8.2",
     "eslint-plugin-markdown": "^2.1.0",
     "eslint-plugin-mocha": "8.1.0",

src/editor/Editor.js

@@ -14,6 +14,13 @@
 * @module SVGEditor
 */
 
+import jQuery from 'jquery/dist/jquery.slim.js';
+import jQueryPluginSVG from '../svgcanvas/jQuery.attr.js'; // Needed for SVG attribute
+import './components/index.js';
+import './dialogs/index.js';
+// Global Constant
+window.$ = jQueryPluginSVG(jQuery);
+
 import './touch.js';
 import { isMac } from '../common/browser.js';
 

src/editor/EditorStartup.js

@@ -655,7 +655,7 @@ class EditorStartup {
               editorObj.svgCanvas.selectOnly([ newImage ]);
               editorObj.svgCanvas.alignSelectedElements('m', 'page');
               editorObj.svgCanvas.alignSelectedElements('c', 'page');
-              editorObj.topPanelHandlers.updateContextPanel();
+              editorObj.topPanel.updateContextPanel();
               document.getElementById('se-prompt-dialog').setAttribute('close', true);
             };
             // create dummy img so we know the default dimensions

src/editor/components/seExplorerButton.js

@@ -151,9 +151,9 @@ export class ExplorerButton extends HTMLElement {
       break;
     case 'disabled':
       if (newValue) {
-        this.$div.classList.add('disabled');
+        this.$overall.classList.add('disabled');
       } else {
-        this.$div.classList.remove('disabled');
+        this.$overall.classList.remove('disabled');
       }
       break;
     case 'lib':

src/editor/components/seFlyingButton.js

@@ -47,7 +47,6 @@ template.innerHTML = `
   }
   .menu {
     position: absolute;
-    top:-2px;
     left:32px;
     background: none !important;
     display:none;
@@ -68,13 +67,14 @@ template.innerHTML = `
   </style>
 
   <div class="overall">
+  <div class="menu">
+  <slot></slot>
+</div>
     <div class="menu-button">
       <img class="button-icon" src="./images/logo.svg" alt="icon">
       <div class="handle"></div>
     </div>
-    <div class="menu">
+   
-      <slot></slot>
-    </div>
   </div>
 
 `;
@@ -139,9 +139,9 @@ export class FlyingButton extends HTMLElement {
       break;
     case 'disabled':
       if (newValue) {
-        this.$div.classList.add('disabled');
+        this.$overall.classList.add('disabled');
       } else {
-        this.$div.classList.remove('disabled');
+        this.$overall.classList.remove('disabled');
       }
       break;
     default:

src/editor/embedapi.js

@@ -113,7 +113,6 @@ svgCanvas.setSvgString('string')(function (data, error) {
      throw error
      } else {
      // Handle data
-     console.log(data)
      }
 });
 

src/editor/extensions/ext-imagelib/index.js

@@ -1,5 +1,4 @@
-/* globals jQuery */
+/* globals $ */
-const $ = jQuery;
 const atags = document.querySelectorAll('a');
 Array.prototype.forEach.call(atags, function (aEle) {
   aEle.addEventListener('click', function (event) {

src/editor/index.js

@@ -4,7 +4,6 @@ For default config and extensions (and available options) available to
 `setConfig()`, see the file `docs/tutorials/ConfigOptions.md`
 */
 
-import './jquery.min.js';
 import Editor from './Editor.js';
 
 const svgEditor = new Editor();

src/editor/panels/LayersPanel.js

@@ -325,7 +325,8 @@ class LayersPanel {
    * @returns {void}
    */
   layerRename() {
-    const oldName = document.querySelector("#layerlist tr.layersel td.layername").textContent;
+    const ele = document.querySelector("#layerlist tr.layersel td.layername");
+    const oldName = (ele) ? ele.textContent : '';
     const newName = prompt(this.editor.i18next.t('notification.enterNewLayerName'), "");
     if (!newName) {
       return;
@@ -425,7 +426,8 @@ class LayersPanel {
     const elements = $id('layerlist').querySelectorAll("td.layervis");
     Array.from(elements).forEach(function(element) {
       element.addEventListener('click', function(evt) {
-        const name = evt.currentTarget.parentNode.querySelector("td.layername").textContent;
+        const ele = evt.currentTarget.parentNode.querySelector("td.layername");
+        const name = (ele)? ele.textContent : '';
         const vis = evt.currentTarget.classList.contains("layerinvis");
         self.editor.svgCanvas.setLayerVisibility(name, vis);
         evt.currentTarget.classList.toggle("layerinvis");

src/svgcanvas/elem-get-set.js

@@ -4,11 +4,8 @@
  * @copyright 2011 Jeff Schiller
  */
 
-/* globals jQuery */
 import { jGraduate } from '../editor/components/jgraduate/jQuery.jGraduate.js';
-
 import * as hstry from './history.js';
-import jQueryPluginSVG from './jQuery.attr.js';
 import { NS } from '../common/namespaces.js';
 import {
   getVisibleElements, getStrokedBBoxDefaultVisible, findDefs,
@@ -19,8 +16,6 @@ import {
 } from '../common/units.js';
 import { getParents } from '../editor/components/jgraduate/Util.js';
 
-const $ = jQueryPluginSVG(jQuery);
-
 const {
   InsertElementCommand, RemoveElementCommand,
   ChangeElementCommand, BatchCommand
@@ -272,7 +267,7 @@ export const setBBoxZoomMethod = function (val, editorW, editorH) {
   switch (val) {
     case 'selection': {
       if (!selectedElements[0]) { return undefined; }
-      const selectedElems = $.map(selectedElements, function (n) {
+      const selectedElems = selectedElements.map(function (n, _) {
         if (n) {
           return n;
         }
@@ -722,7 +717,7 @@ export const getTextMethod = function () {
   const selectedElements = elemContext_.getSelectedElements();
   const selected = selectedElements[0];
   if (isNullish(selected)) { return ''; }
-  return selected.textContent;
+  return (selected) ? selected.textContent : '';
 };
 
 /**
@@ -800,7 +795,7 @@ export const setLinkURLMethod = function (val) {
   if (elem.tagName !== 'a') {
     // See if parent is an anchor
     const parentsA = getParents(elem.parentNode, 'a');
-    if (parentsA.length) {
+    if (parentsA?.length) {
       elem = parentsA[0];
     } else {
       return;

src/svgcanvas/history.js

@@ -294,7 +294,7 @@ export class ChangeElementCommand extends Command {
     this.oldValues = attrs;
     for (const attr in attrs) {
       if (attr === '#text') {
-        this.newValues[attr] = elem.textContent;
+        this.newValues[attr] = (elem) ? elem.textContent : '';
       } else if (attr === '#href') {
         this.newValues[attr] = getHref(elem);
       } else {

src/svgcanvas/path-actions.js

@@ -1,4 +1,4 @@
-/* globals jQuery */
+/* globals $ */
 /**
  * Path functionality.
  * @module path
@@ -23,8 +23,6 @@ import {
   isWebkit
 } from '../common/browser.js';
 
-const $ = jQuery;
-
 let pathActionsContext_ = null;
 let editorContext_ = null;
 let path = null;

src/svgcanvas/recalculate.js

@@ -1,11 +1,10 @@
-/* globals jQuery */
+/* globals $ */
 /**
  * Recalculate.
  * @module recalculate
  * @license MIT
  */
 
-import jQueryPluginSVG from './jQuery.attr.js'; // Needed for SVG attribute setting and array form with `attr`
 import { NS } from '../common/namespaces.js';
 import { convertToNum } from '../common/units.js';
 import { isWebkit } from '../common/browser.js';
@@ -18,8 +17,6 @@ import {
   hasMatrixTransform
 } from './math.js';
 
-const $ = jQueryPluginSVG(jQuery);
-
 let context_;
 
 /**

src/svgcanvas/selected-elem.js

@@ -1,4 +1,4 @@
-/* globals jQuery */
+/* globals $ */
 /**
  * Tools for SVG selected element operation.
  * @module selected-elem
@@ -6,7 +6,7 @@
  *
  * @copyright 2010 Alexis Deveria, 2010 Jeff Schiller
  */
-import jQueryPluginSVG from './jQuery.attr.js'; // Needed for SVG attribute
+
 import { NS } from '../common/namespaces.js';
 import * as hstry from './history.js';
 import * as pathModule from './path.js';
@@ -31,7 +31,6 @@ import { getParents } from '../editor/components/jgraduate/Util.js';
 const {
   MoveElementCommand, BatchCommand, InsertElementCommand, RemoveElementCommand, ChangeElementCommand
 } = hstry;
-const $ = jQueryPluginSVG(jQuery);
 
 let elementContext_ = null;
 
@@ -735,8 +734,11 @@ export const convertToGroup = function (elem) {
   } else if (dataStorage.has($elem, 'symbol')) {
     elem = dataStorage.get($elem, 'symbol');
 
-    ts = $elem.attr('transform');
+    ts = $elem.getAttribute('transform');
-    const pos = $elem.attr([ 'x', 'y' ]);
+    const pos = {
+      x: $elem.getAttribute('x'),
+      y: $elem.getAttribute('y')
+    };
 
     const vb = elem.getAttribute('viewBox');
 
@@ -872,7 +874,7 @@ export const ungroupSelectedElement = function () {
     return;
   }
   const parentsA = getParents(g.parentNode, 'a');
-  if (parentsA.length) {
+  if (parentsA?.length) {
     g = parentsA[0];
   }
 

src/svgcanvas/selection.js

@@ -155,16 +155,14 @@ export const getMouseTargetMethod = function (evt) {
     return selectionContext_.getSVGRoot();
   }
 
-  const $target = mouseTarget;
-
   // If it's a selection grip, return the grip parent
-  if (getClosest($target.parentNode, '#selectorParentGroup')) {
+  if (getClosest(mouseTarget.parentNode, '#selectorParentGroup')) {
     // While we could instead have just returned mouseTarget,
     // this makes it easier to indentify as being a selector grip
     return selectionContext_.getCanvas().selectorManager.selectorParentGroup;
   }
 
-  while (mouseTarget.parentNode !== (selectionContext_.getCurrentGroup() || currentLayer)) {
+  while (!mouseTarget.parentNode.isSameNode(selectionContext_.getCurrentGroup() || currentLayer)) {
     mouseTarget = mouseTarget.parentNode;
   }
 

src/svgcanvas/svg-exec.js

@@ -1,4 +1,4 @@
-/* globals jQuery */
+/* globals $ */
 /**
  * Tools for svg.
  * @module svg
@@ -8,7 +8,6 @@
 
 import { jsPDF } from 'jspdf/dist/jspdf.es.min.js';
 import 'svg2pdf.js/dist/svg2pdf.es.js';
-import jQueryPluginSVG from './jQuery.attr.js';
 import * as hstry from './history.js';
 import {
   text2xml, cleanupElement, findDefs, getHref, preventClickDefault,
@@ -36,8 +35,6 @@ const {
   ChangeElementCommand, BatchCommand
 } = hstry;
 
-const $ = jQueryPluginSVG(jQuery);
-
 let svgContext_ = null;
 let $id = null;
 
@@ -351,7 +348,7 @@ export const setSvgString = function (xmlString, preventUndo) {
     const elements = content.querySelectorAll('image');
     Array.prototype.forEach.call(elements, function (image) {
       preventClickDefault(image);
-      const val = svgContext_.getCanvas().getHref(this);
+      const val = svgContext_.getCanvas().getHref(image);
       if (val) {
         if (val.startsWith('data:')) {
           // Check if an SVG-edit data URI

src/svgcanvas/svgcanvas.js

@@ -1,4 +1,4 @@
-/* globals jQuery */
+/* globals $ */
 /**
  * Numerous tools for working with the editor's "canvas".
  * @module svgcanvas
@@ -12,8 +12,6 @@
 import { Canvg as canvg } from 'canvg';
 import 'pathseg';
 
-import jQueryPluginSVG from './jQuery.attr.js'; // Needed for SVG attribute setting and array form with `attr`
-
 import * as pathModule from './path.js';
 import * as hstry from './history.js';
 import * as draw from './draw.js';
@@ -114,7 +112,6 @@ import {
   getClosest, getParents, mergeDeep
 } from '../editor/components/jgraduate/Util.js';
 
-const $ = jQueryPluginSVG(jQuery);
 const {
   MoveElementCommand, InsertElementCommand, RemoveElementCommand,
   ChangeElementCommand, BatchCommand
@@ -207,7 +204,7 @@ class SvgCanvas {
         this._storage.get(element).set(key, obj);
       },
       get: function (element, key) {
-        return this._storage.get(element).get(key);
+        return this._storage.get(element)?.get(key);
       },
       has: function (element, key) {
         return this._storage.has(element) && this._storage.get(element).has(key);

src/svgcanvas/utilities.js

@@ -1,4 +1,4 @@
-/* globals jQuery */
+/* globals $ */
 /**
  * Miscellaneous utilities.
  * @module utilities
@@ -7,7 +7,6 @@
  * @copyright 2010 Alexis Deveria, 2010 Jeff Schiller
  */
 
-import jQueryPluginSVG from './jQuery.attr.js'; // Needed for SVG attribute setting and array form with `attr`
 import { NS } from '../common/namespaces.js';
 import { getTransformList } from './svgtransformlist.js';
 import { setUnitAttr, getTypeMap } from '../common/units.js';
@@ -20,9 +19,6 @@ import {
 } from '../common/browser.js';
 import { getClosest } from '../editor/components/jgraduate/Util.js';
 
-// Constants
-const $ = jQueryPluginSVG(jQuery);
-
 // String used to encode base64.
 const KEYSTR = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
 
@@ -1324,11 +1320,8 @@ export const snapToGrid = function (value) {
  * @returns {void}
  */
 export const preventClickDefault = function (img) {
-  const elements = document.querySelectorAll(img);
+  img.addEventListener('click', function (e) {
-  Array.from(elements).forEach(function (element) {
+    e.preventDefault();
-    element.addEventListener('click', function (e) {
-      e.preventDefault();
-    });
   });
 };